Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Manually resolve conflict in include/mtd/Kbuild Signed-off-by: David Woodhouse <dwmw2@infradead.org>
author: David Woodhouse <dwmw2@infradead.org> 2006-10-01 12:55:53 -0400
committer: David Woodhouse <dwmw2@infradead.org> 2006-10-01 12:55:53 -0400
commit: 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch)
tree: 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /include
parent: 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff)
parent: 82965addad66fce61a92c5f03104ea90b0b87124 (diff)
939 files changed, 24791 insertions, 11616 deletions
diff --git a/include/Kbuild b/include/Kbuild
index cb2534800b19..2d03f995865f 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,2 +1,9 @@
-header-y += asm-generic/ linux/ scsi/ sound/ mtd/ rdma/ video/
+header-y += asm-generic/
-header-y += asm-$(ARCH)/ 
+header-y += linux/
+header-y += scsi/
+header-y += sound/
+header-y += mtd/
+header-y += rdma/
+header-y += video/
+header-y += asm-$(ARCH)/
diff --git a/include/asm-alpha/Kbuild b/include/asm-alpha/Kbuild
index 2b06b3bad5ff..b7c8f188b313 100644
--- a/include/asm-alpha/Kbuild
+++ b/include/asm-alpha/Kbuild
@@ -1,5 +1,11 @@
 include include/asm-generic/Kbuild.asm
-unifdef-y += console.h fpu.h sysinfo.h compiler.h
+header-y += gentrap.h
+header-y += regdef.h
+header-y += pal.h
+header-y += reg.h
-header-y += gentrap.h regdef.h pal.h reg.h
+unifdef-y += console.h
+unifdef-y += fpu.h
+unifdef-y += sysinfo.h
+unifdef-y += compiler.h
diff --git a/include/asm-alpha/mmzone.h b/include/asm-alpha/mmzone.h
index 64d0ab98fcd8..8af56ce346ad 100644
--- a/include/asm-alpha/mmzone.h
+++ b/include/asm-alpha/mmzone.h
@@ -75,6 +75,7 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)
 #define VALID_PAGE(page)        (((page) - mem_map) < max_mapnr)
 #define pmd_page(pmd)           (pfn_to_page(pmd_val(pmd) >> 32))
+#define pgd_page(pgd)           (pfn_to_page(pgd_val(pgd) >> 32))
 #define pte_pfn(pte)            (pte_val(pte) >> 32)
 #define mk_pte(page, pgprot)                                                 \
diff --git a/include/asm-alpha/pgtable.h b/include/asm-alpha/pgtable.h
index 93eaa58b7961..49ac9bee7ced 100644
--- a/include/asm-alpha/pgtable.h
+++ b/include/asm-alpha/pgtable.h
@@ -230,16 +230,17 @@ extern inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
 extern inline unsigned long
-pmd_page_kernel(pmd_t pmd)
+pmd_page_vaddr(pmd_t pmd)
 {
        return ((pmd_val(pmd) & _PFN_MASK) >> (32-PAGE_SHIFT)) + PAGE_OFFSET;
 }
 #ifndef CONFIG_DISCONTIGMEM
 #define pmd_page(pmd)   (mem_map + ((pmd_val(pmd) & _PFN_MASK) >> 32))
+#define pgd_page(pgd)   (mem_map + ((pgd_val(pgd) & _PFN_MASK) >> 32))
 #endif
-extern inline unsigned long pgd_page(pgd_t pgd)
+extern inline unsigned long pgd_page_vaddr(pgd_t pgd)
 { return PAGE_OFFSET + ((pgd_val(pgd) & _PFN_MASK) >> (32-PAGE_SHIFT)); }
 extern inline int pte_none(pte_t pte)           { return !pte_val(pte); }
@@ -293,13 +294,13 @@ extern inline pte_t pte_mkyoung(pte_t pte)	{ pte_val(pte) |= __ACCESS_BITS; retu
 /* Find an entry in the second-level page table.. */
 extern inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 {
-        return (pmd_t *) pgd_page(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PAGE - 1));
+        return (pmd_t *) pgd_page_vaddr(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PAGE - 1));
 }
 /* Find an entry in the third-level page table.. */
 extern inline pte_t * pte_offset_kernel(pmd_t * dir, unsigned long address)
 {
-        return (pte_t *) pmd_page_kernel(*dir)
+        return (pte_t *) pmd_page_vaddr(*dir)
                + ((address >> PAGE_SHIFT) & (PTRS_PER_PAGE - 1));
 }
diff --git a/include/asm-alpha/spinlock.h b/include/asm-alpha/spinlock.h
index 0c294c9b0c55..aeeb125f6851 100644
--- a/include/asm-alpha/spinlock.h
+++ b/include/asm-alpha/spinlock.h
@@ -166,4 +166,8 @@ static inline void __raw_write_unlock(raw_rwlock_t * lock)
        lock->lock = 0;
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* _ALPHA_SPINLOCK_H */
diff --git a/include/asm-arm/arch-at91rm9200/at91rm9200.h b/include/asm-arm/arch-at91rm9200/at91rm9200.h
index 58f40931a5c1..a5a86b1ff886 100644
--- a/include/asm-arm/arch-at91rm9200/at91rm9200.h
+++ b/include/asm-arm/arch-at91rm9200/at91rm9200.h
@@ -19,67 +19,80 @@
 /*
 * Peripheral identifiers/interrupts.
 */
-#define AT91_ID_FIQ     0       /* Advanced Interrupt Controller (FIQ) */
+#define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
-#define AT91_ID_SYS     1       /* System Peripheral */
+#define AT91_ID_SYS             1       /* System Peripheral */
-#define AT91_ID_PIOA    2       /* Parallel IO Controller A */
+#define AT91RM9200_ID_PIOA      2       /* Parallel IO Controller A */
-#define AT91_ID_PIOB    3       /* Parallel IO Controller B */
+#define AT91RM9200_ID_PIOB      3       /* Parallel IO Controller B */
-#define AT91_ID_PIOC    4       /* Parallel IO Controller C */
+#define AT91RM9200_ID_PIOC      4       /* Parallel IO Controller C */
-#define AT91_ID_PIOD    5       /* Parallel IO Controller D */
+#define AT91RM9200_ID_PIOD      5       /* Parallel IO Controller D */
-#define AT91_ID_US0     6       /* USART 0 */
+#define AT91RM9200_ID_US0       6       /* USART 0 */
-#define AT91_ID_US1     7       /* USART 1 */
+#define AT91RM9200_ID_US1       7       /* USART 1 */
-#define AT91_ID_US2     8       /* USART 2 */
+#define AT91RM9200_ID_US2       8       /* USART 2 */
-#define AT91_ID_US3     9       /* USART 3 */
+#define AT91RM9200_ID_US3       9       /* USART 3 */
-#define AT91_ID_MCI     10      /* Multimedia Card Interface */
+#define AT91RM9200_ID_MCI       10      /* Multimedia Card Interface */
-#define AT91_ID_UDP     11      /* USB Device Port */
+#define AT91RM9200_ID_UDP       11      /* USB Device Port */
-#define AT91_ID_TWI     12      /* Two-Wire Interface */
+#define AT91RM9200_ID_TWI       12      /* Two-Wire Interface */
-#define AT91_ID_SPI     13      /* Serial Peripheral Interface */
+#define AT91RM9200_ID_SPI       13      /* Serial Peripheral Interface */
-#define AT91_ID_SSC0    14      /* Serial Synchronous Controller 0 */
+#define AT91RM9200_ID_SSC0      14      /* Serial Synchronous Controller 0 */
-#define AT91_ID_SSC1    15      /* Serial Synchronous Controller 1 */
+#define AT91RM9200_ID_SSC1      15      /* Serial Synchronous Controller 1 */
-#define AT91_ID_SSC2    16      /* Serial Synchronous Controller 2 */
+#define AT91RM9200_ID_SSC2      16      /* Serial Synchronous Controller 2 */
-#define AT91_ID_TC0     17      /* Timer Counter 0 */
+#define AT91RM9200_ID_TC0       17      /* Timer Counter 0 */
-#define AT91_ID_TC1     18      /* Timer Counter 1 */
+#define AT91RM9200_ID_TC1       18      /* Timer Counter 1 */
-#define AT91_ID_TC2     19      /* Timer Counter 2 */
+#define AT91RM9200_ID_TC2       19      /* Timer Counter 2 */
-#define AT91_ID_TC3     20      /* Timer Counter 3 */
+#define AT91RM9200_ID_TC3       20      /* Timer Counter 3 */
-#define AT91_ID_TC4     21      /* Timer Counter 4 */
+#define AT91RM9200_ID_TC4       21      /* Timer Counter 4 */
-#define AT91_ID_TC5     22      /* Timer Counter 5 */
+#define AT91RM9200_ID_TC5       22      /* Timer Counter 5 */
-#define AT91_ID_UHP     23      /* USB Host port */
+#define AT91RM9200_ID_UHP       23      /* USB Host port */
-#define AT91_ID_EMAC    24      /* Ethernet MAC */
+#define AT91RM9200_ID_EMAC      24      /* Ethernet MAC */
-#define AT91_ID_IRQ0    25      /* Advanced Interrupt Controller (IRQ0) */
+#define AT91RM9200_ID_IRQ0      25      /* Advanced Interrupt Controller (IRQ0) */
-#define AT91_ID_IRQ1    26      /* Advanced Interrupt Controller (IRQ1) */
+#define AT91RM9200_ID_IRQ1      26      /* Advanced Interrupt Controller (IRQ1) */
-#define AT91_ID_IRQ2    27      /* Advanced Interrupt Controller (IRQ2) */
+#define AT91RM9200_ID_IRQ2      27      /* Advanced Interrupt Controller (IRQ2) */
-#define AT91_ID_IRQ3    28      /* Advanced Interrupt Controller (IRQ3) */
+#define AT91RM9200_ID_IRQ3      28      /* Advanced Interrupt Controller (IRQ3) */
-#define AT91_ID_IRQ4    29      /* Advanced Interrupt Controller (IRQ4) */
+#define AT91RM9200_ID_IRQ4      29      /* Advanced Interrupt Controller (IRQ4) */
-#define AT91_ID_IRQ5    30      /* Advanced Interrupt Controller (IRQ5) */
+#define AT91RM9200_ID_IRQ5      30      /* Advanced Interrupt Controller (IRQ5) */
-#define AT91_ID_IRQ6    31      /* Advanced Interrupt Controller (IRQ6) */
+#define AT91RM9200_ID_IRQ6      31      /* Advanced Interrupt Controller (IRQ6) */
 /*
 * Peripheral physical base addresses.
 */
-#define AT91_BASE_TCB0          0xfffa0000
+#define AT91RM9200_BASE_TCB0    0xfffa0000
-#define AT91_BASE_TC0           0xfffa0000
+#define AT91RM9200_BASE_TC0     0xfffa0000
-#define AT91_BASE_TC1           0xfffa0040
+#define AT91RM9200_BASE_TC1     0xfffa0040
-#define AT91_BASE_TC2           0xfffa0080
+#define AT91RM9200_BASE_TC2     0xfffa0080
-#define AT91_BASE_TCB1          0xfffa4000
+#define AT91RM9200_BASE_TCB1    0xfffa4000
-#define AT91_BASE_TC3           0xfffa4000
+#define AT91RM9200_BASE_TC3     0xfffa4000
-#define AT91_BASE_TC4           0xfffa4040
+#define AT91RM9200_BASE_TC4     0xfffa4040
-#define AT91_BASE_TC5           0xfffa4080
+#define AT91RM9200_BASE_TC5     0xfffa4080
-#define AT91_BASE_UDP           0xfffb0000
+#define AT91RM9200_BASE_UDP     0xfffb0000
-#define AT91_BASE_MCI           0xfffb4000
+#define AT91RM9200_BASE_MCI     0xfffb4000
-#define AT91_BASE_TWI           0xfffb8000
+#define AT91RM9200_BASE_TWI     0xfffb8000
-#define AT91_BASE_EMAC          0xfffbc000
+#define AT91RM9200_BASE_EMAC    0xfffbc000
-#define AT91_BASE_US0           0xfffc0000
+#define AT91RM9200_BASE_US0     0xfffc0000
-#define AT91_BASE_US1           0xfffc4000
+#define AT91RM9200_BASE_US1     0xfffc4000
-#define AT91_BASE_US2           0xfffc8000
+#define AT91RM9200_BASE_US2     0xfffc8000
-#define AT91_BASE_US3           0xfffcc000
+#define AT91RM9200_BASE_US3     0xfffcc000
-#define AT91_BASE_SSC0          0xfffd0000
+#define AT91RM9200_BASE_SSC0    0xfffd0000
-#define AT91_BASE_SSC1          0xfffd4000
+#define AT91RM9200_BASE_SSC1    0xfffd4000
-#define AT91_BASE_SSC2          0xfffd8000
+#define AT91RM9200_BASE_SSC2    0xfffd8000
-#define AT91_BASE_SPI           0xfffe0000
+#define AT91RM9200_BASE_SPI     0xfffe0000
 #define AT91_BASE_SYS           0xfffff000
 /*
+ * Internal Memory.
+ */
+#define AT91RM9200_ROM_BASE     0x00100000      /* Internal ROM base address */
+#define AT91RM9200_ROM_SIZE     SZ_128K         /* Internal ROM size (128Kb) */
+#define AT91RM9200_SRAM_BASE    0x00200000      /* Internal SRAM base address */
+#define AT91RM9200_SRAM_SIZE    SZ_16K          /* Internal SRAM size (16Kb) */
+#define AT91RM9200_UHP_BASE     0x00300000      /* USB Host controller */
+#if 0
+/*
 * PIO pin definitions (peripheral A/B multiplexing).
 */
 #define AT91_PA0_MISO           (1 <<  0)       /* A: SPI Master-In Slave-Out */
@@ -257,5 +270,6 @@
 #define AT91_PD25_TPK13         (1 << 25)       /* B: ETM Trace Packet Port 13 */
 #define AT91_PD26_TPK14         (1 << 26)       /* B: ETM Trace Packet Port 14 */
 #define AT91_PD27_TPK15         (1 << 27)       /* B: ETM Trace Packet Port 15 */
+#endif
 #endif
diff --git a/include/asm-arm/arch-at91rm9200/at91rm9200_sys.h b/include/asm-arm/arch-at91rm9200/at91rm9200_sys.h
index 0f4c12d5f0cd..73693fea76a2 100644
--- a/include/asm-arm/arch-at91rm9200/at91rm9200_sys.h
+++ b/include/asm-arm/arch-at91rm9200/at91rm9200_sys.h
@@ -80,6 +80,9 @@
 #define         AT91_CIDR_NVPTYP        (7    << 28)            /* Nonvolatile Program Memory Type */
 #define         AT91_CIDR_EXT           (1    << 31)            /* Extension Flag */
+#define AT91_AIC_FFER           (AT91_AIC + 0x140)      /* Fast Forcing Enable Register [SAM9 only] */
+#define AT91_AIC_FFDR           (AT91_AIC + 0x144)      /* Fast Forcing Disable Register [SAM9 only] */
+#define AT91_AIC_FFSR           (AT91_AIC + 0x148)      /* Fast Forcing Status Register [SAM9 only] */
 /*
 * PIO Controllers.
diff --git a/include/asm-arm/arch-at91rm9200/at91rm9200_twi.h b/include/asm-arm/arch-at91rm9200/at91rm9200_twi.h
new file mode 100644
index 000000000000..93547d7482bd
--- /dev/null
+++ b/include/asm-arm/arch-at91rm9200/at91rm9200_twi.h
@@ -0,0 +1,57 @@
+/*
+ * include/asm-arm/arch-at91rm9200/at91rm9200_twi.h
+ *
+ * Copyright (C) 2005 Ivan Kokshaysky
+ * Copyright (C) SAN People
+ *
+ * Two-wire Interface (TWI) registers.
+ * Based on AT91RM9200 datasheet revision E.
+ *
+ * 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.
+ */
+#ifndef AT91RM9200_TWI_H
+#define AT91RM9200_TWI_H
+#define AT91_TWI_CR             0x00            /* Control Register */
+#define         AT91_TWI_START          (1 <<  0)       /* Send a Start Condition */
+#define         AT91_TWI_STOP           (1 <<  1)       /* Send a Stop Condition */
+#define         AT91_TWI_MSEN           (1 <<  2)       /* Master Transfer Enable */
+#define         AT91_TWI_MSDIS          (1 <<  3)       /* Master Transfer Disable */
+#define         AT91_TWI_SWRST          (1 <<  7)       /* Software Reset */
+#define AT91_TWI_MMR            0x04            /* Master Mode Register */
+#define         AT91_TWI_IADRSZ         (3    <<  8)    /* Internal Device Address Size */
+#define                 AT91_TWI_IADRSZ_NO              (0 << 8)
+#define                 AT91_TWI_IADRSZ_1               (1 << 8)
+#define                 AT91_TWI_IADRSZ_2               (2 << 8)
+#define                 AT91_TWI_IADRSZ_3               (3 << 8)
+#define         AT91_TWI_MREAD          (1    << 12)    /* Master Read Direction */
+#define         AT91_TWI_DADR           (0x7f << 16)    /* Device Address */
+#define AT91_TWI_IADR           0x0c            /* Internal Address Register */
+#define AT91_TWI_CWGR           0x10            /* Clock Waveform Generator Register */
+#define         AT91_TWI_CLDIV          (0xff <<  0)    /* Clock Low Divisor */
+#define         AT91_TWI_CHDIV          (0xff <<  8)    /* Clock High Divisor */
+#define         AT91_TWI_CKDIV          (7    << 16)    /* Clock Divider */
+#define AT91_TWI_SR             0x20            /* Status Register */
+#define         AT91_TWI_TXCOMP         (1 <<  0)       /* Transmission Complete */
+#define         AT91_TWI_RXRDY          (1 <<  1)       /* Receive Holding Register Ready */
+#define         AT91_TWI_TXRDY          (1 <<  2)       /* Transmit Holding Register Ready */
+#define         AT91_TWI_OVRE           (1 <<  6)       /* Overrun Error */
+#define         AT91_TWI_UNRE           (1 <<  7)       /* Underrun Error */
+#define         AT91_TWI_NACK           (1 <<  8)       /* Not Acknowledged */
+#define AT91_TWI_IER            0x24            /* Interrupt Enable Register */
+#define AT91_TWI_IDR            0x28            /* Interrupt Disable Register */
+#define AT91_TWI_IMR            0x2c            /* Interrupt Mask Register */
+#define AT91_TWI_RHR            0x30            /* Receive Holding Register */
+#define AT91_TWI_THR            0x34            /* Transmit Holding Register */
+#endif
diff --git a/include/asm-arm/arch-at91rm9200/gpio.h b/include/asm-arm/arch-at91rm9200/gpio.h
index dbde1baaf251..a011d27876a2 100644
--- a/include/asm-arm/arch-at91rm9200/gpio.h
+++ b/include/asm-arm/arch-at91rm9200/gpio.h
@@ -17,10 +17,9 @@
 #define PIN_BASE                NR_AIC_IRQS
-#define PQFP_GPIO_BANKS         3       /* PQFP package has 3 banks */
+#define MAX_GPIO_BANKS          4
-#define BGA_GPIO_BANKS          4       /* BGA package has 4 banks */
-/* these pin numbers double as IRQ numbers, like AT91_ID_* values */
+/* these pin numbers double as IRQ numbers, like AT91xxx_ID_* values */
 #define AT91_PIN_PA0    (PIN_BASE + 0x00 + 0)
 #define AT91_PIN_PA1    (PIN_BASE + 0x00 + 1)
@@ -180,17 +179,18 @@
 #ifndef __ASSEMBLY__
 /* setup setup routines, called from board init or driver probe() */
-extern int at91_set_A_periph(unsigned pin, int use_pullup);
+extern int __init_or_module at91_set_A_periph(unsigned pin, int use_pullup);
-extern int at91_set_B_periph(unsigned pin, int use_pullup);
+extern int __init_or_module at91_set_B_periph(unsigned pin, int use_pullup);
-extern int at91_set_gpio_input(unsigned pin, int use_pullup);
+extern int __init_or_module at91_set_gpio_input(unsigned pin, int use_pullup);
-extern int at91_set_gpio_output(unsigned pin, int value);
+extern int __init_or_module at91_set_gpio_output(unsigned pin, int value);
-extern int at91_set_deglitch(unsigned pin, int is_on);
+extern int __init_or_module at91_set_deglitch(unsigned pin, int is_on);
-extern int at91_set_multi_drive(unsigned pin, int is_on);
+extern int __init_or_module at91_set_multi_drive(unsigned pin, int is_on);
 /* callable at any time */
 extern int at91_set_gpio_value(unsigned pin, int value);
 extern int at91_get_gpio_value(unsigned pin);
+/* callable only from core power-management code */
 extern void at91_gpio_suspend(void);
 extern void at91_gpio_resume(void);
 #endif
diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/include/asm-arm/arch-at91rm9200/hardware.h
index 235d39d91107..6551b4d1ff7b 100644
--- a/include/asm-arm/arch-at91rm9200/hardware.h
+++ b/include/asm-arm/arch-at91rm9200/hardware.h
@@ -34,27 +34,14 @@
 * Virtual to Physical Address mapping for IO devices.
 */
 #define AT91_VA_BASE_SYS        AT91_IO_P2V(AT91_BASE_SYS)
-#define AT91_VA_BASE_SPI        AT91_IO_P2V(AT91_BASE_SPI)
+#define AT91_VA_BASE_SPI        AT91_IO_P2V(AT91RM9200_BASE_SPI)
-#define AT91_VA_BASE_SSC2       AT91_IO_P2V(AT91_BASE_SSC2)
+#define AT91_VA_BASE_EMAC       AT91_IO_P2V(AT91RM9200_BASE_EMAC)
-#define AT91_VA_BASE_SSC1       AT91_IO_P2V(AT91_BASE_SSC1)
+#define AT91_VA_BASE_TWI        AT91_IO_P2V(AT91RM9200_BASE_TWI)
-#define AT91_VA_BASE_SSC0       AT91_IO_P2V(AT91_BASE_SSC0)
+#define AT91_VA_BASE_MCI        AT91_IO_P2V(AT91RM9200_BASE_MCI)
-#define AT91_VA_BASE_US3        AT91_IO_P2V(AT91_BASE_US3)
+#define AT91_VA_BASE_UDP        AT91_IO_P2V(AT91RM9200_BASE_UDP)
-#define AT91_VA_BASE_US2        AT91_IO_P2V(AT91_BASE_US2)
-#define AT91_VA_BASE_US1        AT91_IO_P2V(AT91_BASE_US1)
-#define AT91_VA_BASE_US0        AT91_IO_P2V(AT91_BASE_US0)
-#define AT91_VA_BASE_EMAC       AT91_IO_P2V(AT91_BASE_EMAC)
-#define AT91_VA_BASE_TWI        AT91_IO_P2V(AT91_BASE_TWI)
-#define AT91_VA_BASE_MCI        AT91_IO_P2V(AT91_BASE_MCI)
-#define AT91_VA_BASE_UDP        AT91_IO_P2V(AT91_BASE_UDP)
-#define AT91_VA_BASE_TCB1       AT91_IO_P2V(AT91_BASE_TCB1)
-#define AT91_VA_BASE_TCB0       AT91_IO_P2V(AT91_BASE_TCB0)
-/* Internal SRAM */
-#define AT91_SRAM_BASE          0x00200000      /* Internal SRAM base address */
-#define AT91_SRAM_SIZE          0x00004000      /* Internal SRAM SIZE (16Kb) */
 /* Internal SRAM is mapped below the IO devices */
-#define AT91_SRAM_VIRT_BASE     (AT91_IO_VIRT_BASE - AT91_SRAM_SIZE)
+#define AT91_SRAM_VIRT_BASE     (AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE)
 /* Serial ports */
 #define AT91_NR_UART            5               /* 4 USART3's and one DBGU port */
@@ -71,9 +58,6 @@
 /* Compact Flash */
 #define AT91_CF_BASE            0x50000000      /* NCS4-NCS6: Compact Flash physical base address */
-/* Multi-Master Memory controller */
-#define AT91_UHP_BASE           0x00300000      /* USB Host controller */
 /* Clocks */
 #define AT91_SLOW_CLOCK         32768           /* slow clock */
diff --git a/include/asm-arm/arch-at91rm9200/irqs.h b/include/asm-arm/arch-at91rm9200/irqs.h
index f63842c2c093..763cb96c418b 100644
--- a/include/asm-arm/arch-at91rm9200/irqs.h
+++ b/include/asm-arm/arch-at91rm9200/irqs.h
@@ -32,7 +32,7 @@
 /*
- * IRQ interrupt symbols are the AT91_ID_* symbols in at91rm9200.h
+ * IRQ interrupt symbols are the AT91xxx_ID_* symbols
 * for IRQs handled directly through the AIC, or else the AT91_PIN_*
 * symbols in gpio.h for ones handled indirectly as GPIOs.
 * We make provision for 4 banks of GPIO.
diff --git a/include/asm-arm/arch-clps711x/time.h b/include/asm-arm/arch-clps711x/time.h
index 9cb27cd4e6ae..0e4a3901d3b3 100644
--- a/include/asm-arm/arch-clps711x/time.h
+++ b/include/asm-arm/arch-clps711x/time.h
@@ -29,7 +29,7 @@ static irqreturn_t
 p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        do_leds();
-        do_timer(regs);
+        do_timer(1);
 #ifndef CONFIG_SMP
        update_process_times(user_mode(regs));
 #endif
diff --git a/include/asm-arm/arch-ep93xx/ep93xx-regs.h b/include/asm-arm/arch-ep93xx/ep93xx-regs.h
index 8c322975f96e..593f562f85c3 100644
--- a/include/asm-arm/arch-ep93xx/ep93xx-regs.h
+++ b/include/asm-arm/arch-ep93xx/ep93xx-regs.h
@@ -27,6 +27,7 @@
 #define EP93XX_DMA_BASE                 (EP93XX_AHB_VIRT_BASE + 0x00000000)
 #define EP93XX_ETHERNET_BASE            (EP93XX_AHB_VIRT_BASE + 0x00010000)
+#define EP93XX_ETHERNET_PHYS_BASE       (EP93XX_AHB_PHYS_BASE + 0x00010000)
 #define EP93XX_USB_BASE                 (EP93XX_AHB_VIRT_BASE + 0x00020000)
 #define EP93XX_USB_PHYS_BASE            (EP93XX_AHB_PHYS_BASE + 0x00020000)
diff --git a/include/asm-arm/arch-ep93xx/platform.h b/include/asm-arm/arch-ep93xx/platform.h
index d7a34ce20293..b4a8deb8bdef 100644
--- a/include/asm-arm/arch-ep93xx/platform.h
+++ b/include/asm-arm/arch-ep93xx/platform.h
@@ -11,5 +11,11 @@ void ep93xx_init_devices(void);
 void ep93xx_clock_init(void);
 extern struct sys_timer ep93xx_timer;
+struct ep93xx_eth_data
+{
+        unsigned char   dev_addr[6];
+        unsigned char   phy_id;
+};
 #endif
diff --git a/include/asm-arm/arch-iop32x/debug-macro.S b/include/asm-arm/arch-iop32x/debug-macro.S
new file mode 100644
index 000000000000..9022b6849e23
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/debug-macro.S
@@ -0,0 +1,20 @@
+/*
+ * include/asm-arm/arch-iop32x/debug-macro.S
+ *
+ * Debugging macro include header
+ *
+ * Copyright (C) 1994-1999 Russell King
+ * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
+ *
+ * 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.
+ */
+                .macro  addruart, rx
+                mov     \rx, #0xfe000000        @ physical as well as virtual
+                orr     \rx, \rx, #0x00800000   @ location of the UART
+                .endm
+#define UART_SHIFT      0
+#include <asm/hardware/debug-8250.S>
diff --git a/include/asm-arm/arch-iop3xx/dma.h b/include/asm-arm/arch-iop32x/dma.h
index 1e808db8af2a..e977a9ef3160 100644
--- a/include/asm-arm/arch-iop3xx/dma.h
+++ b/include/asm-arm/arch-iop32x/dma.h
@@ -1,7 +1,7 @@
 /*
- * linux/include/asm-arm/arch-iop3xx/dma.h
+ * include/asm-arm/arch-iop32x/dma.h
 *
- *  Copyright (C) 2004 Intel Corp.
+ * Copyright (C) 2004 Intel Corp.
 *
 * 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
diff --git a/include/asm-arm/arch-iop32x/entry-macro.S b/include/asm-arm/arch-iop32x/entry-macro.S
new file mode 100644
index 000000000000..1500cbbd2295
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/entry-macro.S
@@ -0,0 +1,21 @@
+/*
+ * include/asm-arm/arch-iop32x/entry-macro.S
+ *
+ * Low-level IRQ helper macros for IOP32x-based platforms
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <asm/arch/iop32x.h>
+                .macro  disable_fiq
+                .endm
+                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
+                ldr     \base, =IOP3XX_REG_ADDR(0x07D8)
+                ldr     \irqstat, [\base]               @ Read IINTSRC
+                cmp     \irqstat, #0
+                clzne   \irqnr, \irqstat
+                rsbne   \irqnr, \irqnr, #31
+                .endm
diff --git a/include/asm-arm/arch-iop32x/glantank.h b/include/asm-arm/arch-iop32x/glantank.h
new file mode 100644
index 000000000000..3b065618dd00
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/glantank.h
@@ -0,0 +1,13 @@
+/*
+ * include/asm/arch-iop32x/glantank.h
+ *
+ * IO-Data GLAN Tank board registers
+ */
+#ifndef __GLANTANK_H
+#define __GLANTANK_H
+#define GLANTANK_UART           0xfe800000      /* UART */
+#endif
diff --git a/include/asm-arm/arch-iop32x/hardware.h b/include/asm-arm/arch-iop32x/hardware.h
new file mode 100644
index 000000000000..6556ed5eee31
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/hardware.h
@@ -0,0 +1,44 @@
+/*
+ * include/asm-arm/arch-iop32x/hardware.h
+ */
+#ifndef __HARDWARE_H
+#define __HARDWARE_H
+#include <asm/types.h>
+/*
+ * Note about PCI IO space mappings
+ *
+ * To make IO space accesses efficient, we store virtual addresses in
+ * the IO resources.
+ *
+ * The PCI IO space is located at virtual 0xfe000000 from physical
+ * 0x90000000. The PCI BARs must be programmed with physical addresses,
+ * but when we read them, we convert them to virtual addresses. See
+ * arch/arm/plat-iop/pci.c.
+ */
+#define pcibios_assign_all_busses() 1
+#define PCIBIOS_MIN_IO          0x00000000
+#define PCIBIOS_MIN_MEM         0x00000000
+#ifndef __ASSEMBLY__
+void iop32x_init_irq(void);
+#endif
+/*
+ * Generic chipset bits
+ */
+#include "iop32x.h"
+/*
+ * Board specific bits
+ */
+#include "glantank.h"
+#include "iq80321.h"
+#include "iq31244.h"
+#include "n2100.h"
+#endif
diff --git a/include/asm-arm/arch-iop3xx/io.h b/include/asm-arm/arch-iop32x/io.h
index 36adbdf5055a..12d9ee02cde3 100644
--- a/include/asm-arm/arch-iop3xx/io.h
+++ b/include/asm-arm/arch-iop32x/io.h
@@ -1,21 +1,22 @@
 /*
- * linux/include/asm-arm/arch-iop3xx/io.h
+ * include/asm-arm/arch-iop32x/io.h
 *
- *  Copyright (C) 2001  MontaVista Software, Inc.
+ * Copyright (C) 2001 MontaVista Software, Inc.
 *
 * 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_ARM_ARCH_IO_H
+#ifndef __IO_H
-#define __ASM_ARM_ARCH_IO_H
+#define __IO_H
 #include <asm/hardware.h>
-#define IO_SPACE_LIMIT 0xffffffff
+#define IO_SPACE_LIMIT          0xffffffff
 #define __io(p)                 ((void __iomem *)(p))
 #define __mem_pci(a)            (a)
 #endif
diff --git a/include/asm-arm/arch-iop32x/iop32x.h b/include/asm-arm/arch-iop32x/iop32x.h
new file mode 100644
index 000000000000..4bbd85f3ed2a
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/iop32x.h
@@ -0,0 +1,28 @@
+/*
+ * include/asm-arm/arch-iop32x/iop32x.h
+ *
+ * Intel IOP32X Chip definitions
+ *
+ * Author: Rory Bolt <rorybolt@pacbell.net>
+ * Copyright (C) 2002 Rory Bolt
+ * Copyright (C) 2004 Intel Corp.
+ *
+ * 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 __IOP32X_H
+#define __IOP32X_H
+/*
+ * Peripherals that are shared between the iop32x and iop33x but
+ * located at different addresses.
+ */
+#define IOP3XX_GPIO_REG(reg)    (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07c0 + (reg))
+#define IOP3XX_TIMER_REG(reg)   (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07e0 + (reg))
+#include <asm/hardware/iop3xx.h>
+#endif
diff --git a/include/asm-arm/arch-iop3xx/iq31244.h b/include/asm-arm/arch-iop32x/iq31244.h
index 4177cfa8100f..fff4eafa1f6b 100644
--- a/include/asm-arm/arch-iop3xx/iq31244.h
+++ b/include/asm-arm/arch-iop32x/iq31244.h
@@ -1,15 +1,11 @@
 /*
- * linux/include/asm/arch-iop3xx/iq31244.h
+ * include/asm-arm/arch-iop32x/iq31244.h
 *
 * Intel IQ31244 evaluation board registers
 */
-#ifndef _IQ31244_H_
+#ifndef __IQ31244_H
-#define _IQ31244_H_
+#define __IQ31244_H
-#define IQ31244_FLASHBASE       0xf0000000      /* Flash */
-#define IQ31244_FLASHSIZE       0x00800000
-#define IQ31244_FLASHWIDTH      2
 #define IQ31244_UART            0xfe800000      /* UART #1 */
 #define IQ31244_7SEG_1          0xfe840000      /* 7-Segment MSB */
@@ -17,8 +13,5 @@
 #define IQ31244_ROTARY_SW       0xfe8d0000      /* Rotary Switch */
 #define IQ31244_BATT_STAT       0xfe8f0000      /* Battery Status */
-#ifndef __ASSEMBLY__
-extern void iq31244_map_io(void);
-#endif
-#endif  // _IQ31244_H_
+#endif
diff --git a/include/asm-arm/arch-iop3xx/iq80321.h b/include/asm-arm/arch-iop32x/iq80321.h
index cb8725979ffa..eb69db9b9a06 100644
--- a/include/asm-arm/arch-iop3xx/iq80321.h
+++ b/include/asm-arm/arch-iop32x/iq80321.h
@@ -1,15 +1,11 @@
 /*
- * linux/include/asm/arch-iop3xx/iq80321.h
+ * include/asm-arm/arch-iop32x/iq80321.h
 *
 * Intel IQ80321 evaluation board registers
 */
-#ifndef _IQ80321_H_
+#ifndef __IQ80321_H
-#define _IQ80321_H_
+#define __IQ80321_H
-#define IQ80321_FLASHBASE       0xf0000000      /* Flash */
-#define IQ80321_FLASHSIZE       0x00800000
-#define IQ80321_FLASHWIDTH      1
 #define IQ80321_UART            0xfe800000      /* UART #1 */
 #define IQ80321_7SEG_1          0xfe840000      /* 7-Segment MSB */
@@ -17,8 +13,5 @@
 #define IQ80321_ROTARY_SW       0xfe8d0000      /* Rotary Switch */
 #define IQ80321_BATT_STAT       0xfe8f0000      /* Battery Status */
-#ifndef __ASSEMBLY__
-extern void iq80321_map_io(void);
-#endif
-#endif  // _IQ80321_H_
+#endif
diff --git a/include/asm-arm/arch-iop32x/irqs.h b/include/asm-arm/arch-iop32x/irqs.h
new file mode 100644
index 000000000000..bbaef873afce
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/irqs.h
@@ -0,0 +1,50 @@
+/*
+ * include/asm-arm/arch-iop32x/irqs.h
+ *
+ * Author:      Rory Bolt <rorybolt@pacbell.net>
+ * Copyright:   (C) 2002 Rory Bolt
+ *
+ * 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 __IRQS_H
+#define __IRQS_H
+/*
+ * IOP80321 chipset interrupts
+ */
+#define IRQ_IOP32X_DMA0_EOT     0
+#define IRQ_IOP32X_DMA0_EOC     1
+#define IRQ_IOP32X_DMA1_EOT     2
+#define IRQ_IOP32X_DMA1_EOC     3
+#define IRQ_IOP32X_AA_EOT       6
+#define IRQ_IOP32X_AA_EOC       7
+#define IRQ_IOP32X_CORE_PMON    8
+#define IRQ_IOP32X_TIMER0       9
+#define IRQ_IOP32X_TIMER1       10
+#define IRQ_IOP32X_I2C_0        11
+#define IRQ_IOP32X_I2C_1        12
+#define IRQ_IOP32X_MESSAGING    13
+#define IRQ_IOP32X_ATU_BIST     14
+#define IRQ_IOP32X_PERFMON      15
+#define IRQ_IOP32X_CORE_PMU     16
+#define IRQ_IOP32X_BIU_ERR      17
+#define IRQ_IOP32X_ATU_ERR      18
+#define IRQ_IOP32X_MCU_ERR      19
+#define IRQ_IOP32X_DMA0_ERR     20
+#define IRQ_IOP32X_DMA1_ERR     21
+#define IRQ_IOP32X_AA_ERR       23
+#define IRQ_IOP32X_MSG_ERR      24
+#define IRQ_IOP32X_SSP          25
+#define IRQ_IOP32X_XINT0        27
+#define IRQ_IOP32X_XINT1        28
+#define IRQ_IOP32X_XINT2        29
+#define IRQ_IOP32X_XINT3        30
+#define IRQ_IOP32X_HPI          31
+#define NR_IRQS                 32
+#endif
diff --git a/include/asm-arm/arch-iop32x/memory.h b/include/asm-arm/arch-iop32x/memory.h
new file mode 100644
index 000000000000..764cd3f0d416
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/memory.h
@@ -0,0 +1,26 @@
+/*
+ * include/asm-arm/arch-iop32x/memory.h
+ */
+#ifndef __MEMORY_H
+#define __MEMORY_H
+#include <asm/hardware.h>
+/*
+ * Physical DRAM offset.
+ */
+#define PHYS_OFFSET     UL(0xa0000000)
+/*
+ * Virtual view <-> PCI DMA view memory address translations
+ * virt_to_bus: Used to translate the virtual address to an
+ *              address suitable to be passed to set_dma_addr
+ * bus_to_virt: Used to convert an address for DMA operations
+ *              to an address that the kernel can use.
+ */
+#define __virt_to_bus(x)        (((__virt_to_phys(x)) & ~(*IOP3XX_IATVR2)) | ((*IOP3XX_IABAR2) & 0xfffffff0))
+#define __bus_to_virt(x)        (__phys_to_virt(((x) & ~(*IOP3XX_IALR2)) | ( *IOP3XX_IATVR2)))
+#endif
diff --git a/include/asm-arm/arch-iop32x/n2100.h b/include/asm-arm/arch-iop32x/n2100.h
new file mode 100644
index 000000000000..fed31a648425
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/n2100.h
@@ -0,0 +1,19 @@
+/*
+ * include/asm/arch-iop32x/n2100.h
+ *
+ * Thecus N2100 board registers
+ */
+#ifndef __N2100_H
+#define __N2100_H
+#define N2100_UART              0xfe800000      /* UART */
+#define N2100_COPY_BUTTON       IOP3XX_GPIO_LINE(0)
+#define N2100_PCA9532_RESET     IOP3XX_GPIO_LINE(2)
+#define N2100_RESET_BUTTON      IOP3XX_GPIO_LINE(3)
+#define N2100_HARDWARE_RESET    IOP3XX_GPIO_LINE(4)
+#define N2100_POWER_BUTTON      IOP3XX_GPIO_LINE(5)
+#endif
diff --git a/include/asm-arm/arch-iop32x/system.h b/include/asm-arm/arch-iop32x/system.h
new file mode 100644
index 000000000000..17b7eb7e9c0d
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/system.h
@@ -0,0 +1,33 @@
+/*
+ * include/asm-arm/arch-iop32x/system.h
+ *
+ * Copyright (C) 2001 MontaVista Software, Inc.
+ *
+ * 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.
+ */
+#include <asm/mach-types.h>
+static inline void arch_idle(void)
+{
+        cpu_do_idle();
+}
+static inline void arch_reset(char mode)
+{
+        local_irq_disable();
+        if (machine_is_n2100()) {
+                gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);
+                gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);
+                while (1)
+                        ;
+        }
+        *IOP3XX_PCSR = 0x30;
+        /* Jump into ROM at address 0 */
+        cpu_reset(0);
+}
diff --git a/include/asm-arm/arch-iop32x/timex.h b/include/asm-arm/arch-iop32x/timex.h
new file mode 100644
index 000000000000..9934b087311b
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/timex.h
@@ -0,0 +1,9 @@
+/*
+ * include/asm-arm/arch-iop32x/timex.h
+ *
+ * IOP32x architecture timex specifications
+ */
+#include <asm/hardware.h>
+#define CLOCK_TICK_RATE         (100 * HZ)
diff --git a/include/asm-arm/arch-iop32x/uncompress.h b/include/asm-arm/arch-iop32x/uncompress.h
new file mode 100644
index 000000000000..e64f52bf2bce
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/uncompress.h
@@ -0,0 +1,39 @@
+/*
+ * include/asm-arm/arch-iop32x/uncompress.h
+ */
+#include <asm/types.h>
+#include <asm/mach-types.h>
+#include <linux/serial_reg.h>
+#include <asm/hardware.h>
+static volatile u8 *uart_base;
+#define TX_DONE         (UART_LSR_TEMT | UART_LSR_THRE)
+static inline void putc(char c)
+{
+        while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
+                barrier();
+        uart_base[UART_TX] = c;
+}
+static inline void flush(void)
+{
+}
+static __inline__ void __arch_decomp_setup(unsigned long arch_id)
+{
+        if (machine_is_iq80321())
+                uart_base = (volatile u8 *)IQ80321_UART;
+        else if (machine_is_iq31244())
+                uart_base = (volatile u8 *)IQ31244_UART;
+        else
+                uart_base = (volatile u8 *)0xfe800000;
+}
+/*
+ * nothing to do
+ */
+#define arch_decomp_setup()     __arch_decomp_setup(arch_id)
+#define arch_decomp_wdog()
diff --git a/include/asm-arm/arch-iop32x/vmalloc.h b/include/asm-arm/arch-iop32x/vmalloc.h
new file mode 100644
index 000000000000..0a70baa19517
--- /dev/null
+++ b/include/asm-arm/arch-iop32x/vmalloc.h
@@ -0,0 +1,5 @@
+/*
+ * include/asm-arm/arch-iop32x/vmalloc.h
+ */
+#define VMALLOC_END     0xfe000000
diff --git a/include/asm-arm/arch-iop33x/debug-macro.S b/include/asm-arm/arch-iop33x/debug-macro.S
new file mode 100644
index 000000000000..9e7132ebe6a7
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/debug-macro.S
@@ -0,0 +1,24 @@
+/*
+ * include/asm-arm/arch-iop33x/debug-macro.S
+ *
+ * Debugging macro include header
+ *
+ * Copyright (C) 1994-1999 Russell King
+ * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
+ *
+ * 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.
+ */
+                .macro  addruart, rx
+                mrc     p15, 0, \rx, c1, c0
+                tst     \rx, #1                 @ mmu enabled?
+                moveq   \rx, #0xff000000        @ physical
+                movne   \rx, #0xfe000000        @ virtual
+                orr     \rx, \rx, #0x00ff0000
+                orr     \rx, \rx, #0x0000f700
+                .endm
+#define UART_SHIFT      2
+#include <asm/hardware/debug-8250.S>
diff --git a/include/asm-arm/arch-iop33x/dma.h b/include/asm-arm/arch-iop33x/dma.h
new file mode 100644
index 000000000000..b7775fdc5ad3
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/dma.h
@@ -0,0 +1,9 @@
+/*
+ * include/asm-arm/arch-iop33x/dma.h
+ *
+ * Copyright (C) 2004 Intel Corp.
+ *
+ * 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.
+ */
diff --git a/include/asm-arm/arch-iop33x/entry-macro.S b/include/asm-arm/arch-iop33x/entry-macro.S
new file mode 100644
index 000000000000..92b791702e34
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/entry-macro.S
@@ -0,0 +1,22 @@
+/*
+ * include/asm-arm/arch-iop33x/entry-macro.S
+ *
+ * Low-level IRQ helper macros for IOP33x-based platforms
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+#include <asm/arch/iop33x.h>
+                .macro  disable_fiq
+                .endm
+                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
+                ldr     \base, =IOP3XX_REG_ADDR(0x07C8)
+                ldr     \irqstat, [\base]               @ Read IINTVEC
+                cmp     \irqstat, #0
+                ldreq   \irqstat, [\base]               @ erratum 63 workaround
+                adds    \irqnr, \irqstat, #1
+                movne   \irqnr, \irqstat, lsr #2
+                .endm
diff --git a/include/asm-arm/arch-iop33x/hardware.h b/include/asm-arm/arch-iop33x/hardware.h
new file mode 100644
index 000000000000..0659cf94d040
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/hardware.h
@@ -0,0 +1,46 @@
+/*
+ * include/asm-arm/arch-iop33x/hardware.h
+ */
+#ifndef __HARDWARE_H
+#define __HARDWARE_H
+#include <asm/types.h>
+/*
+ * Note about PCI IO space mappings
+ *
+ * To make IO space accesses efficient, we store virtual addresses in
+ * the IO resources.
+ *
+ * The PCI IO space is located at virtual 0xfe000000 from physical
+ * 0x90000000.  The PCI BARs must be programmed with physical addresses,
+ * but when we read them, we convert them to virtual addresses.  See
+ * arch/arm/mach-iop3xx/iop3xx-pci.c
+ */
+#define pcibios_assign_all_busses()     1
+#define PCIBIOS_MIN_IO          0x00000000
+#define PCIBIOS_MIN_MEM         0x00000000
+#ifndef __ASSEMBLY__
+void iop33x_init_irq(void);
+extern struct platform_device iop33x_uart0_device;
+extern struct platform_device iop33x_uart1_device;
+#endif
+/*
+ * Generic chipset bits
+ *
+ */
+#include "iop33x.h"
+/*
+ * Board specific bits
+ */
+#include "iq80331.h"
+#include "iq80332.h"
+#endif
diff --git a/include/asm-arm/arch-iop33x/io.h b/include/asm-arm/arch-iop33x/io.h
new file mode 100644
index 000000000000..c017402bab96
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/io.h
@@ -0,0 +1,21 @@
+/*
+ * include/asm-arm/arch-iop33x/io.h
+ *
+ * Copyright (C) 2001  MontaVista Software, Inc.
+ *
+ * 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 __IO_H
+#define __IO_H
+#include <asm/hardware.h>
+#define IO_SPACE_LIMIT          0xffffffff
+#define __io(p)                 ((void __iomem *)(p))
+#define __mem_pci(a)            (a)
+#endif
diff --git a/include/asm-arm/arch-iop33x/iop33x.h b/include/asm-arm/arch-iop33x/iop33x.h
new file mode 100644
index 000000000000..7ac6e93db5ff
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/iop33x.h
@@ -0,0 +1,33 @@
+/*
+ * include/asm-arm/arch-iop33x/iop33x.h
+ *
+ * Intel IOP33X Chip definitions
+ *
+ * Author: Dave Jiang (dave.jiang@intel.com)
+ * Copyright (C) 2003, 2004 Intel Corp.
+ *
+ * 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 __IOP33X_H
+#define __IOP33X_H
+/*
+ * Peripherals that are shared between the iop32x and iop33x but
+ * located at different addresses.
+ */
+#define IOP3XX_GPIO_REG(reg)    (IOP3XX_PERIPHERAL_VIRT_BASE + 0x1780 + (reg))
+#define IOP3XX_TIMER_REG(reg)   (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07d0 + (reg))
+#include <asm/hardware/iop3xx.h>
+/* UARTs  */
+#define IOP33X_UART0_PHYS       (IOP3XX_PERIPHERAL_PHYS_BASE + 0x1700)
+#define IOP33X_UART0_VIRT       (IOP3XX_PERIPHERAL_VIRT_BASE + 0x1700)
+#define IOP33X_UART1_PHYS       (IOP3XX_PERIPHERAL_PHYS_BASE + 0x1740)
+#define IOP33X_UART1_VIRT       (IOP3XX_PERIPHERAL_VIRT_BASE + 0x1740)
+#endif
diff --git a/include/asm-arm/arch-iop3xx/iq80331.h b/include/asm-arm/arch-iop33x/iq80331.h
index 0668e78d483e..79b9302017ea 100644
--- a/include/asm-arm/arch-iop3xx/iq80331.h
+++ b/include/asm-arm/arch-iop33x/iq80331.h
@@ -1,23 +1,16 @@
 /*
- * linux/include/asm/arch-iop3xx/iq80331.h
+ * include/asm-arm/arch-iop33x/iq80331.h
 *
 * Intel IQ80331 evaluation board registers
 */
-#ifndef _IQ80331_H_
+#ifndef __IQ80331_H
-#define _IQ80331_H_
+#define __IQ80331_H
-#define IQ80331_FLASHBASE       0xc0000000      /* Flash */
-#define IQ80331_FLASHSIZE       0x00800000
-#define IQ80331_FLASHWIDTH      1
 #define IQ80331_7SEG_1          0xce840000      /* 7-Segment MSB */
 #define IQ80331_7SEG_0          0xce850000      /* 7-Segment LSB (WO) */
 #define IQ80331_ROTARY_SW       0xce8d0000      /* Rotary Switch */
 #define IQ80331_BATT_STAT       0xce8f0000      /* Battery Status */
-#ifndef __ASSEMBLY__
-extern void iq80331_map_io(void);
-#endif
-#endif  // _IQ80331_H_
+#endif
diff --git a/include/asm-arm/arch-iop3xx/iq80332.h b/include/asm-arm/arch-iop33x/iq80332.h
index e5fff1775d1a..053165629492 100644
--- a/include/asm-arm/arch-iop3xx/iq80332.h
+++ b/include/asm-arm/arch-iop33x/iq80332.h
@@ -1,23 +1,16 @@
 /*
- * linux/include/asm/arch-iop3xx/iq80332.h
+ * include/asm-arm/arch-iop33x/iq80332.h
 *
 * Intel IQ80332 evaluation board registers
 */
-#ifndef _IQ80332_H_
+#ifndef __IQ80332_H
-#define _IQ80332_H_
+#define __IQ80332_H
-#define IQ80332_FLASHBASE       0xc0000000      /* Flash */
-#define IQ80332_FLASHSIZE       0x00800000
-#define IQ80332_FLASHWIDTH      1
 #define IQ80332_7SEG_1          0xce840000      /* 7-Segment MSB */
 #define IQ80332_7SEG_0          0xce850000      /* 7-Segment LSB (WO) */
 #define IQ80332_ROTARY_SW       0xce8d0000      /* Rotary Switch */
 #define IQ80332_BATT_STAT       0xce8f0000      /* Battery Status */
-#ifndef __ASSEMBLY__
-extern void iq80332_map_io(void);
-#endif
-#endif  // _IQ80332_H_
+#endif
diff --git a/include/asm-arm/arch-iop33x/irqs.h b/include/asm-arm/arch-iop33x/irqs.h
new file mode 100644
index 000000000000..d045f8403396
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/irqs.h
@@ -0,0 +1,60 @@
+/*
+ * include/asm-arm/arch-iop33x/irqs.h
+ *
+ * Author:      Dave Jiang (dave.jiang@intel.com)
+ * Copyright:   (C) 2003 Intel Corp.
+ *
+ * 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 __IRQS_H
+#define __IRQS_H
+/*
+ * IOP80331 chipset interrupts
+ */
+#define IRQ_IOP33X_DMA0_EOT     0
+#define IRQ_IOP33X_DMA0_EOC     1
+#define IRQ_IOP33X_DMA1_EOT     2
+#define IRQ_IOP33X_DMA1_EOC     3
+#define IRQ_IOP33X_AA_EOT       6
+#define IRQ_IOP33X_AA_EOC       7
+#define IRQ_IOP33X_TIMER0       8
+#define IRQ_IOP33X_TIMER1       9
+#define IRQ_IOP33X_I2C_0        10
+#define IRQ_IOP33X_I2C_1        11
+#define IRQ_IOP33X_MSG          12
+#define IRQ_IOP33X_MSGIBQ       13
+#define IRQ_IOP33X_ATU_BIST     14
+#define IRQ_IOP33X_PERFMON      15
+#define IRQ_IOP33X_CORE_PMU     16
+#define IRQ_IOP33X_XINT0        24
+#define IRQ_IOP33X_XINT1        25
+#define IRQ_IOP33X_XINT2        26
+#define IRQ_IOP33X_XINT3        27
+#define IRQ_IOP33X_XINT8        32
+#define IRQ_IOP33X_XINT9        33
+#define IRQ_IOP33X_XINT10       34
+#define IRQ_IOP33X_XINT11       35
+#define IRQ_IOP33X_XINT12       36
+#define IRQ_IOP33X_XINT13       37
+#define IRQ_IOP33X_XINT14       38
+#define IRQ_IOP33X_XINT15       39
+#define IRQ_IOP33X_UART0        51
+#define IRQ_IOP33X_UART1        52
+#define IRQ_IOP33X_PBIE         53
+#define IRQ_IOP33X_ATU_CRW      54
+#define IRQ_IOP33X_ATU_ERR      55
+#define IRQ_IOP33X_MCU_ERR      56
+#define IRQ_IOP33X_DMA0_ERR     57
+#define IRQ_IOP33X_DMA1_ERR     58
+#define IRQ_IOP33X_AA_ERR       60
+#define IRQ_IOP33X_MSG_ERR      62
+#define IRQ_IOP33X_HPI          63
+#define NR_IRQS                 64
+#endif
diff --git a/include/asm-arm/arch-iop33x/memory.h b/include/asm-arm/arch-iop33x/memory.h
new file mode 100644
index 000000000000..0d39139b241e
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/memory.h
@@ -0,0 +1,26 @@
+/*
+ * include/asm-arm/arch-iop33x/memory.h
+ */
+#ifndef __MEMORY_H
+#define __MEMORY_H
+#include <asm/hardware.h>
+/*
+ * Physical DRAM offset.
+ */
+#define PHYS_OFFSET     UL(0x00000000)
+/*
+ * Virtual view <-> PCI DMA view memory address translations
+ * virt_to_bus: Used to translate the virtual address to an
+ *              address suitable to be passed to set_dma_addr
+ * bus_to_virt: Used to convert an address for DMA operations
+ *              to an address that the kernel can use.
+ */
+#define __virt_to_bus(x)        (((__virt_to_phys(x)) & ~(*IOP3XX_IATVR2)) | ((*IOP3XX_IABAR2) & 0xfffffff0))
+#define __bus_to_virt(x)        (__phys_to_virt(((x) & ~(*IOP3XX_IALR2)) | ( *IOP3XX_IATVR2)))
+#endif
diff --git a/include/asm-arm/arch-iop33x/system.h b/include/asm-arm/arch-iop33x/system.h
new file mode 100644
index 000000000000..00dd07ece262
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/system.h
@@ -0,0 +1,22 @@
+/*
+ * include/asm-arm/arch-iop33x/system.h
+ *
+ * Copyright (C) 2001 MontaVista Software, Inc.
+ *
+ * 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.
+ */
+static inline void arch_idle(void)
+{
+        cpu_do_idle();
+}
+static inline void arch_reset(char mode)
+{
+        *IOP3XX_PCSR = 0x30;
+        /* Jump into ROM at address 0 */
+        cpu_reset(0);
+}
diff --git a/include/asm-arm/arch-iop33x/timex.h b/include/asm-arm/arch-iop33x/timex.h
new file mode 100644
index 000000000000..fe3e1e369ff9
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/timex.h
@@ -0,0 +1,9 @@
+/*
+ * include/asm-arm/arch-iop33x/timex.h
+ *
+ * IOP3xx architecture timex specifications
+ */
+#include <asm/hardware.h>
+#define CLOCK_TICK_RATE         (100 * HZ)
diff --git a/include/asm-arm/arch-iop33x/uncompress.h b/include/asm-arm/arch-iop33x/uncompress.h
new file mode 100644
index 000000000000..e17fbc05877b
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/uncompress.h
@@ -0,0 +1,37 @@
+/*
+ * include/asm-arm/arch-iop33x/uncompress.h
+ */
+#include <asm/types.h>
+#include <asm/mach-types.h>
+#include <linux/serial_reg.h>
+#include <asm/hardware.h>
+static volatile u32 *uart_base;
+#define TX_DONE         (UART_LSR_TEMT | UART_LSR_THRE)
+static inline void putc(char c)
+{
+        while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
+                barrier();
+        uart_base[UART_TX] = c;
+}
+static inline void flush(void)
+{
+}
+static __inline__ void __arch_decomp_setup(unsigned long arch_id)
+{
+        if (machine_is_iq80331() || machine_is_iq80332())
+                uart_base = (volatile u32 *)IOP33X_UART0_PHYS;
+        else
+                uart_base = (volatile u32 *)0xfe800000;
+}
+/*
+ * nothing to do
+ */
+#define arch_decomp_setup()     __arch_decomp_setup(arch_id)
+#define arch_decomp_wdog()
diff --git a/include/asm-arm/arch-iop33x/vmalloc.h b/include/asm-arm/arch-iop33x/vmalloc.h
new file mode 100644
index 000000000000..66f545a7f4fc
--- /dev/null
+++ b/include/asm-arm/arch-iop33x/vmalloc.h
@@ -0,0 +1,5 @@
+/*
+ * include/asm-arm/arch-iop33x/vmalloc.h
+ */
+#define VMALLOC_END     0xfe000000
diff --git a/include/asm-arm/arch-iop3xx/debug-macro.S b/include/asm-arm/arch-iop3xx/debug-macro.S
deleted file mode 100644
index ce007e531994..000000000000
--- a/include/asm-arm/arch-iop3xx/debug-macro.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/* linux/include/asm-arm/arch-iop3xx/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * 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.
- *
-*/
-                .macro  addruart,rx
-                mov     \rx, #0xfe000000        @ physical
-#if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)
-                orr     \rx, \rx, #0x00800000   @ location of the UART
-#elif defined(CONFIG_ARCH_IOP331)
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0x000fe000        @ Physical Base
-                movne   \rx, #0
-                orr     \rx, \rx, #0xfe000000
-                orr     \rx, \rx, #0x00f00000   @ Virtual Base
-                orr     \rx, \rx, #0x00001700   @ location of the UART
-#else
-#error Unknown IOP3XX implementation
-#endif
-                .endm
-#if !defined(CONFIG_ARCH_IQ80321) || !defined(CONFIG_ARCH_IQ31244) || !defined(CONFIG_ARCH_IQ80331)
-#define FLOW_CONTROL
-#endif
-#define UART_SHIFT      0
-#include <asm/hardware/debug-8250.S>
diff --git a/include/asm-arm/arch-iop3xx/entry-macro.S b/include/asm-arm/arch-iop3xx/entry-macro.S
deleted file mode 100644
index 926668c098a5..000000000000
--- a/include/asm-arm/arch-iop3xx/entry-macro.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * include/asm-arm/arch-iop3xx/entry-macro.S
- *
- * Low-level IRQ helper macros for IOP3xx-based platforms
- *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-#include <asm/arch/irqs.h>
-#if defined(CONFIG_ARCH_IOP321)
-                .macro  disable_fiq
-                .endm
-                /*
-                 * Note: only deal with normal interrupts, not FIQ
-                 */
-                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-                mov     \irqnr, #0
-                mrc     p6, 0, \irqstat, c8, c0, 0      @ Read IINTSRC
-                cmp     \irqstat, #0
-                beq     1001f
-                clz     \irqnr, \irqstat
-                mov     \base, #31
-                subs    \irqnr,\base,\irqnr
-                add     \irqnr,\irqnr,#IRQ_IOP321_DMA0_EOT
-1001:
-                .endm
-#elif defined(CONFIG_ARCH_IOP331)
-                .macro  disable_fiq
-                .endm
-                /*
-                 * Note: only deal with normal interrupts, not FIQ
-                 */
-                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-                mov     \irqnr, #0
-                mrc     p6, 0, \irqstat, c4, c0, 0      @ Read IINTSRC0
-                cmp     \irqstat, #0
-                bne     1002f
-                mrc     p6, 0, \irqstat, c5, c0, 0      @ Read IINTSRC1
-                cmp     \irqstat, #0
-                beq     1001f
-                clz     \irqnr, \irqstat
-                rsbs    \irqnr,\irqnr,#31   @ recommend by RMK
-                add     \irqnr,\irqnr,#IRQ_IOP331_XINT8
-                b       1001f
-1002:   clz     \irqnr, \irqstat
-                rsbs    \irqnr,\irqnr,#31   @ recommend by RMK
-                add     \irqnr,\irqnr,#IRQ_IOP331_DMA0_EOT
-1001:
-                .endm
-#endif
diff --git a/include/asm-arm/arch-iop3xx/hardware.h b/include/asm-arm/arch-iop3xx/hardware.h
deleted file mode 100644
index 3b138171d086..000000000000
--- a/include/asm-arm/arch-iop3xx/hardware.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop3xx/hardware.h
- */
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-#include <asm/types.h>
-/*
- * Note about PCI IO space mappings
- *
- * To make IO space accesses efficient, we store virtual addresses in
- * the IO resources.
- *
- * The PCI IO space is located at virtual 0xfe000000 from physical
- * 0x90000000.  The PCI BARs must be programmed with physical addresses,
- * but when we read them, we convert them to virtual addresses.  See
- * arch/arm/mach-iop3xx/iop3xx-pci.c
- */
-#define pcibios_assign_all_busses() 1
-/*
- * The min PCI I/O and MEM space are dependent on what specific
- * chipset/platform we are running on, so instead of hardcoding with
- * #ifdefs, we just fill these in the platform level PCI init code.
- */
-#ifndef __ASSEMBLY__
-extern unsigned long iop3xx_pcibios_min_io;
-extern unsigned long iop3xx_pcibios_min_mem;
-extern unsigned int processor_id;
-#endif
-/*
- * We just set these to zero since they are really bogus anyways
- */
-#define PCIBIOS_MIN_IO      (iop3xx_pcibios_min_io)
-#define PCIBIOS_MIN_MEM     (iop3xx_pcibios_min_mem)
-/*
- * Generic chipset bits
- *
- */
-#include "iop321.h"
-#include "iop331.h"
-/*
- * Board specific bits
- */
-#include "iq80321.h"
-#include "iq31244.h"
-#include "iq80331.h"
-#include "iq80332.h"
-#endif  /* _ASM_ARCH_HARDWARE_H */
diff --git a/include/asm-arm/arch-iop3xx/iop321-irqs.h b/include/asm-arm/arch-iop3xx/iop321-irqs.h
deleted file mode 100644
index 2fcc1654cb9d..000000000000
--- a/include/asm-arm/arch-iop3xx/iop321-irqs.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop3xx/irqs.h
- *
- * Author:      Rory Bolt <rorybolt@pacbell.net>
- * Copyright:   (C) 2002 Rory Bolt
- *
- * 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 _IOP321_IRQS_H_
-#define _IOP321_IRQS_H_
-/*
- * IOP80321 chipset interrupts
- */
-#define IOP321_IRQ_OFS          0
-#define IOP321_IRQ(x)           (IOP321_IRQ_OFS + (x))
-/*
- * On IRQ or FIQ register
- */
-#define IRQ_IOP321_DMA0_EOT     IOP321_IRQ(0)
-#define IRQ_IOP321_DMA0_EOC     IOP321_IRQ(1)
-#define IRQ_IOP321_DMA1_EOT     IOP321_IRQ(2)
-#define IRQ_IOP321_DMA1_EOC     IOP321_IRQ(3)
-#define IRQ_IOP321_RSVD_4       IOP321_IRQ(4)
-#define IRQ_IOP321_RSVD_5       IOP321_IRQ(5)
-#define IRQ_IOP321_AA_EOT       IOP321_IRQ(6)
-#define IRQ_IOP321_AA_EOC       IOP321_IRQ(7)
-#define IRQ_IOP321_CORE_PMON    IOP321_IRQ(8)
-#define IRQ_IOP321_TIMER0       IOP321_IRQ(9)
-#define IRQ_IOP321_TIMER1       IOP321_IRQ(10)
-#define IRQ_IOP321_I2C_0        IOP321_IRQ(11)
-#define IRQ_IOP321_I2C_1        IOP321_IRQ(12)
-#define IRQ_IOP321_MESSAGING    IOP321_IRQ(13)
-#define IRQ_IOP321_ATU_BIST     IOP321_IRQ(14)
-#define IRQ_IOP321_PERFMON      IOP321_IRQ(15)
-#define IRQ_IOP321_CORE_PMU     IOP321_IRQ(16)
-#define IRQ_IOP321_BIU_ERR      IOP321_IRQ(17)
-#define IRQ_IOP321_ATU_ERR      IOP321_IRQ(18)
-#define IRQ_IOP321_MCU_ERR      IOP321_IRQ(19)
-#define IRQ_IOP321_DMA0_ERR     IOP321_IRQ(20)
-#define IRQ_IOP321_DMA1_ERR     IOP321_IRQ(21)
-#define IRQ_IOP321_RSVD_22      IOP321_IRQ(22)
-#define IRQ_IOP321_AA_ERR       IOP321_IRQ(23)
-#define IRQ_IOP321_MSG_ERR      IOP321_IRQ(24)
-#define IRQ_IOP321_SSP          IOP321_IRQ(25)
-#define IRQ_IOP321_RSVD_26      IOP321_IRQ(26)
-#define IRQ_IOP321_XINT0        IOP321_IRQ(27)
-#define IRQ_IOP321_XINT1        IOP321_IRQ(28)
-#define IRQ_IOP321_XINT2        IOP321_IRQ(29)
-#define IRQ_IOP321_XINT3        IOP321_IRQ(30)
-#define IRQ_IOP321_HPI          IOP321_IRQ(31)
-#define NR_IOP321_IRQS          (IOP321_IRQ(31) + 1)
-#define NR_IRQS                 NR_IOP321_IRQS
-/*
- * Interrupts available on the IQ80321 board
- */
-/*
- * On board devices
- */
-#define IRQ_IQ80321_I82544      IRQ_IOP321_XINT0
-#define IRQ_IQ80321_UART        IRQ_IOP321_XINT1
-/*
- * PCI interrupts
- */
-#define IRQ_IQ80321_INTA        IRQ_IOP321_XINT0
-#define IRQ_IQ80321_INTB        IRQ_IOP321_XINT1
-#define IRQ_IQ80321_INTC        IRQ_IOP321_XINT2
-#define IRQ_IQ80321_INTD        IRQ_IOP321_XINT3
-/*
- * Interrupts on the IQ31244 board
- */
-/*
- * On board devices
- */
-#define IRQ_IQ31244_UART        IRQ_IOP321_XINT1
-#define IRQ_IQ31244_I82546      IRQ_IOP321_XINT0
-#define IRQ_IQ31244_SATA        IRQ_IOP321_XINT2
-#define IRQ_IQ31244_PCIX_SLOT   IRQ_IOP321_XINT3
-/*
- * PCI interrupts
- */
-#define IRQ_IQ31244_INTA        IRQ_IOP321_XINT0
-#define IRQ_IQ31244_INTB        IRQ_IOP321_XINT1
-#define IRQ_IQ31244_INTC        IRQ_IOP321_XINT2
-#define IRQ_IQ31244_INTD        IRQ_IOP321_XINT3
-#endif // _IOP321_IRQ_H_
diff --git a/include/asm-arm/arch-iop3xx/iop321.h b/include/asm-arm/arch-iop3xx/iop321.h
deleted file mode 100644
index f8df778a356f..000000000000
--- a/include/asm-arm/arch-iop3xx/iop321.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * linux/include/asm/arch-iop3xx/iop321.h
- *
- * Intel IOP321 Chip definitions
- *
- * Author: Rory Bolt <rorybolt@pacbell.net>
- * Copyright (C) 2002 Rory Bolt
- * Copyright (C) 2004 Intel Corp.
- *
- * 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 _IOP321_HW_H_
-#define _IOP321_HW_H_
-/*
- * This is needed for mixed drivers that need to work on all
- * IOP3xx variants but behave slightly differently on each.
- */
-#ifndef __ASSEMBLY__
-#ifdef  CONFIG_ARCH_IOP321
-#define iop_is_321() (((processor_id & 0xfffff5e0) == 0x69052420))
-#else
-#define iop_is_321()    0
-#endif
-#endif
-/*
- * IOP321 I/O and Mem space regions for PCI autoconfiguration
- */
-#define IOP321_PCI_IO_WINDOW_SIZE   0x00010000
-#define IOP321_PCI_LOWER_IO_PA      0x90000000
-#define IOP321_PCI_LOWER_IO_VA      0xfe000000
-#define IOP321_PCI_LOWER_IO_BA      (*IOP321_OIOWTVR)
-#define IOP321_PCI_UPPER_IO_PA      (IOP321_PCI_LOWER_IO_PA + IOP321_PCI_IO_WINDOW_SIZE - 1)
-#define IOP321_PCI_UPPER_IO_VA      (IOP321_PCI_LOWER_IO_VA + IOP321_PCI_IO_WINDOW_SIZE - 1)
-#define IOP321_PCI_UPPER_IO_BA      (IOP321_PCI_LOWER_IO_BA + IOP321_PCI_IO_WINDOW_SIZE - 1)
-#define IOP321_PCI_IO_OFFSET        (IOP321_PCI_LOWER_IO_VA - IOP321_PCI_LOWER_IO_BA)
-/* #define IOP321_PCI_MEM_WINDOW_SIZE  (~*IOP321_IALR1 + 1) */
-#define IOP321_PCI_MEM_WINDOW_SIZE  0x04000000 /* 64M outbound window */
-#define IOP321_PCI_LOWER_MEM_PA     0x80000000
-#define IOP321_PCI_LOWER_MEM_BA     (*IOP321_OMWTVR0)
-#define IOP321_PCI_UPPER_MEM_PA     (IOP321_PCI_LOWER_MEM_PA + IOP321_PCI_MEM_WINDOW_SIZE - 1)
-#define IOP321_PCI_UPPER_MEM_BA     (IOP321_PCI_LOWER_MEM_BA + IOP321_PCI_MEM_WINDOW_SIZE - 1)
-#define IOP321_PCI_MEM_OFFSET       (IOP321_PCI_LOWER_MEM_PA - IOP321_PCI_LOWER_MEM_BA)
-/*
- * IOP321 chipset registers
- */
-#define IOP321_VIRT_MEM_BASE 0xfeffe000  /* chip virtual mem address*/
-#define IOP321_PHYS_MEM_BASE 0xffffe000  /* chip physical memory address */
-#define IOP321_REG_ADDR(reg) (IOP321_VIRT_MEM_BASE | (reg))
-/* Reserved 0x00000000 through 0x000000FF */
-/* Address Translation Unit 0x00000100 through 0x000001FF */
-#define IOP321_ATUVID     (volatile u16 *)IOP321_REG_ADDR(0x00000100)
-#define IOP321_ATUDID     (volatile u16 *)IOP321_REG_ADDR(0x00000102)
-#define IOP321_ATUCMD     (volatile u16 *)IOP321_REG_ADDR(0x00000104)
-#define IOP321_ATUSR      (volatile u16 *)IOP321_REG_ADDR(0x00000106)
-#define IOP321_ATURID     (volatile u8  *)IOP321_REG_ADDR(0x00000108)
-#define IOP321_ATUCCR     (volatile u32 *)IOP321_REG_ADDR(0x00000109)
-#define IOP321_ATUCLSR    (volatile u8  *)IOP321_REG_ADDR(0x0000010C)
-#define IOP321_ATULT      (volatile u8  *)IOP321_REG_ADDR(0x0000010D)
-#define IOP321_ATUHTR     (volatile u8  *)IOP321_REG_ADDR(0x0000010E)
-#define IOP321_ATUBIST    (volatile u8  *)IOP321_REG_ADDR(0x0000010F)
-#define IOP321_IABAR0     (volatile u32 *)IOP321_REG_ADDR(0x00000110)
-#define IOP321_IAUBAR0    (volatile u32 *)IOP321_REG_ADDR(0x00000114)
-#define IOP321_IABAR1     (volatile u32 *)IOP321_REG_ADDR(0x00000118)
-#define IOP321_IAUBAR1    (volatile u32 *)IOP321_REG_ADDR(0x0000011C)
-#define IOP321_IABAR2     (volatile u32 *)IOP321_REG_ADDR(0x00000120)
-#define IOP321_IAUBAR2    (volatile u32 *)IOP321_REG_ADDR(0x00000124)
-#define IOP321_ASVIR      (volatile u16 *)IOP321_REG_ADDR(0x0000012C)
-#define IOP321_ASIR       (volatile u16 *)IOP321_REG_ADDR(0x0000012E)
-#define IOP321_ERBAR      (volatile u32 *)IOP321_REG_ADDR(0x00000130)
-/* Reserved 0x00000134 through 0x0000013B */
-#define IOP321_ATUILR     (volatile u8  *)IOP321_REG_ADDR(0x0000013C)
-#define IOP321_ATUIPR     (volatile u8  *)IOP321_REG_ADDR(0x0000013D)
-#define IOP321_ATUMGNT    (volatile u8  *)IOP321_REG_ADDR(0x0000013E)
-#define IOP321_ATUMLAT    (volatile u8  *)IOP321_REG_ADDR(0x0000013F)
-#define IOP321_IALR0      (volatile u32 *)IOP321_REG_ADDR(0x00000140)
-#define IOP321_IATVR0     (volatile u32 *)IOP321_REG_ADDR(0x00000144)
-#define IOP321_ERLR       (volatile u32 *)IOP321_REG_ADDR(0x00000148)
-#define IOP321_ERTVR      (volatile u32 *)IOP321_REG_ADDR(0x0000014C)
-#define IOP321_IALR1      (volatile u32 *)IOP321_REG_ADDR(0x00000150)
-#define IOP321_IALR2      (volatile u32 *)IOP321_REG_ADDR(0x00000154)
-#define IOP321_IATVR2     (volatile u32 *)IOP321_REG_ADDR(0x00000158)
-#define IOP321_OIOWTVR    (volatile u32 *)IOP321_REG_ADDR(0x0000015C)
-#define IOP321_OMWTVR0    (volatile u32 *)IOP321_REG_ADDR(0x00000160)
-#define IOP321_OUMWTVR0   (volatile u32 *)IOP321_REG_ADDR(0x00000164)
-#define IOP321_OMWTVR1    (volatile u32 *)IOP321_REG_ADDR(0x00000168)
-#define IOP321_OUMWTVR1   (volatile u32 *)IOP321_REG_ADDR(0x0000016C)
-/* Reserved 0x00000170 through 0x00000177*/
-#define IOP321_OUDWTVR    (volatile u32 *)IOP321_REG_ADDR(0x00000178)
-/* Reserved 0x0000017C through 0x0000017F*/
-#define IOP321_ATUCR      (volatile u32 *)IOP321_REG_ADDR(0x00000180)
-#define IOP321_PCSR       (volatile u32 *)IOP321_REG_ADDR(0x00000184)
-#define IOP321_ATUISR     (volatile u32 *)IOP321_REG_ADDR(0x00000188)
-#define IOP321_ATUIMR     (volatile u32 *)IOP321_REG_ADDR(0x0000018C)
-#define IOP321_IABAR3     (volatile u32 *)IOP321_REG_ADDR(0x00000190)
-#define IOP321_IAUBAR3    (volatile u32 *)IOP321_REG_ADDR(0x00000194)
-#define IOP321_IALR3      (volatile u32 *)IOP321_REG_ADDR(0x00000198)
-#define IOP321_IATVR3     (volatile u32 *)IOP321_REG_ADDR(0x0000019C)
-/* Reserved 0x000001A0 through 0x000001A3*/
-#define IOP321_OCCAR      (volatile u32 *)IOP321_REG_ADDR(0x000001A4)
-/* Reserved 0x000001A8 through 0x000001AB*/
-#define IOP321_OCCDR      (volatile u32 *)IOP321_REG_ADDR(0x000001AC)
-/* Reserved 0x000001B0 through 0x000001BB*/
-#define IOP321_PDSCR      (volatile u32 *)IOP321_REG_ADDR(0x000001BC)
-#define IOP321_PMCAPID    (volatile u8  *)IOP321_REG_ADDR(0x000001C0)
-#define IOP321_PMNEXT     (volatile u8  *)IOP321_REG_ADDR(0x000001C1)
-#define IOP321_APMCR      (volatile u16 *)IOP321_REG_ADDR(0x000001C2)
-#define IOP321_APMCSR     (volatile u16 *)IOP321_REG_ADDR(0x000001C4)
-/* Reserved 0x000001C6 through 0x000001DF */
-#define IOP321_PCIXCAPID  (volatile u8  *)IOP321_REG_ADDR(0x000001E0)
-#define IOP321_PCIXNEXT   (volatile u8  *)IOP321_REG_ADDR(0x000001E1)
-#define IOP321_PCIXCMD    (volatile u16 *)IOP321_REG_ADDR(0x000001E2)
-#define IOP321_PCIXSR     (volatile u32 *)IOP321_REG_ADDR(0x000001E4)
-#define IOP321_PCIIRSR    (volatile u32 *)IOP321_REG_ADDR(0x000001EC)
-/* Messaging Unit 0x00000300 through 0x000003FF */
-/* Reserved 0x00000300 through 0x0000030c */
-#define IOP321_IMR0       (volatile u32 *)IOP321_REG_ADDR(0x00000310)
-#define IOP321_IMR1       (volatile u32 *)IOP321_REG_ADDR(0x00000314)
-#define IOP321_OMR0       (volatile u32 *)IOP321_REG_ADDR(0x00000318)
-#define IOP321_OMR1       (volatile u32 *)IOP321_REG_ADDR(0x0000031C)
-#define IOP321_IDR        (volatile u32 *)IOP321_REG_ADDR(0x00000320)
-#define IOP321_IISR       (volatile u32 *)IOP321_REG_ADDR(0x00000324)
-#define IOP321_IIMR       (volatile u32 *)IOP321_REG_ADDR(0x00000328)
-#define IOP321_ODR        (volatile u32 *)IOP321_REG_ADDR(0x0000032C)
-#define IOP321_OISR       (volatile u32 *)IOP321_REG_ADDR(0x00000330)
-#define IOP321_OIMR       (volatile u32 *)IOP321_REG_ADDR(0x00000334)
-/* Reserved 0x00000338 through 0x0000034F */
-#define IOP321_MUCR       (volatile u32 *)IOP321_REG_ADDR(0x00000350)
-#define IOP321_QBAR       (volatile u32 *)IOP321_REG_ADDR(0x00000354)
-/* Reserved 0x00000358 through 0x0000035C */
-#define IOP321_IFHPR      (volatile u32 *)IOP321_REG_ADDR(0x00000360)
-#define IOP321_IFTPR      (volatile u32 *)IOP321_REG_ADDR(0x00000364)
-#define IOP321_IPHPR      (volatile u32 *)IOP321_REG_ADDR(0x00000368)
-#define IOP321_IPTPR      (volatile u32 *)IOP321_REG_ADDR(0x0000036C)
-#define IOP321_OFHPR      (volatile u32 *)IOP321_REG_ADDR(0x00000370)
-#define IOP321_OFTPR      (volatile u32 *)IOP321_REG_ADDR(0x00000374)
-#define IOP321_OPHPR      (volatile u32 *)IOP321_REG_ADDR(0x00000378)
-#define IOP321_OPTPR      (volatile u32 *)IOP321_REG_ADDR(0x0000037C)
-#define IOP321_IAR        (volatile u32 *)IOP321_REG_ADDR(0x00000380)
-#define IOP321_IIxR_MASK        0x7f /* masks all */
-#define IOP321_IIxR_IRI         0x40 /* RC Index Register Interrupt */
-#define IOP321_IIxR_OFQF        0x20 /* RC Output Free Q Full (ERROR) */
-#define IOP321_IIxR_ipq         0x10 /* RC Inbound Post Q (post) */
-#define IOP321_IIxR_ERRDI       0x08 /* RO Error Doorbell Interrupt */
-#define IOP321_IIxR_IDI         0x04 /* RO Inbound Doorbell Interrupt */
-#define IOP321_IIxR_IM1         0x02 /* RC Inbound Message 1 Interrupt */
-#define IOP321_IIxR_IM0         0x01 /* RC Inbound Message 0 Interrupt */
-/* Reserved 0x00000384 through 0x000003FF */
-/* DMA Controller 0x00000400 through 0x000004FF */
-#define IOP321_DMA0_CCR   (volatile u32 *)IOP321_REG_ADDR(0x00000400)
-#define IOP321_DMA0_CSR   (volatile u32 *)IOP321_REG_ADDR(0x00000404)
-#define IOP321_DMA0_DAR   (volatile u32 *)IOP321_REG_ADDR(0x0000040C)
-#define IOP321_DMA0_NDAR  (volatile u32 *)IOP321_REG_ADDR(0x00000410)
-#define IOP321_DMA0_PADR  (volatile u32 *)IOP321_REG_ADDR(0x00000414)
-#define IOP321_DMA0_PUADR (volatile u32 *)IOP321_REG_ADDR(0x00000418)
-#define IOP321_DMA0_LADR  (volatile u32 *)IOP321_REG_ADDR(0X0000041C)
-#define IOP321_DMA0_BCR   (volatile u32 *)IOP321_REG_ADDR(0x00000420)
-#define IOP321_DMA0_DCR   (volatile u32 *)IOP321_REG_ADDR(0x00000424)
-/* Reserved 0x00000428 through 0x0000043C */
-#define IOP321_DMA1_CCR   (volatile u32 *)IOP321_REG_ADDR(0x00000440)
-#define IOP321_DMA1_CSR   (volatile u32 *)IOP321_REG_ADDR(0x00000444)
-#define IOP321_DMA1_DAR   (volatile u32 *)IOP321_REG_ADDR(0x0000044C)
-#define IOP321_DMA1_NDAR  (volatile u32 *)IOP321_REG_ADDR(0x00000450)
-#define IOP321_DMA1_PADR  (volatile u32 *)IOP321_REG_ADDR(0x00000454)
-#define IOP321_DMA1_PUADR (volatile u32 *)IOP321_REG_ADDR(0x00000458)
-#define IOP321_DMA1_LADR  (volatile u32 *)IOP321_REG_ADDR(0x0000045C)
-#define IOP321_DMA1_BCR   (volatile u32 *)IOP321_REG_ADDR(0x00000460)
-#define IOP321_DMA1_DCR   (volatile u32 *)IOP321_REG_ADDR(0x00000464)
-/* Reserved 0x00000468 through 0x000004FF */
-/* Memory controller 0x00000500 through 0x0005FF */
-/* Peripheral bus interface unit 0x00000680 through 0x0006FF */
-#define IOP321_PBCR       (volatile u32 *)IOP321_REG_ADDR(0x00000680)
-#define IOP321_PBISR      (volatile u32 *)IOP321_REG_ADDR(0x00000684)
-#define IOP321_PBBAR0     (volatile u32 *)IOP321_REG_ADDR(0x00000688)
-#define IOP321_PBLR0      (volatile u32 *)IOP321_REG_ADDR(0x0000068C)
-#define IOP321_PBBAR1     (volatile u32 *)IOP321_REG_ADDR(0x00000690)
-#define IOP321_PBLR1      (volatile u32 *)IOP321_REG_ADDR(0x00000694)
-#define IOP321_PBBAR2     (volatile u32 *)IOP321_REG_ADDR(0x00000698)
-#define IOP321_PBLR2      (volatile u32 *)IOP321_REG_ADDR(0x0000069C)
-#define IOP321_PBBAR3     (volatile u32 *)IOP321_REG_ADDR(0x000006A0)
-#define IOP321_PBLR3      (volatile u32 *)IOP321_REG_ADDR(0x000006A4)
-#define IOP321_PBBAR4     (volatile u32 *)IOP321_REG_ADDR(0x000006A8)
-#define IOP321_PBLR4      (volatile u32 *)IOP321_REG_ADDR(0x000006AC)
-#define IOP321_PBBAR5     (volatile u32 *)IOP321_REG_ADDR(0x000006B0)
-#define IOP321_PBLR5      (volatile u32 *)IOP321_REG_ADDR(0x000006B4)
-#define IOP321_PBDSCR     (volatile u32 *)IOP321_REG_ADDR(0x000006B8)
-/* Reserved 0x000006BC */
-#define IOP321_PMBR0      (volatile u32 *)IOP321_REG_ADDR(0x000006C0)
-/* Reserved 0x000006C4 through 0x000006DC */
-#define IOP321_PMBR1      (volatile u32 *)IOP321_REG_ADDR(0x000006E0)
-#define IOP321_PMBR2      (volatile u32 *)IOP321_REG_ADDR(0x000006E4)
-#define IOP321_PBCR_EN    0x1
-#define IOP321_PBISR_BOOR_ERR 0x1
-/* Peripheral performance monitoring unit 0x00000700 through 0x00077F */
-#define IOP321_GTMR     (volatile u32 *)IOP321_REG_ADDR(0x00000700)
-#define IOP321_ESR      (volatile u32 *)IOP321_REG_ADDR(0x00000704)
-#define IOP321_EMISR    (volatile u32 *)IOP321_REG_ADDR(0x00000708)
-/* reserved 0x00000070c */
-#define IOP321_GTSR     (volatile u32 *)IOP321_REG_ADDR(0x00000710)
-/* PERC0 DOESN'T EXIST - index from 1! */
-#define IOP321_PERCR0   (volatile u32 *)IOP321_REG_ADDR(0x00000710)
-#define IOP321_GTMR_NGCE        0x04 /* (Not) Global Counter Enable */
-/* Internal arbitration unit 0x00000780 through 0x0007BF */
-#define IOP321_IACR     (volatile u32 *)IOP321_REG_ADDR(0x00000780)
-#define IOP321_MTTR1    (volatile u32 *)IOP321_REG_ADDR(0x00000784)
-#define IOP321_MTTR2    (volatile u32 *)IOP321_REG_ADDR(0x00000788)
-/* General Purpose I/O Registers */
-#define IOP321_GPOE       (volatile u32 *)IOP321_REG_ADDR(0x000007C4)
-#define IOP321_GPID       (volatile u32 *)IOP321_REG_ADDR(0x000007C8)
-#define IOP321_GPOD       (volatile u32 *)IOP321_REG_ADDR(0x000007CC)
-/* Interrupt Controller */
-#define IOP321_INTCTL     (volatile u32 *)IOP321_REG_ADDR(0x000007D0)
-#define IOP321_INTSTR     (volatile u32 *)IOP321_REG_ADDR(0x000007D4)
-#define IOP321_IINTSRC    (volatile u32 *)IOP321_REG_ADDR(0x000007D8)
-#define IOP321_FINTSRC    (volatile u32 *)IOP321_REG_ADDR(0x000007DC)
-/* Timers */
-#define IOP321_TU_TMR0          (volatile u32 *)IOP321_REG_ADDR(0x000007E0)
-#define IOP321_TU_TMR1          (volatile u32 *)IOP321_REG_ADDR(0x000007E4)
-#ifdef CONFIG_ARCH_IQ80321
-#define IOP321_TICK_RATE        200000000       /* 200 MHz clock */
-#elif defined(CONFIG_ARCH_IQ31244)
-#define IOP321_TICK_RATE        198000000       /* 33.000 MHz crystal */
-#endif
-#ifdef CONFIG_ARCH_EP80219
-#undef IOP321_TICK_RATE
-#define IOP321_TICK_RATE 200000000 /* 33.333333 Mhz crystal */
-#endif
-#define IOP321_TMR_TC           0x01
-#define IOP321_TMR_EN           0x02
-#define IOP321_TMR_RELOAD       0x04
-#define IOP321_TMR_PRIVILEGED   0x09
-#define IOP321_TMR_RATIO_1_1    0x00
-#define IOP321_TMR_RATIO_4_1    0x10
-#define IOP321_TMR_RATIO_8_1    0x20
-#define IOP321_TMR_RATIO_16_1   0x30
-#define IOP321_TU_TCR0    (volatile u32 *)IOP321_REG_ADDR(0x000007E8)
-#define IOP321_TU_TCR1    (volatile u32 *)IOP321_REG_ADDR(0x000007EC)
-#define IOP321_TU_TRR0    (volatile u32 *)IOP321_REG_ADDR(0x000007F0)
-#define IOP321_TU_TRR1    (volatile u32 *)IOP321_REG_ADDR(0x000007F4)
-#define IOP321_TU_TISR    (volatile u32 *)IOP321_REG_ADDR(0x000007F8)
-#define IOP321_TU_WDTCR   (volatile u32 *)IOP321_REG_ADDR(0x000007FC)
-/* Application accelerator unit 0x00000800 - 0x000008FF */
-#define IOP321_AAU_ACR     (volatile u32 *)IOP321_REG_ADDR(0x00000800)
-#define IOP321_AAU_ASR     (volatile u32 *)IOP321_REG_ADDR(0x00000804)
-#define IOP321_AAU_ADAR    (volatile u32 *)IOP321_REG_ADDR(0x00000808)
-#define IOP321_AAU_ANDAR   (volatile u32 *)IOP321_REG_ADDR(0x0000080C)
-#define IOP321_AAU_SAR1    (volatile u32 *)IOP321_REG_ADDR(0x00000810)
-#define IOP321_AAU_SAR2    (volatile u32 *)IOP321_REG_ADDR(0x00000814)
-#define IOP321_AAU_SAR3    (volatile u32 *)IOP321_REG_ADDR(0x00000818)
-#define IOP321_AAU_SAR4    (volatile u32 *)IOP321_REG_ADDR(0x0000081C)
-#define IOP321_AAU_SAR5    (volatile u32 *)IOP321_REG_ADDR(0x0000082C)
-#define IOP321_AAU_SAR6    (volatile u32 *)IOP321_REG_ADDR(0x00000830)
-#define IOP321_AAU_SAR7    (volatile u32 *)IOP321_REG_ADDR(0x00000834)
-#define IOP321_AAU_SAR8    (volatile u32 *)IOP321_REG_ADDR(0x00000838)
-#define IOP321_AAU_SAR9    (volatile u32 *)IOP321_REG_ADDR(0x00000840)
-#define IOP321_AAU_SAR10   (volatile u32 *)IOP321_REG_ADDR(0x00000844)
-#define IOP321_AAU_SAR11   (volatile u32 *)IOP321_REG_ADDR(0x00000848)
-#define IOP321_AAU_SAR12   (volatile u32 *)IOP321_REG_ADDR(0x0000084C)
-#define IOP321_AAU_SAR13   (volatile u32 *)IOP321_REG_ADDR(0x00000850)
-#define IOP321_AAU_SAR14   (volatile u32 *)IOP321_REG_ADDR(0x00000854)
-#define IOP321_AAU_SAR15   (volatile u32 *)IOP321_REG_ADDR(0x00000858)
-#define IOP321_AAU_SAR16   (volatile u32 *)IOP321_REG_ADDR(0x0000085C)
-#define IOP321_AAU_SAR17   (volatile u32 *)IOP321_REG_ADDR(0x00000864)
-#define IOP321_AAU_SAR18   (volatile u32 *)IOP321_REG_ADDR(0x00000868)
-#define IOP321_AAU_SAR19   (volatile u32 *)IOP321_REG_ADDR(0x0000086C)
-#define IOP321_AAU_SAR20   (volatile u32 *)IOP321_REG_ADDR(0x00000870)
-#define IOP321_AAU_SAR21   (volatile u32 *)IOP321_REG_ADDR(0x00000874)
-#define IOP321_AAU_SAR22   (volatile u32 *)IOP321_REG_ADDR(0x00000878)
-#define IOP321_AAU_SAR23   (volatile u32 *)IOP321_REG_ADDR(0x0000087C)
-#define IOP321_AAU_SAR24   (volatile u32 *)IOP321_REG_ADDR(0x00000880)
-#define IOP321_AAU_SAR25   (volatile u32 *)IOP321_REG_ADDR(0x00000888)
-#define IOP321_AAU_SAR26   (volatile u32 *)IOP321_REG_ADDR(0x0000088C)
-#define IOP321_AAU_SAR27   (volatile u32 *)IOP321_REG_ADDR(0x00000890)
-#define IOP321_AAU_SAR28   (volatile u32 *)IOP321_REG_ADDR(0x00000894)
-#define IOP321_AAU_SAR29   (volatile u32 *)IOP321_REG_ADDR(0x00000898)
-#define IOP321_AAU_SAR30   (volatile u32 *)IOP321_REG_ADDR(0x0000089C)
-#define IOP321_AAU_SAR31   (volatile u32 *)IOP321_REG_ADDR(0x000008A0)
-#define IOP321_AAU_SAR32   (volatile u32 *)IOP321_REG_ADDR(0x000008A4)
-#define IOP321_AAU_DAR     (volatile u32 *)IOP321_REG_ADDR(0x00000820)
-#define IOP321_AAU_ABCR    (volatile u32 *)IOP321_REG_ADDR(0x00000824)
-#define IOP321_AAU_ADCR    (volatile u32 *)IOP321_REG_ADDR(0x00000828)
-#define IOP321_AAU_EDCR0   (volatile u32 *)IOP321_REG_ADDR(0x0000083c)
-#define IOP321_AAU_EDCR1   (volatile u32 *)IOP321_REG_ADDR(0x00000860)
-#define IOP321_AAU_EDCR2   (volatile u32 *)IOP321_REG_ADDR(0x00000884)
-/* SSP serial port unit 0x00001600 - 0x0000167F */
-/* I2C bus interface unit 0x00001680 - 0x000016FF */
-#define IOP321_ICR0       (volatile u32 *)IOP321_REG_ADDR(0x00001680)
-#define IOP321_ISR0       (volatile u32 *)IOP321_REG_ADDR(0x00001684)
-#define IOP321_ISAR0      (volatile u32 *)IOP321_REG_ADDR(0x00001688)
-#define IOP321_IDBR0      (volatile u32 *)IOP321_REG_ADDR(0x0000168C)
-/* Reserved 0x00001690 */
-#define IOP321_IBMR0      (volatile u32 *)IOP321_REG_ADDR(0x00001694)
-/* Reserved 0x00001698 */
-/* Reserved 0x0000169C */
-#define IOP321_ICR1       (volatile u32 *)IOP321_REG_ADDR(0x000016A0)
-#define IOP321_ISR1       (volatile u32 *)IOP321_REG_ADDR(0x000016A4)
-#define IOP321_ISAR1      (volatile u32 *)IOP321_REG_ADDR(0x000016A8)
-#define IOP321_IDBR1      (volatile u32 *)IOP321_REG_ADDR(0x000016AC)
-#define IOP321_IBMR1      (volatile u32 *)IOP321_REG_ADDR(0x000016B4)
-/* Reserved 0x000016B8 through 0x000016FC */
-/* for I2C bit defs see drivers/i2c/i2c-iop3xx.h */
-#ifndef __ASSEMBLY__
-extern void iop321_map_io(void);
-extern void iop321_init_irq(void);
-extern void iop321_time_init(void);
-#endif
-#endif // _IOP321_HW_H_
diff --git a/include/asm-arm/arch-iop3xx/iop331-irqs.h b/include/asm-arm/arch-iop3xx/iop331-irqs.h
deleted file mode 100644
index 7135ad7e335e..000000000000
--- a/include/asm-arm/arch-iop3xx/iop331-irqs.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop3xx/irqs.h
- *
- * Author:      Dave Jiang (dave.jiang@intel.com)
- * Copyright:   (C) 2003 Intel Corp.
- *
- * 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 _IOP331_IRQS_H_
-#define _IOP331_IRQS_H_
-/*
- * IOP80331 chipset interrupts
- */
-#define IOP331_IRQ_OFS          0
-#define IOP331_IRQ(x)           (IOP331_IRQ_OFS + (x))
-/*
- * On IRQ or FIQ register
- */
-#define IRQ_IOP331_DMA0_EOT     IOP331_IRQ(0)
-#define IRQ_IOP331_DMA0_EOC     IOP331_IRQ(1)
-#define IRQ_IOP331_DMA1_EOT     IOP331_IRQ(2)
-#define IRQ_IOP331_DMA1_EOC     IOP331_IRQ(3)
-#define IRQ_IOP331_RSVD_4       IOP331_IRQ(4)
-#define IRQ_IOP331_RSVD_5       IOP331_IRQ(5)
-#define IRQ_IOP331_AA_EOT       IOP331_IRQ(6)
-#define IRQ_IOP331_AA_EOC       IOP331_IRQ(7)
-#define IRQ_IOP331_TIMER0       IOP331_IRQ(8)
-#define IRQ_IOP331_TIMER1       IOP331_IRQ(9)
-#define IRQ_IOP331_I2C_0        IOP331_IRQ(10)
-#define IRQ_IOP331_I2C_1        IOP331_IRQ(11)
-#define IRQ_IOP331_MSG      IOP331_IRQ(12)
-#define IRQ_IOP331_MSGIBQ   IOP331_IRQ(13)
-#define IRQ_IOP331_ATU_BIST     IOP331_IRQ(14)
-#define IRQ_IOP331_PERFMON      IOP331_IRQ(15)
-#define IRQ_IOP331_CORE_PMU     IOP331_IRQ(16)
-#define IRQ_IOP331_RSVD_17      IOP331_IRQ(17)
-#define IRQ_IOP331_RSVD_18      IOP331_IRQ(18)
-#define IRQ_IOP331_RSVD_19      IOP331_IRQ(19)
-#define IRQ_IOP331_RSVD_20      IOP331_IRQ(20)
-#define IRQ_IOP331_RSVD_21      IOP331_IRQ(21)
-#define IRQ_IOP331_RSVD_22      IOP331_IRQ(22)
-#define IRQ_IOP331_RSVD_23      IOP331_IRQ(23)
-#define IRQ_IOP331_XINT0        IOP331_IRQ(24)
-#define IRQ_IOP331_XINT1        IOP331_IRQ(25)
-#define IRQ_IOP331_XINT2        IOP331_IRQ(26)
-#define IRQ_IOP331_XINT3        IOP331_IRQ(27)
-#define IRQ_IOP331_RSVD_28  IOP331_IRQ(28)
-#define IRQ_IOP331_RSVD_29  IOP331_IRQ(29)
-#define IRQ_IOP331_RSVD_30  IOP331_IRQ(30)
-#define IRQ_IOP331_RSVD_31  IOP331_IRQ(31)
-#define IRQ_IOP331_XINT8    IOP331_IRQ(32)  // 0
-#define IRQ_IOP331_XINT9    IOP331_IRQ(33)  // 1
-#define IRQ_IOP331_XINT10   IOP331_IRQ(34)  // 2
-#define IRQ_IOP331_XINT11   IOP331_IRQ(35)  // 3
-#define IRQ_IOP331_XINT12   IOP331_IRQ(36)  // 4
-#define IRQ_IOP331_XINT13   IOP331_IRQ(37)  // 5
-#define IRQ_IOP331_XINT14   IOP331_IRQ(38)  // 6
-#define IRQ_IOP331_XINT15   IOP331_IRQ(39)  // 7
-#define IRQ_IOP331_RSVD_40  IOP331_IRQ(40)  // 8
-#define IRQ_IOP331_RSVD_41  IOP331_IRQ(41)  // 9
-#define IRQ_IOP331_RSVD_42  IOP331_IRQ(42)  // 10
-#define IRQ_IOP331_RSVD_43  IOP331_IRQ(43)  // 11
-#define IRQ_IOP331_RSVD_44  IOP331_IRQ(44)  // 12
-#define IRQ_IOP331_RSVD_45  IOP331_IRQ(45)  // 13
-#define IRQ_IOP331_RSVD_46  IOP331_IRQ(46)  // 14
-#define IRQ_IOP331_RSVD_47  IOP331_IRQ(47)  // 15
-#define IRQ_IOP331_RSVD_48  IOP331_IRQ(48)  // 16
-#define IRQ_IOP331_RSVD_49  IOP331_IRQ(49)  // 17
-#define IRQ_IOP331_RSVD_50  IOP331_IRQ(50)  // 18
-#define IRQ_IOP331_UART0    IOP331_IRQ(51)  // 19
-#define IRQ_IOP331_UART1    IOP331_IRQ(52)  // 20
-#define IRQ_IOP331_PBIE     IOP331_IRQ(53)  // 21
-#define IRQ_IOP331_ATU_CRW  IOP331_IRQ(54)  // 22
-#define IRQ_IOP331_ATU_ERR      IOP331_IRQ(55)  // 23
-#define IRQ_IOP331_MCU_ERR      IOP331_IRQ(56)  // 24
-#define IRQ_IOP331_DMA0_ERR     IOP331_IRQ(57)  // 25
-#define IRQ_IOP331_DMA1_ERR     IOP331_IRQ(58)  // 26
-#define IRQ_IOP331_RSVD_59  IOP331_IRQ(59)  // 27
-#define IRQ_IOP331_AA_ERR       IOP331_IRQ(60)  // 28
-#define IRQ_IOP331_RSVD_61  IOP331_IRQ(61)  // 29
-#define IRQ_IOP331_MSG_ERR      IOP331_IRQ(62)  // 30
-#define IRQ_IOP331_HPI          IOP331_IRQ(63)  // 31
-#define NR_IOP331_IRQS          (IOP331_IRQ(63) + 1)
-#define NR_IRQS                 NR_IOP331_IRQS
-/*
- * Interrupts available on the IQ80331 board
- */
-/*
- * On board devices
- */
-#define IRQ_IQ80331_I82544      IRQ_IOP331_XINT0
-#define IRQ_IQ80331_UART0       IRQ_IOP331_UART0
-#define IRQ_IQ80331_UART1       IRQ_IOP331_UART1
-/*
- * PCI interrupts
- */
-#define IRQ_IQ80331_INTA        IRQ_IOP331_XINT0
-#define IRQ_IQ80331_INTB        IRQ_IOP331_XINT1
-#define IRQ_IQ80331_INTC        IRQ_IOP331_XINT2
-#define IRQ_IQ80331_INTD        IRQ_IOP331_XINT3
-/*
- * Interrupts available on the IQ80332 board
- */
-/*
- * On board devices
- */
-#define IRQ_IQ80332_I82544      IRQ_IOP331_XINT0
-#define IRQ_IQ80332_UART0       IRQ_IOP331_UART0
-#define IRQ_IQ80332_UART1       IRQ_IOP331_UART1
-/*
- * PCI interrupts
- */
-#define IRQ_IQ80332_INTA        IRQ_IOP331_XINT0
-#define IRQ_IQ80332_INTB        IRQ_IOP331_XINT1
-#define IRQ_IQ80332_INTC        IRQ_IOP331_XINT2
-#define IRQ_IQ80332_INTD        IRQ_IOP331_XINT3
-#endif // _IOP331_IRQ_H_
diff --git a/include/asm-arm/arch-iop3xx/iop331.h b/include/asm-arm/arch-iop3xx/iop331.h
deleted file mode 100644
index fbf0cc11bdd9..000000000000
--- a/include/asm-arm/arch-iop3xx/iop331.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * linux/include/asm/arch-iop3xx/iop331.h
- *
- * Intel IOP331 Chip definitions
- *
- * Author: Dave Jiang (dave.jiang@intel.com)
- * Copyright (C) 2003, 2004 Intel Corp.
- *
- * 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 _IOP331_HW_H_
-#define _IOP331_HW_H_
-/*
- * This is needed for mixed drivers that need to work on all
- * IOP3xx variants but behave slightly differently on each.
- */
-#ifndef __ASSEMBLY__
-#ifdef  CONFIG_ARCH_IOP331
-/*#define       iop_is_331()    ((processor_id & 0xffffffb0) == 0x69054090) */
-#define iop_is_331()    ((processor_id & 0xffffff30) == 0x69054010)
-#else
-#define iop_is_331()    0
-#endif
-#endif
-/*
- * IOP331 I/O and Mem space regions for PCI autoconfiguration
- */
-#define IOP331_PCI_IO_WINDOW_SIZE   0x00010000
-#define IOP331_PCI_LOWER_IO_PA      0x90000000
-#define IOP331_PCI_LOWER_IO_VA      0xfe000000
-#define IOP331_PCI_LOWER_IO_BA      (*IOP331_OIOWTVR)
-#define IOP331_PCI_UPPER_IO_PA      (IOP331_PCI_LOWER_IO_PA + IOP331_PCI_IO_WINDOW_SIZE - 1)
-#define IOP331_PCI_UPPER_IO_VA      (IOP331_PCI_LOWER_IO_VA + IOP331_PCI_IO_WINDOW_SIZE - 1)
-#define IOP331_PCI_UPPER_IO_BA      (IOP331_PCI_LOWER_IO_BA + IOP331_PCI_IO_WINDOW_SIZE - 1)
-#define IOP331_PCI_IO_OFFSET        (IOP331_PCI_LOWER_IO_VA - IOP331_PCI_LOWER_IO_BA)
-/* this can be 128M if OMWTVR1 is set */
-#define IOP331_PCI_MEM_WINDOW_SIZE      0x04000000 /* 64M outbound window */
-/* #define IOP331_PCI_MEM_WINDOW_SIZE  (~*IOP331_IALR1 + 1) */
-#define IOP331_PCI_LOWER_MEM_PA     0x80000000
-#define IOP331_PCI_LOWER_MEM_BA     (*IOP331_OMWTVR0)
-#define IOP331_PCI_UPPER_MEM_PA     (IOP331_PCI_LOWER_MEM_PA + IOP331_PCI_MEM_WINDOW_SIZE - 1)
-#define IOP331_PCI_UPPER_MEM_BA     (IOP331_PCI_LOWER_MEM_BA + IOP331_PCI_MEM_WINDOW_SIZE - 1)
-#define IOP331_PCI_MEM_OFFSET       (IOP331_PCI_LOWER_MEM_PA - IOP331_PCI_LOWER_MEM_BA)
-/*
- * IOP331 chipset registers
- */
-#define IOP331_VIRT_MEM_BASE  0xfeffe000  /* chip virtual mem address*/
-#define IOP331_PHYS_MEM_BASE  0xffffe000  /* chip physical memory address */
-#define IOP331_REG_ADDR(reg) (IOP331_VIRT_MEM_BASE | (reg))
-/* Reserved 0x00000000 through 0x000000FF */
-/* Address Translation Unit 0x00000100 through 0x000001FF */
-#define IOP331_ATUVID     (volatile u16 *)IOP331_REG_ADDR(0x00000100)
-#define IOP331_ATUDID     (volatile u16 *)IOP331_REG_ADDR(0x00000102)
-#define IOP331_ATUCMD     (volatile u16 *)IOP331_REG_ADDR(0x00000104)
-#define IOP331_ATUSR      (volatile u16 *)IOP331_REG_ADDR(0x00000106)
-#define IOP331_ATURID     (volatile u8  *)IOP331_REG_ADDR(0x00000108)
-#define IOP331_ATUCCR     (volatile u32 *)IOP331_REG_ADDR(0x00000109)
-#define IOP331_ATUCLSR    (volatile u8  *)IOP331_REG_ADDR(0x0000010C)
-#define IOP331_ATULT      (volatile u8  *)IOP331_REG_ADDR(0x0000010D)
-#define IOP331_ATUHTR     (volatile u8  *)IOP331_REG_ADDR(0x0000010E)
-#define IOP331_ATUBIST    (volatile u8  *)IOP331_REG_ADDR(0x0000010F)
-#define IOP331_IABAR0     (volatile u32 *)IOP331_REG_ADDR(0x00000110)
-#define IOP331_IAUBAR0    (volatile u32 *)IOP331_REG_ADDR(0x00000114)
-#define IOP331_IABAR1     (volatile u32 *)IOP331_REG_ADDR(0x00000118)
-#define IOP331_IAUBAR1    (volatile u32 *)IOP331_REG_ADDR(0x0000011C)
-#define IOP331_IABAR2     (volatile u32 *)IOP331_REG_ADDR(0x00000120)
-#define IOP331_IAUBAR2    (volatile u32 *)IOP331_REG_ADDR(0x00000124)
-#define IOP331_ASVIR      (volatile u16 *)IOP331_REG_ADDR(0x0000012C)
-#define IOP331_ASIR       (volatile u16 *)IOP331_REG_ADDR(0x0000012E)
-#define IOP331_ERBAR      (volatile u32 *)IOP331_REG_ADDR(0x00000130)
-#define IOP331_ATU_CAPPTR (volatile u32 *)IOP331_REG_ADDR(0x00000134)
-/* Reserved 0x00000138 through 0x0000013B */
-#define IOP331_ATUILR     (volatile u8  *)IOP331_REG_ADDR(0x0000013C)
-#define IOP331_ATUIPR     (volatile u8  *)IOP331_REG_ADDR(0x0000013D)
-#define IOP331_ATUMGNT    (volatile u8  *)IOP331_REG_ADDR(0x0000013E)
-#define IOP331_ATUMLAT    (volatile u8  *)IOP331_REG_ADDR(0x0000013F)
-#define IOP331_IALR0      (volatile u32 *)IOP331_REG_ADDR(0x00000140)
-#define IOP331_IATVR0     (volatile u32 *)IOP331_REG_ADDR(0x00000144)
-#define IOP331_ERLR       (volatile u32 *)IOP331_REG_ADDR(0x00000148)
-#define IOP331_ERTVR      (volatile u32 *)IOP331_REG_ADDR(0x0000014C)
-#define IOP331_IALR1      (volatile u32 *)IOP331_REG_ADDR(0x00000150)
-#define IOP331_IALR2      (volatile u32 *)IOP331_REG_ADDR(0x00000154)
-#define IOP331_IATVR2     (volatile u32 *)IOP331_REG_ADDR(0x00000158)
-#define IOP331_OIOWTVR    (volatile u32 *)IOP331_REG_ADDR(0x0000015C)
-#define IOP331_OMWTVR0    (volatile u32 *)IOP331_REG_ADDR(0x00000160)
-#define IOP331_OUMWTVR0   (volatile u32 *)IOP331_REG_ADDR(0x00000164)
-#define IOP331_OMWTVR1    (volatile u32 *)IOP331_REG_ADDR(0x00000168)
-#define IOP331_OUMWTVR1   (volatile u32 *)IOP331_REG_ADDR(0x0000016C)
-/* Reserved 0x00000170 through 0x00000177*/
-#define IOP331_OUDWTVR    (volatile u32 *)IOP331_REG_ADDR(0x00000178)
-/* Reserved 0x0000017C through 0x0000017F*/
-#define IOP331_ATUCR      (volatile u32 *)IOP331_REG_ADDR(0x00000180)
-#define IOP331_PCSR       (volatile u32 *)IOP331_REG_ADDR(0x00000184)
-#define IOP331_ATUISR     (volatile u32 *)IOP331_REG_ADDR(0x00000188)
-#define IOP331_ATUIMR     (volatile u32 *)IOP331_REG_ADDR(0x0000018C)
-#define IOP331_IABAR3     (volatile u32 *)IOP331_REG_ADDR(0x00000190)
-#define IOP331_IAUBAR3    (volatile u32 *)IOP331_REG_ADDR(0x00000194)
-#define IOP331_IALR3      (volatile u32 *)IOP331_REG_ADDR(0x00000198)
-#define IOP331_IATVR3     (volatile u32 *)IOP331_REG_ADDR(0x0000019C)
-/* Reserved 0x000001A0 through 0x000001A3*/
-#define IOP331_OCCAR      (volatile u32 *)IOP331_REG_ADDR(0x000001A4)
-/* Reserved 0x000001A8 through 0x000001AB*/
-#define IOP331_OCCDR      (volatile u32 *)IOP331_REG_ADDR(0x000001AC)
-/* Reserved 0x000001B0 through 0x000001BB*/
-#define IOP331_VPDCAPID   (volatile u8 *)IOP331_REG_ADDR(0x000001B8)
-#define IOP331_VPDNXTP    (volatile u8 *)IOP331_REG_ADDR(0x000001B9)
-#define IOP331_VPDAR      (volatile u16 *)IOP331_REG_ADDR(0x000001BA)
-#define IOP331_VPDDR      (volatile u32 *)IOP331_REG_ADDR(0x000001BC)
-#define IOP331_PMCAPID    (volatile u8 *)IOP331_REG_ADDR(0x000001C0)
-#define IOP331_PMNEXT     (volatile u8 *)IOP331_REG_ADDR(0x000001C1)
-#define IOP331_APMCR      (volatile u16 *)IOP331_REG_ADDR(0x000001C2)
-#define IOP331_APMCSR     (volatile u16 *)IOP331_REG_ADDR(0x000001C4)
-/* Reserved 0x000001C6 through 0x000001CF */
-#define IOP331_MSICAPID   (volatile u8 *)IOP331_REG_ADDR(0x000001D0)
-#define IOP331_MSINXTP    (volatile u8 *)IOP331_REG_ADDR(0x000001D1)
-#define IOP331_MSIMCR     (volatile u16 *)IOP331_REG_ADDR(0x000001D2)
-#define IOP331_MSIMAR     (volatile u32 *)IOP331_REG_ADDR(0x000001D4)
-#define IOP331_MSIMUAR    (volatile u32 *)IOP331_REG_ADDR(0x000001D8)
-#define IOP331_MSIMDR     (volatile u32 *)IOP331_REG_ADDR(0x000001DC)
-#define IOP331_PCIXCAPID  (volatile u8 *)IOP331_REG_ADDR(0x000001E0)
-#define IOP331_PCIXNEXT   (volatile u8 *)IOP331_REG_ADDR(0x000001E1)
-#define IOP331_PCIXCMD    (volatile u16 *)IOP331_REG_ADDR(0x000001E2)
-#define IOP331_PCIXSR     (volatile u32 *)IOP331_REG_ADDR(0x000001E4)
-#define IOP331_PCIIRSR    (volatile u32 *)IOP331_REG_ADDR(0x000001EC)
-/* Messaging Unit 0x00000300 through 0x000003FF */
-/* Reserved 0x00000300 through 0x0000030c */
-#define IOP331_IMR0       (volatile u32 *)IOP331_REG_ADDR(0x00000310)
-#define IOP331_IMR1       (volatile u32 *)IOP331_REG_ADDR(0x00000314)
-#define IOP331_OMR0       (volatile u32 *)IOP331_REG_ADDR(0x00000318)
-#define IOP331_OMR1       (volatile u32 *)IOP331_REG_ADDR(0x0000031C)
-#define IOP331_IDR        (volatile u32 *)IOP331_REG_ADDR(0x00000320)
-#define IOP331_IISR       (volatile u32 *)IOP331_REG_ADDR(0x00000324)
-#define IOP331_IIMR       (volatile u32 *)IOP331_REG_ADDR(0x00000328)
-#define IOP331_ODR        (volatile u32 *)IOP331_REG_ADDR(0x0000032C)
-#define IOP331_OISR       (volatile u32 *)IOP331_REG_ADDR(0x00000330)
-#define IOP331_OIMR       (volatile u32 *)IOP331_REG_ADDR(0x00000334)
-/* Reserved 0x00000338 through 0x0000034F */
-#define IOP331_MUCR       (volatile u32 *)IOP331_REG_ADDR(0x00000350)
-#define IOP331_QBAR       (volatile u32 *)IOP331_REG_ADDR(0x00000354)
-/* Reserved 0x00000358 through 0x0000035C */
-#define IOP331_IFHPR      (volatile u32 *)IOP331_REG_ADDR(0x00000360)
-#define IOP331_IFTPR      (volatile u32 *)IOP331_REG_ADDR(0x00000364)
-#define IOP331_IPHPR      (volatile u32 *)IOP331_REG_ADDR(0x00000368)
-#define IOP331_IPTPR      (volatile u32 *)IOP331_REG_ADDR(0x0000036C)
-#define IOP331_OFHPR      (volatile u32 *)IOP331_REG_ADDR(0x00000370)
-#define IOP331_OFTPR      (volatile u32 *)IOP331_REG_ADDR(0x00000374)
-#define IOP331_OPHPR      (volatile u32 *)IOP331_REG_ADDR(0x00000378)
-#define IOP331_OPTPR      (volatile u32 *)IOP331_REG_ADDR(0x0000037C)
-#define IOP331_IAR        (volatile u32 *)IOP331_REG_ADDR(0x00000380)
-/* Reserved 0x00000384 through 0x000003FF */
-/* DMA Controller 0x00000400 through 0x000004FF */
-#define IOP331_DMA0_CCR   (volatile u32 *)IOP331_REG_ADDR(0x00000400)
-#define IOP331_DMA0_CSR   (volatile u32 *)IOP331_REG_ADDR(0x00000404)
-#define IOP331_DMA0_DAR   (volatile u32 *)IOP331_REG_ADDR(0x0000040C)
-#define IOP331_DMA0_NDAR  (volatile u32 *)IOP331_REG_ADDR(0x00000410)
-#define IOP331_DMA0_PADR  (volatile u32 *)IOP331_REG_ADDR(0x00000414)
-#define IOP331_DMA0_PUADR (volatile u32 *)IOP331_REG_ADDR(0x00000418)
-#define IOP331_DMA0_LADR  (volatile u32 *)IOP331_REG_ADDR(0X0000041C)
-#define IOP331_DMA0_BCR   (volatile u32 *)IOP331_REG_ADDR(0x00000420)
-#define IOP331_DMA0_DCR   (volatile u32 *)IOP331_REG_ADDR(0x00000424)
-/* Reserved 0x00000428 through 0x0000043C */
-#define IOP331_DMA1_CCR   (volatile u32 *)IOP331_REG_ADDR(0x00000440)
-#define IOP331_DMA1_CSR   (volatile u32 *)IOP331_REG_ADDR(0x00000444)
-#define IOP331_DMA1_DAR   (volatile u32 *)IOP331_REG_ADDR(0x0000044C)
-#define IOP331_DMA1_NDAR  (volatile u32 *)IOP331_REG_ADDR(0x00000450)
-#define IOP331_DMA1_PADR  (volatile u32 *)IOP331_REG_ADDR(0x00000454)
-#define IOP331_DMA1_PUADR (volatile u32 *)IOP331_REG_ADDR(0x00000458)
-#define IOP331_DMA1_LADR  (volatile u32 *)IOP331_REG_ADDR(0x0000045C)
-#define IOP331_DMA1_BCR   (volatile u32 *)IOP331_REG_ADDR(0x00000460)
-#define IOP331_DMA1_DCR   (volatile u32 *)IOP331_REG_ADDR(0x00000464)
-/* Reserved 0x00000468 through 0x000004FF */
-/* Memory controller 0x00000500 through 0x0005FF */
-/* Peripheral bus interface unit 0x00000680 through 0x0006FF */
-#define IOP331_PBCR       (volatile u32 *)IOP331_REG_ADDR(0x00000680)
-#define IOP331_PBISR      (volatile u32 *)IOP331_REG_ADDR(0x00000684)
-#define IOP331_PBBAR0     (volatile u32 *)IOP331_REG_ADDR(0x00000688)
-#define IOP331_PBLR0      (volatile u32 *)IOP331_REG_ADDR(0x0000068C)
-#define IOP331_PBBAR1     (volatile u32 *)IOP331_REG_ADDR(0x00000690)
-#define IOP331_PBLR1      (volatile u32 *)IOP331_REG_ADDR(0x00000694)
-#define IOP331_PBBAR2     (volatile u32 *)IOP331_REG_ADDR(0x00000698)
-#define IOP331_PBLR2      (volatile u32 *)IOP331_REG_ADDR(0x0000069C)
-#define IOP331_PBBAR3     (volatile u32 *)IOP331_REG_ADDR(0x000006A0)
-#define IOP331_PBLR3      (volatile u32 *)IOP331_REG_ADDR(0x000006A4)
-#define IOP331_PBBAR4     (volatile u32 *)IOP331_REG_ADDR(0x000006A8)
-#define IOP331_PBLR4      (volatile u32 *)IOP331_REG_ADDR(0x000006AC)
-#define IOP331_PBBAR5     (volatile u32 *)IOP331_REG_ADDR(0x000006B0)
-#define IOP331_PBLR5      (volatile u32 *)IOP331_REG_ADDR(0x000006B4)
-#define IOP331_PBDSCR     (volatile u32 *)IOP331_REG_ADDR(0x000006B8)
-/* Reserved 0x000006BC */
-#define IOP331_PMBR0      (volatile u32 *)IOP331_REG_ADDR(0x000006C0)
-/* Reserved 0x000006C4 through 0x000006DC */
-#define IOP331_PMBR1      (volatile u32 *)IOP331_REG_ADDR(0x000006E0)
-#define IOP331_PMBR2      (volatile u32 *)IOP331_REG_ADDR(0x000006E4)
-#define IOP331_PBCR_EN    0x1
-#define IOP331_PBISR_BOOR_ERR 0x1
-/* Peripheral performance monitoring unit 0x00000700 through 0x00077F */
-/* Internal arbitration unit 0x00000780 through 0x0007BF */
-/* Interrupt Controller */
-#define IOP331_INTCTL0    (volatile u32 *)IOP331_REG_ADDR(0x00000790)
-#define IOP331_INTCTL1    (volatile u32 *)IOP331_REG_ADDR(0x00000794)
-#define IOP331_INTSTR0    (volatile u32 *)IOP331_REG_ADDR(0x00000798)
-#define IOP331_INTSTR1    (volatile u32 *)IOP331_REG_ADDR(0x0000079C)
-#define IOP331_IINTSRC0   (volatile u32 *)IOP331_REG_ADDR(0x000007A0)
-#define IOP331_IINTSRC1   (volatile u32 *)IOP331_REG_ADDR(0x000007A4)
-#define IOP331_FINTSRC0   (volatile u32 *)IOP331_REG_ADDR(0x000007A8)
-#define IOP331_FINTSRC1   (volatile u32 *)IOP331_REG_ADDR(0x000007AC)
-#define IOP331_IPR0       (volatile u32 *)IOP331_REG_ADDR(0x000007B0)
-#define IOP331_IPR1       (volatile u32 *)IOP331_REG_ADDR(0x000007B4)
-#define IOP331_IPR2       (volatile u32 *)IOP331_REG_ADDR(0x000007B8)
-#define IOP331_IPR3       (volatile u32 *)IOP331_REG_ADDR(0x000007BC)
-#define IOP331_INTBASE    (volatile u32 *)IOP331_REG_ADDR(0x000007C0)
-#define IOP331_INTSIZE    (volatile u32 *)IOP331_REG_ADDR(0x000007C4)
-#define IOP331_IINTVEC    (volatile u32 *)IOP331_REG_ADDR(0x000007C8)
-#define IOP331_FINTVEC    (volatile u32 *)IOP331_REG_ADDR(0x000007CC)
-/* Timers */
-#define IOP331_TU_TMR0          (volatile u32 *)IOP331_REG_ADDR(0x000007D0)
-#define IOP331_TU_TMR1          (volatile u32 *)IOP331_REG_ADDR(0x000007D4)
-#define IOP331_TMR_TC           0x01
-#define IOP331_TMR_EN           0x02
-#define IOP331_TMR_RELOAD       0x04
-#define IOP331_TMR_PRIVILEGED   0x09
-#define IOP331_TMR_RATIO_1_1    0x00
-#define IOP331_TMR_RATIO_4_1    0x10
-#define IOP331_TMR_RATIO_8_1    0x20
-#define IOP331_TMR_RATIO_16_1   0x30
-#define IOP331_TU_TCR0    (volatile u32 *)IOP331_REG_ADDR(0x000007D8)
-#define IOP331_TU_TCR1    (volatile u32 *)IOP331_REG_ADDR(0x000007DC)
-#define IOP331_TU_TRR0    (volatile u32 *)IOP331_REG_ADDR(0x000007E0)
-#define IOP331_TU_TRR1    (volatile u32 *)IOP331_REG_ADDR(0x000007E4)
-#define IOP331_TU_TISR    (volatile u32 *)IOP331_REG_ADDR(0x000007E8)
-#define IOP331_TU_WDTCR   (volatile u32 *)IOP331_REG_ADDR(0x000007EC)
-#if defined(CONFIG_ARCH_IOP331)
-#define IOP331_TICK_RATE        266000000       /* 266 MHz IB clock */
-#endif
-#if defined(CONFIG_IOP331_STEPD) || defined(CONFIG_ARCH_IQ80333)
-#undef IOP331_TICK_RATE
-#define IOP331_TICK_RATE        333000000       /* 333 Mhz IB clock */
-#endif
-/* Application accelerator unit 0x00000800 - 0x000008FF */
-#define IOP331_AAU_ACR     (volatile u32 *)IOP331_REG_ADDR(0x00000800)
-#define IOP331_AAU_ASR     (volatile u32 *)IOP331_REG_ADDR(0x00000804)
-#define IOP331_AAU_ADAR    (volatile u32 *)IOP331_REG_ADDR(0x00000808)
-#define IOP331_AAU_ANDAR   (volatile u32 *)IOP331_REG_ADDR(0x0000080C)
-#define IOP331_AAU_SAR1    (volatile u32 *)IOP331_REG_ADDR(0x00000810)
-#define IOP331_AAU_SAR2    (volatile u32 *)IOP331_REG_ADDR(0x00000814)
-#define IOP331_AAU_SAR3    (volatile u32 *)IOP331_REG_ADDR(0x00000818)
-#define IOP331_AAU_SAR4    (volatile u32 *)IOP331_REG_ADDR(0x0000081C)
-#define IOP331_AAU_SAR5    (volatile u32 *)IOP331_REG_ADDR(0x0000082C)
-#define IOP331_AAU_SAR6    (volatile u32 *)IOP331_REG_ADDR(0x00000830)
-#define IOP331_AAU_SAR7    (volatile u32 *)IOP331_REG_ADDR(0x00000834)
-#define IOP331_AAU_SAR8    (volatile u32 *)IOP331_REG_ADDR(0x00000838)
-#define IOP331_AAU_SAR9    (volatile u32 *)IOP331_REG_ADDR(0x00000840)
-#define IOP331_AAU_SAR10   (volatile u32 *)IOP331_REG_ADDR(0x00000844)
-#define IOP331_AAU_SAR11   (volatile u32 *)IOP331_REG_ADDR(0x00000848)
-#define IOP331_AAU_SAR12   (volatile u32 *)IOP331_REG_ADDR(0x0000084C)
-#define IOP331_AAU_SAR13   (volatile u32 *)IOP331_REG_ADDR(0x00000850)
-#define IOP331_AAU_SAR14   (volatile u32 *)IOP331_REG_ADDR(0x00000854)
-#define IOP331_AAU_SAR15   (volatile u32 *)IOP331_REG_ADDR(0x00000858)
-#define IOP331_AAU_SAR16   (volatile u32 *)IOP331_REG_ADDR(0x0000085C)
-#define IOP331_AAU_SAR17   (volatile u32 *)IOP331_REG_ADDR(0x00000864)
-#define IOP331_AAU_SAR18   (volatile u32 *)IOP331_REG_ADDR(0x00000868)
-#define IOP331_AAU_SAR19   (volatile u32 *)IOP331_REG_ADDR(0x0000086C)
-#define IOP331_AAU_SAR20   (volatile u32 *)IOP331_REG_ADDR(0x00000870)
-#define IOP331_AAU_SAR21   (volatile u32 *)IOP331_REG_ADDR(0x00000874)
-#define IOP331_AAU_SAR22   (volatile u32 *)IOP331_REG_ADDR(0x00000878)
-#define IOP331_AAU_SAR23   (volatile u32 *)IOP331_REG_ADDR(0x0000087C)
-#define IOP331_AAU_SAR24   (volatile u32 *)IOP331_REG_ADDR(0x00000880)
-#define IOP331_AAU_SAR25   (volatile u32 *)IOP331_REG_ADDR(0x00000888)
-#define IOP331_AAU_SAR26   (volatile u32 *)IOP331_REG_ADDR(0x0000088C)
-#define IOP331_AAU_SAR27   (volatile u32 *)IOP331_REG_ADDR(0x00000890)
-#define IOP331_AAU_SAR28   (volatile u32 *)IOP331_REG_ADDR(0x00000894)
-#define IOP331_AAU_SAR29   (volatile u32 *)IOP331_REG_ADDR(0x00000898)
-#define IOP331_AAU_SAR30   (volatile u32 *)IOP331_REG_ADDR(0x0000089C)
-#define IOP331_AAU_SAR31   (volatile u32 *)IOP331_REG_ADDR(0x000008A0)
-#define IOP331_AAU_SAR32   (volatile u32 *)IOP331_REG_ADDR(0x000008A4)
-#define IOP331_AAU_DAR     (volatile u32 *)IOP331_REG_ADDR(0x00000820)
-#define IOP331_AAU_ABCR    (volatile u32 *)IOP331_REG_ADDR(0x00000824)
-#define IOP331_AAU_ADCR    (volatile u32 *)IOP331_REG_ADDR(0x00000828)
-#define IOP331_AAU_EDCR0   (volatile u32 *)IOP331_REG_ADDR(0x0000083c)
-#define IOP331_AAU_EDCR1   (volatile u32 *)IOP331_REG_ADDR(0x00000860)
-#define IOP331_AAU_EDCR2   (volatile u32 *)IOP331_REG_ADDR(0x00000884)
-#define IOP331_SPDSCR     (volatile u32 *)IOP331_REG_ADDR(0x000015C0)
-#define IOP331_PPDSCR     (volatile u32 *)IOP331_REG_ADDR(0x000015C8)
-/* SSP serial port unit 0x00001600 - 0x0000167F */
-/* I2C bus interface unit 0x00001680 - 0x000016FF */
-/* for I2C bit defs see drivers/i2c/i2c-iop3xx.h */
-#define IOP331_ICR0       (volatile u32 *)IOP331_REG_ADDR(0x00001680)
-#define IOP331_ISR0       (volatile u32 *)IOP331_REG_ADDR(0x00001684)
-#define IOP331_ISAR0      (volatile u32 *)IOP331_REG_ADDR(0x00001688)
-#define IOP331_IDBR0      (volatile u32 *)IOP331_REG_ADDR(0x0000168C)
-/* Reserved 0x00001690 */
-#define IOP331_IBMR0      (volatile u32 *)IOP331_REG_ADDR(0x00001694)
-/* Reserved 0x00001698 */
-/* Reserved 0x0000169C */
-#define IOP331_ICR1       (volatile u32 *)IOP331_REG_ADDR(0x000016A0)
-#define IOP331_ISR1       (volatile u32 *)IOP331_REG_ADDR(0x000016A4)
-#define IOP331_ISAR1      (volatile u32 *)IOP331_REG_ADDR(0x000016A8)
-#define IOP331_IDBR1      (volatile u32 *)IOP331_REG_ADDR(0x000016AC)
-#define IOP331_IBMR1      (volatile u32 *)IOP331_REG_ADDR(0x000016B4)
-/* Reserved 0x000016B8 through 0x000016FF */
-/* 0x00001700 through 0x0000172C  UART 0 */
-/* Reserved 0x00001730 through 0x0000173F */
-/* 0x00001740 through 0x0000176C UART 1 */
-#define IOP331_UART0_PHYS  (IOP331_PHYS_MEM_BASE | 0x00001700)  /* UART #1 physical */
-#define IOP331_UART1_PHYS  (IOP331_PHYS_MEM_BASE | 0x00001740)  /* UART #2 physical */
-#define IOP331_UART0_VIRT  (IOP331_VIRT_MEM_BASE | 0x00001700) /* UART #1 virtual addr */
-#define IOP331_UART1_VIRT  (IOP331_VIRT_MEM_BASE | 0x00001740) /* UART #2 virtual addr */
-/* Reserved 0x00001770 through 0x0000177F */
-/* General Purpose I/O Registers */
-#define IOP331_GPOE       (volatile u32 *)IOP331_REG_ADDR(0x00001780)
-#define IOP331_GPID       (volatile u32 *)IOP331_REG_ADDR(0x00001784)
-#define IOP331_GPOD       (volatile u32 *)IOP331_REG_ADDR(0x00001788)
-/* Reserved 0x0000178c through 0x000019ff */
-#ifndef __ASSEMBLY__
-extern void iop331_map_io(void);
-extern void iop331_init_irq(void);
-extern void iop331_time_init(void);
-#endif
-#endif // _IOP331_HW_H_
diff --git a/include/asm-arm/arch-iop3xx/irqs.h b/include/asm-arm/arch-iop3xx/irqs.h
deleted file mode 100644
index b2c03f4c269c..000000000000
--- a/include/asm-arm/arch-iop3xx/irqs.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop3xx/irqs.h
- *
- * Copyright:   (C) 2001-2003 MontaVista Software Inc.
- *
- * 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.
- *
- */
-/*
- * Chipset-specific bits
- */
-#ifdef CONFIG_ARCH_IOP321
-#include "iop321-irqs.h"
-#endif
-#ifdef CONFIG_ARCH_IOP331
-#include "iop331-irqs.h"
-#endif
diff --git a/include/asm-arm/arch-iop3xx/memory.h b/include/asm-arm/arch-iop3xx/memory.h
deleted file mode 100644
index e43ebd984745..000000000000
--- a/include/asm-arm/arch-iop3xx/memory.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop3xx/memory.h
- */
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-#include <asm/hardware.h>
-/*
- * Physical DRAM offset.
- */
-#ifndef CONFIG_ARCH_IOP331
-#define PHYS_OFFSET     UL(0xa0000000)
-#else
-#define PHYS_OFFSET     UL(0x00000000)
-#endif
-/*
- * Virtual view <-> PCI DMA view memory address translations
- * virt_to_bus: Used to translate the virtual address to an
- *              address suitable to be passed to set_dma_addr
- * bus_to_virt: Used to convert an address for DMA operations
- *              to an address that the kernel can use.
- */
-#if defined(CONFIG_ARCH_IOP321)
-#define __virt_to_bus(x)        (((__virt_to_phys(x)) & ~(*IOP321_IATVR2)) | ((*IOP321_IABAR2) & 0xfffffff0))
-#define __bus_to_virt(x)    (__phys_to_virt(((x) & ~(*IOP321_IALR2)) | ( *IOP321_IATVR2)))
-#elif defined(CONFIG_ARCH_IOP331)
-#define __virt_to_bus(x)        (((__virt_to_phys(x)) & ~(*IOP331_IATVR2)) | ((*IOP331_IABAR2) & 0xfffffff0))
-#define __bus_to_virt(x)    (__phys_to_virt(((x) & ~(*IOP331_IALR2)) | ( *IOP331_IATVR2)))
-#endif
-#endif
diff --git a/include/asm-arm/arch-iop3xx/system.h b/include/asm-arm/arch-iop3xx/system.h
deleted file mode 100644
index af6ae8cd36c9..000000000000
--- a/include/asm-arm/arch-iop3xx/system.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop3xx/system.h
- *
- *  Copyright (C) 2001 MontaVista Software, Inc.
- *
- * 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.
- */
-static inline void arch_idle(void)
-{
-        cpu_do_idle();
-}
-static inline void arch_reset(char mode)
-{
-#ifdef CONFIG_ARCH_IOP321
-    *IOP321_PCSR = 0x30;
-#endif
-#ifdef CONFIG_ARCH_IOP331
-    *IOP331_PCSR = 0x30;
-#endif
-        if ( 1 && mode == 's') {
-                /* Jump into ROM at address 0 */
-                cpu_reset(0);
-        } else {
-                /* No on-chip reset capability */
-                cpu_reset(0);
-        }
-}
diff --git a/include/asm-arm/arch-iop3xx/timex.h b/include/asm-arm/arch-iop3xx/timex.h
deleted file mode 100644
index 14ca8d0f7b29..000000000000
--- a/include/asm-arm/arch-iop3xx/timex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop3xx/timex.h
- *
- * IOP3xx architecture timex specifications
- */
-#include <asm/hardware.h>
-#if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)
-#define CLOCK_TICK_RATE IOP321_TICK_RATE
-#elif defined(CONFIG_ARCH_IQ80331) || defined(CONFIG_MACH_IQ80332)
-#define CLOCK_TICK_RATE IOP331_TICK_RATE
-#else
-#error "No IOP3xx timex information for this architecture"
-#endif
diff --git a/include/asm-arm/arch-iop3xx/uncompress.h b/include/asm-arm/arch-iop3xx/uncompress.h
deleted file mode 100644
index fbdd5af644fe..000000000000
--- a/include/asm-arm/arch-iop3xx/uncompress.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  linux/include/asm-arm/arch-iop3xx/uncompress.h
- */
-#include <asm/types.h>
-#include <asm/mach-types.h>
-#include <linux/serial_reg.h>
-#include <asm/hardware.h>
-#ifdef CONFIG_ARCH_IOP321
-#define UTYPE unsigned char *
-#elif defined(CONFIG_ARCH_IOP331)
-#define UTYPE u32 *
-#else
-#error "Missing IOP3xx arch type def"
-#endif
-static volatile UTYPE uart_base;
-#define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE)
-static inline void putc(char c)
-{
-        while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
-                barrier();
-        *uart_base = c;
-}
-static inline void flush(void)
-{
-}
-static __inline__ void __arch_decomp_setup(unsigned long arch_id)
-{
-        if(machine_is_iq80321())
-                        uart_base = (volatile UTYPE)IQ80321_UART;
-                else if(machine_is_iq31244())
-                        uart_base = (volatile UTYPE)IQ31244_UART;
-                else if(machine_is_iq80331() || machine_is_iq80332())
-                        uart_base = (volatile UTYPE)IOP331_UART0_PHYS;
-                else
-                        uart_base = (volatile UTYPE)0xfe800000;
-}
-/*
- * nothing to do
- */
-#define arch_decomp_setup()     __arch_decomp_setup(arch_id)
-#define arch_decomp_wdog()
diff --git a/include/asm-arm/arch-iop3xx/vmalloc.h b/include/asm-arm/arch-iop3xx/vmalloc.h
deleted file mode 100644
index 0f2f6847f93c..000000000000
--- a/include/asm-arm/arch-iop3xx/vmalloc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * linux/include/asm-arm/arch-iop3xx/vmalloc.h
- */
-/*
- * Just any arbitrary offset to the start of the vmalloc VM area: the
- * current 8MB value just means that there will be a 8MB "hole" after the
- * physical memory until the kernel virtual memory starts.  That means that
- * any out-of-bounds memory accesses will hopefully be caught.
- * The vmalloc() routines leaves a hole of 4kB between each vmalloced
- * area for the same reason. ;)
- */
-//#define VMALLOC_END       (0xe8000000)
-/* increase usable physical RAM to ~992M per RMK */
-#define VMALLOC_END       (0xfe000000)
diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/include/asm-arm/arch-ixp4xx/platform.h
index 13aee17b0475..8d10a9187693 100644
--- a/include/asm-arm/arch-ixp4xx/platform.h
+++ b/include/asm-arm/arch-ixp4xx/platform.h
@@ -90,6 +90,11 @@ struct ixp4xx_i2c_pins {
 struct sys_timer;
 /*
+ * Frequency of clock used for primary clocksource
+ */
+extern unsigned long ixp4xx_timer_freq;
+/*
 * Functions used by platform-level setup code
 */
 extern void ixp4xx_map_io(void);
diff --git a/include/asm-arm/arch-l7200/io.h b/include/asm-arm/arch-l7200/io.h
index cd080d8384d9..d744d97c18a5 100644
--- a/include/asm-arm/arch-l7200/io.h
+++ b/include/asm-arm/arch-l7200/io.h
@@ -31,9 +31,9 @@
 static inline unsigned int __arch_getw(unsigned long a)
 {
        unsigned int value;
-        __asm__ __volatile__("ldr%?h    %0, [%1, #0]    @ getw"
+        __asm__ __volatile__("ldrh    %0, [%1, #0]    @ getw"
                : "=&r" (value)
-                : "r" (a));
+                : "r" (a) : "cc");
        return value;
 }
@@ -42,8 +42,8 @@ static inline unsigned int __arch_getw(unsigned long a)
 static inline void __arch_putw(unsigned int value, unsigned long a)
 {
-        __asm__ __volatile__("str%?h    %0, [%1, #0]    @ putw"
+        __asm__ __volatile__("strh    %0, [%1, #0]    @ putw"
-                : : "r" (value), "r" (a));
+                : : "r" (value), "r" (a) : "cc");
 }
 /*
diff --git a/include/asm-arm/arch-l7200/time.h b/include/asm-arm/arch-l7200/time.h
index 7b98b533e63a..c69cb508735f 100644
--- a/include/asm-arm/arch-l7200/time.h
+++ b/include/asm-arm/arch-l7200/time.h
@@ -45,7 +45,7 @@
 static irqreturn_t
 timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        do_timer(regs);
+        do_timer(1);
 #ifndef CONFIG_SMP
        update_process_times(user_mode(regs));
 #endif
diff --git a/include/asm-arm/arch-omap/board-ams-delta.h b/include/asm-arm/arch-omap/board-ams-delta.h
index 0070f6d3b75c..9aee15d97145 100644
--- a/include/asm-arm/arch-omap/board-ams-delta.h
+++ b/include/asm-arm/arch-omap/board-ams-delta.h
@@ -50,9 +50,20 @@
 #define AMS_DELTA_LATCH2_NAND_NWE       0x0020
 #define AMS_DELTA_LATCH2_NAND_ALE       0x0040
 #define AMS_DELTA_LATCH2_NAND_CLE       0x0080
+#define AMD_DELTA_LATCH2_KEYBRD_PWR     0x0100
+#define AMD_DELTA_LATCH2_KEYBRD_DATA    0x0200
+#define AMD_DELTA_LATCH2_SCARD_RSTIN    0x0400
+#define AMD_DELTA_LATCH2_SCARD_CMDVCC   0x0800
 #define AMS_DELTA_LATCH2_MODEM_NRESET   0x1000
 #define AMS_DELTA_LATCH2_MODEM_CODEC    0x2000
+#define AMS_DELTA_GPIO_PIN_KEYBRD_DATA  0
+#define AMS_DELTA_GPIO_PIN_KEYBRD_CLK   1
+#define AMS_DELTA_GPIO_PIN_MODEM_IRQ    2
+#define AMS_DELTA_GPIO_PIN_HOOK_SWITCH  4
+#define AMS_DELTA_GPIO_PIN_SCARD_NOFF   6
+#define AMS_DELTA_GPIO_PIN_SCARD_IO     7
+#define AMS_DELTA_GPIO_PIN_CONFIG       11
 #define AMS_DELTA_GPIO_PIN_NAND_RB      12
 #ifndef __ASSEMBLY__
diff --git a/include/asm-arm/arch-omap/clock.h b/include/asm-arm/arch-omap/clock.h
index f83003f5287b..fa6881049903 100644
--- a/include/asm-arm/arch-omap/clock.h
+++ b/include/asm-arm/arch-omap/clock.h
@@ -45,6 +45,7 @@ struct clk_functions {
        struct clk *    (*clk_get_parent)(struct clk *clk);
        void            (*clk_allow_idle)(struct clk *clk);
        void            (*clk_deny_idle)(struct clk *clk);
+        void            (*clk_disable_unused)(struct clk *clk);
 };
 extern unsigned int mpurate;
diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h
index 1b1b02307e77..d591d0585bba 100644
--- a/include/asm-arm/arch-omap/dma.h
+++ b/include/asm-arm/arch-omap/dma.h
@@ -331,6 +331,12 @@ enum omap_dma_color_mode {
        OMAP_DMA_TRANSPARENT_COPY
 };
+enum omap_dma_write_mode {
+        OMAP_DMA_WRITE_NON_POSTED = 0,
+        OMAP_DMA_WRITE_POSTED,
+        OMAP_DMA_WRITE_LAST_NON_POSTED
+};
 struct omap_dma_channel_params {
        int data_type;          /* data type 8,16,32 */
        int elem_count;         /* number of elements in a frame */
@@ -338,13 +344,13 @@ struct omap_dma_channel_params {
        int src_port;           /* Only on OMAP1 REVISIT: Is this needed? */
        int src_amode;          /* constant , post increment, indexed , double indexed */
-        int src_start;          /* source address : physical */
+        unsigned long src_start;        /* source address : physical */
        int src_ei;             /* source element index */
        int src_fi;             /* source frame index */
        int dst_port;           /* Only on OMAP1 REVISIT: Is this needed? */
        int dst_amode;          /* constant , post increment, indexed , double indexed */
-        int dst_start;          /* source address : physical */
+        unsigned long dst_start;        /* source address : physical */
        int dst_ei;             /* source element index */
        int dst_fi;             /* source frame index */
@@ -356,7 +362,7 @@ struct omap_dma_channel_params {
 };
-extern void omap_set_dma_priority(int dst_port, int priority);
+extern void omap_set_dma_priority(int lch, int dst_port, int priority);
 extern int omap_request_dma(int dev_id, const char *dev_name,
                            void (* callback)(int lch, u16 ch_status, void *data),
                            void *data, int *dma_ch);
@@ -371,6 +377,7 @@ extern void omap_set_dma_transfer_params(int lch, int data_type,
                                         int dma_trigger, int src_or_dst_synch);
 extern void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode,
                                    u32 color);
+extern void omap_set_dma_write_mode(int lch, enum omap_dma_write_mode mode);
 extern void omap_set_dma_src_params(int lch, int src_port, int src_amode,
                                    unsigned long src_start,
@@ -394,6 +401,9 @@ extern void omap_set_dma_params(int lch,
 extern void omap_dma_link_lch (int lch_head, int lch_queue);
 extern void omap_dma_unlink_lch (int lch_head, int lch_queue);
+extern int omap_set_dma_callback(int lch,
+                        void (* callback)(int lch, u16 ch_status, void *data),
+                        void *data);
 extern dma_addr_t omap_get_dma_src_pos(int lch);
 extern dma_addr_t omap_get_dma_dst_pos(int lch);
 extern int omap_get_dma_src_addr_counter(int lch);
diff --git a/include/asm-arm/arch-omap/dmtimer.h b/include/asm-arm/arch-omap/dmtimer.h
index 7a289ff07404..b5f3a71b899d 100644
--- a/include/asm-arm/arch-omap/dmtimer.h
+++ b/include/asm-arm/arch-omap/dmtimer.h
@@ -52,6 +52,8 @@ int omap_dm_timer_init(void);
 struct omap_dm_timer *omap_dm_timer_request(void);
 struct omap_dm_timer *omap_dm_timer_request_specific(int timer_id);
 void omap_dm_timer_free(struct omap_dm_timer *timer);
+void omap_dm_timer_enable(struct omap_dm_timer *timer);
+void omap_dm_timer_disable(struct omap_dm_timer *timer);
 int omap_dm_timer_get_irq(struct omap_dm_timer *timer);
diff --git a/include/asm-arm/arch-omap/gpmc.h b/include/asm-arm/arch-omap/gpmc.h
index 1a0a5207822d..7c03ef6c14c4 100644
--- a/include/asm-arm/arch-omap/gpmc.h
+++ b/include/asm-arm/arch-omap/gpmc.h
@@ -85,7 +85,7 @@ extern void gpmc_cs_write_reg(int cs, int idx, u32 val);
 extern u32 gpmc_cs_read_reg(int cs, int idx);
 extern int gpmc_cs_calc_divider(int cs, unsigned int sync_clk);
 extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t);
-extern unsigned long gpmc_cs_get_base_addr(int cs);
+extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base);
+extern void gpmc_cs_free(int cs);
 #endif
diff --git a/include/asm-arm/arch-omap/irqs.h b/include/asm-arm/arch-omap/irqs.h
index 2542495d8a43..c5bb05a69b81 100644
--- a/include/asm-arm/arch-omap/irqs.h
+++ b/include/asm-arm/arch-omap/irqs.h
@@ -237,6 +237,7 @@
 #define INT_24XX_SDMA_IRQ1      13
 #define INT_24XX_SDMA_IRQ2      14
 #define INT_24XX_SDMA_IRQ3      15
+#define INT_24XX_CAM_IRQ        24
 #define INT_24XX_DSS_IRQ        25
 #define INT_24XX_GPIO_BANK1     29
 #define INT_24XX_GPIO_BANK2     30
@@ -261,6 +262,7 @@
 #define INT_24XX_UART1_IRQ      72
 #define INT_24XX_UART2_IRQ      73
 #define INT_24XX_UART3_IRQ      74
+#define INT_24XX_MMC_IRQ        83
 /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730) and
 * 16 MPUIO lines */
diff --git a/include/asm-arm/arch-omap/keypad.h b/include/asm-arm/arch-omap/keypad.h
index 8a023a984acb..b7f83075436e 100644
--- a/include/asm-arm/arch-omap/keypad.h
+++ b/include/asm-arm/arch-omap/keypad.h
@@ -14,7 +14,10 @@ struct omap_kp_platform_data {
        int rows;
        int cols;
        int *keymap;
+        unsigned int keymapsize;
        unsigned int rep:1;
+        unsigned long delay;
+        unsigned int dbounce:1;
        /* specific to OMAP242x*/
        unsigned int *row_gpios;
        unsigned int *col_gpios;
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index 679869c5e68f..828cc5c114e1 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -320,6 +320,17 @@ enum omap1xxx_index {
        P15_1610_UWIRE_CS3,
        N15_1610_UWIRE_CS1,
+        /* OMAP-1610 SPI */
+        U19_1610_SPIF_SCK,
+        U18_1610_SPIF_DIN,
+        P20_1610_SPIF_DIN,
+        W21_1610_SPIF_DOUT,
+        R18_1610_SPIF_DOUT,
+        N14_1610_SPIF_CS0,
+        N15_1610_SPIF_CS1,
+        T19_1610_SPIF_CS2,
+        P15_1610_SPIF_CS3,
        /* OMAP-1610 Flash */
        L3_1610_FLASH_CS2B_OE,
        M8_1610_FLASH_CS2B_WE,
@@ -461,6 +472,20 @@ enum omap24xx_index {
        K15_24XX_UART3_TX,
        K14_24XX_UART3_RX,
+        /* MMC/SDIO */
+        G19_24XX_MMC_CLKO,
+        H18_24XX_MMC_CMD,
+        F20_24XX_MMC_DAT0,
+        H14_24XX_MMC_DAT1,
+        E19_24XX_MMC_DAT2,
+        D19_24XX_MMC_DAT3,
+        F19_24XX_MMC_DAT_DIR0,
+        E20_24XX_MMC_DAT_DIR1,
+        F18_24XX_MMC_DAT_DIR2,
+        E18_24XX_MMC_DAT_DIR3,
+        G18_24XX_MMC_CMD_DIR,
+        H15_24XX_MMC_CLKI,
        /* Keypad GPIO*/
        T19_24XX_KBR0,
        R19_24XX_KBR1,
diff --git a/include/asm-arm/arch-pxa/udc.h b/include/asm-arm/arch-pxa/udc.h
index 30548a30c773..121cd241115d 100644
--- a/include/asm-arm/arch-pxa/udc.h
+++ b/include/asm-arm/arch-pxa/udc.h
@@ -12,6 +12,14 @@ struct pxa2xx_udc_mach_info {
        void (*udc_command)(int cmd);
 #define PXA2XX_UDC_CMD_CONNECT          0       /* let host see us */
 #define PXA2XX_UDC_CMD_DISCONNECT       1       /* so host won't see us */
+        /* Boards following the design guidelines in the developer's manual,
+         * with on-chip GPIOs not Lubbock's wierd hardware, can have a sane
+         * VBUS IRQ and omit the methods above.  Store the GPIO number
+         * here; for GPIO 0, also mask in one of the pxa_gpio_mode() bits.
+         */
+        u16     gpio_vbus;                      /* high == vbus present */
+        u16     gpio_pullup;                    /* high == pullup activated */
 };
 extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info);
diff --git a/include/asm-arm/arch-s3c2410/dma.h b/include/asm-arm/arch-s3c2410/dma.h
index 3661e465b0a5..7ac224836971 100644
--- a/include/asm-arm/arch-s3c2410/dma.h
+++ b/include/asm-arm/arch-s3c2410/dma.h
@@ -23,6 +23,39 @@
 #define MAX_DMA_ADDRESS         0x40000000
 #define MAX_DMA_TRANSFER_SIZE   0x100000 /* Data Unit is half word  */
+/* We use `virtual` dma channels to hide the fact we have only a limited
+ * number of DMA channels, and not of all of them (dependant on the device)
+ * can be attached to any DMA source. We therefore let the DMA core handle
+ * the allocation of hardware channels to clients.
+*/
+enum dma_ch {
+        DMACH_XD0,
+        DMACH_XD1,
+        DMACH_SDI,
+        DMACH_SPI0,
+        DMACH_SPI1,
+        DMACH_UART0,
+        DMACH_UART1,
+        DMACH_UART2,
+        DMACH_TIMER,
+        DMACH_I2S_IN,
+        DMACH_I2S_OUT,
+        DMACH_PCM_IN,
+        DMACH_PCM_OUT,
+        DMACH_MIC_IN,
+        DMACH_USB_EP1,
+        DMACH_USB_EP2,
+        DMACH_USB_EP3,
+        DMACH_USB_EP4,
+        DMACH_UART0_SRC2,       /* s3c2412 second uart sources */
+        DMACH_UART1_SRC2,
+        DMACH_UART2_SRC2,
+        DMACH_MAX,              /* the end entry */
+};
+#define DMACH_LOW_LEVEL (1<<28) /* use this to specifiy hardware ch no */
 /* we have 4 dma channels */
 #define S3C2410_DMA_CHANNELS        (4)
@@ -149,6 +182,8 @@ struct s3c2410_dma_stats {
        unsigned long           timeout_failed;
 };
+struct s3c2410_dma_map;
 /* struct s3c2410_dma_chan
 *
 * full state information for each DMA channel
@@ -174,6 +209,8 @@ struct s3c2410_dma_chan {
        unsigned long            load_timeout;
        unsigned int             flags;         /* channel flags */
+        struct s3c24xx_dma_map  *map;           /* channel hw maps */
        /* channel's hardware position and configuration */
        void __iomem            *regs;          /* channels registers */
        void __iomem            *addr_reg;      /* data address register */
@@ -283,6 +320,7 @@ extern int s3c2410_dma_set_buffdone_fn(dmach_t, s3c2410_dma_cbfn_t rtn);
 #define S3C2410_DMA_DCSRC       (0x18)
 #define S3C2410_DMA_DCDST       (0x1C)
 #define S3C2410_DMA_DMASKTRIG   (0x20)
+#define S3C2412_DMA_DMAREQSEL   (0x24)
 #define S3C2410_DISRCC_INC      (1<<0)
 #define S3C2410_DISRCC_APB      (1<<1)
@@ -349,4 +387,32 @@ extern int s3c2410_dma_set_buffdone_fn(dmach_t, s3c2410_dma_cbfn_t rtn);
 #define S3C2440_DCON_CH3_PCMOUT (6<<24)
 #endif
+#ifdef CONFIG_CPU_S3C2412
+#define S3C2412_DMAREQSEL_SRC(x)        ((x)<<1)
+#define S3C2412_DMAREQSEL_HW            (1)
+#define S3C2412_DMAREQSEL_SPI0TX        S3C2412_DMAREQSEL_SRC(0)
+#define S3C2412_DMAREQSEL_SPI0RX        S3C2412_DMAREQSEL_SRC(1)
+#define S3C2412_DMAREQSEL_SPI1TX        S3C2412_DMAREQSEL_SRC(2)
+#define S3C2412_DMAREQSEL_SPI1RX        S3C2412_DMAREQSEL_SRC(3)
+#define S3C2412_DMAREQSEL_I2STX         S3C2412_DMAREQSEL_SRC(4)
+#define S3C2412_DMAREQSEL_I2SRX         S3C2412_DMAREQSEL_SRC(5)
+#define S3C2412_DMAREQSEL_TIMER         S3C2412_DMAREQSEL_SRC(9)
+#define S3C2412_DMAREQSEL_SDI           S3C2412_DMAREQSEL_SRC(10)
+#define S3C2412_DMAREQSEL_USBEP1        S3C2412_DMAREQSEL_SRC(13)
+#define S3C2412_DMAREQSEL_USBEP2        S3C2412_DMAREQSEL_SRC(14)
+#define S3C2412_DMAREQSEL_USBEP3        S3C2412_DMAREQSEL_SRC(15)
+#define S3C2412_DMAREQSEL_USBEP4        S3C2412_DMAREQSEL_SRC(16)
+#define S3C2412_DMAREQSEL_XDREQ0        S3C2412_DMAREQSEL_SRC(17)
+#define S3C2412_DMAREQSEL_XDREQ1        S3C2412_DMAREQSEL_SRC(18)
+#define S3C2412_DMAREQSEL_UART0_0       S3C2412_DMAREQSEL_SRC(19)
+#define S3C2412_DMAREQSEL_UART0_1       S3C2412_DMAREQSEL_SRC(20)
+#define S3C2412_DMAREQSEL_UART1_0       S3C2412_DMAREQSEL_SRC(21)
+#define S3C2412_DMAREQSEL_UART1_1       S3C2412_DMAREQSEL_SRC(22)
+#define S3C2412_DMAREQSEL_UART2_0       S3C2412_DMAREQSEL_SRC(23)
+#define S3C2412_DMAREQSEL_UART2_1       S3C2412_DMAREQSEL_SRC(24)
+#endif
 #endif /* __ASM_ARCH_DMA_H */
diff --git a/include/asm-arm/arch-s3c2410/map.h b/include/asm-arm/arch-s3c2410/map.h
index 27ba0ac3fdd5..7895042d176b 100644
--- a/include/asm-arm/arch-s3c2410/map.h
+++ b/include/asm-arm/arch-s3c2410/map.h
@@ -160,6 +160,11 @@
 #define S3C2440_PA_CAMIF   (0x4F000000)
 #define S3C2440_SZ_CAMIF   SZ_1M
+/* AC97 */
+#define S3C2440_PA_AC97    (0x5B000000)
+#define S3C2440_SZ_AC97    SZ_1M
 /* ISA style IO, for each machine to sort out mappings for, if it
 * implements it. We reserve two 16M regions for ISA.
 */
diff --git a/include/asm-arm/arch-s3c2410/osiris-map.h b/include/asm-arm/arch-s3c2410/osiris-map.h
index e2d406218ae5..a14164dfa525 100644
--- a/include/asm-arm/arch-s3c2410/osiris-map.h
+++ b/include/asm-arm/arch-s3c2410/osiris-map.h
@@ -18,22 +18,22 @@
 /* start peripherals off after the S3C2410 */
-#define OSIRIS_IOADDR(x)        (S3C2410_ADDR((x) + 0x05000000))
+#define OSIRIS_IOADDR(x)        (S3C2410_ADDR((x) + 0x04000000))
-#define OSIRIS_PA_CPLD          (S3C2410_CS1 | (3<<25))
+#define OSIRIS_PA_CPLD          (S3C2410_CS1 | (1<<26))
 /* we put the CPLD registers next, to get them out of the way */
-#define OSIRIS_VA_CTRL1     OSIRIS_IOADDR(0x00000000)    /* 0x01300000 */
+#define OSIRIS_VA_CTRL1     OSIRIS_IOADDR(0x00000000)
 #define OSIRIS_PA_CTRL1     (OSIRIS_PA_CPLD)
-#define OSIRIS_VA_CTRL2     OSIRIS_IOADDR(0x00100000)    /* 0x01400000 */
+#define OSIRIS_VA_CTRL2     OSIRIS_IOADDR(0x00100000)
-#define OSIRIS_PA_CTRL2     (OSIRIS_PA_CPLD + (1<<24))
+#define OSIRIS_PA_CTRL2     (OSIRIS_PA_CPLD + (1<<23))
-#define OSIRIS_VA_CTRL3     OSIRIS_IOADDR(0x00200000)    /* 0x01500000 */
+#define OSIRIS_VA_CTRL3     OSIRIS_IOADDR(0x00200000)
-#define OSIRIS_PA_CTRL3     (OSIRIS_PA_CPLD + (2<<24))
+#define OSIRIS_PA_CTRL3     (OSIRIS_PA_CPLD + (2<<23))
-#define OSIRIS_VA_CTRL4     OSIRIS_IOADDR(0x00300000)    /* 0x01600000 */
+#define OSIRIS_VA_CTRL4     OSIRIS_IOADDR(0x00300000)
-#define OSIRIS_PA_CTRL4     (OSIRIS_PA_CPLD + (3<<24))
+#define OSIRIS_PA_CTRL4     (OSIRIS_PA_CPLD + (3<<23))
 #endif /* __ASM_ARCH_OSIRISMAP_H */
diff --git a/include/asm-arm/arch-s3c2410/regs-ac97.h b/include/asm-arm/arch-s3c2410/regs-ac97.h
new file mode 100644
index 000000000000..bdd6a4f93d7f
--- /dev/null
+++ b/include/asm-arm/arch-s3c2410/regs-ac97.h
@@ -0,0 +1,23 @@
+/* linux/include/asm-arm/arch-s3c2410/regs-ac97.h
+ *
+ * Copyright (c) 2006 Simtec Electronics <linux@simtec.co.uk>
+ *              http://www.simtec.co.uk/products/SWLINUX/
+ *
+ * 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.
+ *
+ * S3C2440 AC97 Controller
+*/
+#ifndef __ASM_ARCH_REGS_AC97_H
+#define __ASM_ARCH_REGS_AC97_H __FILE__
+#define S3C_AC97_GLBCTRL        (0x00)
+#define S3C_AC97_GLBSTAT        (0x04)
+#define S3C_AC97_CODEC_CMD      (0x08)
+#define S3C_AC97_PCM_ADDR       (0x10)
+#define S3C_AC97_PCM_DATA       (0x18)
+#define S3C_AC97_MIC_DATA       (0x1C)
+#endif /* __ASM_ARCH_REGS_AC97_H */
diff --git a/include/asm-arm/arch-s3c2410/regs-lcd.h b/include/asm-arm/arch-s3c2410/regs-lcd.h
index b306d6e3135d..6d7881c8cfc8 100644
--- a/include/asm-arm/arch-s3c2410/regs-lcd.h
+++ b/include/asm-arm/arch-s3c2410/regs-lcd.h
@@ -63,6 +63,8 @@
 #define S3C2410_LCDCON3_GET_HBPD(x) ( ((x) >> 19) & 0x7F)
 #define S3C2410_LCDCON3_GET_HFPD(x) ( ((x) >>  0) & 0xFF)
+/* LDCCON4 changes for STN mode on the S3C2412 */
 #define S3C2410_LCDCON4_MVAL(x)     ((x) << 8)
 #define S3C2410_LCDCON4_HSPW(x)     ((x) << 0)
 #define S3C2410_LCDCON4_WLH(x)      ((x) << 0)
@@ -113,10 +115,38 @@
 #define S3C2410_LCDINT_FRSYNC   (1<<1)
 #define S3C2410_LCDINT_FICNT    (1<<0)
+/* s3c2442 extra stn registers */
+#define S3C2442_REDLUT          S3C2410_LCDREG(0x20)
+#define S3C2442_GREENLUT        S3C2410_LCDREG(0x24)
+#define S3C2442_BLUELUT         S3C2410_LCDREG(0x28)
+#define S3C2442_DITHMODE        S3C2410_LCDREG(0x20)
 #define S3C2410_LPCSEL     S3C2410_LCDREG(0x60)
 #define S3C2410_TFTPAL(x)  S3C2410_LCDREG((0x400 + (x)*4))
+/* S3C2412 registers */
+#define S3C2412_TPAL            S3C2410_LCDREG(0x20)
+#define S3C2412_LCDINTPND       S3C2410_LCDREG(0x24)
+#define S3C2412_LCDSRCPND       S3C2410_LCDREG(0x28)
+#define S3C2412_LCDINTMSK       S3C2410_LCDREG(0x2C)
+#define S3C2412_TCONSEL         S3C2410_LCDREG(0x30)
+#define S3C2412_LCDCON6         S3C2410_LCDREG(0x34)
+#define S3C2412_LCDCON7         S3C2410_LCDREG(0x38)
+#define S3C2412_LCDCON8         S3C2410_LCDREG(0x3C)
+#define S3C2412_LCDCON9         S3C2410_LCDREG(0x40)
+#define S3C2412_REDLUT(x)       S3C2410_LCDREG(0x44 + ((x)*4))
+#define S3C2412_GREENLUT(x)     S3C2410_LCDREG(0x60 + ((x)*4))
+#define S3C2412_BLUELUT(x)      S3C2410_LCDREG(0x98 + ((x)*4))
+#define S3C2412_FRCPAT(x)       S3C2410_LCDREG(0xB4 + ((x)*4))
 #endif /* ___ASM_ARCH_REGS_LCD_H */
diff --git a/include/asm-arm/atomic.h b/include/asm-arm/atomic.h
index 4b0ce3e7de9a..ea88aa6bfc78 100644
--- a/include/asm-arm/atomic.h
+++ b/include/asm-arm/atomic.h
@@ -128,10 +128,10 @@ static inline int atomic_add_return(int i, atomic_t *v)
        unsigned long flags;
        int val;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        val = v->counter;
        v->counter = val += i;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
        return val;
 }
@@ -141,10 +141,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
        unsigned long flags;
        int val;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        val = v->counter;
        v->counter = val -= i;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
        return val;
 }
@@ -154,11 +154,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
        int ret;
        unsigned long flags;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        ret = v->counter;
        if (likely(ret == old))
                v->counter = new;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
        return ret;
 }
@@ -167,9 +167,9 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
 {
        unsigned long flags;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        *addr &= ~mask;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
 }
 #endif /* __LINUX_ARM_ARCH__ */
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index 0ac54b1a8bad..b41831b6432f 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -37,9 +37,9 @@ static inline void ____atomic_set_bit(unsigned int bit, volatile unsigned long *
        p += bit >> 5;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        *p |= mask;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
 }
 static inline void ____atomic_clear_bit(unsigned int bit, volatile unsigned long *p)
@@ -49,9 +49,9 @@ static inline void ____atomic_clear_bit(unsigned int bit, volatile unsigned long
        p += bit >> 5;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        *p &= ~mask;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
 }
 static inline void ____atomic_change_bit(unsigned int bit, volatile unsigned long *p)
@@ -61,9 +61,9 @@ static inline void ____atomic_change_bit(unsigned int bit, volatile unsigned lon
        p += bit >> 5;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        *p ^= mask;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
 }
 static inline int
@@ -75,10 +75,10 @@ ____atomic_test_and_set_bit(unsigned int bit, volatile unsigned long *p)
        p += bit >> 5;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        res = *p;
        *p = res | mask;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
        return res & mask;
 }
@@ -92,10 +92,10 @@ ____atomic_test_and_clear_bit(unsigned int bit, volatile unsigned long *p)
        p += bit >> 5;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        res = *p;
        *p = res & ~mask;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
        return res & mask;
 }
@@ -109,10 +109,10 @@ ____atomic_test_and_change_bit(unsigned int bit, volatile unsigned long *p)
        p += bit >> 5;
-        local_irq_save(flags);
+        raw_local_irq_save(flags);
        res = *p;
        *p = res ^ mask;
-        local_irq_restore(flags);
+        raw_local_irq_restore(flags);
        return res & mask;
 }
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h
index e4a2569c636c..f0845646aacb 100644
--- a/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@@ -25,7 +25,7 @@
 #undef _CACHE
 #undef MULTI_CACHE
-#if defined(CONFIG_CPU_ARM610) || defined(CONFIG_CPU_ARM710)
+#if defined(CONFIG_CPU_CACHE_V3)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
 # else
@@ -33,7 +33,7 @@
 # endif
 #endif
-#if defined(CONFIG_CPU_ARM720T)
+#if defined(CONFIG_CPU_CACHE_V4)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
 # else
@@ -54,7 +54,23 @@
 # endif
 #endif
-#if defined(CONFIG_CPU_SA110) || defined(CONFIG_CPU_SA1100)
+#if defined(CONFIG_CPU_ARM940T)
+# ifdef _CACHE
+#  define MULTI_CACHE 1
+# else
+#  define _CACHE arm940
+# endif
+#endif
+#if defined(CONFIG_CPU_ARM946E)
+# ifdef _CACHE
+#  define MULTI_CACHE 1
+# else
+#  define _CACHE arm946
+# endif
+#endif
+#if defined(CONFIG_CPU_CACHE_V4WB)
 # ifdef _CACHE
 #  define MULTI_CACHE 1
 # else
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h
index ae7baa6c73f7..17f0c656d272 100644
--- a/include/asm-arm/elf.h
+++ b/include/asm-arm/elf.h
@@ -8,9 +8,6 @@
 #include <asm/ptrace.h>
 #include <asm/user.h>
-#ifdef __KERNEL
-#include <asm/procinfo.h>
-#endif
 typedef unsigned long elf_greg_t;
 typedef unsigned long elf_freg_t[3];
@@ -32,11 +29,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fp elf_fpregset_t;
 /*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )
-/*
 * These are used to set parameters in the core dumps.
 */
 #define ELF_CLASS       ELFCLASS32
@@ -47,6 +39,14 @@ typedef struct user_fp elf_fpregset_t;
 #endif
 #define ELF_ARCH        EM_ARM
+#ifdef __KERNEL__
+#include <asm/procinfo.h>
+/*
+ * This is used to ensure we don't load something for the wrong architecture.
+ */
+#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )
 #define USE_ELF_CORE_DUMP
 #define ELF_EXEC_PAGESIZE       4096
@@ -83,8 +83,6 @@ typedef struct user_fp elf_fpregset_t;
 extern char elf_platform[];
 #define ELF_PLATFORM    (elf_platform)
-#ifdef __KERNEL__
 /*
 * 32-bit code is always OK.  Some cpus can do 26-bit, some can't.
 */
diff --git a/include/asm-arm/flat.h b/include/asm-arm/flat.h
new file mode 100644
index 000000000000..966946478589
--- /dev/null
+++ b/include/asm-arm/flat.h
@@ -0,0 +1,16 @@
+/*
+ * include/asm-arm/flat.h -- uClinux flat-format executables
+ */
+#ifndef __ARM_FLAT_H__
+#define __ARM_FLAT_H__
+#define flat_stack_align(sp)                    /* nothing needed */
+#define flat_argvp_envp_on_stack()              1
+#define flat_old_ram_flag(flags)                (flags)
+#define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
+#define flat_get_addr_from_rp(rp, relval, flags) get_unaligned(rp)
+#define flat_put_addr_at_rp(rp, val, relval)    put_unaligned(val,rp)
+#define flat_get_relocate_addr(rel)             (rel)
+#endif /* __ARM_FLAT_H__ */
diff --git a/include/asm-arm/hardware/iop3xx.h b/include/asm-arm/hardware/iop3xx.h
new file mode 100644
index 000000000000..1018a7486ab7
--- /dev/null
+++ b/include/asm-arm/hardware/iop3xx.h
@@ -0,0 +1,301 @@
+/*
+ * include/asm-arm/hardware/iop3xx.h
+ *
+ * Intel IOP32X and IOP33X register definitions
+ *
+ * Author: Rory Bolt <rorybolt@pacbell.net>
+ * Copyright (C) 2002 Rory Bolt
+ * Copyright (C) 2004 Intel Corp.
+ *
+ * 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 __IOP3XX_H
+#define __IOP3XX_H
+/*
+ * IOP3XX GPIO handling
+ */
+#define GPIO_IN                 0
+#define GPIO_OUT                1
+#define GPIO_LOW                0
+#define GPIO_HIGH               1
+#define IOP3XX_GPIO_LINE(x)     (x)
+#ifndef __ASSEMBLY__
+extern void gpio_line_config(int line, int direction);
+extern int  gpio_line_get(int line);
+extern void gpio_line_set(int line, int value);
+#endif
+/*
+ * IOP3XX processor registers
+ */
+#define IOP3XX_PERIPHERAL_PHYS_BASE     0xffffe000
+#define IOP3XX_PERIPHERAL_VIRT_BASE     0xfeffe000
+#define IOP3XX_PERIPHERAL_SIZE          0x00002000
+#define IOP3XX_REG_ADDR(reg)            (IOP3XX_PERIPHERAL_VIRT_BASE + (reg))
+/* Address Translation Unit  */
+#define IOP3XX_ATUVID           (volatile u16 *)IOP3XX_REG_ADDR(0x0100)
+#define IOP3XX_ATUDID           (volatile u16 *)IOP3XX_REG_ADDR(0x0102)
+#define IOP3XX_ATUCMD           (volatile u16 *)IOP3XX_REG_ADDR(0x0104)
+#define IOP3XX_ATUSR            (volatile u16 *)IOP3XX_REG_ADDR(0x0106)
+#define IOP3XX_ATURID           (volatile u8  *)IOP3XX_REG_ADDR(0x0108)
+#define IOP3XX_ATUCCR           (volatile u32 *)IOP3XX_REG_ADDR(0x0109)
+#define IOP3XX_ATUCLSR          (volatile u8  *)IOP3XX_REG_ADDR(0x010c)
+#define IOP3XX_ATULT            (volatile u8  *)IOP3XX_REG_ADDR(0x010d)
+#define IOP3XX_ATUHTR           (volatile u8  *)IOP3XX_REG_ADDR(0x010e)
+#define IOP3XX_ATUBIST          (volatile u8  *)IOP3XX_REG_ADDR(0x010f)
+#define IOP3XX_IABAR0           (volatile u32 *)IOP3XX_REG_ADDR(0x0110)
+#define IOP3XX_IAUBAR0          (volatile u32 *)IOP3XX_REG_ADDR(0x0114)
+#define IOP3XX_IABAR1           (volatile u32 *)IOP3XX_REG_ADDR(0x0118)
+#define IOP3XX_IAUBAR1          (volatile u32 *)IOP3XX_REG_ADDR(0x011c)
+#define IOP3XX_IABAR2           (volatile u32 *)IOP3XX_REG_ADDR(0x0120)
+#define IOP3XX_IAUBAR2          (volatile u32 *)IOP3XX_REG_ADDR(0x0124)
+#define IOP3XX_ASVIR            (volatile u16 *)IOP3XX_REG_ADDR(0x012c)
+#define IOP3XX_ASIR             (volatile u16 *)IOP3XX_REG_ADDR(0x012e)
+#define IOP3XX_ERBAR            (volatile u32 *)IOP3XX_REG_ADDR(0x0130)
+#define IOP3XX_ATUILR           (volatile u8  *)IOP3XX_REG_ADDR(0x013c)
+#define IOP3XX_ATUIPR           (volatile u8  *)IOP3XX_REG_ADDR(0x013d)
+#define IOP3XX_ATUMGNT          (volatile u8  *)IOP3XX_REG_ADDR(0x013e)
+#define IOP3XX_ATUMLAT          (volatile u8  *)IOP3XX_REG_ADDR(0x013f)
+#define IOP3XX_IALR0            (volatile u32 *)IOP3XX_REG_ADDR(0x0140)
+#define IOP3XX_IATVR0           (volatile u32 *)IOP3XX_REG_ADDR(0x0144)
+#define IOP3XX_ERLR             (volatile u32 *)IOP3XX_REG_ADDR(0x0148)
+#define IOP3XX_ERTVR            (volatile u32 *)IOP3XX_REG_ADDR(0x014c)
+#define IOP3XX_IALR1            (volatile u32 *)IOP3XX_REG_ADDR(0x0150)
+#define IOP3XX_IALR2            (volatile u32 *)IOP3XX_REG_ADDR(0x0154)
+#define IOP3XX_IATVR2           (volatile u32 *)IOP3XX_REG_ADDR(0x0158)
+#define IOP3XX_OIOWTVR          (volatile u32 *)IOP3XX_REG_ADDR(0x015c)
+#define IOP3XX_OMWTVR0          (volatile u32 *)IOP3XX_REG_ADDR(0x0160)
+#define IOP3XX_OUMWTVR0         (volatile u32 *)IOP3XX_REG_ADDR(0x0164)
+#define IOP3XX_OMWTVR1          (volatile u32 *)IOP3XX_REG_ADDR(0x0168)
+#define IOP3XX_OUMWTVR1         (volatile u32 *)IOP3XX_REG_ADDR(0x016c)
+#define IOP3XX_OUDWTVR          (volatile u32 *)IOP3XX_REG_ADDR(0x0178)
+#define IOP3XX_ATUCR            (volatile u32 *)IOP3XX_REG_ADDR(0x0180)
+#define IOP3XX_PCSR             (volatile u32 *)IOP3XX_REG_ADDR(0x0184)
+#define IOP3XX_ATUISR           (volatile u32 *)IOP3XX_REG_ADDR(0x0188)
+#define IOP3XX_ATUIMR           (volatile u32 *)IOP3XX_REG_ADDR(0x018c)
+#define IOP3XX_IABAR3           (volatile u32 *)IOP3XX_REG_ADDR(0x0190)
+#define IOP3XX_IAUBAR3          (volatile u32 *)IOP3XX_REG_ADDR(0x0194)
+#define IOP3XX_IALR3            (volatile u32 *)IOP3XX_REG_ADDR(0x0198)
+#define IOP3XX_IATVR3           (volatile u32 *)IOP3XX_REG_ADDR(0x019c)
+#define IOP3XX_OCCAR            (volatile u32 *)IOP3XX_REG_ADDR(0x01a4)
+#define IOP3XX_OCCDR            (volatile u32 *)IOP3XX_REG_ADDR(0x01ac)
+#define IOP3XX_PDSCR            (volatile u32 *)IOP3XX_REG_ADDR(0x01bc)
+#define IOP3XX_PMCAPID          (volatile u8  *)IOP3XX_REG_ADDR(0x01c0)
+#define IOP3XX_PMNEXT           (volatile u8  *)IOP3XX_REG_ADDR(0x01c1)
+#define IOP3XX_APMCR            (volatile u16 *)IOP3XX_REG_ADDR(0x01c2)
+#define IOP3XX_APMCSR           (volatile u16 *)IOP3XX_REG_ADDR(0x01c4)
+#define IOP3XX_PCIXCAPID        (volatile u8  *)IOP3XX_REG_ADDR(0x01e0)
+#define IOP3XX_PCIXNEXT         (volatile u8  *)IOP3XX_REG_ADDR(0x01e1)
+#define IOP3XX_PCIXCMD          (volatile u16 *)IOP3XX_REG_ADDR(0x01e2)
+#define IOP3XX_PCIXSR           (volatile u32 *)IOP3XX_REG_ADDR(0x01e4)
+#define IOP3XX_PCIIRSR          (volatile u32 *)IOP3XX_REG_ADDR(0x01ec)
+/* Messaging Unit  */
+#define IOP3XX_IMR0             (volatile u32 *)IOP3XX_REG_ADDR(0x0310)
+#define IOP3XX_IMR1             (volatile u32 *)IOP3XX_REG_ADDR(0x0314)
+#define IOP3XX_OMR0             (volatile u32 *)IOP3XX_REG_ADDR(0x0318)
+#define IOP3XX_OMR1             (volatile u32 *)IOP3XX_REG_ADDR(0x031c)
+#define IOP3XX_IDR              (volatile u32 *)IOP3XX_REG_ADDR(0x0320)
+#define IOP3XX_IISR             (volatile u32 *)IOP3XX_REG_ADDR(0x0324)
+#define IOP3XX_IIMR             (volatile u32 *)IOP3XX_REG_ADDR(0x0328)
+#define IOP3XX_ODR              (volatile u32 *)IOP3XX_REG_ADDR(0x032c)
+#define IOP3XX_OISR             (volatile u32 *)IOP3XX_REG_ADDR(0x0330)
+#define IOP3XX_OIMR             (volatile u32 *)IOP3XX_REG_ADDR(0x0334)
+#define IOP3XX_MUCR             (volatile u32 *)IOP3XX_REG_ADDR(0x0350)
+#define IOP3XX_QBAR             (volatile u32 *)IOP3XX_REG_ADDR(0x0354)
+#define IOP3XX_IFHPR            (volatile u32 *)IOP3XX_REG_ADDR(0x0360)
+#define IOP3XX_IFTPR            (volatile u32 *)IOP3XX_REG_ADDR(0x0364)
+#define IOP3XX_IPHPR            (volatile u32 *)IOP3XX_REG_ADDR(0x0368)
+#define IOP3XX_IPTPR            (volatile u32 *)IOP3XX_REG_ADDR(0x036c)
+#define IOP3XX_OFHPR            (volatile u32 *)IOP3XX_REG_ADDR(0x0370)
+#define IOP3XX_OFTPR            (volatile u32 *)IOP3XX_REG_ADDR(0x0374)
+#define IOP3XX_OPHPR            (volatile u32 *)IOP3XX_REG_ADDR(0x0378)
+#define IOP3XX_OPTPR            (volatile u32 *)IOP3XX_REG_ADDR(0x037c)
+#define IOP3XX_IAR              (volatile u32 *)IOP3XX_REG_ADDR(0x0380)
+/* DMA Controller  */
+#define IOP3XX_DMA0_CCR         (volatile u32 *)IOP3XX_REG_ADDR(0x0400)
+#define IOP3XX_DMA0_CSR         (volatile u32 *)IOP3XX_REG_ADDR(0x0404)
+#define IOP3XX_DMA0_DAR         (volatile u32 *)IOP3XX_REG_ADDR(0x040c)
+#define IOP3XX_DMA0_NDAR        (volatile u32 *)IOP3XX_REG_ADDR(0x0410)
+#define IOP3XX_DMA0_PADR        (volatile u32 *)IOP3XX_REG_ADDR(0x0414)
+#define IOP3XX_DMA0_PUADR       (volatile u32 *)IOP3XX_REG_ADDR(0x0418)
+#define IOP3XX_DMA0_LADR        (volatile u32 *)IOP3XX_REG_ADDR(0x041c)
+#define IOP3XX_DMA0_BCR         (volatile u32 *)IOP3XX_REG_ADDR(0x0420)
+#define IOP3XX_DMA0_DCR         (volatile u32 *)IOP3XX_REG_ADDR(0x0424)
+#define IOP3XX_DMA1_CCR         (volatile u32 *)IOP3XX_REG_ADDR(0x0440)
+#define IOP3XX_DMA1_CSR         (volatile u32 *)IOP3XX_REG_ADDR(0x0444)
+#define IOP3XX_DMA1_DAR         (volatile u32 *)IOP3XX_REG_ADDR(0x044c)
+#define IOP3XX_DMA1_NDAR        (volatile u32 *)IOP3XX_REG_ADDR(0x0450)
+#define IOP3XX_DMA1_PADR        (volatile u32 *)IOP3XX_REG_ADDR(0x0454)
+#define IOP3XX_DMA1_PUADR       (volatile u32 *)IOP3XX_REG_ADDR(0x0458)
+#define IOP3XX_DMA1_LADR        (volatile u32 *)IOP3XX_REG_ADDR(0x045c)
+#define IOP3XX_DMA1_BCR         (volatile u32 *)IOP3XX_REG_ADDR(0x0460)
+#define IOP3XX_DMA1_DCR         (volatile u32 *)IOP3XX_REG_ADDR(0x0464)
+/* Peripheral bus interface  */
+#define IOP3XX_PBCR             (volatile u32 *)IOP3XX_REG_ADDR(0x0680)
+#define IOP3XX_PBISR            (volatile u32 *)IOP3XX_REG_ADDR(0x0684)
+#define IOP3XX_PBBAR0           (volatile u32 *)IOP3XX_REG_ADDR(0x0688)
+#define IOP3XX_PBLR0            (volatile u32 *)IOP3XX_REG_ADDR(0x068c)
+#define IOP3XX_PBBAR1           (volatile u32 *)IOP3XX_REG_ADDR(0x0690)
+#define IOP3XX_PBLR1            (volatile u32 *)IOP3XX_REG_ADDR(0x0694)
+#define IOP3XX_PBBAR2           (volatile u32 *)IOP3XX_REG_ADDR(0x0698)
+#define IOP3XX_PBLR2            (volatile u32 *)IOP3XX_REG_ADDR(0x069c)
+#define IOP3XX_PBBAR3           (volatile u32 *)IOP3XX_REG_ADDR(0x06a0)
+#define IOP3XX_PBLR3            (volatile u32 *)IOP3XX_REG_ADDR(0x06a4)
+#define IOP3XX_PBBAR4           (volatile u32 *)IOP3XX_REG_ADDR(0x06a8)
+#define IOP3XX_PBLR4            (volatile u32 *)IOP3XX_REG_ADDR(0x06ac)
+#define IOP3XX_PBBAR5           (volatile u32 *)IOP3XX_REG_ADDR(0x06b0)
+#define IOP3XX_PBLR5            (volatile u32 *)IOP3XX_REG_ADDR(0x06b4)
+#define IOP3XX_PMBR0            (volatile u32 *)IOP3XX_REG_ADDR(0x06c0)
+#define IOP3XX_PMBR1            (volatile u32 *)IOP3XX_REG_ADDR(0x06e0)
+#define IOP3XX_PMBR2            (volatile u32 *)IOP3XX_REG_ADDR(0x06e4)
+/* Peripheral performance monitoring unit  */
+#define IOP3XX_GTMR             (volatile u32 *)IOP3XX_REG_ADDR(0x0700)
+#define IOP3XX_ESR              (volatile u32 *)IOP3XX_REG_ADDR(0x0704)
+#define IOP3XX_EMISR            (volatile u32 *)IOP3XX_REG_ADDR(0x0708)
+#define IOP3XX_GTSR             (volatile u32 *)IOP3XX_REG_ADDR(0x0710)
+/* PERCR0 DOESN'T EXIST - index from 1! */
+#define IOP3XX_PERCR0           (volatile u32 *)IOP3XX_REG_ADDR(0x0710)
+/* General Purpose I/O  */
+#define IOP3XX_GPOE             (volatile u32 *)IOP3XX_GPIO_REG(0x0004)
+#define IOP3XX_GPID             (volatile u32 *)IOP3XX_GPIO_REG(0x0008)
+#define IOP3XX_GPOD             (volatile u32 *)IOP3XX_GPIO_REG(0x000c)
+/* Timers  */
+#define IOP3XX_TU_TMR0          (volatile u32 *)IOP3XX_TIMER_REG(0x0000)
+#define IOP3XX_TU_TMR1          (volatile u32 *)IOP3XX_TIMER_REG(0x0004)
+#define IOP3XX_TU_TCR0          (volatile u32 *)IOP3XX_TIMER_REG(0x0008)
+#define IOP3XX_TU_TCR1          (volatile u32 *)IOP3XX_TIMER_REG(0x000c)
+#define IOP3XX_TU_TRR0          (volatile u32 *)IOP3XX_TIMER_REG(0x0010)
+#define IOP3XX_TU_TRR1          (volatile u32 *)IOP3XX_TIMER_REG(0x0014)
+#define IOP3XX_TU_TISR          (volatile u32 *)IOP3XX_TIMER_REG(0x0018)
+#define IOP3XX_TU_WDTCR         (volatile u32 *)IOP3XX_TIMER_REG(0x001c)
+#define IOP3XX_TMR_TC           0x01
+#define IOP3XX_TMR_EN           0x02
+#define IOP3XX_TMR_RELOAD       0x04
+#define IOP3XX_TMR_PRIVILEGED   0x09
+#define IOP3XX_TMR_RATIO_1_1    0x00
+#define IOP3XX_TMR_RATIO_4_1    0x10
+#define IOP3XX_TMR_RATIO_8_1    0x20
+#define IOP3XX_TMR_RATIO_16_1   0x30
+/* Application accelerator unit  */
+#define IOP3XX_AAU_ACR          (volatile u32 *)IOP3XX_REG_ADDR(0x0800)
+#define IOP3XX_AAU_ASR          (volatile u32 *)IOP3XX_REG_ADDR(0x0804)
+#define IOP3XX_AAU_ADAR         (volatile u32 *)IOP3XX_REG_ADDR(0x0808)
+#define IOP3XX_AAU_ANDAR        (volatile u32 *)IOP3XX_REG_ADDR(0x080c)
+#define IOP3XX_AAU_SAR1         (volatile u32 *)IOP3XX_REG_ADDR(0x0810)
+#define IOP3XX_AAU_SAR2         (volatile u32 *)IOP3XX_REG_ADDR(0x0814)
+#define IOP3XX_AAU_SAR3         (volatile u32 *)IOP3XX_REG_ADDR(0x0818)
+#define IOP3XX_AAU_SAR4         (volatile u32 *)IOP3XX_REG_ADDR(0x081c)
+#define IOP3XX_AAU_DAR          (volatile u32 *)IOP3XX_REG_ADDR(0x0820)
+#define IOP3XX_AAU_ABCR         (volatile u32 *)IOP3XX_REG_ADDR(0x0824)
+#define IOP3XX_AAU_ADCR         (volatile u32 *)IOP3XX_REG_ADDR(0x0828)
+#define IOP3XX_AAU_SAR5         (volatile u32 *)IOP3XX_REG_ADDR(0x082c)
+#define IOP3XX_AAU_SAR6         (volatile u32 *)IOP3XX_REG_ADDR(0x0830)
+#define IOP3XX_AAU_SAR7         (volatile u32 *)IOP3XX_REG_ADDR(0x0834)
+#define IOP3XX_AAU_SAR8         (volatile u32 *)IOP3XX_REG_ADDR(0x0838)
+#define IOP3XX_AAU_EDCR0        (volatile u32 *)IOP3XX_REG_ADDR(0x083c)
+#define IOP3XX_AAU_SAR9         (volatile u32 *)IOP3XX_REG_ADDR(0x0840)
+#define IOP3XX_AAU_SAR10        (volatile u32 *)IOP3XX_REG_ADDR(0x0844)
+#define IOP3XX_AAU_SAR11        (volatile u32 *)IOP3XX_REG_ADDR(0x0848)
+#define IOP3XX_AAU_SAR12        (volatile u32 *)IOP3XX_REG_ADDR(0x084c)
+#define IOP3XX_AAU_SAR13        (volatile u32 *)IOP3XX_REG_ADDR(0x0850)
+#define IOP3XX_AAU_SAR14        (volatile u32 *)IOP3XX_REG_ADDR(0x0854)
+#define IOP3XX_AAU_SAR15        (volatile u32 *)IOP3XX_REG_ADDR(0x0858)
+#define IOP3XX_AAU_SAR16        (volatile u32 *)IOP3XX_REG_ADDR(0x085c)
+#define IOP3XX_AAU_EDCR1        (volatile u32 *)IOP3XX_REG_ADDR(0x0860)
+#define IOP3XX_AAU_SAR17        (volatile u32 *)IOP3XX_REG_ADDR(0x0864)
+#define IOP3XX_AAU_SAR18        (volatile u32 *)IOP3XX_REG_ADDR(0x0868)
+#define IOP3XX_AAU_SAR19        (volatile u32 *)IOP3XX_REG_ADDR(0x086c)
+#define IOP3XX_AAU_SAR20        (volatile u32 *)IOP3XX_REG_ADDR(0x0870)
+#define IOP3XX_AAU_SAR21        (volatile u32 *)IOP3XX_REG_ADDR(0x0874)
+#define IOP3XX_AAU_SAR22        (volatile u32 *)IOP3XX_REG_ADDR(0x0878)
+#define IOP3XX_AAU_SAR23        (volatile u32 *)IOP3XX_REG_ADDR(0x087c)
+#define IOP3XX_AAU_SAR24        (volatile u32 *)IOP3XX_REG_ADDR(0x0880)
+#define IOP3XX_AAU_EDCR2        (volatile u32 *)IOP3XX_REG_ADDR(0x0884)
+#define IOP3XX_AAU_SAR25        (volatile u32 *)IOP3XX_REG_ADDR(0x0888)
+#define IOP3XX_AAU_SAR26        (volatile u32 *)IOP3XX_REG_ADDR(0x088c)
+#define IOP3XX_AAU_SAR27        (volatile u32 *)IOP3XX_REG_ADDR(0x0890)
+#define IOP3XX_AAU_SAR28        (volatile u32 *)IOP3XX_REG_ADDR(0x0894)
+#define IOP3XX_AAU_SAR29        (volatile u32 *)IOP3XX_REG_ADDR(0x0898)
+#define IOP3XX_AAU_SAR30        (volatile u32 *)IOP3XX_REG_ADDR(0x089c)
+#define IOP3XX_AAU_SAR31        (volatile u32 *)IOP3XX_REG_ADDR(0x08a0)
+#define IOP3XX_AAU_SAR32        (volatile u32 *)IOP3XX_REG_ADDR(0x08a4)
+/* I2C bus interface unit  */
+#define IOP3XX_ICR0             (volatile u32 *)IOP3XX_REG_ADDR(0x1680)
+#define IOP3XX_ISR0             (volatile u32 *)IOP3XX_REG_ADDR(0x1684)
+#define IOP3XX_ISAR0            (volatile u32 *)IOP3XX_REG_ADDR(0x1688)
+#define IOP3XX_IDBR0            (volatile u32 *)IOP3XX_REG_ADDR(0x168c)
+#define IOP3XX_IBMR0            (volatile u32 *)IOP3XX_REG_ADDR(0x1694)
+#define IOP3XX_ICR1             (volatile u32 *)IOP3XX_REG_ADDR(0x16a0)
+#define IOP3XX_ISR1             (volatile u32 *)IOP3XX_REG_ADDR(0x16a4)
+#define IOP3XX_ISAR1            (volatile u32 *)IOP3XX_REG_ADDR(0x16a8)
+#define IOP3XX_IDBR1            (volatile u32 *)IOP3XX_REG_ADDR(0x16ac)
+#define IOP3XX_IBMR1            (volatile u32 *)IOP3XX_REG_ADDR(0x16b4)
+/*
+ * IOP3XX I/O and Mem space regions for PCI autoconfiguration
+ */
+#define IOP3XX_PCI_MEM_WINDOW_SIZE      0x04000000
+#define IOP3XX_PCI_LOWER_MEM_PA         0x80000000
+#define IOP3XX_PCI_LOWER_MEM_BA         (*IOP3XX_OMWTVR0)
+#define IOP3XX_PCI_IO_WINDOW_SIZE       0x00010000
+#define IOP3XX_PCI_LOWER_IO_PA          0x90000000
+#define IOP3XX_PCI_LOWER_IO_VA          0xfe000000
+#define IOP3XX_PCI_LOWER_IO_BA          (*IOP3XX_OIOWTVR)
+#ifndef __ASSEMBLY__
+void iop3xx_map_io(void);
+void iop3xx_init_time(unsigned long);
+unsigned long iop3xx_gettimeoffset(void);
+extern struct platform_device iop3xx_i2c0_device;
+extern struct platform_device iop3xx_i2c1_device;
+extern inline void iop3xx_cp6_enable(void)
+{
+        u32 temp;
+        asm volatile (
+                "mrc    p15, 0, %0, c15, c1, 0\n\t"
+                "orr    %0, %0, #(1 << 6)\n\t"
+                "mcr    p15, 0, %0, c15, c1, 0\n\t"
+                "mrc    p15, 0, %0, c15, c1, 0\n\t"
+                "mov    %0, %0\n\t"
+                "sub    pc, pc, #4\n\t"
+                : "=r" (temp) );
+}
+extern inline void iop3xx_cp6_disable(void)
+{
+        u32 temp;
+        asm volatile (
+                "mrc    p15, 0, %0, c15, c1, 0\n\t"
+                "bic    %0, %0, #(1 << 6)\n\t"
+                "mcr    p15, 0, %0, c15, c1, 0\n\t"
+                "mrc    p15, 0, %0, c15, c1, 0\n\t"
+                "mov    %0, %0\n\t"
+                "sub    pc, pc, #4\n\t"
+                : "=r" (temp) );
+}
+#endif
+#endif
diff --git a/include/asm-arm/hardware/locomo.h b/include/asm-arm/hardware/locomo.h
index 22dfb1737768..adab77780ed3 100644
--- a/include/asm-arm/hardware/locomo.h
+++ b/include/asm-arm/hardware/locomo.h
@@ -54,17 +54,18 @@
 #define LOCOMO_DAC_SDAOEB       0x01    /* SDA pin output data       */
 /* SPI interface */
-#define LOCOMO_SPIMD    0x60            /* SPI mode setting */
+#define LOCOMO_SPI      0x60
-#define LOCOMO_SPICT    0x64            /* SPI mode control */
+#define LOCOMO_SPIMD    0x00            /* SPI mode setting */
-#define LOCOMO_SPIST    0x68            /* SPI status */
+#define LOCOMO_SPICT    0x04            /* SPI mode control */
-#define LOCOMO_SPIIS    0x70            /* SPI interrupt status */
+#define LOCOMO_SPIST    0x08            /* SPI status */
-#define LOCOMO_SPIWE    0x74            /* SPI interrupt status write enable */
+#define LOCOMO_SPIIS    0x10            /* SPI interrupt status */
-#define LOCOMO_SPIIE    0x78            /* SPI interrupt enable */
+#define LOCOMO_SPIWE    0x14            /* SPI interrupt status write enable */
-#define LOCOMO_SPIIR    0x7c            /* SPI interrupt request */
+#define LOCOMO_SPIIE    0x18            /* SPI interrupt enable */
-#define LOCOMO_SPITD    0x80            /* SPI transfer data write */
+#define LOCOMO_SPIIR    0x1c            /* SPI interrupt request */
-#define LOCOMO_SPIRD    0x84            /* SPI receive data read */
+#define LOCOMO_SPITD    0x20            /* SPI transfer data write */
-#define LOCOMO_SPITS    0x88            /* SPI transfer data shift */
+#define LOCOMO_SPIRD    0x24            /* SPI receive data read */
-#define LOCOMO_SPIRS    0x8C            /* SPI receive data shift */
+#define LOCOMO_SPITS    0x28            /* SPI transfer data shift */
+#define LOCOMO_SPIRS    0x2C            /* SPI receive data shift */
 #define LOCOMO_SPI_TEND (1 << 3)        /* Transfer end bit */
 #define LOCOMO_SPI_OVRN (1 << 2)        /* Over Run bit */
 #define LOCOMO_SPI_RFW  (1 << 1)        /* write buffer bit */
@@ -161,6 +162,7 @@ extern struct bus_type locomo_bus_type;
 #define LOCOMO_DEVID_AUDIO      3
 #define LOCOMO_DEVID_LED        4
 #define LOCOMO_DEVID_UART       5
+#define LOCOMO_DEVID_SPI                6
 struct locomo_dev {
        struct device   dev;
@@ -197,10 +199,11 @@ int locomo_driver_register(struct locomo_driver *);
 void locomo_driver_unregister(struct locomo_driver *);
 /* GPIO control functions */
-void locomo_gpio_set_dir(struct locomo_dev *ldev, unsigned int bits, unsigned int dir);
+void locomo_gpio_set_dir(struct device *dev, unsigned int bits, unsigned int dir);
-unsigned int locomo_gpio_read_level(struct locomo_dev *ldev, unsigned int bits);
+int locomo_gpio_read_level(struct device *dev, unsigned int bits);
-unsigned int locomo_gpio_read_output(struct locomo_dev *ldev, unsigned int bits);
+int locomo_gpio_read_output(struct device *dev, unsigned int bits);
-void locomo_gpio_write(struct locomo_dev *ldev, unsigned int bits, unsigned int set);
+void locomo_gpio_write(struct device *dev, unsigned int bits, unsigned int set);
 /* M62332 control function */
 void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int channel);
diff --git a/include/asm-arm/hardware/sharpsl_pm.h b/include/asm-arm/hardware/sharpsl_pm.h
index ecf15b83956f..a836e76a14f7 100644
--- a/include/asm-arm/hardware/sharpsl_pm.h
+++ b/include/asm-arm/hardware/sharpsl_pm.h
@@ -25,6 +25,7 @@ struct sharpsl_charger_machinfo {
        void (*measure_temp)(int);
        void (*presuspend)(void);
        void (*postsuspend)(void);
+        void (*earlyresume)(void);
        unsigned long (*read_devdata)(int);
 #define SHARPSL_BATT_VOLT       1
 #define SHARPSL_BATT_TEMP       2
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index bf7b9dea30f1..8076a85c3675 100644
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -280,6 +280,10 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);
 #define BIOVEC_MERGEABLE(vec1, vec2)    \
        ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
+extern int valid_phys_addr_range(unsigned long addr, size_t size);
+extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
 /*
 * Convert a physical pointer to a virtual kernel pointer for /dev/mem
 * access
diff --git a/include/asm-arm/irqflags.h b/include/asm-arm/irqflags.h
new file mode 100644
index 000000000000..6d09974e6646
--- /dev/null
+++ b/include/asm-arm/irqflags.h
@@ -0,0 +1,132 @@
+#ifndef __ASM_ARM_IRQFLAGS_H
+#define __ASM_ARM_IRQFLAGS_H
+#ifdef __KERNEL__
+#include <asm/ptrace.h>
+/*
+ * CPU interrupt mask handling.
+ */
+#if __LINUX_ARM_ARCH__ >= 6
+#define raw_local_irq_save(x)                                   \
+        ({                                                      \
+        __asm__ __volatile__(                                   \
+        "mrs    %0, cpsr                @ local_irq_save\n"     \
+        "cpsid  i"                                              \
+        : "=r" (x) : : "memory", "cc");                         \
+        })
+#define raw_local_irq_enable()  __asm__("cpsie i        @ __sti" : : : "memory", "cc")
+#define raw_local_irq_disable() __asm__("cpsid i        @ __cli" : : : "memory", "cc")
+#define local_fiq_enable()  __asm__("cpsie f    @ __stf" : : : "memory", "cc")
+#define local_fiq_disable() __asm__("cpsid f    @ __clf" : : : "memory", "cc")
+#else
+/*
+ * Save the current interrupt enable state & disable IRQs
+ */
+#define raw_local_irq_save(x)                                   \
+        ({                                                      \
+                unsigned long temp;                             \
+                (void) (&temp == &x);                           \
+        __asm__ __volatile__(                                   \
+        "mrs    %0, cpsr                @ local_irq_save\n"     \
+"       orr     %1, %0, #128\n"                                 \
+"       msr     cpsr_c, %1"                                     \
+        : "=r" (x), "=r" (temp)                                 \
+        :                                                       \
+        : "memory", "cc");                                      \
+        })
+        
+/*
+ * Enable IRQs
+ */
+#define raw_local_irq_enable()                                  \
+        ({                                                      \
+                unsigned long temp;                             \
+        __asm__ __volatile__(                                   \
+        "mrs    %0, cpsr                @ local_irq_enable\n"   \
+"       bic     %0, %0, #128\n"                                 \
+"       msr     cpsr_c, %0"                                     \
+        : "=r" (temp)                                           \
+        :                                                       \
+        : "memory", "cc");                                      \
+        })
+/*
+ * Disable IRQs
+ */
+#define raw_local_irq_disable()                                 \
+        ({                                                      \
+                unsigned long temp;                             \
+        __asm__ __volatile__(                                   \
+        "mrs    %0, cpsr                @ local_irq_disable\n"  \
+"       orr     %0, %0, #128\n"                                 \
+"       msr     cpsr_c, %0"                                     \
+        : "=r" (temp)                                           \
+        :                                                       \
+        : "memory", "cc");                                      \
+        })
+/*
+ * Enable FIQs
+ */
+#define local_fiq_enable()                                      \
+        ({                                                      \
+                unsigned long temp;                             \
+        __asm__ __volatile__(                                   \
+        "mrs    %0, cpsr                @ stf\n"                \
+"       bic     %0, %0, #64\n"                                  \
+"       msr     cpsr_c, %0"                                     \
+        : "=r" (temp)                                           \
+        :                                                       \
+        : "memory", "cc");                                      \
+        })
+/*
+ * Disable FIQs
+ */
+#define local_fiq_disable()                                     \
+        ({                                                      \
+                unsigned long temp;                             \
+        __asm__ __volatile__(                                   \
+        "mrs    %0, cpsr                @ clf\n"                \
+"       orr     %0, %0, #64\n"                                  \
+"       msr     cpsr_c, %0"                                     \
+        : "=r" (temp)                                           \
+        :                                                       \
+        : "memory", "cc");                                      \
+        })
+#endif
+/*
+ * Save the current interrupt enable state.
+ */
+#define raw_local_save_flags(x)                                 \
+        ({                                                      \
+        __asm__ __volatile__(                                   \
+        "mrs    %0, cpsr                @ local_save_flags"     \
+        : "=r" (x) : : "memory", "cc");                         \
+        })
+/*
+ * restore saved IRQ & FIQ state
+ */
+#define raw_local_irq_restore(x)                                \
+        __asm__ __volatile__(                                   \
+        "msr    cpsr_c, %0              @ local_irq_restore\n"  \
+        :                                                       \
+        : "r" (x)                                               \
+        : "memory", "cc")
+#define raw_irqs_disabled_flags(flags)  \
+({                                      \
+        (int)((flags) & PSR_I_BIT);     \
+})
+#endif
+#endif
diff --git a/include/asm-arm/mach/pci.h b/include/asm-arm/mach/pci.h
index 923e0ca66200..24621c49a0c7 100644
--- a/include/asm-arm/mach/pci.h
+++ b/include/asm-arm/mach/pci.h
@@ -52,13 +52,9 @@ void pci_common_init(struct hw_pci *);
 /*
 * PCI controllers
 */
-extern int iop321_setup(int nr, struct pci_sys_data *);
+extern int iop3xx_pci_setup(int nr, struct pci_sys_data *);
-extern struct pci_bus *iop321_scan_bus(int nr, struct pci_sys_data *);
+extern struct pci_bus *iop3xx_pci_scan_bus(int nr, struct pci_sys_data *);
-extern void iop321_init(void);
+extern void iop3xx_pci_preinit(void);
-extern int iop331_setup(int nr, struct pci_sys_data *);
-extern struct pci_bus *iop331_scan_bus(int nr, struct pci_sys_data *);
-extern void iop331_init(void);
 extern int dc21285_setup(int nr, struct pci_sys_data *);
 extern struct pci_bus *dc21285_scan_bus(int nr, struct pci_sys_data *);
diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h
index dee0bc336fe8..1eb93f5c0d6c 100644
--- a/include/asm-arm/mach/time.h
+++ b/include/asm-arm/mach/time.h
@@ -38,7 +38,9 @@ struct sys_timer {
        void                    (*init)(void);
        void                    (*suspend)(void);
        void                    (*resume)(void);
+#ifndef CONFIG_GENERIC_TIME
        unsigned long           (*offset)(void);
+#endif
 #ifdef CONFIG_NO_IDLE_HZ
        struct dyn_tick_timer   *dyn_tick;
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index b721270b9986..7e85db77d99b 100644
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -11,13 +11,13 @@
 #define _ASMARM_PAGE_H
+#ifdef __KERNEL__
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT              12
 #define PAGE_SIZE               (1UL << PAGE_SHIFT)
 #define PAGE_MASK               (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr)        (((addr)+PAGE_SIZE-1)&PAGE_MASK)
@@ -174,9 +174,6 @@ typedef unsigned long pgprot_t;
 #endif /* STRICT_MM_TYPECHECKS */
-/* the upper-most page table pointer */
-extern pmd_t *top_pmd;
 #endif /* CONFIG_MMU */
 #include <asm/memory.h>
diff --git a/include/asm-arm/pgtable.h b/include/asm-arm/pgtable.h
index 8d3919c6458c..ed8cb5963e99 100644
--- a/include/asm-arm/pgtable.h
+++ b/include/asm-arm/pgtable.h
@@ -136,6 +136,13 @@ extern void __pgd_error(const char *file, int line, unsigned long val);
 #define USER_PTRS_PER_PGD       ((TASK_SIZE/PGDIR_SIZE) - FIRST_USER_PGD_NR)
 /*
+ * section address mask and size definitions.
+ */
+#define SECTION_SHIFT           20
+#define SECTION_SIZE            (1UL << SECTION_SHIFT)
+#define SECTION_MASK            (~(SECTION_SIZE-1))
+/*
 * ARMv6 supersection address mask and size definitions.
 */
 #define SUPERSECTION_SHIFT      24
@@ -224,9 +231,9 @@ extern struct page *empty_zero_page;
 #define pte_none(pte)           (!pte_val(pte))
 #define pte_clear(mm,addr,ptep) set_pte_at((mm),(addr),(ptep), __pte(0))
 #define pte_page(pte)           (pfn_to_page(pte_pfn(pte)))
-#define pte_offset_kernel(dir,addr)     (pmd_page_kernel(*(dir)) + __pte_index(addr))
+#define pte_offset_kernel(dir,addr)     (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-#define pte_offset_map(dir,addr)        (pmd_page_kernel(*(dir)) + __pte_index(addr))
+#define pte_offset_map(dir,addr)        (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-#define pte_offset_map_nested(dir,addr) (pmd_page_kernel(*(dir)) + __pte_index(addr))
+#define pte_offset_map_nested(dir,addr) (pmd_page_vaddr(*(dir)) + __pte_index(addr))
 #define pte_unmap(pte)          do { } while (0)
 #define pte_unmap_nested(pte)   do { } while (0)
@@ -291,7 +298,7 @@ PTE_BIT_FUNC(mkyoung,   |= L_PTE_YOUNG);
                clean_pmd_entry(pmdp);  \
        } while (0)
-static inline pte_t *pmd_page_kernel(pmd_t pmd)
+static inline pte_t *pmd_page_vaddr(pmd_t pmd)
 {
        unsigned long ptr;
diff --git a/include/asm-arm/proc-fns.h b/include/asm-arm/proc-fns.h
index 1bde92cdaebd..ea7e54c319be 100644
--- a/include/asm-arm/proc-fns.h
+++ b/include/asm-arm/proc-fns.h
@@ -33,6 +33,14 @@
 #   define CPU_NAME cpu_arm6
 #  endif
 # endif
+# ifdef CONFIG_CPU_ARM7TDMI
+#  ifdef CPU_NAME
+#   undef  MULTI_CPU
+#   define MULTI_CPU
+#  else
+#   define CPU_NAME cpu_arm7tdmi
+#  endif
+# endif
 # ifdef CONFIG_CPU_ARM710
 #  ifdef CPU_NAME
 #   undef  MULTI_CPU
@@ -49,6 +57,22 @@
 #   define CPU_NAME cpu_arm720
 #  endif
 # endif
+# ifdef CONFIG_CPU_ARM740T
+#  ifdef CPU_NAME
+#   undef  MULTI_CPU
+#   define MULTI_CPU
+#  else
+#   define CPU_NAME cpu_arm740
+#  endif
+# endif
+# ifdef CONFIG_CPU_ARM9TDMI
+#  ifdef CPU_NAME
+#   undef  MULTI_CPU
+#   define MULTI_CPU
+#  else
+#   define CPU_NAME cpu_arm9tdmi
+#  endif
+# endif
 # ifdef CONFIG_CPU_ARM920T
 #  ifdef CPU_NAME
 #   undef  MULTI_CPU
@@ -81,6 +105,22 @@
 #   define CPU_NAME cpu_arm926
 #  endif
 # endif
+# ifdef CONFIG_CPU_ARM940T
+#  ifdef CPU_NAME
+#   undef  MULTI_CPU
+#   define MULTI_CPU
+#  else
+#   define CPU_NAME cpu_arm940
+#  endif
+# endif
+# ifdef CONFIG_CPU_ARM946E
+#  ifdef CPU_NAME
+#   undef  MULTI_CPU
+#   define MULTI_CPU
+#  else
+#   define CPU_NAME cpu_arm946
+#  endif
+# endif
 # ifdef CONFIG_CPU_SA110
 #  ifdef CPU_NAME
 #   undef  MULTI_CPU
diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h
index ea3ed2465233..aa4b5782f0c9 100644
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@ -194,13 +194,15 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn }
 # define NR_BANKS 8
 #endif
+struct membank {
+        unsigned long start;
+        unsigned long size;
+        int           node;
+};
 struct meminfo {
        int nr_banks;
-        struct {
+        struct membank bank[NR_BANKS];
-                unsigned long start;
-                unsigned long size;
-                int           node;
-        } bank[NR_BANKS];
 };
 /*
diff --git a/include/asm-arm/spinlock.h b/include/asm-arm/spinlock.h
index 01b7c26a3038..861092fbaa53 100644
--- a/include/asm-arm/spinlock.h
+++ b/include/asm-arm/spinlock.h
@@ -218,4 +218,8 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw)
 /* read_can_lock - would read_trylock() succeed? */
 #define __raw_read_can_lock(x)          ((x)->lock < 0x80000000)
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 0947cbf9b69a..f05fbe31576c 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -46,6 +46,7 @@
 #define CPUID_TCM       2
 #define CPUID_TLBTYPE   3
+#ifdef CONFIG_CPU_CP15
 #define read_cpuid(reg)                                                 \
        ({                                                              \
                unsigned int __val;                                     \
@@ -55,6 +56,9 @@
                    : "cc");                                            \
                __val;                                                  \
        })
+#else
+#define read_cpuid(reg) (processor_id)
+#endif
 /*
 * This is used to ensure the compiler did actually allocate the register we
@@ -207,130 +211,7 @@ static inline void sched_cacheflush(void)
 {
 }
-/*
+#include <linux/irqflags.h>
- * CPU interrupt mask handling.
- */
-#if __LINUX_ARM_ARCH__ >= 6
-#define local_irq_save(x)                                       \
-        ({                                                      \
-        __asm__ __volatile__(                                   \
-        "mrs    %0, cpsr                @ local_irq_save\n"     \
-        "cpsid  i"                                              \
-        : "=r" (x) : : "memory", "cc");                         \
-        })
-#define local_irq_enable()  __asm__("cpsie i    @ __sti" : : : "memory", "cc")
-#define local_irq_disable() __asm__("cpsid i    @ __cli" : : : "memory", "cc")
-#define local_fiq_enable()  __asm__("cpsie f    @ __stf" : : : "memory", "cc")
-#define local_fiq_disable() __asm__("cpsid f    @ __clf" : : : "memory", "cc")
-#else
-/*
- * Save the current interrupt enable state & disable IRQs
- */
-#define local_irq_save(x)                                       \
-        ({                                                      \
-                unsigned long temp;                             \
-                (void) (&temp == &x);                           \
-        __asm__ __volatile__(                                   \
-        "mrs    %0, cpsr                @ local_irq_save\n"     \
-"       orr     %1, %0, #128\n"                                 \
-"       msr     cpsr_c, %1"                                     \
-        : "=r" (x), "=r" (temp)                                 \
-        :                                                       \
-        : "memory", "cc");                                      \
-        })
-        
-/*
- * Enable IRQs
- */
-#define local_irq_enable()                                      \
-        ({                                                      \
-                unsigned long temp;                             \
-        __asm__ __volatile__(                                   \
-        "mrs    %0, cpsr                @ local_irq_enable\n"   \
-"       bic     %0, %0, #128\n"                                 \
-"       msr     cpsr_c, %0"                                     \
-        : "=r" (temp)                                           \
-        :                                                       \
-        : "memory", "cc");                                      \
-        })
-/*
- * Disable IRQs
- */
-#define local_irq_disable()                                     \
-        ({                                                      \
-                unsigned long temp;                             \
-        __asm__ __volatile__(                                   \
-        "mrs    %0, cpsr                @ local_irq_disable\n"  \
-"       orr     %0, %0, #128\n"                                 \
-"       msr     cpsr_c, %0"                                     \
-        : "=r" (temp)                                           \
-        :                                                       \
-        : "memory", "cc");                                      \
-        })
-/*
- * Enable FIQs
- */
-#define local_fiq_enable()                                      \
-        ({                                                      \
-                unsigned long temp;                             \
-        __asm__ __volatile__(                                   \
-        "mrs    %0, cpsr                @ stf\n"                \
-"       bic     %0, %0, #64\n"                                  \
-"       msr     cpsr_c, %0"                                     \
-        : "=r" (temp)                                           \
-        :                                                       \
-        : "memory", "cc");                                      \
-        })
-/*
- * Disable FIQs
- */
-#define local_fiq_disable()                                     \
-        ({                                                      \
-                unsigned long temp;                             \
-        __asm__ __volatile__(                                   \
-        "mrs    %0, cpsr                @ clf\n"                \
-"       orr     %0, %0, #64\n"                                  \
-"       msr     cpsr_c, %0"                                     \
-        : "=r" (temp)                                           \
-        :                                                       \
-        : "memory", "cc");                                      \
-        })
-#endif
-/*
- * Save the current interrupt enable state.
- */
-#define local_save_flags(x)                                     \
-        ({                                                      \
-        __asm__ __volatile__(                                   \
-        "mrs    %0, cpsr                @ local_save_flags"     \
-        : "=r" (x) : : "memory", "cc");                         \
-        })
-/*
- * restore saved IRQ & FIQ state
- */
-#define local_irq_restore(x)                                    \
-        __asm__ __volatile__(                                   \
-        "msr    cpsr_c, %0              @ local_irq_restore\n"  \
-        :                                                       \
-        : "r" (x)                                               \
-        : "memory", "cc")
-#define irqs_disabled()                 \
-({                                      \
-        unsigned long flags;            \
-        local_save_flags(flags);        \
-        (int)(flags & PSR_I_BIT);       \
-})
 #ifdef CONFIG_SMP
@@ -405,17 +286,17 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
 #error SMP is not supported on this platform
 #endif
        case 1:
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                ret = *(volatile unsigned char *)ptr;
                *(volatile unsigned char *)ptr = x;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
                break;
        case 4:
-                local_irq_save(flags);
+                raw_local_irq_save(flags);
                ret = *(volatile unsigned long *)ptr;
                *(volatile unsigned long *)ptr = x;
-                local_irq_restore(flags);
+                raw_local_irq_restore(flags);
                break;
 #else
        case 1:
diff --git a/include/asm-arm/timeofday.h b/include/asm-arm/timeofday.h
new file mode 100644
index 000000000000..27254bd5b94f
--- /dev/null
+++ b/include/asm-arm/timeofday.h
@@ -0,0 +1,4 @@
+#ifndef _ASM_ARM_TIMEOFDAY_H
+#define _ASM_ARM_TIMEOFDAY_H
+#include <asm-generic/timeofday.h>
+#endif
diff --git a/include/asm-arm/tlbflush.h b/include/asm-arm/tlbflush.h
index d97fc76189a5..cd10a0b5f8ae 100644
--- a/include/asm-arm/tlbflush.h
+++ b/include/asm-arm/tlbflush.h
@@ -247,16 +247,16 @@ static inline void local_flush_tlb_all(void)
        const unsigned int __tlb_flag = __cpu_tlb_flags;
        if (tlb_flag(TLB_WB))
-                asm("mcr%? p15, 0, %0, c7, c10, 4" : : "r" (zero));
+                asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (zero) : "cc");
        if (tlb_flag(TLB_V3_FULL))
-                asm("mcr%? p15, 0, %0, c6, c0, 0" : : "r" (zero));
+                asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (zero) : "cc");
        if (tlb_flag(TLB_V4_U_FULL | TLB_V6_U_FULL))
-                asm("mcr%? p15, 0, %0, c8, c7, 0" : : "r" (zero));
+                asm("mcr p15, 0, %0, c8, c7, 0" : : "r" (zero) : "cc");
        if (tlb_flag(TLB_V4_D_FULL | TLB_V6_D_FULL))
-                asm("mcr%? p15, 0, %0, c8, c6, 0" : : "r" (zero));
+                asm("mcr p15, 0, %0, c8, c6, 0" : : "r" (zero) : "cc");
        if (tlb_flag(TLB_V4_I_FULL | TLB_V6_I_FULL))
-                asm("mcr%? p15, 0, %0, c8, c5, 0" : : "r" (zero));
+                asm("mcr p15, 0, %0, c8, c5, 0" : : "r" (zero) : "cc");
 }
 static inline void local_flush_tlb_mm(struct mm_struct *mm)
@@ -266,25 +266,25 @@ static inline void local_flush_tlb_mm(struct mm_struct *mm)
        const unsigned int __tlb_flag = __cpu_tlb_flags;
        if (tlb_flag(TLB_WB))
-                asm("mcr%? p15, 0, %0, c7, c10, 4" : : "r" (zero));
+                asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (zero) : "cc");
        if (cpu_isset(smp_processor_id(), mm->cpu_vm_mask)) {
                if (tlb_flag(TLB_V3_FULL))
-                        asm("mcr%? p15, 0, %0, c6, c0, 0" : : "r" (zero));
+                        asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (zero) : "cc");
                if (tlb_flag(TLB_V4_U_FULL))
-                        asm("mcr%? p15, 0, %0, c8, c7, 0" : : "r" (zero));
+                        asm("mcr p15, 0, %0, c8, c7, 0" : : "r" (zero) : "cc");
                if (tlb_flag(TLB_V4_D_FULL))
-                        asm("mcr%? p15, 0, %0, c8, c6, 0" : : "r" (zero));
+                        asm("mcr p15, 0, %0, c8, c6, 0" : : "r" (zero) : "cc");
                if (tlb_flag(TLB_V4_I_FULL))
-                        asm("mcr%? p15, 0, %0, c8, c5, 0" : : "r" (zero));
+                        asm("mcr p15, 0, %0, c8, c5, 0" : : "r" (zero) : "cc");
        }
        if (tlb_flag(TLB_V6_U_ASID))
-                asm("mcr%? p15, 0, %0, c8, c7, 2" : : "r" (asid));
+                asm("mcr p15, 0, %0, c8, c7, 2" : : "r" (asid) : "cc");
        if (tlb_flag(TLB_V6_D_ASID))
-                asm("mcr%? p15, 0, %0, c8, c6, 2" : : "r" (asid));
+                asm("mcr p15, 0, %0, c8, c6, 2" : : "r" (asid) : "cc");
        if (tlb_flag(TLB_V6_I_ASID))
-                asm("mcr%? p15, 0, %0, c8, c5, 2" : : "r" (asid));
+                asm("mcr p15, 0, %0, c8, c5, 2" : : "r" (asid) : "cc");
 }
 static inline void
@@ -296,27 +296,27 @@ local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
        uaddr = (uaddr & PAGE_MASK) | ASID(vma->vm_mm);
        if (tlb_flag(TLB_WB))
-                asm("mcr%? p15, 0, %0, c7, c10, 4" : : "r" (zero));
+                asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (zero));
        if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask)) {
                if (tlb_flag(TLB_V3_PAGE))
-                        asm("mcr%? p15, 0, %0, c6, c0, 0" : : "r" (uaddr));
+                        asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (uaddr) : "cc");
                if (tlb_flag(TLB_V4_U_PAGE))
-                        asm("mcr%? p15, 0, %0, c8, c7, 1" : : "r" (uaddr));
+                        asm("mcr p15, 0, %0, c8, c7, 1" : : "r" (uaddr) : "cc");
                if (tlb_flag(TLB_V4_D_PAGE))
-                        asm("mcr%? p15, 0, %0, c8, c6, 1" : : "r" (uaddr));
+                        asm("mcr p15, 0, %0, c8, c6, 1" : : "r" (uaddr) : "cc");
                if (tlb_flag(TLB_V4_I_PAGE))
-                        asm("mcr%? p15, 0, %0, c8, c5, 1" : : "r" (uaddr));
+                        asm("mcr p15, 0, %0, c8, c5, 1" : : "r" (uaddr) : "cc");
                if (!tlb_flag(TLB_V4_I_PAGE) && tlb_flag(TLB_V4_I_FULL))
-                        asm("mcr%? p15, 0, %0, c8, c5, 0" : : "r" (zero));
+                        asm("mcr p15, 0, %0, c8, c5, 0" : : "r" (zero) : "cc");
        }
        if (tlb_flag(TLB_V6_U_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c7, 1" : : "r" (uaddr));
+                asm("mcr p15, 0, %0, c8, c7, 1" : : "r" (uaddr) : "cc");
        if (tlb_flag(TLB_V6_D_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c6, 1" : : "r" (uaddr));
+                asm("mcr p15, 0, %0, c8, c6, 1" : : "r" (uaddr) : "cc");
        if (tlb_flag(TLB_V6_I_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c5, 1" : : "r" (uaddr));
+                asm("mcr p15, 0, %0, c8, c5, 1" : : "r" (uaddr) : "cc");
 }
 static inline void local_flush_tlb_kernel_page(unsigned long kaddr)
@@ -327,31 +327,31 @@ static inline void local_flush_tlb_kernel_page(unsigned long kaddr)
        kaddr &= PAGE_MASK;
        if (tlb_flag(TLB_WB))
-                asm("mcr%? p15, 0, %0, c7, c10, 4" : : "r" (zero));
+                asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (zero) : "cc");
        if (tlb_flag(TLB_V3_PAGE))
-                asm("mcr%? p15, 0, %0, c6, c0, 0" : : "r" (kaddr));
+                asm("mcr p15, 0, %0, c6, c0, 0" : : "r" (kaddr) : "cc");
        if (tlb_flag(TLB_V4_U_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c7, 1" : : "r" (kaddr));
+                asm("mcr p15, 0, %0, c8, c7, 1" : : "r" (kaddr) : "cc");
        if (tlb_flag(TLB_V4_D_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c6, 1" : : "r" (kaddr));
+                asm("mcr p15, 0, %0, c8, c6, 1" : : "r" (kaddr) : "cc");
        if (tlb_flag(TLB_V4_I_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c5, 1" : : "r" (kaddr));
+                asm("mcr p15, 0, %0, c8, c5, 1" : : "r" (kaddr) : "cc");
        if (!tlb_flag(TLB_V4_I_PAGE) && tlb_flag(TLB_V4_I_FULL))
-                asm("mcr%? p15, 0, %0, c8, c5, 0" : : "r" (zero));
+                asm("mcr p15, 0, %0, c8, c5, 0" : : "r" (zero) : "cc");
        if (tlb_flag(TLB_V6_U_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c7, 1" : : "r" (kaddr));
+                asm("mcr p15, 0, %0, c8, c7, 1" : : "r" (kaddr) : "cc");
        if (tlb_flag(TLB_V6_D_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c6, 1" : : "r" (kaddr));
+                asm("mcr p15, 0, %0, c8, c6, 1" : : "r" (kaddr) : "cc");
        if (tlb_flag(TLB_V6_I_PAGE))
-                asm("mcr%? p15, 0, %0, c8, c5, 1" : : "r" (kaddr));
+                asm("mcr p15, 0, %0, c8, c5, 1" : : "r" (kaddr) : "cc");
        /* The ARM ARM states that the completion of a TLB maintenance
         * operation is only guaranteed by a DSB instruction
         */
        if (tlb_flag(TLB_V6_U_PAGE | TLB_V6_D_PAGE | TLB_V6_I_PAGE))
-                asm("mcr%? p15, 0, %0, c7, c10, 4" : : "r" (zero));
+                asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (zero) : "cc");
 }
 /*
@@ -373,11 +373,11 @@ static inline void flush_pmd_entry(pmd_t *pmd)
        const unsigned int __tlb_flag = __cpu_tlb_flags;
        if (tlb_flag(TLB_DCLEAN))
-                asm("mcr%?      p15, 0, %0, c7, c10, 1  @ flush_pmd"
+                asm("mcr        p15, 0, %0, c7, c10, 1  @ flush_pmd"
-                        : : "r" (pmd));
+                        : : "r" (pmd) : "cc");
        if (tlb_flag(TLB_WB))
-                asm("mcr%?      p15, 0, %0, c7, c10, 4  @ flush_pmd"
+                asm("mcr        p15, 0, %0, c7, c10, 4  @ flush_pmd"
-                        : : "r" (zero));
+                        : : "r" (zero) : "cc");
 }
 static inline void clean_pmd_entry(pmd_t *pmd)
@@ -385,8 +385,8 @@ static inline void clean_pmd_entry(pmd_t *pmd)
        const unsigned int __tlb_flag = __cpu_tlb_flags;
        if (tlb_flag(TLB_DCLEAN))
-                asm("mcr%?      p15, 0, %0, c7, c10, 1  @ flush_pmd"
+                asm("mcr        p15, 0, %0, c7, c10, 1  @ flush_pmd"
-                        : : "r" (pmd));
+                        : : "r" (pmd) : "cc");
 }
 #undef tlb_flag
diff --git a/include/asm-arm/unaligned.h b/include/asm-arm/unaligned.h
index 1b39c2f322c9..795b9e5b9e6a 100644
--- a/include/asm-arm/unaligned.h
+++ b/include/asm-arm/unaligned.h
@@ -3,7 +3,7 @@
 #include <asm/types.h>
-extern int __bug_unaligned_x(void *ptr);
+extern int __bug_unaligned_x(const void *ptr);
 /*
 * What is the most efficient way of loading/storing an unaligned value?
@@ -51,44 +51,32 @@ extern int __bug_unaligned_x(void *ptr);
 #define __get_unaligned_4_be(__p)                                       \
        (__p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3])
-#define __get_unaligned_le(ptr)                                 \
+#define __get_unaligned_8_le(__p)                                       \
-        ({                                                      \
+        ((unsigned long long)__get_unaligned_4_le((__p+4)) << 32 |      \
-                __typeof__(*(ptr)) __v;                         \
+                __get_unaligned_4_le(__p))
-                __u8 *__p = (__u8 *)(ptr);                      \
-                switch (sizeof(*(ptr))) {                       \
+#define __get_unaligned_8_be(__p)                                       \
-                case 1: __v = *(ptr);                   break;  \
+        ((unsigned long long)__get_unaligned_4_be(__p) << 32 |          \
-                case 2: __v = __get_unaligned_2_le(__p);        break;  \
+                __get_unaligned_4_be((__p+4)))
-                case 4: __v = __get_unaligned_4_le(__p);        break;  \
-                case 8: {                                       \
+#define __get_unaligned_le(ptr)                                         \
-                                unsigned int __v1, __v2;        \
+        ({                                                              \
-                                __v2 = __get_unaligned_4_le((__p+4)); \
+                const __u8 *__p = (const __u8 *)(ptr);                  \
-                                __v1 = __get_unaligned_4_le(__p);       \
+                __builtin_choose_expr(sizeof(*(ptr)) == 1, *__p,        \
-                                __v = ((unsigned long long)__v2 << 32 | __v1);  \
+                  __builtin_choose_expr(sizeof(*(ptr)) == 2, __get_unaligned_2_le(__p), \
-                        }                                       \
+                  __builtin_choose_expr(sizeof(*(ptr)) == 4, __get_unaligned_4_le(__p), \
-                        break;                                  \
+                  __builtin_choose_expr(sizeof(*(ptr)) == 8, __get_unaligned_8_le(__p), \
-                default: __v = __bug_unaligned_x(__p);  break;  \
+                    (void)__bug_unaligned_x(__p)))));                   \
-                }                                               \
-                __v;                                            \
        })
-#define __get_unaligned_be(ptr)                                 \
+#define __get_unaligned_be(ptr)                                         \
-        ({                                                      \
+        ({                                                              \
-                __typeof__(*(ptr)) __v;                         \
+                const __u8 *__p = (const __u8 *)(ptr);                  \
-                __u8 *__p = (__u8 *)(ptr);                      \
+                __builtin_choose_expr(sizeof(*(ptr)) == 1, *__p,        \
-                switch (sizeof(*(ptr))) {                       \
+                  __builtin_choose_expr(sizeof(*(ptr)) == 2, __get_unaligned_2_be(__p), \
-                case 1: __v = *(ptr);                   break;  \
+                  __builtin_choose_expr(sizeof(*(ptr)) == 4, __get_unaligned_4_be(__p), \
-                case 2: __v = __get_unaligned_2_be(__p);        break;  \
+                  __builtin_choose_expr(sizeof(*(ptr)) == 8, __get_unaligned_8_be(__p), \
-                case 4: __v = __get_unaligned_4_be(__p);        break;  \
+                    (void)__bug_unaligned_x(__p)))));                   \
-                case 8: {                                       \
-                                unsigned int __v1, __v2;        \
-                                __v2 = __get_unaligned_4_be(__p); \
-                                __v1 = __get_unaligned_4_be((__p+4));   \
-                                __v = ((unsigned long long)__v2 << 32 | __v1);  \
-                        }                                       \
-                        break;                                  \
-                default: __v = __bug_unaligned_x(__p);  break;  \
-                }                                               \
-                __v;                                            \
        })
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index 1e891f860ef3..2ab4078334bf 100644
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -377,6 +377,7 @@
 #endif
 #ifdef __KERNEL__
+#include <linux/err.h>
 #include <linux/linkage.h>
 #define __sys2(x) #x
@@ -396,7 +397,7 @@
 #define __syscall_return(type, res)                                     \
 do {                                                                    \
-        if ((unsigned long)(res) >= (unsigned long)(-129)) {            \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) {      \
                errno = -(res);                                         \
                res = -1;                                               \
        }                                                               \
diff --git a/include/asm-arm26/pgtable.h b/include/asm-arm26/pgtable.h
index 19ac9101a6bb..63a8881fae13 100644
--- a/include/asm-arm26/pgtable.h
+++ b/include/asm-arm26/pgtable.h
@@ -186,12 +186,12 @@ extern struct page *empty_zero_page;
 * return a pointer to memory (no special alignment)
 */
 #define pmd_page(pmd)  ((struct page *)(pmd_val((pmd)) & ~_PMD_PRESENT))
-#define pmd_page_kernel(pmd) ((pte_t *)(pmd_val((pmd)) & ~_PMD_PRESENT))
+#define pmd_page_vaddr(pmd) ((pte_t *)(pmd_val((pmd)) & ~_PMD_PRESENT))
-#define pte_offset_kernel(dir,addr)     (pmd_page_kernel(*(dir)) + __pte_index(addr))
+#define pte_offset_kernel(dir,addr)     (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-#define pte_offset_map(dir,addr)        (pmd_page_kernel(*(dir)) + __pte_index(addr))
+#define pte_offset_map(dir,addr)        (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-#define pte_offset_map_nested(dir,addr) (pmd_page_kernel(*(dir)) + __pte_index(addr))
+#define pte_offset_map_nested(dir,addr) (pmd_page_vaddr(*(dir)) + __pte_index(addr))
 #define pte_unmap(pte)                  do { } while (0)
 #define pte_unmap_nested(pte)           do { } while (0)
diff --git a/include/asm-arm26/unistd.h b/include/asm-arm26/unistd.h
index 70eb6d91cfd0..c6d2436c9d34 100644
--- a/include/asm-arm26/unistd.h
+++ b/include/asm-arm26/unistd.h
@@ -311,6 +311,7 @@
 #define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
 #ifdef __KERNEL__
+#include <linux/err.h>
 #include <linux/linkage.h>
 #define __sys2(x) #x
@@ -322,7 +323,7 @@
 #define __syscall_return(type, res)                                     \
 do {                                                                    \
-        if ((unsigned long)(res) >= (unsigned long)(-125)) {            \
+        if ((unsigned long)(res) >= (unsigned long)-MAX_ERRNO) {        \
                errno = -(res);                                         \
                res = -1;                                               \
        }                                                               \
diff --git a/include/asm-arm26/Kbuild b/include/asm-avr32/Kbuild
index c68e1680da01..8770e73ce938 100644
--- a/include/asm-arm26/Kbuild
+++ b/include/asm-avr32/Kbuild
@@ -1 +1,3 @@
 include include/asm-generic/Kbuild.asm
+headers-y       += cachectl.h
diff --git a/include/asm-avr32/a.out.h b/include/asm-avr32/a.out.h
new file mode 100644
index 000000000000..50bf6e31a143
--- /dev/null
+++ b/include/asm-avr32/a.out.h
@@ -0,0 +1,26 @@
+#ifndef __ASM_AVR32_A_OUT_H
+#define __ASM_AVR32_A_OUT_H
+struct exec
+{
+  unsigned long a_info;         /* Use macros N_MAGIC, etc for access */
+  unsigned a_text;              /* length of text, in bytes */
+  unsigned a_data;              /* length of data, in bytes */
+  unsigned a_bss;               /* length of uninitialized data area for file, in bytes */
+  unsigned a_syms;              /* length of symbol table data in file, in bytes */
+  unsigned a_entry;             /* start address */
+  unsigned a_trsize;            /* length of relocation info for text, in bytes */
+  unsigned a_drsize;            /* length of relocation info for data, in bytes */
+};
+#define N_TRSIZE(a)     ((a).a_trsize)
+#define N_DRSIZE(a)     ((a).a_drsize)
+#define N_SYMSIZE(a)    ((a).a_syms)
+#ifdef __KERNEL__
+#define STACK_TOP       TASK_SIZE
+#endif
+#endif /* __ASM_AVR32_A_OUT_H */
diff --git a/include/asm-avr32/addrspace.h b/include/asm-avr32/addrspace.h
new file mode 100644
index 000000000000..366794858ec7
--- /dev/null
+++ b/include/asm-avr32/addrspace.h
@@ -0,0 +1,43 @@
+/*
+ * Defitions for the address spaces of the AVR32 CPUs. Heavily based on
+ * include/asm-sh/addrspace.h
+ *
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_ADDRSPACE_H
+#define __ASM_AVR32_ADDRSPACE_H
+#ifdef CONFIG_MMU
+/* Memory segments when segmentation is enabled */
+#define P0SEG           0x00000000
+#define P1SEG           0x80000000
+#define P2SEG           0xa0000000
+#define P3SEG           0xc0000000
+#define P4SEG           0xe0000000
+/* Returns the privileged segment base of a given address */
+#define PXSEG(a)        (((unsigned long)(a)) & 0xe0000000)
+/* Returns the physical address of a PnSEG (n=1,2) address */
+#define PHYSADDR(a)     (((unsigned long)(a)) & 0x1fffffff)
+/*
+ * Map an address to a certain privileged segment
+ */
+#define P1SEGADDR(a) ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) \
+                                      | P1SEG))
+#define P2SEGADDR(a) ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) \
+                                      | P2SEG))
+#define P3SEGADDR(a) ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) \
+                                      | P3SEG))
+#define P4SEGADDR(a) ((__typeof__(a))(((unsigned long)(a) & 0x1fffffff) \
+                                      | P4SEG))
+#endif /* CONFIG_MMU */
+#endif /* __ASM_AVR32_ADDRSPACE_H */
diff --git a/include/asm-avr32/arch-at32ap/at91rm9200_pdc.h b/include/asm-avr32/arch-at32ap/at91rm9200_pdc.h
new file mode 100644
index 000000000000..ce1150d4438d
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/at91rm9200_pdc.h
@@ -0,0 +1,36 @@
+/*
+ * include/asm-arm/arch-at91rm9200/at91rm9200_pdc.h
+ *
+ * Copyright (C) 2005 Ivan Kokshaysky
+ * Copyright (C) SAN People
+ *
+ * Peripheral Data Controller (PDC) registers.
+ * Based on AT91RM9200 datasheet revision E.
+ *
+ * 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.
+ */
+#ifndef AT91RM9200_PDC_H
+#define AT91RM9200_PDC_H
+#define AT91_PDC_RPR            0x100   /* Receive Pointer Register */
+#define AT91_PDC_RCR            0x104   /* Receive Counter Register */
+#define AT91_PDC_TPR            0x108   /* Transmit Pointer Register */
+#define AT91_PDC_TCR            0x10c   /* Transmit Counter Register */
+#define AT91_PDC_RNPR           0x110   /* Receive Next Pointer Register */
+#define AT91_PDC_RNCR           0x114   /* Receive Next Counter Register */
+#define AT91_PDC_TNPR           0x118   /* Transmit Next Pointer Register */
+#define AT91_PDC_TNCR           0x11c   /* Transmit Next Counter Register */
+#define AT91_PDC_PTCR           0x120   /* Transfer Control Register */
+#define         AT91_PDC_RXTEN          (1 << 0)        /* Receiver Transfer Enable */
+#define         AT91_PDC_RXTDIS         (1 << 1)        /* Receiver Transfer Disable */
+#define         AT91_PDC_TXTEN          (1 << 8)        /* Transmitter Transfer Enable */
+#define         AT91_PDC_TXTDIS         (1 << 9)        /* Transmitter Transfer Disable */
+#define AT91_PDC_PTSR           0x124   /* Transfer Status Register */
+#endif
diff --git a/include/asm-avr32/arch-at32ap/at91rm9200_usart.h b/include/asm-avr32/arch-at32ap/at91rm9200_usart.h
new file mode 100644
index 000000000000..79f851e31b9c
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/at91rm9200_usart.h
@@ -0,0 +1,123 @@
+/*
+ * include/asm-arm/arch-at91rm9200/at91rm9200_usart.h
+ *
+ * Copyright (C) 2005 Ivan Kokshaysky
+ * Copyright (C) SAN People
+ *
+ * USART registers.
+ * Based on AT91RM9200 datasheet revision E.
+ *
+ * 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.
+ */
+#ifndef AT91RM9200_USART_H
+#define AT91RM9200_USART_H
+#define AT91_US_CR              0x00                    /* Control Register */
+#define         AT91_US_RSTRX           (1 <<  2)               /* Reset Receiver */
+#define         AT91_US_RSTTX           (1 <<  3)               /* Reset Transmitter */
+#define         AT91_US_RXEN            (1 <<  4)               /* Receiver Enable */
+#define         AT91_US_RXDIS           (1 <<  5)               /* Receiver Disable */
+#define         AT91_US_TXEN            (1 <<  6)               /* Transmitter Enable */
+#define         AT91_US_TXDIS           (1 <<  7)               /* Transmitter Disable */
+#define         AT91_US_RSTSTA          (1 <<  8)               /* Reset Status Bits */
+#define         AT91_US_STTBRK          (1 <<  9)               /* Start Break */
+#define         AT91_US_STPBRK          (1 << 10)               /* Stop Break */
+#define         AT91_US_STTTO           (1 << 11)               /* Start Time-out */
+#define         AT91_US_SENDA           (1 << 12)               /* Send Address */
+#define         AT91_US_RSTIT           (1 << 13)               /* Reset Iterations */
+#define         AT91_US_RSTNACK         (1 << 14)               /* Reset Non Acknowledge */
+#define         AT91_US_RETTO           (1 << 15)               /* Rearm Time-out */
+#define         AT91_US_DTREN           (1 << 16)               /* Data Terminal Ready Enable */
+#define         AT91_US_DTRDIS          (1 << 17)               /* Data Terminal Ready Disable */
+#define         AT91_US_RTSEN           (1 << 18)               /* Request To Send Enable */
+#define         AT91_US_RTSDIS          (1 << 19)               /* Request To Send Disable */
+#define AT91_US_MR              0x04                    /* Mode Register */
+#define         AT91_US_USMODE          (0xf <<  0)             /* Mode of the USART */
+#define                 AT91_US_USMODE_NORMAL           0
+#define                 AT91_US_USMODE_RS485            1
+#define                 AT91_US_USMODE_HWHS             2
+#define                 AT91_US_USMODE_MODEM            3
+#define                 AT91_US_USMODE_ISO7816_T0       4
+#define                 AT91_US_USMODE_ISO7816_T1       6
+#define                 AT91_US_USMODE_IRDA             8
+#define         AT91_US_USCLKS          (3   <<  4)             /* Clock Selection */
+#define         AT91_US_CHRL            (3   <<  6)             /* Character Length */
+#define                 AT91_US_CHRL_5                  (0 <<  6)
+#define                 AT91_US_CHRL_6                  (1 <<  6)
+#define                 AT91_US_CHRL_7                  (2 <<  6)
+#define                 AT91_US_CHRL_8                  (3 <<  6)
+#define         AT91_US_SYNC            (1 <<  8)               /* Synchronous Mode Select */
+#define         AT91_US_PAR             (7 <<  9)               /* Parity Type */
+#define                 AT91_US_PAR_EVEN                (0 <<  9)
+#define                 AT91_US_PAR_ODD                 (1 <<  9)
+#define                 AT91_US_PAR_SPACE               (2 <<  9)
+#define                 AT91_US_PAR_MARK                (3 <<  9)
+#define                 AT91_US_PAR_NONE                (4 <<  9)
+#define                 AT91_US_PAR_MULTI_DROP          (6 <<  9)
+#define         AT91_US_NBSTOP          (3 << 12)               /* Number of Stop Bits */
+#define                 AT91_US_NBSTOP_1                (0 << 12)
+#define                 AT91_US_NBSTOP_1_5              (1 << 12)
+#define                 AT91_US_NBSTOP_2                (2 << 12)
+#define         AT91_US_CHMODE          (3 << 14)               /* Channel Mode */
+#define                 AT91_US_CHMODE_NORMAL           (0 << 14)
+#define                 AT91_US_CHMODE_ECHO             (1 << 14)
+#define                 AT91_US_CHMODE_LOC_LOOP         (2 << 14)
+#define                 AT91_US_CHMODE_REM_LOOP         (3 << 14)
+#define         AT91_US_MSBF            (1 << 16)               /* Bit Order */
+#define         AT91_US_MODE9           (1 << 17)               /* 9-bit Character Length */
+#define         AT91_US_CLKO            (1 << 18)               /* Clock Output Select */
+#define         AT91_US_OVER            (1 << 19)               /* Oversampling Mode */
+#define         AT91_US_INACK           (1 << 20)               /* Inhibit Non Acknowledge */
+#define         AT91_US_DSNACK          (1 << 21)               /* Disable Successive NACK */
+#define         AT91_US_MAX_ITER        (7 << 24)               /* Max Iterations */
+#define         AT91_US_FILTER          (1 << 28)               /* Infrared Receive Line Filter */
+#define AT91_US_IER             0x08                    /* Interrupt Enable Register */
+#define         AT91_US_RXRDY           (1 <<  0)               /* Receiver Ready */
+#define         AT91_US_TXRDY           (1 <<  1)               /* Transmitter Ready */
+#define         AT91_US_RXBRK           (1 <<  2)               /* Break Received / End of Break */
+#define         AT91_US_ENDRX           (1 <<  3)               /* End of Receiver Transfer */
+#define         AT91_US_ENDTX           (1 <<  4)               /* End of Transmitter Transfer */
+#define         AT91_US_OVRE            (1 <<  5)               /* Overrun Error */
+#define         AT91_US_FRAME           (1 <<  6)               /* Framing Error */
+#define         AT91_US_PARE            (1 <<  7)               /* Parity Error */
+#define         AT91_US_TIMEOUT         (1 <<  8)               /* Receiver Time-out */
+#define         AT91_US_TXEMPTY         (1 <<  9)               /* Transmitter Empty */
+#define         AT91_US_ITERATION       (1 << 10)               /* Max number of Repetitions Reached */
+#define         AT91_US_TXBUFE          (1 << 11)               /* Transmission Buffer Empty */
+#define         AT91_US_RXBUFF          (1 << 12)               /* Reception Buffer Full */
+#define         AT91_US_NACK            (1 << 13)               /* Non Acknowledge */
+#define         AT91_US_RIIC            (1 << 16)               /* Ring Indicator Input Change */
+#define         AT91_US_DSRIC           (1 << 17)               /* Data Set Ready Input Change */
+#define         AT91_US_DCDIC           (1 << 18)               /* Data Carrier Detect Input Change */
+#define         AT91_US_CTSIC           (1 << 19)               /* Clear to Send Input Change */
+#define         AT91_US_RI              (1 << 20)               /* RI */
+#define         AT91_US_DSR             (1 << 21)               /* DSR */
+#define         AT91_US_DCD             (1 << 22)               /* DCD */
+#define         AT91_US_CTS             (1 << 23)               /* CTS */
+#define AT91_US_IDR             0x0c                    /* Interrupt Disable Register */
+#define AT91_US_IMR             0x10                    /* Interrupt Mask Register */
+#define AT91_US_CSR             0x14                    /* Channel Status Register */
+#define AT91_US_RHR             0x18                    /* Receiver Holding Register */
+#define AT91_US_THR             0x1c                    /* Transmitter Holding Register */
+#define AT91_US_BRGR            0x20                    /* Baud Rate Generator Register */
+#define         AT91_US_CD              (0xffff << 0)           /* Clock Divider */
+#define AT91_US_RTOR            0x24                    /* Receiver Time-out Register */
+#define         AT91_US_TO              (0xffff << 0)           /* Time-out Value */
+#define AT91_US_TTGR            0x28                    /* Transmitter Timeguard Register */
+#define         AT91_US_TG              (0xff << 0)             /* Timeguard Value */
+#define AT91_US_FIDI            0x40                    /* FI DI Ratio Register */
+#define AT91_US_NER             0x44                    /* Number of Errors Register */
+#define AT91_US_IF              0x4c                    /* IrDA Filter Register */
+#endif
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h
new file mode 100644
index 000000000000..39368e18ab20
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/board.h
@@ -0,0 +1,35 @@
+/*
+ * Platform data definitions.
+ */
+#ifndef __ASM_ARCH_BOARD_H
+#define __ASM_ARCH_BOARD_H
+#include <linux/types.h>
+/* Add basic devices: system manager, interrupt controller, portmuxes, etc. */
+void at32_add_system_devices(void);
+#define AT91_NR_UART    4
+extern struct platform_device *at91_default_console_device;
+struct platform_device *at32_add_device_usart(unsigned int id);
+struct eth_platform_data {
+        u8      valid;
+        u8      mii_phy_addr;
+        u8      is_rmii;
+        u8      hw_addr[6];
+};
+struct platform_device *
+at32_add_device_eth(unsigned int id, struct eth_platform_data *data);
+struct platform_device *at32_add_device_spi(unsigned int id);
+struct lcdc_platform_data {
+        unsigned long fbmem_start;
+        unsigned long fbmem_size;
+};
+struct platform_device *
+at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data);
+#endif /* __ASM_ARCH_BOARD_H */
diff --git a/include/asm-avr32/arch-at32ap/init.h b/include/asm-avr32/arch-at32ap/init.h
new file mode 100644
index 000000000000..43722634e069
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/init.h
@@ -0,0 +1,21 @@
+/*
+ * AT32AP platform initialization calls.
+ *
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * 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_AVR32_AT32AP_INIT_H__
+#define __ASM_AVR32_AT32AP_INIT_H__
+void setup_platform(void);
+/* Called by setup_platform */
+void at32_clock_init(void);
+void at32_portmux_init(void);
+void at32_setup_serial_console(unsigned int usart_id);
+#endif /* __ASM_AVR32_AT32AP_INIT_H__ */
diff --git a/include/asm-avr32/arch-at32ap/portmux.h b/include/asm-avr32/arch-at32ap/portmux.h
new file mode 100644
index 000000000000..4d50421262a1
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/portmux.h
@@ -0,0 +1,16 @@
+/*
+ * AT32 portmux interface.
+ *
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * 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_AVR32_AT32_PORTMUX_H__
+#define __ASM_AVR32_AT32_PORTMUX_H__
+void portmux_set_func(unsigned int portmux_id, unsigned int pin_id,
+                      unsigned int function_id);
+#endif /* __ASM_AVR32_AT32_PORTMUX_H__ */
diff --git a/include/asm-avr32/arch-at32ap/sm.h b/include/asm-avr32/arch-at32ap/sm.h
new file mode 100644
index 000000000000..265a9ead20bf
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/sm.h
@@ -0,0 +1,27 @@
+/*
+ * AT32 System Manager interface.
+ *
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * 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_AVR32_AT32_SM_H__
+#define __ASM_AVR32_AT32_SM_H__
+struct irq_chip;
+struct platform_device;
+struct at32_sm {
+        spinlock_t lock;
+        void __iomem *regs;
+        struct irq_chip *eim_chip;
+        unsigned int eim_first_irq;
+        struct platform_device *pdev;
+};
+extern struct platform_device at32_sm_device;
+extern struct at32_sm system_manager;
+#endif /* __ASM_AVR32_AT32_SM_H__ */
diff --git a/include/asm-avr32/arch-at32ap/smc.h b/include/asm-avr32/arch-at32ap/smc.h
new file mode 100644
index 000000000000..3732b328303d
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/smc.h
@@ -0,0 +1,60 @@
+/*
+ * Static Memory Controller for AT32 chips
+ *
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * Inspired by the OMAP2 General-Purpose Memory Controller interface
+ *
+ * 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 __ARCH_AT32AP_SMC_H
+#define __ARCH_AT32AP_SMC_H
+/*
+ * All timing parameters are in nanoseconds.
+ */
+struct smc_config {
+        /* Delay from address valid to assertion of given strobe */
+        u16             ncs_read_setup;
+        u16             nrd_setup;
+        u16             ncs_write_setup;
+        u16             nwe_setup;
+        /* Pulse length of given strobe */
+        u16             ncs_read_pulse;
+        u16             nrd_pulse;
+        u16             ncs_write_pulse;
+        u16             nwe_pulse;
+        /* Total cycle length of given operation */
+        u16             read_cycle;
+        u16             write_cycle;
+        /* Bus width in bytes */
+        u8              bus_width;
+        /*
+         * 0: Data is sampled on rising edge of NCS
+         * 1: Data is sampled on rising edge of NRD
+         */
+        unsigned int    nrd_controlled:1;
+        /*
+         * 0: Data is driven on falling edge of NCS
+         * 1: Data is driven on falling edge of NWR
+         */
+        unsigned int    nwe_controlled:1;
+        /*
+         * 0: Byte select access type
+         * 1: Byte write access type
+         */
+        unsigned int    byte_write:1;
+};
+extern int smc_set_configuration(int cs, const struct smc_config *config);
+extern struct smc_config *smc_get_configuration(int cs);
+#endif /* __ARCH_AT32AP_SMC_H */
diff --git a/include/asm-avr32/asm.h b/include/asm-avr32/asm.h
new file mode 100644
index 000000000000..515c7618952b
--- /dev/null
+++ b/include/asm-avr32/asm.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_ASM_H__
+#define __ASM_AVR32_ASM_H__
+#include <asm/sysreg.h>
+#include <asm/asm-offsets.h>
+#include <asm/thread_info.h>
+#define mask_interrupts         ssrf    SR_GM_BIT
+#define mask_exceptions         ssrf    SR_EM_BIT
+#define unmask_interrupts       csrf    SR_GM_BIT
+#define unmask_exceptions       csrf    SR_EM_BIT
+#ifdef CONFIG_FRAME_POINTER
+        .macro  save_fp
+        st.w    --sp, r7
+        .endm
+        .macro  restore_fp
+        ld.w    r7, sp++
+        .endm
+        .macro  zero_fp
+        mov     r7, 0
+        .endm
+#else
+        .macro  save_fp
+        .endm
+        .macro  restore_fp
+        .endm
+        .macro  zero_fp
+        .endm
+#endif
+        .macro  get_thread_info reg
+        mov     \reg, sp
+        andl    \reg, ~(THREAD_SIZE - 1) & 0xffff
+        .endm
+        /* Save and restore registers */
+        .macro  save_min sr, tmp=lr
+        pushm   lr
+        mfsr    \tmp, \sr
+        zero_fp
+        st.w    --sp, \tmp
+        .endm
+        .macro  restore_min sr, tmp=lr
+        ld.w    \tmp, sp++
+        mtsr    \sr, \tmp
+        popm    lr
+        .endm
+        .macro  save_half sr, tmp=lr
+        save_fp
+        pushm   r8-r9,r10,r11,r12,lr
+        zero_fp
+        mfsr    \tmp, \sr
+        st.w    --sp, \tmp
+        .endm
+        .macro  restore_half sr, tmp=lr
+        ld.w    \tmp, sp++
+        mtsr    \sr, \tmp
+        popm    r8-r9,r10,r11,r12,lr
+        restore_fp
+        .endm
+        .macro  save_full_user sr, tmp=lr
+        stmts   --sp, r0,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11,r12,sp,lr
+        st.w    --sp, lr
+        zero_fp
+        mfsr    \tmp, \sr
+        st.w    --sp, \tmp
+        .endm
+        .macro  restore_full_user sr, tmp=lr
+        ld.w    \tmp, sp++
+        mtsr    \sr, \tmp
+        ld.w    lr, sp++
+        ldmts   sp++, r0,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11,r12,sp,lr
+        .endm
+        /* uaccess macros */
+        .macro branch_if_kernel scratch, label
+        get_thread_info \scratch
+        ld.w    \scratch, \scratch[TI_flags]
+        bld     \scratch, TIF_USERSPACE
+        brcc    \label
+        .endm
+        .macro ret_if_privileged scratch, addr, size, ret
+        sub     \scratch, \size, 1
+        add     \scratch, \addr
+        retcs   \ret
+        retmi   \ret
+        .endm
+#endif /* __ASM_AVR32_ASM_H__ */
diff --git a/include/asm-avr32/atomic.h b/include/asm-avr32/atomic.h
new file mode 100644
index 000000000000..e0b9c44c126c
--- /dev/null
+++ b/include/asm-avr32/atomic.h
@@ -0,0 +1,201 @@
+/*
+ * Atomic operations that C can't guarantee us.  Useful for
+ * resource counting etc.
+ *
+ * But use these as seldom as possible since they are slower than
+ * regular operations.
+ *
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_ATOMIC_H
+#define __ASM_AVR32_ATOMIC_H
+#include <asm/system.h>
+typedef struct { volatile int counter; } atomic_t;
+#define ATOMIC_INIT(i)  { (i) }
+#define atomic_read(v)          ((v)->counter)
+#define atomic_set(v, i)        (((v)->counter) = i)
+/*
+ * atomic_sub_return - subtract the atomic variable
+ * @i: integer value to subtract
+ * @v: pointer of type atomic_t
+ *
+ * Atomically subtracts @i from @v. Returns the resulting value.
+ */
+static inline int atomic_sub_return(int i, atomic_t *v)
+{
+        int result;
+        asm volatile(
+                "/* atomic_sub_return */\n"
+                "1:     ssrf    5\n"
+                "       ld.w    %0, %2\n"
+                "       sub     %0, %3\n"
+                "       stcond  %1, %0\n"
+                "       brne    1b"
+                : "=&r"(result), "=o"(v->counter)
+                : "m"(v->counter), "ir"(i)
+                : "cc");
+        return result;
+}
+/*
+ * atomic_add_return - add integer to atomic variable
+ * @i: integer value to add
+ * @v: pointer of type atomic_t
+ *
+ * Atomically adds @i to @v. Returns the resulting value.
+ */
+static inline int atomic_add_return(int i, atomic_t *v)
+{
+        int result;
+        if (__builtin_constant_p(i))
+                result = atomic_sub_return(-i, v);
+        else
+                asm volatile(
+                        "/* atomic_add_return */\n"
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %1\n"
+                        "       add     %0, %3\n"
+                        "       stcond  %2, %0\n"
+                        "       brne    1b"
+                        : "=&r"(result), "=o"(v->counter)
+                        : "m"(v->counter), "r"(i)
+                        : "cc", "memory");
+        return result;
+}
+/*
+ * atomic_sub_unless - sub unless the number is a given value
+ * @v: pointer of type atomic_t
+ * @a: the amount to add to v...
+ * @u: ...unless v is equal to u.
+ *
+ * If the atomic value v is not equal to u, this function subtracts a
+ * from v, and returns non zero. If v is equal to u then it returns
+ * zero. This is done as an atomic operation.
+*/
+static inline int atomic_sub_unless(atomic_t *v, int a, int u)
+{
+        int tmp, result = 0;
+        asm volatile(
+                "/* atomic_sub_unless */\n"
+                "1:     ssrf    5\n"
+                "       ld.w    %0, %3\n"
+                "       cp.w    %0, %5\n"
+                "       breq    1f\n"
+                "       sub     %0, %4\n"
+                "       stcond  %2, %0\n"
+                "       brne    1b\n"
+                "       mov     %1, 1\n"
+                "1:"
+                : "=&r"(tmp), "=&r"(result), "=o"(v->counter)
+                : "m"(v->counter), "ir"(a), "ir"(u)
+                : "cc", "memory");
+        return result;
+}
+/*
+ * atomic_add_unless - add unless the number is a given value
+ * @v: pointer of type atomic_t
+ * @a: the amount to add to v...
+ * @u: ...unless v is equal to u.
+ *
+ * If the atomic value v is not equal to u, this function adds a to v,
+ * and returns non zero. If v is equal to u then it returns zero. This
+ * is done as an atomic operation.
+*/
+static inline int atomic_add_unless(atomic_t *v, int a, int u)
+{
+        int tmp, result;
+        if (__builtin_constant_p(a))
+                result = atomic_sub_unless(v, -a, u);
+        else {
+                result = 0;
+                asm volatile(
+                        "/* atomic_add_unless */\n"
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %3\n"
+                        "       cp.w    %0, %5\n"
+                        "       breq    1f\n"
+                        "       add     %0, %4\n"
+                        "       stcond  %2, %0\n"
+                        "       brne    1b\n"
+                        "       mov     %1, 1\n"
+                        "1:"
+                        : "=&r"(tmp), "=&r"(result), "=o"(v->counter)
+                        : "m"(v->counter), "r"(a), "ir"(u)
+                        : "cc", "memory");
+        }
+        return result;
+}
+/*
+ * atomic_sub_if_positive - conditionally subtract integer from atomic variable
+ * @i: integer value to subtract
+ * @v: pointer of type atomic_t
+ *
+ * Atomically test @v and subtract @i if @v is greater or equal than @i.
+ * The function returns the old value of @v minus @i.
+ */
+static inline int atomic_sub_if_positive(int i, atomic_t *v)
+{
+        int result;
+        asm volatile(
+                "/* atomic_sub_if_positive */\n"
+                "1:     ssrf    5\n"
+                "       ld.w    %0, %2\n"
+                "       sub     %0, %3\n"
+                "       brlt    1f\n"
+                "       stcond  %1, %0\n"
+                "       brne    1b\n"
+                "1:"
+                : "=&r"(result), "=o"(v->counter)
+                : "m"(v->counter), "ir"(i)
+                : "cc", "memory");
+        return result;
+}
+#define atomic_xchg(v, new)     (xchg(&((v)->counter), new))
+#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))
+#define atomic_sub(i, v)        (void)atomic_sub_return(i, v)
+#define atomic_add(i, v)        (void)atomic_add_return(i, v)
+#define atomic_dec(v)           atomic_sub(1, (v))
+#define atomic_inc(v)           atomic_add(1, (v))
+#define atomic_dec_return(v)    atomic_sub_return(1, v)
+#define atomic_inc_return(v)    atomic_add_return(1, v)
+#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
+#define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
+#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
+#define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
+#define atomic_inc_not_zero(v)  atomic_add_unless(v, 1, 0)
+#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)
+#define smp_mb__before_atomic_dec()     barrier()
+#define smp_mb__after_atomic_dec()      barrier()
+#define smp_mb__before_atomic_inc()     barrier()
+#define smp_mb__after_atomic_inc()      barrier()
+#include <asm-generic/atomic.h>
+#endif /*  __ASM_AVR32_ATOMIC_H */
diff --git a/include/asm-avr32/auxvec.h b/include/asm-avr32/auxvec.h
new file mode 100644
index 000000000000..d5dd435bf8f4
--- /dev/null
+++ b/include/asm-avr32/auxvec.h
@@ -0,0 +1,4 @@
+#ifndef __ASM_AVR32_AUXVEC_H
+#define __ASM_AVR32_AUXVEC_H
+#endif /* __ASM_AVR32_AUXVEC_H */
diff --git a/include/asm-avr32/bitops.h b/include/asm-avr32/bitops.h
new file mode 100644
index 000000000000..5299f8c8e11d
--- /dev/null
+++ b/include/asm-avr32/bitops.h
@@ -0,0 +1,296 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_BITOPS_H
+#define __ASM_AVR32_BITOPS_H
+#include <asm/byteorder.h>
+#include <asm/system.h>
+/*
+ * clear_bit() doesn't provide any barrier for the compiler
+ */
+#define smp_mb__before_clear_bit()      barrier()
+#define smp_mb__after_clear_bit()       barrier()
+/*
+ * set_bit - Atomically set a bit in memory
+ * @nr: the bit to set
+ * @addr: the address to start counting from
+ *
+ * This function is atomic and may not be reordered.  See __set_bit()
+ * if you do not require the atomic guarantees.
+ *
+ * Note that @nr may be almost arbitrarily large; this function is not
+ * restricted to acting on a single-word quantity.
+ */
+static inline void set_bit(int nr, volatile void * addr)
+{
+        unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
+        unsigned long tmp;
+        if (__builtin_constant_p(nr)) {
+                asm volatile(
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %2\n"
+                        "       sbr     %0, %3\n"
+                        "       stcond  %1, %0\n"
+                        "       brne    1b"
+                        : "=&r"(tmp), "=o"(*p)
+                        : "m"(*p), "i"(nr)
+                        : "cc");
+        } else {
+                unsigned long mask = 1UL << (nr % BITS_PER_LONG);
+                asm volatile(
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %2\n"
+                        "       or      %0, %3\n"
+                        "       stcond  %1, %0\n"
+                        "       brne    1b"
+                        : "=&r"(tmp), "=o"(*p)
+                        : "m"(*p), "r"(mask)
+                        : "cc");
+        }
+}
+/*
+ * clear_bit - Clears a bit in memory
+ * @nr: Bit to clear
+ * @addr: Address to start counting from
+ *
+ * clear_bit() is atomic and may not be reordered.  However, it does
+ * not contain a memory barrier, so if it is used for locking purposes,
+ * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
+ * in order to ensure changes are visible on other processors.
+ */
+static inline void clear_bit(int nr, volatile void * addr)
+{
+        unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
+        unsigned long tmp;
+        if (__builtin_constant_p(nr)) {
+                asm volatile(
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %2\n"
+                        "       cbr     %0, %3\n"
+                        "       stcond  %1, %0\n"
+                        "       brne    1b"
+                        : "=&r"(tmp), "=o"(*p)
+                        : "m"(*p), "i"(nr)
+                        : "cc");
+        } else {
+                unsigned long mask = 1UL << (nr % BITS_PER_LONG);
+                asm volatile(
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %2\n"
+                        "       andn    %0, %3\n"
+                        "       stcond  %1, %0\n"
+                        "       brne    1b"
+                        : "=&r"(tmp), "=o"(*p)
+                        : "m"(*p), "r"(mask)
+                        : "cc");
+        }
+}
+/*
+ * change_bit - Toggle a bit in memory
+ * @nr: Bit to change
+ * @addr: Address to start counting from
+ *
+ * change_bit() is atomic and may not be reordered.
+ * Note that @nr may be almost arbitrarily large; this function is not
+ * restricted to acting on a single-word quantity.
+ */
+static inline void change_bit(int nr, volatile void * addr)
+{
+        unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
+        unsigned long mask = 1UL << (nr % BITS_PER_LONG);
+        unsigned long tmp;
+        asm volatile(
+                "1:     ssrf    5\n"
+                "       ld.w    %0, %2\n"
+                "       eor     %0, %3\n"
+                "       stcond  %1, %0\n"
+                "       brne    1b"
+                : "=&r"(tmp), "=o"(*p)
+                : "m"(*p), "r"(mask)
+                : "cc");
+}
+/*
+ * test_and_set_bit - Set a bit and return its old value
+ * @nr: Bit to set
+ * @addr: Address to count from
+ *
+ * This operation is atomic and cannot be reordered.
+ * It also implies a memory barrier.
+ */
+static inline int test_and_set_bit(int nr, volatile void * addr)
+{
+        unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
+        unsigned long mask = 1UL << (nr % BITS_PER_LONG);
+        unsigned long tmp, old;
+        if (__builtin_constant_p(nr)) {
+                asm volatile(
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %3\n"
+                        "       mov     %2, %0\n"
+                        "       sbr     %0, %4\n"
+                        "       stcond  %1, %0\n"
+                        "       brne    1b"
+                        : "=&r"(tmp), "=o"(*p), "=&r"(old)
+                        : "m"(*p), "i"(nr)
+                        : "memory", "cc");
+        } else {
+                asm volatile(
+                        "1:     ssrf    5\n"
+                        "       ld.w    %2, %3\n"
+                        "       or      %0, %2, %4\n"
+                        "       stcond  %1, %0\n"
+                        "       brne    1b"
+                        : "=&r"(tmp), "=o"(*p), "=&r"(old)
+                        : "m"(*p), "r"(mask)
+                        : "memory", "cc");
+        }
+        return (old & mask) != 0;
+}
+/*
+ * test_and_clear_bit - Clear a bit and return its old value
+ * @nr: Bit to clear
+ * @addr: Address to count from
+ *
+ * This operation is atomic and cannot be reordered.
+ * It also implies a memory barrier.
+ */
+static inline int test_and_clear_bit(int nr, volatile void * addr)
+{
+        unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
+        unsigned long mask = 1UL << (nr % BITS_PER_LONG);
+        unsigned long tmp, old;
+        if (__builtin_constant_p(nr)) {
+                asm volatile(
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %3\n"
+                        "       mov     %2, %0\n"
+                        "       cbr     %0, %4\n"
+                        "       stcond  %1, %0\n"
+                        "       brne    1b"
+                        : "=&r"(tmp), "=o"(*p), "=&r"(old)
+                        : "m"(*p), "i"(nr)
+                        : "memory", "cc");
+        } else {
+                asm volatile(
+                        "1:     ssrf    5\n"
+                        "       ld.w    %0, %3\n"
+                        "       mov     %2, %0\n"
+                        "       andn    %0, %4\n"
+                        "       stcond  %1, %0\n"
+                        "       brne    1b"
+                        : "=&r"(tmp), "=o"(*p), "=&r"(old)
+                        : "m"(*p), "r"(mask)
+                        : "memory", "cc");
+        }
+        return (old & mask) != 0;
+}
+/*
+ * test_and_change_bit - Change a bit and return its old value
+ * @nr: Bit to change
+ * @addr: Address to count from
+ *
+ * This operation is atomic and cannot be reordered.
+ * It also implies a memory barrier.
+ */
+static inline int test_and_change_bit(int nr, volatile void * addr)
+{
+        unsigned long *p = ((unsigned long *)addr) + nr / BITS_PER_LONG;
+        unsigned long mask = 1UL << (nr % BITS_PER_LONG);
+        unsigned long tmp, old;
+        asm volatile(
+                "1:     ssrf    5\n"
+                "       ld.w    %2, %3\n"
+                "       eor     %0, %2, %4\n"
+                "       stcond  %1, %0\n"
+                "       brne    1b"
+                : "=&r"(tmp), "=o"(*p), "=&r"(old)
+                : "m"(*p), "r"(mask)
+                : "memory", "cc");
+        return (old & mask) != 0;
+}
+#include <asm-generic/bitops/non-atomic.h>
+/* Find First bit Set */
+static inline unsigned long __ffs(unsigned long word)
+{
+        unsigned long result;
+        asm("brev %1\n\t"
+            "clz %0,%1"
+            : "=r"(result), "=&r"(word)
+            : "1"(word));
+        return result;
+}
+/* Find First Zero */
+static inline unsigned long ffz(unsigned long word)
+{
+        return __ffs(~word);
+}
+/* Find Last bit Set */
+static inline int fls(unsigned long word)
+{
+        unsigned long result;
+        asm("clz %0,%1" : "=r"(result) : "r"(word));
+        return 32 - result;
+}
+unsigned long find_first_zero_bit(const unsigned long *addr,
+                                  unsigned long size);
+unsigned long find_next_zero_bit(const unsigned long *addr,
+                                 unsigned long size,
+                                 unsigned long offset);
+unsigned long find_first_bit(const unsigned long *addr,
+                             unsigned long size);
+unsigned long find_next_bit(const unsigned long *addr,
+                                 unsigned long size,
+                                 unsigned long offset);
+/*
+ * ffs: find first bit set. This is defined the same way as
+ * the libc and compiler builtin ffs routines, therefore
+ * differs in spirit from the above ffz (man ffs).
+ *
+ * The difference is that bit numbering starts at 1, and if no bit is set,
+ * the function returns 0.
+ */
+static inline int ffs(unsigned long word)
+{
+        if(word == 0)
+                return 0;
+        return __ffs(word) + 1;
+}
+#include <asm-generic/bitops/fls64.h>
+#include <asm-generic/bitops/sched.h>
+#include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/ext2-non-atomic.h>
+#include <asm-generic/bitops/ext2-atomic.h>
+#include <asm-generic/bitops/minix-le.h>
+#endif /* __ASM_AVR32_BITOPS_H */
diff --git a/include/asm-avr32/bug.h b/include/asm-avr32/bug.h
new file mode 100644
index 000000000000..521766bc9366
--- /dev/null
+++ b/include/asm-avr32/bug.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * 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_AVR32_BUG_H
+#define __ASM_AVR32_BUG_H
+#ifdef CONFIG_BUG
+/*
+ * According to our Chief Architect, this compact opcode is very
+ * unlikely to ever be implemented.
+ */
+#define AVR32_BUG_OPCODE        0x5df0
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+#define BUG()                                                           \
+        do {                                                            \
+                asm volatile(".hword    %0\n\t"                         \
+                             ".hword    %1\n\t"                         \
+                             ".long     %2"                             \
+                             :                                          \
+                             : "n"(AVR32_BUG_OPCODE),                   \
+                               "i"(__LINE__), "X"(__FILE__));           \
+        } while (0)
+#else
+#define BUG()                                                           \
+        do {                                                            \
+                asm volatile(".hword    %0\n\t"                         \
+                             : : "n"(AVR32_BUG_OPCODE));                \
+        } while (0)
+#endif /* CONFIG_DEBUG_BUGVERBOSE */
+#define HAVE_ARCH_BUG
+#endif /* CONFIG_BUG */
+#include <asm-generic/bug.h>
+#endif /* __ASM_AVR32_BUG_H */
diff --git a/include/asm-avr32/bugs.h b/include/asm-avr32/bugs.h
new file mode 100644
index 000000000000..7635e770622e
--- /dev/null
+++ b/include/asm-avr32/bugs.h
@@ -0,0 +1,15 @@
+/*
+ * This is included by init/main.c to check for architecture-dependent bugs.
+ *
+ * Needs:
+ *      void check_bugs(void);
+ */
+#ifndef __ASM_AVR32_BUGS_H
+#define __ASM_AVR32_BUGS_H
+static void __init check_bugs(void)
+{
+        cpu_data->loops_per_jiffy = loops_per_jiffy;
+}
+#endif /* __ASM_AVR32_BUGS_H */
diff --git a/include/asm-avr32/byteorder.h b/include/asm-avr32/byteorder.h
new file mode 100644
index 000000000000..402ff4125cdc
--- /dev/null
+++ b/include/asm-avr32/byteorder.h
@@ -0,0 +1,25 @@
+/*
+ * AVR32 endian-conversion functions.
+ */
+#ifndef __ASM_AVR32_BYTEORDER_H
+#define __ASM_AVR32_BYTEORDER_H
+#include <asm/types.h>
+#include <linux/compiler.h>
+#ifdef __CHECKER__
+extern unsigned long __builtin_bswap_32(unsigned long x);
+extern unsigned short __builtin_bswap_16(unsigned short x);
+#endif
+#define __arch__swab32(x) __builtin_bswap_32(x)
+#define __arch__swab16(x) __builtin_bswap_16(x)
+#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
+# define __BYTEORDER_HAS_U64__
+# define __SWAB_64_THRU_32__
+#endif
+#include <linux/byteorder/big_endian.h>
+#endif /* __ASM_AVR32_BYTEORDER_H */
diff --git a/include/asm-avr32/cache.h b/include/asm-avr32/cache.h
new file mode 100644
index 000000000000..dabb955f3c00
--- /dev/null
+++ b/include/asm-avr32/cache.h
@@ -0,0 +1,29 @@
+#ifndef __ASM_AVR32_CACHE_H
+#define __ASM_AVR32_CACHE_H
+#define L1_CACHE_SHIFT 5
+#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
+#ifndef __ASSEMBLER__
+struct cache_info {
+        unsigned int ways;
+        unsigned int sets;
+        unsigned int linesz;
+};
+#endif /* __ASSEMBLER */
+/* Cache operation constants */
+#define ICACHE_FLUSH            0x00
+#define ICACHE_INVALIDATE       0x01
+#define ICACHE_LOCK             0x02
+#define ICACHE_UNLOCK           0x03
+#define ICACHE_PREFETCH         0x04
+#define DCACHE_FLUSH            0x08
+#define DCACHE_LOCK             0x09
+#define DCACHE_UNLOCK           0x0a
+#define DCACHE_INVALIDATE       0x0b
+#define DCACHE_CLEAN            0x0c
+#define DCACHE_CLEAN_INVAL      0x0d
+#endif /* __ASM_AVR32_CACHE_H */
diff --git a/include/asm-avr32/cachectl.h b/include/asm-avr32/cachectl.h
new file mode 100644
index 000000000000..4faf1ce60061
--- /dev/null
+++ b/include/asm-avr32/cachectl.h
@@ -0,0 +1,11 @@
+#ifndef __ASM_AVR32_CACHECTL_H
+#define __ASM_AVR32_CACHECTL_H
+/*
+ * Operations that can be performed through the cacheflush system call
+ */
+/* Clean the data cache, then invalidate the icache */
+#define CACHE_IFLUSH    0
+#endif /* __ASM_AVR32_CACHECTL_H */
diff --git a/include/asm-avr32/cacheflush.h b/include/asm-avr32/cacheflush.h
new file mode 100644
index 000000000000..f1bf1708980e
--- /dev/null
+++ b/include/asm-avr32/cacheflush.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_CACHEFLUSH_H
+#define __ASM_AVR32_CACHEFLUSH_H
+/* Keep includes the same across arches.  */
+#include <linux/mm.h>
+#define CACHE_OP_ICACHE_INVALIDATE      0x01
+#define CACHE_OP_DCACHE_INVALIDATE      0x0b
+#define CACHE_OP_DCACHE_CLEAN           0x0c
+#define CACHE_OP_DCACHE_CLEAN_INVAL     0x0d
+/*
+ * Invalidate any cacheline containing virtual address vaddr without
+ * writing anything back to memory.
+ *
+ * Note that this function may corrupt unrelated data structures when
+ * applied on buffers that are not cacheline aligned in both ends.
+ */
+static inline void invalidate_dcache_line(void *vaddr)
+{
+        asm volatile("cache %0[0], %1"
+                     :
+                     : "r"(vaddr), "n"(CACHE_OP_DCACHE_INVALIDATE)
+                     : "memory");
+}
+/*
+ * Make sure any cacheline containing virtual address vaddr is written
+ * to memory.
+ */
+static inline void clean_dcache_line(void *vaddr)
+{
+        asm volatile("cache %0[0], %1"
+                     :
+                     : "r"(vaddr), "n"(CACHE_OP_DCACHE_CLEAN)
+                     : "memory");
+}
+/*
+ * Make sure any cacheline containing virtual address vaddr is written
+ * to memory and then invalidate it.
+ */
+static inline void flush_dcache_line(void *vaddr)
+{
+        asm volatile("cache %0[0], %1"
+                     :
+                     : "r"(vaddr), "n"(CACHE_OP_DCACHE_CLEAN_INVAL)
+                     : "memory");
+}
+/*
+ * Invalidate any instruction cacheline containing virtual address
+ * vaddr.
+ */
+static inline void invalidate_icache_line(void *vaddr)
+{
+        asm volatile("cache %0[0], %1"
+                     :
+                     : "r"(vaddr), "n"(CACHE_OP_ICACHE_INVALIDATE)
+                     : "memory");
+}
+/*
+ * Applies the above functions on all lines that are touched by the
+ * specified virtual address range.
+ */
+void invalidate_dcache_region(void *start, size_t len);
+void clean_dcache_region(void *start, size_t len);
+void flush_dcache_region(void *start, size_t len);
+void invalidate_icache_region(void *start, size_t len);
+/*
+ * Make sure any pending writes are completed before continuing.
+ */
+#define flush_write_buffer() asm volatile("sync 0" : : : "memory")
+/*
+ * The following functions are called when a virtual mapping changes.
+ * We do not need to flush anything in this case.
+ */
+#define flush_cache_all()                       do { } while (0)
+#define flush_cache_mm(mm)                      do { } while (0)
+#define flush_cache_range(vma, start, end)      do { } while (0)
+#define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
+#define flush_cache_vmap(start, end)            do { } while (0)
+#define flush_cache_vunmap(start, end)          do { } while (0)
+/*
+ * I think we need to implement this one to be able to reliably
+ * execute pages from RAMDISK. However, if we implement the
+ * flush_dcache_*() functions, it might not be needed anymore.
+ *
+ * #define flush_icache_page(vma, page)         do { } while (0)
+ */
+extern void flush_icache_page(struct vm_area_struct *vma, struct page *page);
+/*
+ * These are (I think) related to D-cache aliasing.  We might need to
+ * do something here, but only for certain configurations.  No such
+ * configurations exist at this time.
+ */
+#define flush_dcache_page(page)                 do { } while (0)
+#define flush_dcache_mmap_lock(page)            do { } while (0)
+#define flush_dcache_mmap_unlock(page)          do { } while (0)
+/*
+ * These are for I/D cache coherency. In this case, we do need to
+ * flush with all configurations.
+ */
+extern void flush_icache_range(unsigned long start, unsigned long end);
+extern void flush_icache_user_range(struct vm_area_struct *vma,
+                                    struct page *page,
+                                    unsigned long addr, int len);
+#define copy_to_user_page(vma, page, vaddr, dst, src, len) do { \
+        memcpy(dst, src, len);                                  \
+        flush_icache_user_range(vma, page, vaddr, len);         \
+} while(0)
+#define copy_from_user_page(vma, page, vaddr, dst, src, len)    \
+        memcpy(dst, src, len)
+#endif /* __ASM_AVR32_CACHEFLUSH_H */
diff --git a/include/asm-avr32/checksum.h b/include/asm-avr32/checksum.h
new file mode 100644
index 000000000000..41b7af09edc4
--- /dev/null
+++ b/include/asm-avr32/checksum.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_CHECKSUM_H
+#define __ASM_AVR32_CHECKSUM_H
+/*
+ * computes the checksum of a memory block at buff, length len,
+ * and adds in "sum" (32-bit)
+ *
+ * returns a 32-bit number suitable for feeding into itself
+ * or csum_tcpudp_magic
+ *
+ * this function must be called with even lengths, except
+ * for the last fragment, which may be odd
+ *
+ * it's best to have buff aligned on a 32-bit boundary
+ */
+unsigned int csum_partial(const unsigned char * buff, int len,
+                          unsigned int sum);
+/*
+ * the same as csum_partial, but copies from src while it
+ * checksums, and handles user-space pointer exceptions correctly, when needed.
+ *
+ * here even more important to align src and dst on a 32-bit (or even
+ * better 64-bit) boundary
+ */
+unsigned int csum_partial_copy_generic(const char *src, char *dst, int len,
+                                       int sum, int *src_err_ptr,
+                                       int *dst_err_ptr);
+/*
+ *      Note: when you get a NULL pointer exception here this means someone
+ *      passed in an incorrect kernel address to one of these functions.
+ *
+ *      If you use these functions directly please don't forget the
+ *      verify_area().
+ */
+static inline
+unsigned int csum_partial_copy_nocheck(const char *src, char *dst,
+                                       int len, int sum)
+{
+        return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
+}
+static inline
+unsigned int csum_partial_copy_from_user (const char __user *src, char *dst,
+                                          int len, int sum, int *err_ptr)
+{
+        return csum_partial_copy_generic((const char __force *)src, dst, len,
+                                         sum, err_ptr, NULL);
+}
+/*
+ *      This is a version of ip_compute_csum() optimized for IP headers,
+ *      which always checksum on 4 octet boundaries.
+ */
+static inline unsigned short ip_fast_csum(unsigned char *iph,
+                                          unsigned int ihl)
+{
+        unsigned int sum, tmp;
+        __asm__ __volatile__(
+                "       ld.w    %0, %1++\n"
+                "       ld.w    %3, %1++\n"
+                "       sub     %2, 4\n"
+                "       add     %0, %3\n"
+                "       ld.w    %3, %1++\n"
+                "       adc     %0, %0, %3\n"
+                "       ld.w    %3, %1++\n"
+                "       adc     %0, %0, %3\n"
+                "       acr     %0\n"
+                "1:     ld.w    %3, %1++\n"
+                "       add     %0, %3\n"
+                "       acr     %0\n"
+                "       sub     %2, 1\n"
+                "       brne    1b\n"
+                "       lsl     %3, %0, 16\n"
+                "       andl    %0, 0\n"
+                "       mov     %2, 0xffff\n"
+                "       add     %0, %3\n"
+                "       adc     %0, %0, %2\n"
+                "       com     %0\n"
+                "       lsr     %0, 16\n"
+                : "=r"(sum), "=r"(iph), "=r"(ihl), "=r"(tmp)
+                : "1"(iph), "2"(ihl)
+                : "memory", "cc");
+        return sum;
+}
+/*
+ *      Fold a partial checksum
+ */
+static inline unsigned int csum_fold(unsigned int sum)
+{
+        unsigned int tmp;
+        asm("   bfextu  %1, %0, 0, 16\n"
+            "   lsr     %0, 16\n"
+            "   add     %0, %1\n"
+            "   bfextu  %1, %0, 16, 16\n"
+            "   add     %0, %1"
+            : "=&r"(sum), "=&r"(tmp)
+            : "0"(sum));
+        return ~sum;
+}
+static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
+                                               unsigned long daddr,
+                                               unsigned short len,
+                                               unsigned short proto,
+                                               unsigned int sum)
+{
+        asm("   add     %0, %1\n"
+            "   adc     %0, %0, %2\n"
+            "   adc     %0, %0, %3\n"
+            "   acr     %0"
+            : "=r"(sum)
+            : "r"(daddr), "r"(saddr), "r"(ntohs(len) | (proto << 16)),
+              "0"(sum)
+            : "cc");
+        return sum;
+}
+/*
+ * computes the checksum of the TCP/UDP pseudo-header
+ * returns a 16-bit checksum, already complemented
+ */
+static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
+                                                   unsigned long daddr,
+                                                   unsigned short len,
+                                                   unsigned short proto,
+                                                   unsigned int sum)
+{
+        return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
+}
+/*
+ * this routine is used for miscellaneous IP-like checksums, mainly
+ * in icmp.c
+ */
+static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
+{
+    return csum_fold(csum_partial(buff, len, 0));
+}
+#endif /* __ASM_AVR32_CHECKSUM_H */
diff --git a/include/asm-avr32/cputime.h b/include/asm-avr32/cputime.h
new file mode 100644
index 000000000000..e87e0f81cbeb
--- /dev/null
+++ b/include/asm-avr32/cputime.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_CPUTIME_H
+#define __ASM_AVR32_CPUTIME_H
+#include <asm-generic/cputime.h>
+#endif /* __ASM_AVR32_CPUTIME_H */
diff --git a/include/asm-avr32/current.h b/include/asm-avr32/current.h
new file mode 100644
index 000000000000..c7b0549eab8a
--- /dev/null
+++ b/include/asm-avr32/current.h
@@ -0,0 +1,15 @@
+#ifndef __ASM_AVR32_CURRENT_H
+#define __ASM_AVR32_CURRENT_H
+#include <linux/thread_info.h>
+struct task_struct;
+inline static struct task_struct * get_current(void)
+{
+        return current_thread_info()->task;
+}
+#define current get_current()
+#endif /* __ASM_AVR32_CURRENT_H */
diff --git a/include/asm-avr32/delay.h b/include/asm-avr32/delay.h
new file mode 100644
index 000000000000..cc3b2e3343b3
--- /dev/null
+++ b/include/asm-avr32/delay.h
@@ -0,0 +1,26 @@
+#ifndef __ASM_AVR32_DELAY_H
+#define __ASM_AVR32_DELAY_H
+/*
+ * Copyright (C) 1993 Linus Torvalds
+ *
+ * Delay routines calling functions in arch/avr32/lib/delay.c
+ */
+extern void __bad_udelay(void);
+extern void __bad_ndelay(void);
+extern void __udelay(unsigned long usecs);
+extern void __ndelay(unsigned long nsecs);
+extern void __const_udelay(unsigned long usecs);
+extern void __delay(unsigned long loops);
+#define udelay(n) (__builtin_constant_p(n) ? \
+        ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \
+        __udelay(n))
+#define ndelay(n) (__builtin_constant_p(n) ? \
+        ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
+        __ndelay(n))
+#endif /* __ASM_AVR32_DELAY_H */
diff --git a/include/asm-avr32/div64.h b/include/asm-avr32/div64.h
new file mode 100644
index 000000000000..d7ddd4fdeca6
--- /dev/null
+++ b/include/asm-avr32/div64.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_DIV64_H
+#define __ASM_AVR32_DIV64_H
+#include <asm-generic/div64.h>
+#endif /* __ASM_AVR32_DIV64_H */
diff --git a/include/asm-avr32/dma-mapping.h b/include/asm-avr32/dma-mapping.h
new file mode 100644
index 000000000000..4c40cb41cdf8
--- /dev/null
+++ b/include/asm-avr32/dma-mapping.h
@@ -0,0 +1,320 @@
+#ifndef __ASM_AVR32_DMA_MAPPING_H
+#define __ASM_AVR32_DMA_MAPPING_H
+#include <linux/mm.h>
+#include <linux/device.h>
+#include <asm/scatterlist.h>
+#include <asm/processor.h>
+#include <asm/cacheflush.h>
+#include <asm/io.h>
+extern void dma_cache_sync(void *vaddr, size_t size, int direction);
+/*
+ * Return whether the given device DMA address mask can be supported
+ * properly.  For example, if your device can only drive the low 24-bits
+ * during bus mastering, then you would pass 0x00ffffff as the mask
+ * to this function.
+ */
+static inline int dma_supported(struct device *dev, u64 mask)
+{
+        /* Fix when needed. I really don't know of any limitations */
+        return 1;
+}
+static inline int dma_set_mask(struct device *dev, u64 dma_mask)
+{
+        if (!dev->dma_mask || !dma_supported(dev, dma_mask))
+                return -EIO;
+        *dev->dma_mask = dma_mask;
+        return 0;
+}
+/**
+ * dma_alloc_coherent - allocate consistent memory for DMA
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @size: required memory size
+ * @handle: bus-specific DMA address
+ *
+ * Allocate some uncached, unbuffered memory for a device for
+ * performing DMA.  This function allocates pages, and will
+ * return the CPU-viewed address, and sets @handle to be the
+ * device-viewed address.
+ */
+extern void *dma_alloc_coherent(struct device *dev, size_t size,
+                                dma_addr_t *handle, gfp_t gfp);
+/**
+ * dma_free_coherent - free memory allocated by dma_alloc_coherent
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @size: size of memory originally requested in dma_alloc_coherent
+ * @cpu_addr: CPU-view address returned from dma_alloc_coherent
+ * @handle: device-view address returned from dma_alloc_coherent
+ *
+ * Free (and unmap) a DMA buffer previously allocated by
+ * dma_alloc_coherent().
+ *
+ * References to memory and mappings associated with cpu_addr/handle
+ * during and after this call executing are illegal.
+ */
+extern void dma_free_coherent(struct device *dev, size_t size,
+                              void *cpu_addr, dma_addr_t handle);
+/**
+ * dma_alloc_writecombine - allocate write-combining memory for DMA
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @size: required memory size
+ * @handle: bus-specific DMA address
+ *
+ * Allocate some uncached, buffered memory for a device for
+ * performing DMA.  This function allocates pages, and will
+ * return the CPU-viewed address, and sets @handle to be the
+ * device-viewed address.
+ */
+extern void *dma_alloc_writecombine(struct device *dev, size_t size,
+                                    dma_addr_t *handle, gfp_t gfp);
+/**
+ * dma_free_coherent - free memory allocated by dma_alloc_writecombine
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @size: size of memory originally requested in dma_alloc_writecombine
+ * @cpu_addr: CPU-view address returned from dma_alloc_writecombine
+ * @handle: device-view address returned from dma_alloc_writecombine
+ *
+ * Free (and unmap) a DMA buffer previously allocated by
+ * dma_alloc_writecombine().
+ *
+ * References to memory and mappings associated with cpu_addr/handle
+ * during and after this call executing are illegal.
+ */
+extern void dma_free_writecombine(struct device *dev, size_t size,
+                                  void *cpu_addr, dma_addr_t handle);
+/**
+ * dma_map_single - map a single buffer for streaming DMA
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @cpu_addr: CPU direct mapped address of buffer
+ * @size: size of buffer to map
+ * @dir: DMA transfer direction
+ *
+ * Ensure that any data held in the cache is appropriately discarded
+ * or written back.
+ *
+ * The device owns this memory once this call has completed.  The CPU
+ * can regain ownership by calling dma_unmap_single() or dma_sync_single().
+ */
+static inline dma_addr_t
+dma_map_single(struct device *dev, void *cpu_addr, size_t size,
+               enum dma_data_direction direction)
+{
+        dma_cache_sync(cpu_addr, size, direction);
+        return virt_to_bus(cpu_addr);
+}
+/**
+ * dma_unmap_single - unmap a single buffer previously mapped
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @handle: DMA address of buffer
+ * @size: size of buffer to map
+ * @dir: DMA transfer direction
+ *
+ * Unmap a single streaming mode DMA translation.  The handle and size
+ * must match what was provided in the previous dma_map_single() call.
+ * All other usages are undefined.
+ *
+ * After this call, reads by the CPU to the buffer are guaranteed to see
+ * whatever the device wrote there.
+ */
+static inline void
+dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
+                 enum dma_data_direction direction)
+{
+}
+/**
+ * dma_map_page - map a portion of a page for streaming DMA
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @page: page that buffer resides in
+ * @offset: offset into page for start of buffer
+ * @size: size of buffer to map
+ * @dir: DMA transfer direction
+ *
+ * Ensure that any data held in the cache is appropriately discarded
+ * or written back.
+ *
+ * The device owns this memory once this call has completed.  The CPU
+ * can regain ownership by calling dma_unmap_page() or dma_sync_single().
+ */
+static inline dma_addr_t
+dma_map_page(struct device *dev, struct page *page,
+             unsigned long offset, size_t size,
+             enum dma_data_direction direction)
+{
+        return dma_map_single(dev, page_address(page) + offset,
+                              size, direction);
+}
+/**
+ * dma_unmap_page - unmap a buffer previously mapped through dma_map_page()
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @handle: DMA address of buffer
+ * @size: size of buffer to map
+ * @dir: DMA transfer direction
+ *
+ * Unmap a single streaming mode DMA translation.  The handle and size
+ * must match what was provided in the previous dma_map_single() call.
+ * All other usages are undefined.
+ *
+ * After this call, reads by the CPU to the buffer are guaranteed to see
+ * whatever the device wrote there.
+ */
+static inline void
+dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
+               enum dma_data_direction direction)
+{
+        dma_unmap_single(dev, dma_address, size, direction);
+}
+/**
+ * dma_map_sg - map a set of SG buffers for streaming mode DMA
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @sg: list of buffers
+ * @nents: number of buffers to map
+ * @dir: DMA transfer direction
+ *
+ * Map a set of buffers described by scatterlist in streaming
+ * mode for DMA.  This is the scatter-gather version of the
+ * above pci_map_single interface.  Here the scatter gather list
+ * elements are each tagged with the appropriate dma address
+ * and length.  They are obtained via sg_dma_{address,length}(SG).
+ *
+ * NOTE: An implementation may be able to use a smaller number of
+ *       DMA address/length pairs than there are SG table elements.
+ *       (for example via virtual mapping capabilities)
+ *       The routine returns the number of addr/length pairs actually
+ *       used, at most nents.
+ *
+ * Device ownership issues as mentioned above for pci_map_single are
+ * the same here.
+ */
+static inline int
+dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
+           enum dma_data_direction direction)
+{
+        int i;
+        for (i = 0; i < nents; i++) {
+                char *virt;
+                sg[i].dma_address = page_to_bus(sg[i].page) + sg[i].offset;
+                virt = page_address(sg[i].page) + sg[i].offset;
+                dma_cache_sync(virt, sg[i].length, direction);
+        }
+        return nents;
+}
+/**
+ * dma_unmap_sg - unmap a set of SG buffers mapped by dma_map_sg
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @sg: list of buffers
+ * @nents: number of buffers to map
+ * @dir: DMA transfer direction
+ *
+ * Unmap a set of streaming mode DMA translations.
+ * Again, CPU read rules concerning calls here are the same as for
+ * pci_unmap_single() above.
+ */
+static inline void
+dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
+             enum dma_data_direction direction)
+{
+}
+/**
+ * dma_sync_single_for_cpu
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @handle: DMA address of buffer
+ * @size: size of buffer to map
+ * @dir: DMA transfer direction
+ *
+ * Make physical memory consistent for a single streaming mode DMA
+ * translation after a transfer.
+ *
+ * If you perform a dma_map_single() but wish to interrogate the
+ * buffer using the cpu, yet do not wish to teardown the DMA mapping,
+ * you must call this function before doing so.  At the next point you
+ * give the DMA address back to the card, you must first perform a
+ * dma_sync_single_for_device, and then the device again owns the
+ * buffer.
+ */
+static inline void
+dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
+                        size_t size, enum dma_data_direction direction)
+{
+        dma_cache_sync(bus_to_virt(dma_handle), size, direction);
+}
+static inline void
+dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
+                           size_t size, enum dma_data_direction direction)
+{
+        dma_cache_sync(bus_to_virt(dma_handle), size, direction);
+}
+/**
+ * dma_sync_sg_for_cpu
+ * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
+ * @sg: list of buffers
+ * @nents: number of buffers to map
+ * @dir: DMA transfer direction
+ *
+ * Make physical memory consistent for a set of streaming
+ * mode DMA translations after a transfer.
+ *
+ * The same as dma_sync_single_for_* but for a scatter-gather list,
+ * same rules and usage.
+ */
+static inline void
+dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
+                    int nents, enum dma_data_direction direction)
+{
+        int i;
+        for (i = 0; i < nents; i++) {
+                dma_cache_sync(page_address(sg[i].page) + sg[i].offset,
+                               sg[i].length, direction);
+        }
+}
+static inline void
+dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
+                       int nents, enum dma_data_direction direction)
+{
+        int i;
+        for (i = 0; i < nents; i++) {
+                dma_cache_sync(page_address(sg[i].page) + sg[i].offset,
+                               sg[i].length, direction);
+        }
+}
+/* Now for the API extensions over the pci_ one */
+#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
+#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
+static inline int dma_is_consistent(dma_addr_t dma_addr)
+{
+        return 1;
+}
+static inline int dma_get_cache_alignment(void)
+{
+        return boot_cpu_data.dcache.linesz;
+}
+#endif /* __ASM_AVR32_DMA_MAPPING_H */
diff --git a/include/asm-avr32/dma.h b/include/asm-avr32/dma.h
new file mode 100644
index 000000000000..9e91205590ac
--- /dev/null
+++ b/include/asm-avr32/dma.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_AVR32_DMA_H
+#define __ASM_AVR32_DMA_H
+/* The maximum address that we can perform a DMA transfer to on this platform.
+ * Not really applicable to AVR32, but some functions need it. */
+#define MAX_DMA_ADDRESS         0xffffffff
+#endif /* __ASM_AVR32_DMA_H */
diff --git a/include/asm-avr32/elf.h b/include/asm-avr32/elf.h
new file mode 100644
index 000000000000..d334b4994d2d
--- /dev/null
+++ b/include/asm-avr32/elf.h
@@ -0,0 +1,110 @@
+#ifndef __ASM_AVR32_ELF_H
+#define __ASM_AVR32_ELF_H
+/* AVR32 relocation numbers */
+#define R_AVR32_NONE            0
+#define R_AVR32_32              1
+#define R_AVR32_16              2
+#define R_AVR32_8               3
+#define R_AVR32_32_PCREL        4
+#define R_AVR32_16_PCREL        5
+#define R_AVR32_8_PCREL         6
+#define R_AVR32_DIFF32          7
+#define R_AVR32_DIFF16          8
+#define R_AVR32_DIFF8           9
+#define R_AVR32_GOT32           10
+#define R_AVR32_GOT16           11
+#define R_AVR32_GOT8            12
+#define R_AVR32_21S             13
+#define R_AVR32_16U             14
+#define R_AVR32_16S             15
+#define R_AVR32_8S              16
+#define R_AVR32_8S_EXT          17
+#define R_AVR32_22H_PCREL       18
+#define R_AVR32_18W_PCREL       19
+#define R_AVR32_16B_PCREL       20
+#define R_AVR32_16N_PCREL       21
+#define R_AVR32_14UW_PCREL      22
+#define R_AVR32_11H_PCREL       23
+#define R_AVR32_10UW_PCREL      24
+#define R_AVR32_9H_PCREL        25
+#define R_AVR32_9UW_PCREL       26
+#define R_AVR32_HI16            27
+#define R_AVR32_LO16            28
+#define R_AVR32_GOTPC           29
+#define R_AVR32_GOTCALL         30
+#define R_AVR32_LDA_GOT         31
+#define R_AVR32_GOT21S          32
+#define R_AVR32_GOT18SW         33
+#define R_AVR32_GOT16S          34
+#define R_AVR32_GOT7UW          35
+#define R_AVR32_32_CPENT        36
+#define R_AVR32_CPCALL          37
+#define R_AVR32_16_CP           38
+#define R_AVR32_9W_CP           39
+#define R_AVR32_RELATIVE        40
+#define R_AVR32_GLOB_DAT        41
+#define R_AVR32_JMP_SLOT        42
+#define R_AVR32_ALIGN           43
+/*
+ * ELF register definitions..
+ */
+#include <asm/ptrace.h>
+#include <asm/user.h>
+typedef unsigned long elf_greg_t;
+#define ELF_NGREG (sizeof (struct pt_regs) / sizeof (elf_greg_t))
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+typedef struct user_fpu_struct elf_fpregset_t;
+/*
+ * This is used to ensure we don't load something for the wrong architecture.
+ */
+#define elf_check_arch(x) ( (x)->e_machine == EM_AVR32 )
+/*
+ * These are used to set parameters in the core dumps.
+ */
+#define ELF_CLASS       ELFCLASS32
+#ifdef __LITTLE_ENDIAN__
+#define ELF_DATA        ELFDATA2LSB
+#else
+#define ELF_DATA        ELFDATA2MSB
+#endif
+#define ELF_ARCH        EM_AVR32
+#define USE_ELF_CORE_DUMP
+#define ELF_EXEC_PAGESIZE       4096
+/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
+   use of this is to invoke "./ld.so someprog" to test out a new version of
+   the loader.  We need to make sure that it is out of the way of the program
+   that it will "exec", and that there is sufficient room for the brk.  */
+#define ELF_ET_DYN_BASE         (2 * TASK_SIZE / 3)
+/* This yields a mask that user programs can use to figure out what
+   instruction set this CPU supports.  This could be done in user space,
+   but it's not easy, and we've already done it here.  */
+#define ELF_HWCAP       (0)
+/* This yields a string that ld.so will use to load implementation
+   specific libraries for optimization.  This is more specific in
+   intent than poking at uname or /proc/cpuinfo.
+   For the moment, we have only optimizations for the Intel generations,
+   but that could change... */
+#define ELF_PLATFORM  (NULL)
+#ifdef __KERNEL__
+#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
+#endif
+#endif /* __ASM_AVR32_ELF_H */
diff --git a/include/asm-avr32/emergency-restart.h b/include/asm-avr32/emergency-restart.h
new file mode 100644
index 000000000000..3e7e014776ba
--- /dev/null
+++ b/include/asm-avr32/emergency-restart.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_EMERGENCY_RESTART_H
+#define __ASM_AVR32_EMERGENCY_RESTART_H
+#include <asm-generic/emergency-restart.h>
+#endif /* __ASM_AVR32_EMERGENCY_RESTART_H */
diff --git a/include/asm-avr32/errno.h b/include/asm-avr32/errno.h
new file mode 100644
index 000000000000..558a7249f06d
--- /dev/null
+++ b/include/asm-avr32/errno.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_ERRNO_H
+#define __ASM_AVR32_ERRNO_H
+#include <asm-generic/errno.h>
+#endif /* __ASM_AVR32_ERRNO_H */
diff --git a/include/asm-avr32/fcntl.h b/include/asm-avr32/fcntl.h
new file mode 100644
index 000000000000..14c0c4402b11
--- /dev/null
+++ b/include/asm-avr32/fcntl.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_FCNTL_H
+#define __ASM_AVR32_FCNTL_H
+#include <asm-generic/fcntl.h>
+#endif /* __ASM_AVR32_FCNTL_H */
diff --git a/include/asm-avr32/futex.h b/include/asm-avr32/futex.h
new file mode 100644
index 000000000000..10419f14a68a
--- /dev/null
+++ b/include/asm-avr32/futex.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_FUTEX_H
+#define __ASM_AVR32_FUTEX_H
+#include <asm-generic/futex.h>
+#endif /* __ASM_AVR32_FUTEX_H */
diff --git a/include/asm-avr32/hardirq.h b/include/asm-avr32/hardirq.h
new file mode 100644
index 000000000000..267354356f60
--- /dev/null
+++ b/include/asm-avr32/hardirq.h
@@ -0,0 +1,34 @@
+#ifndef __ASM_AVR32_HARDIRQ_H
+#define __ASM_AVR32_HARDIRQ_H
+#include <linux/threads.h>
+#include <asm/irq.h>
+#ifndef __ASSEMBLY__
+#include <linux/cache.h>
+/* entry.S is sensitive to the offsets of these fields */
+typedef struct {
+        unsigned int __softirq_pending;
+} ____cacheline_aligned irq_cpustat_t;
+void ack_bad_irq(unsigned int irq);
+/* Standard mappings for irq_cpustat_t above */
+#include <linux/irq_cpustat.h>
+#endif /* __ASSEMBLY__ */
+#define HARDIRQ_BITS    12
+/*
+ * The hardirq mask has to be large enough to have
+ * space for potentially all IRQ sources in the system
+ * nesting on a single CPU:
+ */
+#if (1 << HARDIRQ_BITS) < NR_IRQS
+# error HARDIRQ_BITS is too low!
+#endif
+#endif /* __ASM_AVR32_HARDIRQ_H */
diff --git a/include/asm-avr32/hw_irq.h b/include/asm-avr32/hw_irq.h
new file mode 100644
index 000000000000..218b0a6bfd1b
--- /dev/null
+++ b/include/asm-avr32/hw_irq.h
@@ -0,0 +1,9 @@
+#ifndef __ASM_AVR32_HW_IRQ_H
+#define __ASM_AVR32_HW_IRQ_H
+static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i)
+{
+        /* Nothing to do */
+}
+#endif /* __ASM_AVR32_HW_IRQ_H */
diff --git a/include/asm-avr32/intc.h b/include/asm-avr32/intc.h
new file mode 100644
index 000000000000..1ac9ca75e8fd
--- /dev/null
+++ b/include/asm-avr32/intc.h
@@ -0,0 +1,128 @@
+#ifndef __ASM_AVR32_INTC_H
+#define __ASM_AVR32_INTC_H
+#include <linux/sysdev.h>
+#include <linux/interrupt.h>
+struct irq_controller;
+struct irqaction;
+struct pt_regs;
+struct platform_device;
+/* Information about the internal interrupt controller */
+struct intc_device {
+        /* ioremapped address of configuration block */
+        void __iomem *regs;
+        /* the physical device */
+        struct platform_device *pdev;
+        /* Number of interrupt lines per group. */
+        unsigned int irqs_per_group;
+        /* The highest group ID + 1 */
+        unsigned int nr_groups;
+        /*
+         * Bitfield indicating which groups are actually in use.  The
+         * size of the array is
+         * ceil(group_max / (8 * sizeof(unsigned int))).
+         */
+        unsigned int group_mask[];
+};
+struct irq_controller_class {
+        /*
+         * A short name identifying this kind of controller.
+         */
+        const char *typename;
+        /*
+         * Handle the IRQ.  Must do any necessary acking and masking.
+         */
+        irqreturn_t (*handle)(int irq, void *dev_id, struct pt_regs *regs);
+        /*
+         * Register a new IRQ handler.
+         */
+        int (*setup)(struct irq_controller *ctrl, unsigned int irq,
+                     struct irqaction *action);
+        /*
+         * Unregister a IRQ handler.
+         */
+        void (*free)(struct irq_controller *ctrl, unsigned int irq,
+                     void *dev_id);
+        /*
+         * Mask the IRQ in the interrupt controller.
+         */
+        void (*mask)(struct irq_controller *ctrl, unsigned int irq);
+        /*
+         * Unmask the IRQ in the interrupt controller.
+         */
+        void (*unmask)(struct irq_controller *ctrl, unsigned int irq);
+        /*
+         * Set the type of the IRQ. See below for possible types.
+         * Return -EINVAL if a given type is not supported
+         */
+        int (*set_type)(struct irq_controller *ctrl, unsigned int irq,
+                        unsigned int type);
+        /*
+         * Return the IRQ type currently set
+         */
+        unsigned int (*get_type)(struct irq_controller *ctrl, unsigned int irq);
+};
+struct irq_controller {
+        struct irq_controller_class *class;
+        unsigned int irq_group;
+        unsigned int first_irq;
+        unsigned int nr_irqs;
+        struct list_head list;
+};
+struct intc_group_desc {
+        struct irq_controller *ctrl;
+        irqreturn_t (*handle)(int, void *, struct pt_regs *);
+        unsigned long flags;
+        void *dev_id;
+        const char *devname;
+};
+/*
+ * The internal interrupt controller.  Defined in board/part-specific
+ * devices.c.
+ * TODO: Should probably be defined per-cpu.
+ */
+extern struct intc_device intc;
+extern int request_internal_irq(unsigned int irq,
+                                irqreturn_t (*handler)(int, void *, struct pt_regs *),
+                                unsigned long irqflags,
+                                const char *devname, void *dev_id);
+extern void free_internal_irq(unsigned int irq);
+/* Only used by time_init() */
+extern int setup_internal_irq(unsigned int irq, struct intc_group_desc *desc);
+/*
+ * Set interrupt priority for a given group. `group' can be found by
+ * using irq_to_group(irq). Priority can be from 0 (lowest) to 3
+ * (highest). Higher-priority interrupts will preempt lower-priority
+ * interrupts (unless interrupts are masked globally).
+ *
+ * This function does not check for conflicts within a group.
+ */
+extern int intc_set_priority(unsigned int group,
+                             unsigned int priority);
+/*
+ * Returns a bitmask of pending interrupts in a group.
+ */
+extern unsigned long intc_get_pending(unsigned int group);
+/*
+ * Register a new external interrupt controller.  Returns the first
+ * external IRQ number that is assigned to the new controller.
+ */
+extern int intc_register_controller(struct irq_controller *ctrl);
+#endif /* __ASM_AVR32_INTC_H */
diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h
new file mode 100644
index 000000000000..2fc8f111dce9
--- /dev/null
+++ b/include/asm-avr32/io.h
@@ -0,0 +1,253 @@
+#ifndef __ASM_AVR32_IO_H
+#define __ASM_AVR32_IO_H
+#include <linux/string.h>
+#ifdef __KERNEL__
+#include <asm/addrspace.h>
+#include <asm/byteorder.h>
+/* virt_to_phys will only work when address is in P1 or P2 */
+static __inline__ unsigned long virt_to_phys(volatile void *address)
+{
+        return PHYSADDR(address);
+}
+static __inline__ void * phys_to_virt(unsigned long address)
+{
+        return (void *)P1SEGADDR(address);
+}
+#define cached_to_phys(addr)    ((unsigned long)PHYSADDR(addr))
+#define uncached_to_phys(addr)  ((unsigned long)PHYSADDR(addr))
+#define phys_to_cached(addr)    ((void *)P1SEGADDR(addr))
+#define phys_to_uncached(addr)  ((void *)P2SEGADDR(addr))
+/*
+ * Generic IO read/write.  These perform native-endian accesses.  Note
+ * that some architectures will want to re-define __raw_{read,write}w.
+ */
+extern void __raw_writesb(unsigned int addr, const void *data, int bytelen);
+extern void __raw_writesw(unsigned int addr, const void *data, int wordlen);
+extern void __raw_writesl(unsigned int addr, const void *data, int longlen);
+extern void __raw_readsb(unsigned int addr, void *data, int bytelen);
+extern void __raw_readsw(unsigned int addr, void *data, int wordlen);
+extern void __raw_readsl(unsigned int addr, void *data, int longlen);
+static inline void writeb(unsigned char b, volatile void __iomem *addr)
+{
+        *(volatile unsigned char __force *)addr = b;
+}
+static inline void writew(unsigned short b, volatile void __iomem *addr)
+{
+        *(volatile unsigned short __force *)addr = b;
+}
+static inline void writel(unsigned int b, volatile void __iomem *addr)
+{
+        *(volatile unsigned int __force *)addr = b;
+}
+#define __raw_writeb writeb
+#define __raw_writew writew
+#define __raw_writel writel
+static inline unsigned char readb(const volatile void __iomem *addr)
+{
+        return *(const volatile unsigned char __force *)addr;
+}
+static inline unsigned short readw(const volatile void __iomem *addr)
+{
+        return *(const volatile unsigned short __force *)addr;
+}
+static inline unsigned int readl(const volatile void __iomem *addr)
+{
+        return *(const volatile unsigned int __force *)addr;
+}
+#define __raw_readb readb
+#define __raw_readw readw
+#define __raw_readl readl
+#define writesb(p, d, l)        __raw_writesb((unsigned int)p, d, l)
+#define writesw(p, d, l)        __raw_writesw((unsigned int)p, d, l)
+#define writesl(p, d, l)        __raw_writesl((unsigned int)p, d, l)
+#define readsb(p, d, l)         __raw_readsb((unsigned int)p, d, l)
+#define readsw(p, d, l)         __raw_readsw((unsigned int)p, d, l)
+#define readsl(p, d, l)         __raw_readsl((unsigned int)p, d, l)
+/*
+ * These two are only here because ALSA _thinks_ it needs them...
+ */
+static inline void memcpy_fromio(void * to, const volatile void __iomem *from,
+                                 unsigned long count)
+{
+        char *p = to;
+        while (count) {
+                count--;
+                *p = readb(from);
+                p++;
+                from++;
+        }
+}
+static inline void  memcpy_toio(volatile void __iomem *to, const void * from,
+                                unsigned long count)
+{
+        const char *p = from;
+        while (count) {
+                count--;
+                writeb(*p, to);
+                p++;
+                to++;
+        }
+}
+static inline void memset_io(volatile void __iomem *addr, unsigned char val,
+                             unsigned long count)
+{
+        memset((void __force *)addr, val, count);
+}
+/*
+ * Bad read/write accesses...
+ */
+extern void __readwrite_bug(const char *fn);
+#define IO_SPACE_LIMIT  0xffffffff
+/* Convert I/O port address to virtual address */
+#define __io(p)         ((void __iomem *)phys_to_uncached(p))
+/*
+ *  IO port access primitives
+ *  -------------------------
+ *
+ * The AVR32 doesn't have special IO access instructions; all IO is memory
+ * mapped. Note that these are defined to perform little endian accesses
+ * only. Their primary purpose is to access PCI and ISA peripherals.
+ *
+ * Note that for a big endian machine, this implies that the following
+ * big endian mode connectivity is in place.
+ *
+ * The machine specific io.h include defines __io to translate an "IO"
+ * address to a memory address.
+ *
+ * Note that we prevent GCC re-ordering or caching values in expressions
+ * by introducing sequence points into the in*() definitions.  Note that
+ * __raw_* do not guarantee this behaviour.
+ *
+ * The {in,out}[bwl] macros are for emulating x86-style PCI/ISA IO space.
+ */
+#define outb(v, p)              __raw_writeb(v, __io(p))
+#define outw(v, p)              __raw_writew(cpu_to_le16(v), __io(p))
+#define outl(v, p)              __raw_writel(cpu_to_le32(v), __io(p))
+#define inb(p)                  __raw_readb(__io(p))
+#define inw(p)                  le16_to_cpu(__raw_readw(__io(p)))
+#define inl(p)                  le32_to_cpu(__raw_readl(__io(p)))
+static inline void __outsb(unsigned long port, void *addr, unsigned int count)
+{
+        while (count--) {
+                outb(*(u8 *)addr, port);
+                addr++;
+        }
+}
+static inline void __insb(unsigned long port, void *addr, unsigned int count)
+{
+        while (count--) {
+                *(u8 *)addr = inb(port);
+                addr++;
+        }
+}
+static inline void __outsw(unsigned long port, void *addr, unsigned int count)
+{
+        while (count--) {
+                outw(*(u16 *)addr, port);
+                addr += 2;
+        }
+}
+static inline void __insw(unsigned long port, void *addr, unsigned int count)
+{
+        while (count--) {
+                *(u16 *)addr = inw(port);
+                addr += 2;
+        }
+}
+static inline void __outsl(unsigned long port, void *addr, unsigned int count)
+{
+        while (count--) {
+                outl(*(u32 *)addr, port);
+                addr += 4;
+        }
+}
+static inline void __insl(unsigned long port, void *addr, unsigned int count)
+{
+        while (count--) {
+                *(u32 *)addr = inl(port);
+                addr += 4;
+        }
+}
+#define outsb(port, addr, count)        __outsb(port, addr, count)
+#define insb(port, addr, count)         __insb(port, addr, count)
+#define outsw(port, addr, count)        __outsw(port, addr, count)
+#define insw(port, addr, count)         __insw(port, addr, count)
+#define outsl(port, addr, count)        __outsl(port, addr, count)
+#define insl(port, addr, count)         __insl(port, addr, count)
+extern void __iomem *__ioremap(unsigned long offset, size_t size,
+                               unsigned long flags);
+extern void __iounmap(void __iomem *addr);
+/*
+ * ioremap      -   map bus memory into CPU space
+ * @offset      bus address of the memory
+ * @size        size of the resource to map
+ *
+ * ioremap performs a platform specific sequence of operations to make
+ * bus memory CPU accessible via the readb/.../writel functions and
+ * the other mmio helpers. The returned address is not guaranteed to
+ * be usable directly as a virtual address.
+ */
+#define ioremap(offset, size)                   \
+        __ioremap((offset), (size), 0)
+#define iounmap(addr)                           \
+        __iounmap(addr)
+#define cached(addr) P1SEGADDR(addr)
+#define uncached(addr) P2SEGADDR(addr)
+#define virt_to_bus virt_to_phys
+#define bus_to_virt phys_to_virt
+#define page_to_bus page_to_phys
+#define bus_to_page phys_to_page
+#define dma_cache_wback_inv(_start, _size)      \
+        flush_dcache_region(_start, _size)
+#define dma_cache_inv(_start, _size)            \
+        invalidate_dcache_region(_start, _size)
+#define dma_cache_wback(_start, _size)          \
+        clean_dcache_region(_start, _size)
+/*
+ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
+ * access
+ */
+#define xlate_dev_mem_ptr(p)    __va(p)
+/*
+ * Convert a virtual cached pointer to an uncached pointer
+ */
+#define xlate_dev_kmem_ptr(p)   p
+#endif /* __KERNEL__ */
+#endif /* __ASM_AVR32_IO_H */
diff --git a/include/asm-avr32/ioctl.h b/include/asm-avr32/ioctl.h
new file mode 100644
index 000000000000..c8472c1398ef
--- /dev/null
+++ b/include/asm-avr32/ioctl.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_IOCTL_H
+#define __ASM_AVR32_IOCTL_H
+#include <asm-generic/ioctl.h>
+#endif /* __ASM_AVR32_IOCTL_H */
diff --git a/include/asm-avr32/ioctls.h b/include/asm-avr32/ioctls.h
new file mode 100644
index 000000000000..0500426b7186
--- /dev/null
+++ b/include/asm-avr32/ioctls.h
@@ -0,0 +1,83 @@
+#ifndef __ASM_AVR32_IOCTLS_H
+#define __ASM_AVR32_IOCTLS_H
+#include <asm/ioctl.h>
+/* 0x54 is just a magic number to make these relatively unique ('T') */
+#define TCGETS          0x5401
+#define TCSETS          0x5402 /* Clashes with SNDCTL_TMR_START sound ioctl */
+#define TCSETSW         0x5403
+#define TCSETSF         0x5404
+#define TCGETA          0x5405
+#define TCSETA          0x5406
+#define TCSETAW         0x5407
+#define TCSETAF         0x5408
+#define TCSBRK          0x5409
+#define TCXONC          0x540A
+#define TCFLSH          0x540B
+#define TIOCEXCL        0x540C
+#define TIOCNXCL        0x540D
+#define TIOCSCTTY       0x540E
+#define TIOCGPGRP       0x540F
+#define TIOCSPGRP       0x5410
+#define TIOCOUTQ        0x5411
+#define TIOCSTI         0x5412
+#define TIOCGWINSZ      0x5413
+#define TIOCSWINSZ      0x5414
+#define TIOCMGET        0x5415
+#define TIOCMBIS        0x5416
+#define TIOCMBIC        0x5417
+#define TIOCMSET        0x5418
+#define TIOCGSOFTCAR    0x5419
+#define TIOCSSOFTCAR    0x541A
+#define FIONREAD        0x541B
+#define TIOCINQ         FIONREAD
+#define TIOCLINUX       0x541C
+#define TIOCCONS        0x541D
+#define TIOCGSERIAL     0x541E
+#define TIOCSSERIAL     0x541F
+#define TIOCPKT         0x5420
+#define FIONBIO         0x5421
+#define TIOCNOTTY       0x5422
+#define TIOCSETD        0x5423
+#define TIOCGETD        0x5424
+#define TCSBRKP         0x5425  /* Needed for POSIX tcsendbreak() */
+/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */
+#define TIOCSBRK        0x5427  /* BSD compatibility */
+#define TIOCCBRK        0x5428  /* BSD compatibility */
+#define TIOCGSID        0x5429  /* Return the session ID of FD */
+#define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
+#define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
+#define FIONCLEX        0x5450
+#define FIOCLEX         0x5451
+#define FIOASYNC        0x5452
+#define TIOCSERCONFIG   0x5453
+#define TIOCSERGWILD    0x5454
+#define TIOCSERSWILD    0x5455
+#define TIOCGLCKTRMIOS  0x5456
+#define TIOCSLCKTRMIOS  0x5457
+#define TIOCSERGSTRUCT  0x5458 /* For debugging only */
+#define TIOCSERGETLSR   0x5459 /* Get line status register */
+#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
+#define TIOCSERSETMULTI 0x545B /* Set multiport config */
+#define TIOCMIWAIT      0x545C  /* wait for a change on serial input line(s) */
+#define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
+#define TIOCGHAYESESP   0x545E  /* Get Hayes ESP configuration */
+#define TIOCSHAYESESP   0x545F  /* Set Hayes ESP configuration */
+#define FIOQSIZE        0x5460
+/* Used for packet mode */
+#define TIOCPKT_DATA             0
+#define TIOCPKT_FLUSHREAD        1
+#define TIOCPKT_FLUSHWRITE       2
+#define TIOCPKT_STOP             4
+#define TIOCPKT_START            8
+#define TIOCPKT_NOSTOP          16
+#define TIOCPKT_DOSTOP          32
+#define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
+#endif /* __ASM_AVR32_IOCTLS_H */
diff --git a/include/asm-avr32/ipcbuf.h b/include/asm-avr32/ipcbuf.h
new file mode 100644
index 000000000000..1552c9698f5e
--- /dev/null
+++ b/include/asm-avr32/ipcbuf.h
@@ -0,0 +1,29 @@
+#ifndef __ASM_AVR32_IPCBUF_H
+#define __ASM_AVR32_IPCBUF_H
+/*
+* The user_ipc_perm structure for AVR32 architecture.
+* Note extra padding because this structure is passed back and forth
+* between kernel and user space.
+*
+* Pad space is left for:
+* - 32-bit mode_t and seq
+* - 2 miscellaneous 32-bit values
+*/
+struct ipc64_perm
+{
+        __kernel_key_t          key;
+        __kernel_uid32_t        uid;
+        __kernel_gid32_t        gid;
+        __kernel_uid32_t        cuid;
+        __kernel_gid32_t        cgid;
+        __kernel_mode_t         mode;
+        unsigned short          __pad1;
+        unsigned short          seq;
+        unsigned short          __pad2;
+        unsigned long           __unused1;
+        unsigned long           __unused2;
+};
+#endif /* __ASM_AVR32_IPCBUF_H */
diff --git a/include/asm-avr32/irq.h b/include/asm-avr32/irq.h
new file mode 100644
index 000000000000..f7e725707dd7
--- /dev/null
+++ b/include/asm-avr32/irq.h
@@ -0,0 +1,10 @@
+#ifndef __ASM_AVR32_IRQ_H
+#define __ASM_AVR32_IRQ_H
+#define NR_INTERNAL_IRQS        64
+#define NR_EXTERNAL_IRQS        64
+#define NR_IRQS                 (NR_INTERNAL_IRQS + NR_EXTERNAL_IRQS)
+#define irq_canonicalize(i)     (i)
+#endif /* __ASM_AVR32_IOCTLS_H */
diff --git a/include/asm-avr32/irqflags.h b/include/asm-avr32/irqflags.h
new file mode 100644
index 000000000000..93570daac38a
--- /dev/null
+++ b/include/asm-avr32/irqflags.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_IRQFLAGS_H
+#define __ASM_AVR32_IRQFLAGS_H
+#include <asm/sysreg.h>
+static inline unsigned long __raw_local_save_flags(void)
+{
+        return sysreg_read(SR);
+}
+#define raw_local_save_flags(x)                                 \
+        do { (x) = __raw_local_save_flags(); } while (0)
+/*
+ * This will restore ALL status register flags, not only the interrupt
+ * mask flag.
+ *
+ * The empty asm statement informs the compiler of this fact while
+ * also serving as a barrier.
+ */
+static inline void raw_local_irq_restore(unsigned long flags)
+{
+        sysreg_write(SR, flags);
+        asm volatile("" : : : "memory", "cc");
+}
+static inline void raw_local_irq_disable(void)
+{
+        asm volatile("ssrf %0" : : "n"(SYSREG_GM_OFFSET) : "memory");
+}
+static inline void raw_local_irq_enable(void)
+{
+        asm volatile("csrf %0" : : "n"(SYSREG_GM_OFFSET) : "memory");
+}
+static inline int raw_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & SYSREG_BIT(GM)) != 0;
+}
+static inline int raw_irqs_disabled(void)
+{
+        unsigned long flags = __raw_local_save_flags();
+        return raw_irqs_disabled_flags(flags);
+}
+static inline unsigned long __raw_local_irq_save(void)
+{
+        unsigned long flags = __raw_local_save_flags();
+        raw_local_irq_disable();
+        return flags;
+}
+#define raw_local_irq_save(flags)                               \
+        do { (flags) = __raw_local_irq_save(); } while (0)
+#endif /* __ASM_AVR32_IRQFLAGS_H */
diff --git a/include/asm-avr32/kdebug.h b/include/asm-avr32/kdebug.h
new file mode 100644
index 000000000000..f583b643ffb2
--- /dev/null
+++ b/include/asm-avr32/kdebug.h
@@ -0,0 +1,38 @@
+#ifndef __ASM_AVR32_KDEBUG_H
+#define __ASM_AVR32_KDEBUG_H
+#include <linux/notifier.h>
+struct pt_regs;
+struct die_args {
+        struct pt_regs *regs;
+        int trapnr;
+};
+int register_die_notifier(struct notifier_block *nb);
+int unregister_die_notifier(struct notifier_block *nb);
+int register_page_fault_notifier(struct notifier_block *nb);
+int unregister_page_fault_notifier(struct notifier_block *nb);
+extern struct atomic_notifier_head avr32_die_chain;
+/* Grossly misnamed. */
+enum die_val {
+        DIE_FAULT,
+        DIE_BREAKPOINT,
+        DIE_SSTEP,
+        DIE_PAGE_FAULT,
+};
+static inline int notify_die(enum die_val val, struct pt_regs *regs,
+                             int trap, int sig)
+{
+        struct die_args args = {
+                .regs = regs,
+                .trapnr = trap,
+        };
+        return atomic_notifier_call_chain(&avr32_die_chain, val, &args);
+}
+#endif /* __ASM_AVR32_KDEBUG_H */
diff --git a/include/asm-avr32/kmap_types.h b/include/asm-avr32/kmap_types.h
new file mode 100644
index 000000000000..b7f5c6870107
--- /dev/null
+++ b/include/asm-avr32/kmap_types.h
@@ -0,0 +1,30 @@
+#ifndef __ASM_AVR32_KMAP_TYPES_H
+#define __ASM_AVR32_KMAP_TYPES_H
+#ifdef CONFIG_DEBUG_HIGHMEM
+# define D(n) __KM_FENCE_##n ,
+#else
+# define D(n)
+#endif
+enum km_type {
+D(0)    KM_BOUNCE_READ,
+D(1)    KM_SKB_SUNRPC_DATA,
+D(2)    KM_SKB_DATA_SOFTIRQ,
+D(3)    KM_USER0,
+D(4)    KM_USER1,
+D(5)    KM_BIO_SRC_IRQ,
+D(6)    KM_BIO_DST_IRQ,
+D(7)    KM_PTE0,
+D(8)    KM_PTE1,
+D(9)    KM_PTE2,
+D(10)   KM_IRQ0,
+D(11)   KM_IRQ1,
+D(12)   KM_SOFTIRQ0,
+D(13)   KM_SOFTIRQ1,
+D(14)   KM_TYPE_NR
+};
+#undef D
+#endif /* __ASM_AVR32_KMAP_TYPES_H */
diff --git a/include/asm-avr32/kprobes.h b/include/asm-avr32/kprobes.h
new file mode 100644
index 000000000000..09a5cbe2f896
--- /dev/null
+++ b/include/asm-avr32/kprobes.h
@@ -0,0 +1,34 @@
+/*
+ * Kernel Probes (KProbes)
+ *
+ * Copyright (C) 2005-2006 Atmel Corporation
+ * Copyright (C) IBM Corporation, 2002, 2004
+ *
+ * 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_AVR32_KPROBES_H
+#define __ASM_AVR32_KPROBES_H
+#include <linux/types.h>
+typedef u16     kprobe_opcode_t;
+#define BREAKPOINT_INSTRUCTION  0xd673  /* breakpoint */
+#define MAX_INSN_SIZE           2
+#define ARCH_INACTIVE_KPROBE_COUNT 1
+#define arch_remove_kprobe(p)   do { } while (0)
+/* Architecture specific copy of original instruction */
+struct arch_specific_insn {
+        kprobe_opcode_t insn[MAX_INSN_SIZE];
+};
+extern int kprobe_exceptions_notify(struct notifier_block *self,
+                                    unsigned long val, void *data);
+#define flush_insn_slot(p)      do { } while (0)
+#endif /* __ASM_AVR32_KPROBES_H */
diff --git a/include/asm-avr32/linkage.h b/include/asm-avr32/linkage.h
new file mode 100644
index 000000000000..f7b285e910d4
--- /dev/null
+++ b/include/asm-avr32/linkage.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
+#define __ALIGN .balign 2
+#define __ALIGN_STR ".balign 2"
+#endif /* __ASM_LINKAGE_H */
diff --git a/include/asm-avr32/local.h b/include/asm-avr32/local.h
new file mode 100644
index 000000000000..1c1619694da3
--- /dev/null
+++ b/include/asm-avr32/local.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_LOCAL_H
+#define __ASM_AVR32_LOCAL_H
+#include <asm-generic/local.h>
+#endif /* __ASM_AVR32_LOCAL_H */
diff --git a/include/asm-avr32/mach/serial_at91.h b/include/asm-avr32/mach/serial_at91.h
new file mode 100644
index 000000000000..1290bb32802d
--- /dev/null
+++ b/include/asm-avr32/mach/serial_at91.h
@@ -0,0 +1,33 @@
+/*
+ *  linux/include/asm-arm/mach/serial_at91.h
+ *
+ *  Based on serial_sa1100.h  by Nicolas Pitre
+ *
+ *  Copyright (C) 2002 ATMEL Rousset
+ *
+ *  Low level machine dependent UART functions.
+ */
+struct uart_port;
+/*
+ * This is a temporary structure for registering these
+ * functions; it is intended to be discarded after boot.
+ */
+struct at91_port_fns {
+        void    (*set_mctrl)(struct uart_port *, u_int);
+        u_int   (*get_mctrl)(struct uart_port *);
+        void    (*enable_ms)(struct uart_port *);
+        void    (*pm)(struct uart_port *, u_int, u_int);
+        int     (*set_wake)(struct uart_port *, u_int);
+        int     (*open)(struct uart_port *);
+        void    (*close)(struct uart_port *);
+};
+#if defined(CONFIG_SERIAL_AT91)
+void at91_register_uart_fns(struct at91_port_fns *fns);
+#else
+#define at91_register_uart_fns(fns) do { } while (0)
+#endif
diff --git a/include/asm-avr32/mman.h b/include/asm-avr32/mman.h
new file mode 100644
index 000000000000..648f91e7187a
--- /dev/null
+++ b/include/asm-avr32/mman.h
@@ -0,0 +1,17 @@
+#ifndef __ASM_AVR32_MMAN_H__
+#define __ASM_AVR32_MMAN_H__
+#include <asm-generic/mman.h>
+#define MAP_GROWSDOWN   0x0100          /* stack-like segment */
+#define MAP_DENYWRITE   0x0800          /* ETXTBSY */
+#define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
+#define MAP_LOCKED      0x2000          /* pages are locked */
+#define MAP_NORESERVE   0x4000          /* don't check for reservations */
+#define MAP_POPULATE    0x8000          /* populate (prefault) page tables */
+#define MAP_NONBLOCK    0x10000         /* do not block on IO */
+#define MCL_CURRENT     1               /* lock all current mappings */
+#define MCL_FUTURE      2               /* lock all future mappings */
+#endif /* __ASM_AVR32_MMAN_H__ */
diff --git a/include/asm-avr32/mmu.h b/include/asm-avr32/mmu.h
new file mode 100644
index 000000000000..60c2d2650d32
--- /dev/null
+++ b/include/asm-avr32/mmu.h
@@ -0,0 +1,10 @@
+#ifndef __ASM_AVR32_MMU_H
+#define __ASM_AVR32_MMU_H
+/* Default "unsigned long" context */
+typedef unsigned long mm_context_t;
+#define MMU_ITLB_ENTRIES        64
+#define MMU_DTLB_ENTRIES        64
+#endif /* __ASM_AVR32_MMU_H */
diff --git a/include/asm-avr32/mmu_context.h b/include/asm-avr32/mmu_context.h
new file mode 100644
index 000000000000..31add1ae8089
--- /dev/null
+++ b/include/asm-avr32/mmu_context.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * ASID handling taken from SH implementation.
+ *   Copyright (C) 1999 Niibe Yutaka
+ *   Copyright (C) 2003 Paul Mundt
+ *
+ * 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_AVR32_MMU_CONTEXT_H
+#define __ASM_AVR32_MMU_CONTEXT_H
+#include <asm/tlbflush.h>
+#include <asm/pgalloc.h>
+#include <asm/sysreg.h>
+/*
+ * The MMU "context" consists of two things:
+ *    (a) TLB cache version
+ *    (b) ASID (Address Space IDentifier)
+ */
+#define MMU_CONTEXT_ASID_MASK           0x000000ff
+#define MMU_CONTEXT_VERSION_MASK        0xffffff00
+#define MMU_CONTEXT_FIRST_VERSION       0x00000100
+#define NO_CONTEXT                      0
+#define MMU_NO_ASID                     0x100
+/* Virtual Page Number mask */
+#define MMU_VPN_MASK    0xfffff000
+/* Cache of MMU context last used */
+extern unsigned long mmu_context_cache;
+/*
+ * Get MMU context if needed
+ */
+static inline void
+get_mmu_context(struct mm_struct *mm)
+{
+        unsigned long mc = mmu_context_cache;
+        if (((mm->context ^ mc) & MMU_CONTEXT_VERSION_MASK) == 0)
+                /* It's up to date, do nothing */
+                return;
+        /* It's old, we need to get new context with new version */
+        mc = ++mmu_context_cache;
+        if (!(mc & MMU_CONTEXT_ASID_MASK)) {
+                /*
+                 * We have exhausted all ASIDs of this version.
+                 * Flush the TLB and start new cycle.
+                 */
+                flush_tlb_all();
+                /*
+                 * Fix version. Note that we avoid version #0
+                 * to distinguish NO_CONTEXT.
+                 */
+                if (!mc)
+                        mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION;
+        }
+        mm->context = mc;
+}
+/*
+ * Initialize the context related info for a new mm_struct
+ * instance.
+ */
+static inline int init_new_context(struct task_struct *tsk,
+                                       struct mm_struct *mm)
+{
+        mm->context = NO_CONTEXT;
+        return 0;
+}
+/*
+ * Destroy context related info for an mm_struct that is about
+ * to be put to rest.
+ */
+static inline void destroy_context(struct mm_struct *mm)
+{
+        /* Do nothing */
+}
+static inline void set_asid(unsigned long asid)
+{
+        /* XXX: We're destroying TLBEHI[8:31] */
+        sysreg_write(TLBEHI, asid & MMU_CONTEXT_ASID_MASK);
+        cpu_sync_pipeline();
+}
+static inline unsigned long get_asid(void)
+{
+        unsigned long asid;
+        asid = sysreg_read(TLBEHI);
+        return asid & MMU_CONTEXT_ASID_MASK;
+}
+static inline void activate_context(struct mm_struct *mm)
+{
+        get_mmu_context(mm);
+        set_asid(mm->context & MMU_CONTEXT_ASID_MASK);
+}
+static inline void switch_mm(struct mm_struct *prev,
+                                 struct mm_struct *next,
+                                 struct task_struct *tsk)
+{
+        if (likely(prev != next)) {
+                unsigned long __pgdir = (unsigned long)next->pgd;
+                sysreg_write(PTBR, __pgdir);
+                activate_context(next);
+        }
+}
+#define deactivate_mm(tsk,mm) do { } while(0)
+#define activate_mm(prev, next) switch_mm((prev), (next), NULL)
+static inline void
+enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
+{
+}
+static inline void enable_mmu(void)
+{
+        sysreg_write(MMUCR, (SYSREG_BIT(MMUCR_S)
+                             | SYSREG_BIT(E)
+                             | SYSREG_BIT(MMUCR_I)));
+        nop(); nop(); nop(); nop(); nop(); nop(); nop(); nop();
+        if (mmu_context_cache == NO_CONTEXT)
+                mmu_context_cache = MMU_CONTEXT_FIRST_VERSION;
+        set_asid(mmu_context_cache & MMU_CONTEXT_ASID_MASK);
+}
+static inline void disable_mmu(void)
+{
+        sysreg_write(MMUCR, SYSREG_BIT(MMUCR_S));
+}
+#endif /* __ASM_AVR32_MMU_CONTEXT_H */
diff --git a/include/asm-avr32/module.h b/include/asm-avr32/module.h
new file mode 100644
index 000000000000..451444538a1b
--- /dev/null
+++ b/include/asm-avr32/module.h
@@ -0,0 +1,28 @@
+#ifndef __ASM_AVR32_MODULE_H
+#define __ASM_AVR32_MODULE_H
+struct mod_arch_syminfo {
+        unsigned long got_offset;
+        int got_initialized;
+};
+struct mod_arch_specific {
+        /* Starting offset of got in the module core memory. */
+        unsigned long got_offset;
+        /* Size of the got. */
+        unsigned long got_size;
+        /* Number of symbols in syminfo. */
+        int nsyms;
+        /* Additional symbol information (got offsets). */
+        struct mod_arch_syminfo *syminfo;
+};
+#define Elf_Shdr                Elf32_Shdr
+#define Elf_Sym                 Elf32_Sym
+#define Elf_Ehdr                Elf32_Ehdr
+#define MODULE_PROC_FAMILY "AVR32v1"
+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
+#endif /* __ASM_AVR32_MODULE_H */
diff --git a/include/asm-avr32/msgbuf.h b/include/asm-avr32/msgbuf.h
new file mode 100644
index 000000000000..ac18bc4da7f7
--- /dev/null
+++ b/include/asm-avr32/msgbuf.h
@@ -0,0 +1,31 @@
+#ifndef __ASM_AVR32_MSGBUF_H
+#define __ASM_AVR32_MSGBUF_H
+/*
+ * The msqid64_ds structure for i386 architecture.
+ * Note extra padding because this structure is passed back and forth
+ * between kernel and user space.
+ *
+ * Pad space is left for:
+ * - 64-bit time_t to solve y2038 problem
+ * - 2 miscellaneous 32-bit values
+ */
+struct msqid64_ds {
+        struct ipc64_perm msg_perm;
+        __kernel_time_t msg_stime;      /* last msgsnd time */
+        unsigned long   __unused1;
+        __kernel_time_t msg_rtime;      /* last msgrcv time */
+        unsigned long   __unused2;
+        __kernel_time_t msg_ctime;      /* last change time */
+        unsigned long   __unused3;
+        unsigned long  msg_cbytes;      /* current number of bytes on queue */
+        unsigned long  msg_qnum;        /* number of messages in queue */
+        unsigned long  msg_qbytes;      /* max number of bytes on queue */
+        __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
+        __kernel_pid_t msg_lrpid;       /* last receive pid */
+        unsigned long  __unused4;
+        unsigned long  __unused5;
+};
+#endif /* __ASM_AVR32_MSGBUF_H */
diff --git a/include/asm-avr32/mutex.h b/include/asm-avr32/mutex.h
new file mode 100644
index 000000000000..458c1f7fbc18
--- /dev/null
+++ b/include/asm-avr32/mutex.h
@@ -0,0 +1,9 @@
+/*
+ * Pull in the generic implementation for the mutex fastpath.
+ *
+ * TODO: implement optimized primitives instead, or leave the generic
+ * implementation in place, or pick the atomic_xchg() based generic
+ * implementation. (see asm-generic/mutex-xchg.h for details)
+ */
+#include <asm-generic/mutex-dec.h>
diff --git a/include/asm-avr32/namei.h b/include/asm-avr32/namei.h
new file mode 100644
index 000000000000..f0a26de06cab
--- /dev/null
+++ b/include/asm-avr32/namei.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_AVR32_NAMEI_H
+#define __ASM_AVR32_NAMEI_H
+/* This dummy routine may be changed to something useful */
+#define __emul_prefix() NULL
+#endif /* __ASM_AVR32_NAMEI_H */
diff --git a/include/asm-avr32/numnodes.h b/include/asm-avr32/numnodes.h
new file mode 100644
index 000000000000..0b864d7ce330
--- /dev/null
+++ b/include/asm-avr32/numnodes.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_AVR32_NUMNODES_H
+#define __ASM_AVR32_NUMNODES_H
+/* Max 4 nodes */
+#define NODES_SHIFT     2
+#endif /* __ASM_AVR32_NUMNODES_H */
diff --git a/include/asm-avr32/ocd.h b/include/asm-avr32/ocd.h
new file mode 100644
index 000000000000..46f73180a127
--- /dev/null
+++ b/include/asm-avr32/ocd.h
@@ -0,0 +1,78 @@
+/*
+ * AVR32 OCD Registers
+ *
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_OCD_H
+#define __ASM_AVR32_OCD_H
+/* Debug Registers */
+#define DBGREG_DID                0
+#define DBGREG_DC                 8
+#define DBGREG_DS                16
+#define DBGREG_RWCS              28
+#define DBGREG_RWA               36
+#define DBGREG_RWD               40
+#define DBGREG_WT                44
+#define DBGREG_DTC               52
+#define DBGREG_DTSA0             56
+#define DBGREG_DTSA1             60
+#define DBGREG_DTEA0             72
+#define DBGREG_DTEA1             76
+#define DBGREG_BWC0A             88
+#define DBGREG_BWC0B             92
+#define DBGREG_BWC1A             96
+#define DBGREG_BWC1B            100
+#define DBGREG_BWC2A            104
+#define DBGREG_BWC2B            108
+#define DBGREG_BWC3A            112
+#define DBGREG_BWC3B            116
+#define DBGREG_BWA0A            120
+#define DBGREG_BWA0B            124
+#define DBGREG_BWA1A            128
+#define DBGREG_BWA1B            132
+#define DBGREG_BWA2A            136
+#define DBGREG_BWA2B            140
+#define DBGREG_BWA3A            144
+#define DBGREG_BWA3B            148
+#define DBGREG_BWD3A            153
+#define DBGREG_BWD3B            156
+#define DBGREG_PID              284
+#define SABAH_OCD               0x01
+#define SABAH_ICACHE            0x02
+#define SABAH_MEM_CACHED        0x04
+#define SABAH_MEM_UNCACHED      0x05
+/* Fields in the Development Control register */
+#define DC_SS_BIT               8
+#define DC_SS                   (1 <<  DC_SS_BIT)
+#define DC_DBE                  (1 << 13)
+#define DC_RID                  (1 << 27)
+#define DC_ORP                  (1 << 28)
+#define DC_MM                   (1 << 29)
+#define DC_RES                  (1 << 30)
+/* Fields in the Development Status register */
+#define DS_SSS                  (1 <<  0)
+#define DS_SWB                  (1 <<  1)
+#define DS_HWB                  (1 <<  2)
+#define DS_BP_SHIFT             8
+#define DS_BP_MASK              (0xff << DS_BP_SHIFT)
+#define __mfdr(addr)                                                    \
+({                                                                      \
+        register unsigned long value;                                   \
+        asm volatile("mfdr      %0, %1" : "=r"(value) : "i"(addr));     \
+        value;                                                          \
+})
+#define __mtdr(addr, value)                                             \
+        asm volatile("mtdr      %0, %1" : : "i"(addr), "r"(value))
+#endif /* __ASM_AVR32_OCD_H */
diff --git a/include/asm-avr32/page.h b/include/asm-avr32/page.h
new file mode 100644
index 000000000000..0f630b3e9932
--- /dev/null
+++ b/include/asm-avr32/page.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_PAGE_H
+#define __ASM_AVR32_PAGE_H
+#ifdef __KERNEL__
+/* PAGE_SHIFT determines the page size */
+#define PAGE_SHIFT      12
+#ifdef __ASSEMBLY__
+#define PAGE_SIZE       (1 << PAGE_SHIFT)
+#else
+#define PAGE_SIZE       (1UL << PAGE_SHIFT)
+#endif
+#define PAGE_MASK       (~(PAGE_SIZE-1))
+#define PTE_MASK        PAGE_MASK
+#ifndef __ASSEMBLY__
+#include <asm/addrspace.h>
+extern void clear_page(void *to);
+extern void copy_page(void *to, void *from);
+#define clear_user_page(page, vaddr, pg)        clear_page(page)
+#define copy_user_page(to, from, vaddr, pg)     copy_page(to, from)
+/*
+ * These are used to make use of C type-checking..
+ */
+typedef struct { unsigned long pte; } pte_t;
+typedef struct { unsigned long pgd; } pgd_t;
+typedef struct { unsigned long pgprot; } pgprot_t;
+#define pte_val(x)              ((x).pte)
+#define pgd_val(x)              ((x).pgd)
+#define pgprot_val(x)           ((x).pgprot)
+#define __pte(x)                ((pte_t) { (x) })
+#define __pgd(x)                ((pgd_t) { (x) })
+#define __pgprot(x)             ((pgprot_t) { (x) })
+/* FIXME: These should be removed soon */
+extern unsigned long memory_start, memory_end;
+/* Pure 2^n version of get_order */
+static inline int get_order(unsigned long size)
+{
+        unsigned lz;
+        size = (size - 1) >> PAGE_SHIFT;
+        asm("clz %0, %1" : "=r"(lz) : "r"(size));
+        return 32 - lz;
+}
+#endif /* !__ASSEMBLY__ */
+/* Align the pointer to the (next) page boundary */
+#define PAGE_ALIGN(addr)        (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
+/*
+ * The hardware maps the virtual addresses 0x80000000 -> 0x9fffffff
+ * permanently to the physical addresses 0x00000000 -> 0x1fffffff when
+ * segmentation is enabled. We want to make use of this in order to
+ * minimize TLB pressure.
+ */
+#define PAGE_OFFSET             (0x80000000UL)
+/*
+ * ALSA uses virt_to_page() on DMA pages, which I'm not entirely sure
+ * is a good idea. Anyway, we can't simply subtract PAGE_OFFSET here
+ * in that case, so we'll have to mask out the three most significant
+ * bits of the address instead...
+ *
+ * What's the difference between __pa() and virt_to_phys() anyway?
+ */
+#define __pa(x)         PHYSADDR(x)
+#define __va(x)         ((void *)(P1SEGADDR(x)))
+#define MAP_NR(addr)    (((unsigned long)(addr) - PAGE_OFFSET) >> PAGE_SHIFT)
+#define phys_to_page(phys)      (pfn_to_page(phys >> PAGE_SHIFT))
+#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
+#ifndef CONFIG_NEED_MULTIPLE_NODES
+#define PHYS_PFN_OFFSET         (CONFIG_PHYS_OFFSET >> PAGE_SHIFT)
+#define pfn_to_page(pfn)        (mem_map + ((pfn) - PHYS_PFN_OFFSET))
+#define page_to_pfn(page)       ((unsigned long)((page) - mem_map) + PHYS_PFN_OFFSET)
+#define pfn_valid(pfn)          ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
+#endif /* CONFIG_NEED_MULTIPLE_NODES */
+#define virt_to_page(kaddr)     pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
+#define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
+#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE |   \
+                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+/*
+ * Memory above this physical address will be considered highmem.
+ */
+#define HIGHMEM_START           0x20000000UL
+#endif /* __KERNEL__ */
+#endif /* __ASM_AVR32_PAGE_H */
diff --git a/include/asm-avr32/param.h b/include/asm-avr32/param.h
new file mode 100644
index 000000000000..34bc8d4c3b29
--- /dev/null
+++ b/include/asm-avr32/param.h
@@ -0,0 +1,23 @@
+#ifndef __ASM_AVR32_PARAM_H
+#define __ASM_AVR32_PARAM_H
+#ifdef __KERNEL__
+# define HZ             CONFIG_HZ
+# define USER_HZ        100             /* User interfaces are in "ticks" */
+# define CLOCKS_PER_SEC (USER_HZ)       /* frequency at which times() counts */
+#endif
+#ifndef HZ
+# define HZ             100
+#endif
+/* TODO: Should be configurable */
+#define EXEC_PAGESIZE   4096
+#ifndef NOGROUP
+# define NOGROUP        (-1)
+#endif
+#define MAXHOSTNAMELEN  64
+#endif /* __ASM_AVR32_PARAM_H */
diff --git a/include/asm-avr32/pci.h b/include/asm-avr32/pci.h
new file mode 100644
index 000000000000..0f5f134b896a
--- /dev/null
+++ b/include/asm-avr32/pci.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_AVR32_PCI_H__
+#define __ASM_AVR32_PCI_H__
+/* We don't support PCI yet, but some drivers require this file anyway */
+#define PCI_DMA_BUS_IS_PHYS     (1)
+#endif /* __ASM_AVR32_PCI_H__ */
diff --git a/include/asm-avr32/percpu.h b/include/asm-avr32/percpu.h
new file mode 100644
index 000000000000..69227b4cd0d4
--- /dev/null
+++ b/include/asm-avr32/percpu.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_PERCPU_H
+#define __ASM_AVR32_PERCPU_H
+#include <asm-generic/percpu.h>
+#endif /* __ASM_AVR32_PERCPU_H */
diff --git a/include/asm-avr32/pgalloc.h b/include/asm-avr32/pgalloc.h
new file mode 100644
index 000000000000..7492cfb92ced
--- /dev/null
+++ b/include/asm-avr32/pgalloc.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_PGALLOC_H
+#define __ASM_AVR32_PGALLOC_H
+#include <asm/processor.h>
+#include <linux/threads.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+#define pmd_populate_kernel(mm, pmd, pte) \
+        set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
+static __inline__ void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
+                                    struct page *pte)
+{
+        set_pmd(pmd, __pmd(_PAGE_TABLE + page_to_phys(pte)));
+}
+/*
+ * Allocate and free page tables
+ */
+static __inline__ pgd_t *pgd_alloc(struct mm_struct *mm)
+{
+        unsigned int pgd_size = (USER_PTRS_PER_PGD * sizeof(pgd_t));
+        pgd_t *pgd = (pgd_t *)kmalloc(pgd_size, GFP_KERNEL);
+        if (pgd)
+                memset(pgd, 0, pgd_size);
+        return pgd;
+}
+static inline void pgd_free(pgd_t *pgd)
+{
+        kfree(pgd);
+}
+static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
+                                          unsigned long address)
+{
+        int count = 0;
+        pte_t *pte;
+        do {
+                pte = (pte_t *) __get_free_page(GFP_KERNEL | __GFP_REPEAT);
+                if (pte)
+                        clear_page(pte);
+                else {
+                        current->state = TASK_UNINTERRUPTIBLE;
+                        schedule_timeout(HZ);
+                }
+        } while (!pte && (count++ < 10));
+        return pte;
+}
+static inline struct page *pte_alloc_one(struct mm_struct *mm,
+                                         unsigned long address)
+{
+        int count = 0;
+        struct page *pte;
+        do {
+                pte = alloc_pages(GFP_KERNEL, 0);
+                if (pte)
+                        clear_page(page_address(pte));
+                else {
+                        current->state = TASK_UNINTERRUPTIBLE;
+                        schedule_timeout(HZ);
+                }
+        } while (!pte && (count++ < 10));
+        return pte;
+}
+static inline void pte_free_kernel(pte_t *pte)
+{
+        free_page((unsigned long)pte);
+}
+static inline void pte_free(struct page *pte)
+{
+        __free_page(pte);
+}
+#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
+#define check_pgt_cache() do { } while(0)
+#endif /* __ASM_AVR32_PGALLOC_H */
diff --git a/include/asm-avr32/pgtable-2level.h b/include/asm-avr32/pgtable-2level.h
new file mode 100644
index 000000000000..425dd567b5b9
--- /dev/null
+++ b/include/asm-avr32/pgtable-2level.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_PGTABLE_2LEVEL_H
+#define __ASM_AVR32_PGTABLE_2LEVEL_H
+#include <asm-generic/pgtable-nopmd.h>
+/*
+ * Traditional 2-level paging structure
+ */
+#define PGDIR_SHIFT     22
+#define PTRS_PER_PGD    1024
+#define PTRS_PER_PTE    1024
+#ifndef __ASSEMBLY__
+#define pte_ERROR(e) \
+        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
+#define pgd_ERROR(e) \
+        printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
+/*
+ * Certain architectures need to do special things when PTEs
+ * within a page table are directly modified.  Thus, the following
+ * hook is made available.
+ */
+#define set_pte(pteptr, pteval) (*(pteptr) = pteval)
+#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep, pteval)
+/*
+ * (pmds are folded into pgds so this doesn't get actually called,
+ * but the define is needed for a generic inline function.)
+ */
+#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
+#define pte_pfn(x)              ((unsigned long)(((x).pte >> PAGE_SHIFT)))
+#define pfn_pte(pfn, prot)      __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#define pfn_pmd(pfn, prot)      __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#endif /* !__ASSEMBLY__ */
+#endif /* __ASM_AVR32_PGTABLE_2LEVEL_H */
diff --git a/include/asm-avr32/pgtable.h b/include/asm-avr32/pgtable.h
new file mode 100644
index 000000000000..6b8ca9db2bd5
--- /dev/null
+++ b/include/asm-avr32/pgtable.h
@@ -0,0 +1,408 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_PGTABLE_H
+#define __ASM_AVR32_PGTABLE_H
+#include <asm/addrspace.h>
+#ifndef __ASSEMBLY__
+#include <linux/sched.h>
+#endif /* !__ASSEMBLY__ */
+/*
+ * Use two-level page tables just as the i386 (without PAE)
+ */
+#include <asm/pgtable-2level.h>
+/*
+ * The following code might need some cleanup when the values are
+ * final...
+ */
+#define PMD_SIZE        (1UL << PMD_SHIFT)
+#define PMD_MASK        (~(PMD_SIZE-1))
+#define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
+#define PGDIR_MASK      (~(PGDIR_SIZE-1))
+#define USER_PTRS_PER_PGD       (TASK_SIZE / PGDIR_SIZE)
+#define FIRST_USER_ADDRESS      0
+#define PTE_PHYS_MASK   0x1ffff000
+#ifndef __ASSEMBLY__
+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
+extern void paging_init(void);
+/*
+ * ZERO_PAGE is a global shared page that is always zero: used for
+ * zero-mapped memory areas etc.
+ */
+extern struct page *empty_zero_page;
+#define ZERO_PAGE(vaddr) (empty_zero_page)
+/*
+ * Just any arbitrary offset to the start of the vmalloc VM area: the
+ * current 8 MiB value just means that there will be a 8 MiB "hole"
+ * after the uncached physical memory (P2 segment) until the vmalloc
+ * area starts. That means that any out-of-bounds memory accesses will
+ * hopefully be caught; we don't know if the end of the P1/P2 segments
+ * are actually used for anything, but it is anyway safer to let the
+ * MMU catch these kinds of errors than to rely on the memory bus.
+ *
+ * A "hole" of the same size is added to the end of the P3 segment as
+ * well. It might seem wasteful to use 16 MiB of virtual address space
+ * on this, but we do have 512 MiB of it...
+ *
+ * The vmalloc() routines leave a hole of 4 KiB between each vmalloced
+ * area for the same reason.
+ */
+#define VMALLOC_OFFSET  (8 * 1024 * 1024)
+#define VMALLOC_START   (P3SEG + VMALLOC_OFFSET)
+#define VMALLOC_END     (P4SEG - VMALLOC_OFFSET)
+#endif /* !__ASSEMBLY__ */
+/*
+ * Page flags. Some of these flags are not directly supported by
+ * hardware, so we have to emulate them.
+ */
+#define _TLBEHI_BIT_VALID       9
+#define _TLBEHI_VALID           (1 << _TLBEHI_BIT_VALID)
+#define _PAGE_BIT_WT            0  /* W-bit   : write-through */
+#define _PAGE_BIT_DIRTY         1  /* D-bit   : page changed */
+#define _PAGE_BIT_SZ0           2  /* SZ0-bit : Size of page */
+#define _PAGE_BIT_SZ1           3  /* SZ1-bit : Size of page */
+#define _PAGE_BIT_EXECUTE       4  /* X-bit   : execute access allowed */
+#define _PAGE_BIT_RW            5  /* AP0-bit : write access allowed */
+#define _PAGE_BIT_USER          6  /* AP1-bit : user space access allowed */
+#define _PAGE_BIT_BUFFER        7  /* B-bit   : bufferable */
+#define _PAGE_BIT_GLOBAL        8  /* G-bit   : global (ignore ASID) */
+#define _PAGE_BIT_CACHABLE      9  /* C-bit   : cachable */
+/* If we drop support for 1K pages, we get two extra bits */
+#define _PAGE_BIT_PRESENT       10
+#define _PAGE_BIT_ACCESSED      11 /* software: page was accessed */
+/* The following flags are only valid when !PRESENT */
+#define _PAGE_BIT_FILE          0 /* software: pagecache or swap? */
+#define _PAGE_WT                (1 << _PAGE_BIT_WT)
+#define _PAGE_DIRTY             (1 << _PAGE_BIT_DIRTY)
+#define _PAGE_EXECUTE           (1 << _PAGE_BIT_EXECUTE)
+#define _PAGE_RW                (1 << _PAGE_BIT_RW)
+#define _PAGE_USER              (1 << _PAGE_BIT_USER)
+#define _PAGE_BUFFER            (1 << _PAGE_BIT_BUFFER)
+#define _PAGE_GLOBAL            (1 << _PAGE_BIT_GLOBAL)
+#define _PAGE_CACHABLE          (1 << _PAGE_BIT_CACHABLE)
+/* Software flags */
+#define _PAGE_ACCESSED          (1 << _PAGE_BIT_ACCESSED)
+#define _PAGE_PRESENT           (1 << _PAGE_BIT_PRESENT)
+#define _PAGE_FILE              (1 << _PAGE_BIT_FILE)
+/*
+ * Page types, i.e. sizes. _PAGE_TYPE_NONE corresponds to what is
+ * usually called _PAGE_PROTNONE on other architectures.
+ *
+ * XXX: Find out if _PAGE_PROTNONE is equivalent with !_PAGE_USER. If
+ * so, we can encode all possible page sizes (although we can't really
+ * support 1K pages anyway due to the _PAGE_PRESENT and _PAGE_ACCESSED
+ * bits)
+ *
+ */
+#define _PAGE_TYPE_MASK         ((1 << _PAGE_BIT_SZ0) | (1 << _PAGE_BIT_SZ1))
+#define _PAGE_TYPE_NONE         (0 << _PAGE_BIT_SZ0)
+#define _PAGE_TYPE_SMALL        (1 << _PAGE_BIT_SZ0)
+#define _PAGE_TYPE_MEDIUM       (2 << _PAGE_BIT_SZ0)
+#define _PAGE_TYPE_LARGE        (3 << _PAGE_BIT_SZ0)
+/*
+ * Mask which drop software flags. We currently can't handle more than
+ * 512 MiB of physical memory, so we can use bits 29-31 for other
+ * stuff.  With a fixed 4K page size, we can use bits 10-11 as well as
+ * bits 2-3 (SZ)
+ */
+#define _PAGE_FLAGS_HARDWARE_MASK       0xfffff3ff
+#define _PAGE_FLAGS_CACHE_MASK  (_PAGE_CACHABLE | _PAGE_BUFFER | _PAGE_WT)
+/* TODO: Check for saneness */
+/* User-mode page table flags (to be set in a pgd or pmd entry) */
+#define _PAGE_TABLE             (_PAGE_PRESENT | _PAGE_TYPE_SMALL | _PAGE_RW \
+                                 | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
+/* Kernel-mode page table flags */
+#define _KERNPG_TABLE           (_PAGE_PRESENT | _PAGE_TYPE_SMALL | _PAGE_RW \
+                                 | _PAGE_ACCESSED | _PAGE_DIRTY)
+/* Flags that may be modified by software */
+#define _PAGE_CHG_MASK          (PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY \
+                                 | _PAGE_FLAGS_CACHE_MASK)
+#define _PAGE_FLAGS_READ        (_PAGE_CACHABLE | _PAGE_BUFFER)
+#define _PAGE_FLAGS_WRITE       (_PAGE_FLAGS_READ | _PAGE_RW | _PAGE_DIRTY)
+#define _PAGE_NORMAL(x) __pgprot((x) | _PAGE_PRESENT | _PAGE_TYPE_SMALL \
+                                 | _PAGE_ACCESSED)
+#define PAGE_NONE       (_PAGE_ACCESSED | _PAGE_TYPE_NONE)
+#define PAGE_READ       (_PAGE_FLAGS_READ | _PAGE_USER)
+#define PAGE_EXEC       (_PAGE_FLAGS_READ | _PAGE_EXECUTE | _PAGE_USER)
+#define PAGE_WRITE      (_PAGE_FLAGS_WRITE | _PAGE_USER)
+#define PAGE_KERNEL     _PAGE_NORMAL(_PAGE_FLAGS_WRITE | _PAGE_EXECUTE | _PAGE_GLOBAL)
+#define PAGE_KERNEL_RO  _PAGE_NORMAL(_PAGE_FLAGS_READ | _PAGE_EXECUTE | _PAGE_GLOBAL)
+#define _PAGE_P(x)      _PAGE_NORMAL((x) & ~(_PAGE_RW | _PAGE_DIRTY))
+#define _PAGE_S(x)      _PAGE_NORMAL(x)
+#define PAGE_COPY       _PAGE_P(PAGE_WRITE | PAGE_READ)
+#ifndef __ASSEMBLY__
+/*
+ * The hardware supports flags for write- and execute access. Read is
+ * always allowed if the page is loaded into the TLB, so the "-w-",
+ * "--x" and "-wx" mappings are implemented as "rw-", "r-x" and "rwx",
+ * respectively.
+ *
+ * The "---" case is handled by software; the page will simply not be
+ * loaded into the TLB if the page type is _PAGE_TYPE_NONE.
+ */
+#define __P000  __pgprot(PAGE_NONE)
+#define __P001  _PAGE_P(PAGE_READ)
+#define __P010  _PAGE_P(PAGE_WRITE)
+#define __P011  _PAGE_P(PAGE_WRITE | PAGE_READ)
+#define __P100  _PAGE_P(PAGE_EXEC)
+#define __P101  _PAGE_P(PAGE_EXEC | PAGE_READ)
+#define __P110  _PAGE_P(PAGE_EXEC | PAGE_WRITE)
+#define __P111  _PAGE_P(PAGE_EXEC | PAGE_WRITE | PAGE_READ)
+#define __S000  __pgprot(PAGE_NONE)
+#define __S001  _PAGE_S(PAGE_READ)
+#define __S010  _PAGE_S(PAGE_WRITE)
+#define __S011  _PAGE_S(PAGE_WRITE | PAGE_READ)
+#define __S100  _PAGE_S(PAGE_EXEC)
+#define __S101  _PAGE_S(PAGE_EXEC | PAGE_READ)
+#define __S110  _PAGE_S(PAGE_EXEC | PAGE_WRITE)
+#define __S111  _PAGE_S(PAGE_EXEC | PAGE_WRITE | PAGE_READ)
+#define pte_none(x)     (!pte_val(x))
+#define pte_present(x)  (pte_val(x) & _PAGE_PRESENT)
+#define pte_clear(mm,addr,xp)                                   \
+        do {                                                    \
+                set_pte_at(mm, addr, xp, __pte(0));             \
+        } while (0)
+/*
+ * The following only work if pte_present() is true.
+ * Undefined behaviour if not..
+ */
+static inline int pte_read(pte_t pte)
+{
+        return pte_val(pte) & _PAGE_USER;
+}
+static inline int pte_write(pte_t pte)
+{
+        return pte_val(pte) & _PAGE_RW;
+}
+static inline int pte_exec(pte_t pte)
+{
+        return pte_val(pte) & _PAGE_EXECUTE;
+}
+static inline int pte_dirty(pte_t pte)
+{
+        return pte_val(pte) & _PAGE_DIRTY;
+}
+static inline int pte_young(pte_t pte)
+{
+        return pte_val(pte) & _PAGE_ACCESSED;
+}
+/*
+ * The following only work if pte_present() is not true.
+ */
+static inline int pte_file(pte_t pte)
+{
+        return pte_val(pte) & _PAGE_FILE;
+}
+/* Mutator functions for PTE bits */
+static inline pte_t pte_rdprotect(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_USER));
+        return pte;
+}
+static inline pte_t pte_wrprotect(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_RW));
+        return pte;
+}
+static inline pte_t pte_exprotect(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_EXECUTE));
+        return pte;
+}
+static inline pte_t pte_mkclean(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_DIRTY));
+        return pte;
+}
+static inline pte_t pte_mkold(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_ACCESSED));
+        return pte;
+}
+static inline pte_t pte_mkread(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) | _PAGE_USER));
+        return pte;
+}
+static inline pte_t pte_mkwrite(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) | _PAGE_RW));
+        return pte;
+}
+static inline pte_t pte_mkexec(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) | _PAGE_EXECUTE));
+        return pte;
+}
+static inline pte_t pte_mkdirty(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) | _PAGE_DIRTY));
+        return pte;
+}
+static inline pte_t pte_mkyoung(pte_t pte)
+{
+        set_pte(&pte, __pte(pte_val(pte) | _PAGE_ACCESSED));
+        return pte;
+}
+#define pmd_none(x)     (!pmd_val(x))
+#define pmd_present(x)  (pmd_val(x) & _PAGE_PRESENT)
+#define pmd_clear(xp)   do { set_pmd(xp, __pmd(0)); } while (0)
+#define pmd_bad(x)      ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER))      \
+                         != _KERNPG_TABLE)
+/*
+ * Permanent address of a page. We don't support highmem, so this is
+ * trivial.
+ */
+#define pages_to_mb(x)  ((x) >> (20-PAGE_SHIFT))
+#define pte_page(x)     phys_to_page(pte_val(x) & PTE_PHYS_MASK)
+/*
+ * Mark the prot value as uncacheable and unbufferable
+ */
+#define pgprot_noncached(prot)                                          \
+        __pgprot(pgprot_val(prot) & ~(_PAGE_BUFFER | _PAGE_CACHABLE))
+/*
+ * Mark the prot value as uncacheable but bufferable
+ */
+#define pgprot_writecombine(prot)                                       \
+        __pgprot((pgprot_val(prot) & ~_PAGE_CACHABLE) | _PAGE_BUFFER)
+/*
+ * Conversion functions: convert a page and protection to a page entry,
+ * and a page entry and page directory to the page they refer to.
+ *
+ * extern pte_t mk_pte(struct page *page, pgprot_t pgprot)
+ */
+#define mk_pte(page, pgprot)    pfn_pte(page_to_pfn(page), (pgprot))
+static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+{
+        set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK)
+                            | pgprot_val(newprot)));
+        return pte;
+}
+#define page_pte(page)  page_pte_prot(page, __pgprot(0))
+#define pmd_page_vaddr(pmd)                                     \
+        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+#define pmd_page(pmd)   (phys_to_page(pmd_val(pmd)))
+/* to find an entry in a page-table-directory. */
+#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
+#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))
+#define pgd_offset_current(address)                             \
+        ((pgd_t *)__mfsr(SYSREG_PTBR) + pgd_index(address))
+/* to find an entry in a kernel page-table-directory */
+#define pgd_offset_k(address) pgd_offset(&init_mm, address)
+/* Find an entry in the third-level page table.. */
+#define pte_index(address)                              \
+        ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+#define pte_offset(dir, address)                                        \
+        ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address))
+#define pte_offset_kernel(dir, address)                                 \
+        ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address))
+#define pte_offset_map(dir, address) pte_offset_kernel(dir, address)
+#define pte_offset_map_nested(dir, address) pte_offset_kernel(dir, address)
+#define pte_unmap(pte)          do { } while (0)
+#define pte_unmap_nested(pte)   do { } while (0)
+struct vm_area_struct;
+extern void update_mmu_cache(struct vm_area_struct * vma,
+                             unsigned long address, pte_t pte);
+/*
+ * Encode and decode a swap entry
+ *
+ * Constraints:
+ *   _PAGE_FILE at bit 0
+ *   _PAGE_TYPE_* at bits 2-3 (for emulating _PAGE_PROTNONE)
+ *   _PAGE_PRESENT at bit 10
+ *
+ * We encode the type into bits 4-9 and offset into bits 11-31. This
+ * gives us a 21 bits offset, or 2**21 * 4K = 8G usable swap space per
+ * device, and 64 possible types.
+ *
+ * NOTE: We should set ZEROs at the position of _PAGE_PRESENT
+ *       and _PAGE_PROTNONE bits
+ */
+#define __swp_type(x)           (((x).val >> 4) & 0x3f)
+#define __swp_offset(x)         ((x).val >> 11)
+#define __swp_entry(type, offset) ((swp_entry_t) { ((type) << 4) | ((offset) << 11) })
+#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
+#define __swp_entry_to_pte(x)   ((pte_t) { (x).val })
+/*
+ * Encode and decode a nonlinear file mapping entry. We have to
+ * preserve _PAGE_FILE and _PAGE_PRESENT here. _PAGE_TYPE_* isn't
+ * necessary, since _PAGE_FILE implies !_PAGE_PROTNONE (?)
+ */
+#define PTE_FILE_MAX_BITS       30
+#define pte_to_pgoff(pte)       (((pte_val(pte) >> 1) & 0x1ff)          \
+                                 | ((pte_val(pte) >> 11) << 9))
+#define pgoff_to_pte(off)       ((pte_t) { ((((off) & 0x1ff) << 1)      \
+                                            | (((off) >> 9) << 11)      \
+                                            | _PAGE_FILE) })
+typedef pte_t *pte_addr_t;
+#define kern_addr_valid(addr)   (1)
+#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
+        remap_pfn_range(vma, vaddr, pfn, size, prot)
+#define MK_IOSPACE_PFN(space, pfn)      (pfn)
+#define GET_IOSPACE(pfn)                0
+#define GET_PFN(pfn)                    (pfn)
+/* No page table caches to initialize (?) */
+#define pgtable_cache_init()    do { } while(0)
+#include <asm-generic/pgtable.h>
+#endif /* !__ASSEMBLY__ */
+#endif /* __ASM_AVR32_PGTABLE_H */
diff --git a/include/asm-avr32/poll.h b/include/asm-avr32/poll.h
new file mode 100644
index 000000000000..736e29755dfc
--- /dev/null
+++ b/include/asm-avr32/poll.h
@@ -0,0 +1,27 @@
+#ifndef __ASM_AVR32_POLL_H
+#define __ASM_AVR32_POLL_H
+/* These are specified by iBCS2 */
+#define POLLIN          0x0001
+#define POLLPRI         0x0002
+#define POLLOUT         0x0004
+#define POLLERR         0x0008
+#define POLLHUP         0x0010
+#define POLLNVAL        0x0020
+/* The rest seem to be more-or-less nonstandard. Check them! */
+#define POLLRDNORM      0x0040
+#define POLLRDBAND      0x0080
+#define POLLWRNORM      0x0100
+#define POLLWRBAND      0x0200
+#define POLLMSG         0x0400
+#define POLLREMOVE      0x1000
+#define POLLRDHUP       0x2000
+struct pollfd {
+        int fd;
+        short events;
+        short revents;
+};
+#endif /* __ASM_AVR32_POLL_H */
diff --git a/include/asm-avr32/posix_types.h b/include/asm-avr32/posix_types.h
new file mode 100644
index 000000000000..2831b039b349
--- /dev/null
+++ b/include/asm-avr32/posix_types.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_POSIX_TYPES_H
+#define __ASM_AVR32_POSIX_TYPES_H
+/*
+ * This file is generally used by user-level software, so you need to
+ * be a little careful about namespace pollution etc.  Also, we cannot
+ * assume GCC is being used.
+ */
+typedef unsigned long   __kernel_ino_t;
+typedef unsigned short  __kernel_mode_t;
+typedef unsigned short  __kernel_nlink_t;
+typedef long            __kernel_off_t;
+typedef int             __kernel_pid_t;
+typedef unsigned short  __kernel_ipc_pid_t;
+typedef unsigned int    __kernel_uid_t;
+typedef unsigned int    __kernel_gid_t;
+typedef unsigned long   __kernel_size_t;
+typedef int             __kernel_ssize_t;
+typedef int             __kernel_ptrdiff_t;
+typedef long            __kernel_time_t;
+typedef long            __kernel_suseconds_t;
+typedef long            __kernel_clock_t;
+typedef int             __kernel_timer_t;
+typedef int             __kernel_clockid_t;
+typedef int             __kernel_daddr_t;
+typedef char *          __kernel_caddr_t;
+typedef unsigned short  __kernel_uid16_t;
+typedef unsigned short  __kernel_gid16_t;
+typedef unsigned int    __kernel_uid32_t;
+typedef unsigned int    __kernel_gid32_t;
+typedef unsigned short  __kernel_old_uid_t;
+typedef unsigned short  __kernel_old_gid_t;
+typedef unsigned short  __kernel_old_dev_t;
+#ifdef __GNUC__
+typedef long long       __kernel_loff_t;
+#endif
+typedef struct {
+#if defined(__KERNEL__) || defined(__USE_ALL)
+    int     val[2];
+#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
+    int     __val[2];
+#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
+} __kernel_fsid_t;
+#if defined(__KERNEL__)
+#undef  __FD_SET
+static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
+{
+    unsigned long __tmp = __fd / __NFDBITS;
+    unsigned long __rem = __fd % __NFDBITS;
+    __fdsetp->fds_bits[__tmp] |= (1UL<<__rem);
+}
+#undef  __FD_CLR
+static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)
+{
+    unsigned long __tmp = __fd / __NFDBITS;
+    unsigned long __rem = __fd % __NFDBITS;
+    __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);
+}
+#undef  __FD_ISSET
+static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)
+{
+    unsigned long __tmp = __fd / __NFDBITS;
+    unsigned long __rem = __fd % __NFDBITS;
+    return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
+}
+/*
+ * This will unroll the loop for the normal constant case (8 ints,
+ * for a 256-bit fd_set)
+ */
+#undef  __FD_ZERO
+static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
+{
+    unsigned long *__tmp = __p->fds_bits;
+    int __i;
+    if (__builtin_constant_p(__FDSET_LONGS)) {
+        switch (__FDSET_LONGS) {
+            case 16:
+                __tmp[ 0] = 0; __tmp[ 1] = 0;
+                __tmp[ 2] = 0; __tmp[ 3] = 0;
+                __tmp[ 4] = 0; __tmp[ 5] = 0;
+                __tmp[ 6] = 0; __tmp[ 7] = 0;
+                __tmp[ 8] = 0; __tmp[ 9] = 0;
+                __tmp[10] = 0; __tmp[11] = 0;
+                __tmp[12] = 0; __tmp[13] = 0;
+                __tmp[14] = 0; __tmp[15] = 0;
+                return;
+            case 8:
+                __tmp[ 0] = 0; __tmp[ 1] = 0;
+                __tmp[ 2] = 0; __tmp[ 3] = 0;
+                __tmp[ 4] = 0; __tmp[ 5] = 0;
+                __tmp[ 6] = 0; __tmp[ 7] = 0;
+                return;
+            case 4:
+                __tmp[ 0] = 0; __tmp[ 1] = 0;
+                __tmp[ 2] = 0; __tmp[ 3] = 0;
+                return;
+        }
+    }
+    __i = __FDSET_LONGS;
+    while (__i) {
+        __i--;
+        *__tmp = 0;
+        __tmp++;
+    }
+}
+#endif /* defined(__KERNEL__) */
+#endif /* __ASM_AVR32_POSIX_TYPES_H */
diff --git a/include/asm-avr32/processor.h b/include/asm-avr32/processor.h
new file mode 100644
index 000000000000..f6913778a45f
--- /dev/null
+++ b/include/asm-avr32/processor.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_PROCESSOR_H
+#define __ASM_AVR32_PROCESSOR_H
+#include <asm/page.h>
+#include <asm/cache.h>
+#define TASK_SIZE       0x80000000
+#ifndef __ASSEMBLY__
+static inline void *current_text_addr(void)
+{
+        register void *pc asm("pc");
+        return pc;
+}
+enum arch_type {
+        ARCH_AVR32A,
+        ARCH_AVR32B,
+        ARCH_MAX
+};
+enum cpu_type {
+        CPU_MORGAN,
+        CPU_AT32AP,
+        CPU_MAX
+};
+enum tlb_config {
+        TLB_NONE,
+        TLB_SPLIT,
+        TLB_UNIFIED,
+        TLB_INVALID
+};
+struct avr32_cpuinfo {
+        struct clk *clk;
+        unsigned long loops_per_jiffy;
+        enum arch_type arch_type;
+        enum cpu_type cpu_type;
+        unsigned short arch_revision;
+        unsigned short cpu_revision;
+        enum tlb_config tlb_config;
+        struct cache_info icache;
+        struct cache_info dcache;
+};
+extern struct avr32_cpuinfo boot_cpu_data;
+#ifdef CONFIG_SMP
+extern struct avr32_cpuinfo cpu_data[];
+#define current_cpu_data cpu_data[smp_processor_id()]
+#else
+#define cpu_data (&boot_cpu_data)
+#define current_cpu_data boot_cpu_data
+#endif
+/* This decides where the kernel will search for a free chunk of vm
+ * space during mmap's
+ */
+#define TASK_UNMAPPED_BASE      (PAGE_ALIGN(TASK_SIZE / 3))
+#define cpu_relax()             barrier()
+#define cpu_sync_pipeline()     asm volatile("sub pc, -2" : : : "memory")
+struct cpu_context {
+        unsigned long sr;
+        unsigned long pc;
+        unsigned long ksp;      /* Kernel stack pointer */
+        unsigned long r7;
+        unsigned long r6;
+        unsigned long r5;
+        unsigned long r4;
+        unsigned long r3;
+        unsigned long r2;
+        unsigned long r1;
+        unsigned long r0;
+};
+/* This struct contains the CPU context as stored by switch_to() */
+struct thread_struct {
+        struct cpu_context cpu_context;
+        unsigned long single_step_addr;
+        u16 single_step_insn;
+};
+#define INIT_THREAD {                                           \
+        .cpu_context = {                                        \
+                .ksp = sizeof(init_stack) + (long)&init_stack,  \
+        },                                                      \
+}
+/*
+ * Do necessary setup to start up a newly executed thread.
+ */
+#define start_thread(regs, new_pc, new_sp)       \
+        do {                                     \
+                set_fs(USER_DS);                 \
+                memset(regs, 0, sizeof(*regs));  \
+                regs->sr = MODE_USER;            \
+                regs->pc = new_pc & ~1;          \
+                regs->sp = new_sp;               \
+        } while(0)
+struct task_struct;
+/* Free all resources held by a thread */
+extern void release_thread(struct task_struct *);
+/* Create a kernel thread without removing it from tasklists */
+extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
+/* Prepare to copy thread state - unlazy all lazy status */
+#define prepare_to_copy(tsk) do { } while(0)
+/* Return saved PC of a blocked thread */
+#define thread_saved_pc(tsk)    ((tsk)->thread.cpu_context.pc)
+struct pt_regs;
+void show_trace(struct task_struct *task, unsigned long *stack,
+                struct pt_regs *regs);
+extern unsigned long get_wchan(struct task_struct *p);
+#define KSTK_EIP(tsk)   ((tsk)->thread.cpu_context.pc)
+#define KSTK_ESP(tsk)   ((tsk)->thread.cpu_context.ksp)
+#define ARCH_HAS_PREFETCH
+static inline void prefetch(const void *x)
+{
+        const char *c = x;
+        asm volatile("pref %0" : : "r"(c));
+}
+#define PREFETCH_STRIDE L1_CACHE_BYTES
+#endif /* __ASSEMBLY__ */
+#endif /* __ASM_AVR32_PROCESSOR_H */
diff --git a/include/asm-avr32/ptrace.h b/include/asm-avr32/ptrace.h
new file mode 100644
index 000000000000..60f0f19a81f1
--- /dev/null
+++ b/include/asm-avr32/ptrace.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_PTRACE_H
+#define __ASM_AVR32_PTRACE_H
+#define PTRACE_GETREGS          12
+#define PTRACE_SETREGS          13
+/*
+ * Status Register bits
+ */
+#define SR_H            0x40000000
+#define SR_R            0x20000000
+#define SR_J            0x10000000
+#define SR_DM           0x08000000
+#define SR_D            0x04000000
+#define MODE_NMI        0x01c00000
+#define MODE_EXCEPTION  0x01800000
+#define MODE_INT3       0x01400000
+#define MODE_INT2       0x01000000
+#define MODE_INT1       0x00c00000
+#define MODE_INT0       0x00800000
+#define MODE_SUPERVISOR 0x00400000
+#define MODE_USER       0x00000000
+#define MODE_MASK       0x01c00000
+#define SR_EM           0x00200000
+#define SR_I3M          0x00100000
+#define SR_I2M          0x00080000
+#define SR_I1M          0x00040000
+#define SR_I0M          0x00020000
+#define SR_GM           0x00010000
+#define SR_H_BIT        30
+#define SR_R_BIT        29
+#define SR_J_BIT        28
+#define SR_DM_BIT       27
+#define SR_D_BIT        26
+#define MODE_SHIFT      22
+#define SR_EM_BIT       21
+#define SR_I3M_BIT      20
+#define SR_I2M_BIT      19
+#define SR_I1M_BIT      18
+#define SR_I0M_BIT      17
+#define SR_GM_BIT       16
+/* The user-visible part */
+#define SR_L            0x00000020
+#define SR_Q            0x00000010
+#define SR_V            0x00000008
+#define SR_N            0x00000004
+#define SR_Z            0x00000002
+#define SR_C            0x00000001
+#define SR_L_BIT        5
+#define SR_Q_BIT        4
+#define SR_V_BIT        3
+#define SR_N_BIT        2
+#define SR_Z_BIT        1
+#define SR_C_BIT        0
+/*
+ * The order is defined by the stmts instruction. r0 is stored first,
+ * so it gets the highest address.
+ *
+ * Registers 0-12 are general-purpose registers (r12 is normally used for
+ * the function return value).
+ * Register 13 is the stack pointer
+ * Register 14 is the link register
+ * Register 15 is the program counter (retrieved from the RAR sysreg)
+ */
+#define FRAME_SIZE_FULL 72
+#define REG_R12_ORIG    68
+#define REG_R0          64
+#define REG_R1          60
+#define REG_R2          56
+#define REG_R3          52
+#define REG_R4          48
+#define REG_R5          44
+#define REG_R6          40
+#define REG_R7          36
+#define REG_R8          32
+#define REG_R9          28
+#define REG_R10         24
+#define REG_R11         20
+#define REG_R12         16
+#define REG_SP          12
+#define REG_LR           8
+#define FRAME_SIZE_MIN   8
+#define REG_PC           4
+#define REG_SR           0
+#ifndef __ASSEMBLY__
+struct pt_regs {
+        /* These are always saved */
+        unsigned long sr;
+        unsigned long pc;
+        /* These are sometimes saved */
+        unsigned long lr;
+        unsigned long sp;
+        unsigned long r12;
+        unsigned long r11;
+        unsigned long r10;
+        unsigned long r9;
+        unsigned long r8;
+        unsigned long r7;
+        unsigned long r6;
+        unsigned long r5;
+        unsigned long r4;
+        unsigned long r3;
+        unsigned long r2;
+        unsigned long r1;
+        unsigned long r0;
+        /* Only saved on system call */
+        unsigned long r12_orig;
+};
+#ifdef __KERNEL__
+# define user_mode(regs) (((regs)->sr & MODE_MASK) == MODE_USER)
+extern void show_regs (struct pt_regs *);
+static __inline__ int valid_user_regs(struct pt_regs *regs)
+{
+        /*
+         * Some of the Java bits might be acceptable if/when we
+         * implement some support for that stuff...
+         */
+        if ((regs->sr & 0xffff0000) == 0)
+                return 1;
+        /*
+         * Force status register flags to be sane and report this
+         * illegal behaviour...
+         */
+        regs->sr &= 0x0000ffff;
+        return 0;
+}
+#define instruction_pointer(regs) ((regs)->pc)
+#define profile_pc(regs) instruction_pointer(regs)
+#endif /* __KERNEL__ */
+#endif /* ! __ASSEMBLY__ */
+#endif /* __ASM_AVR32_PTRACE_H */
diff --git a/include/asm-avr32/resource.h b/include/asm-avr32/resource.h
new file mode 100644
index 000000000000..c6dd101472b1
--- /dev/null
+++ b/include/asm-avr32/resource.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_RESOURCE_H
+#define __ASM_AVR32_RESOURCE_H
+#include <asm-generic/resource.h>
+#endif /* __ASM_AVR32_RESOURCE_H */
diff --git a/include/asm-avr32/scatterlist.h b/include/asm-avr32/scatterlist.h
new file mode 100644
index 000000000000..bfe7d753423c
--- /dev/null
+++ b/include/asm-avr32/scatterlist.h
@@ -0,0 +1,21 @@
+#ifndef __ASM_AVR32_SCATTERLIST_H
+#define __ASM_AVR32_SCATTERLIST_H
+struct scatterlist {
+    struct page         *page;
+    unsigned int        offset;
+    dma_addr_t          dma_address;
+    unsigned int        length;
+};
+/* These macros should be used after a pci_map_sg call has been done
+ * to get bus addresses of each of the SG entries and their lengths.
+ * You should only work with the number of sg entries pci_map_sg
+ * returns.
+ */
+#define sg_dma_address(sg)      ((sg)->dma_address)
+#define sg_dma_len(sg)          ((sg)->length)
+#define ISA_DMA_THRESHOLD (0xffffffff)
+#endif /* __ASM_AVR32_SCATTERLIST_H */
diff --git a/include/asm-avr32/sections.h b/include/asm-avr32/sections.h
new file mode 100644
index 000000000000..aa14252e4181
--- /dev/null
+++ b/include/asm-avr32/sections.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_SECTIONS_H
+#define __ASM_AVR32_SECTIONS_H
+#include <asm-generic/sections.h>
+#endif /* __ASM_AVR32_SECTIONS_H */
diff --git a/include/asm-avr32/semaphore.h b/include/asm-avr32/semaphore.h
new file mode 100644
index 000000000000..ef99ddccc10c
--- /dev/null
+++ b/include/asm-avr32/semaphore.h
@@ -0,0 +1,109 @@
+/*
+ * SMP- and interrupt-safe semaphores.
+ *
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * Based on include/asm-i386/semaphore.h
+ *   Copyright (C) 1996 Linus Torvalds
+ *
+ * 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_AVR32_SEMAPHORE_H
+#define __ASM_AVR32_SEMAPHORE_H
+#include <linux/linkage.h>
+#include <asm/system.h>
+#include <asm/atomic.h>
+#include <linux/wait.h>
+#include <linux/rwsem.h>
+struct semaphore {
+        atomic_t count;
+        int sleepers;
+        wait_queue_head_t wait;
+};
+#define __SEMAPHORE_INITIALIZER(name, n)                                \
+{                                                                       \
+        .count          = ATOMIC_INIT(n),                               \
+        .wait           = __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)    \
+}
+#define __DECLARE_SEMAPHORE_GENERIC(name,count) \
+        struct semaphore name = __SEMAPHORE_INITIALIZER(name,count)
+#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name,1)
+#define DECLARE_MUTEX_LOCKED(name) __DECLARE_SEMAPHORE_GENERIC(name,0)
+static inline void sema_init (struct semaphore *sem, int val)
+{
+        atomic_set(&sem->count, val);
+        sem->sleepers = 0;
+        init_waitqueue_head(&sem->wait);
+}
+static inline void init_MUTEX (struct semaphore *sem)
+{
+        sema_init(sem, 1);
+}
+static inline void init_MUTEX_LOCKED (struct semaphore *sem)
+{
+        sema_init(sem, 0);
+}
+void __down(struct semaphore * sem);
+int  __down_interruptible(struct semaphore * sem);
+void __up(struct semaphore * sem);
+/*
+ * This is ugly, but we want the default case to fall through.
+ * "__down_failed" is a special asm handler that calls the C
+ * routine that actually waits. See arch/i386/kernel/semaphore.c
+ */
+static inline void down(struct semaphore * sem)
+{
+        might_sleep();
+        if (unlikely(atomic_dec_return (&sem->count) < 0))
+                __down (sem);
+}
+/*
+ * Interruptible try to acquire a semaphore.  If we obtained
+ * it, return zero.  If we were interrupted, returns -EINTR
+ */
+static inline int down_interruptible(struct semaphore * sem)
+{
+        int ret = 0;
+        might_sleep();
+        if (unlikely(atomic_dec_return (&sem->count) < 0))
+                ret = __down_interruptible (sem);
+        return ret;
+}
+/*
+ * Non-blockingly attempt to down() a semaphore.
+ * Returns zero if we acquired it
+ */
+static inline int down_trylock(struct semaphore * sem)
+{
+        return atomic_dec_if_positive(&sem->count) < 0;
+}
+/*
+ * Note! This is subtle. We jump to wake people up only if
+ * the semaphore was negative (== somebody was waiting on it).
+ * The default case (no contention) will result in NO
+ * jumps for both down() and up().
+ */
+static inline void up(struct semaphore * sem)
+{
+        if (unlikely(atomic_inc_return (&sem->count) <= 0))
+                __up (sem);
+}
+#endif /*__ASM_AVR32_SEMAPHORE_H */
diff --git a/include/asm-avr32/sembuf.h b/include/asm-avr32/sembuf.h
new file mode 100644
index 000000000000..e472216e0c97
--- /dev/null
+++ b/include/asm-avr32/sembuf.h
@@ -0,0 +1,25 @@
+#ifndef __ASM_AVR32_SEMBUF_H
+#define __ASM_AVR32_SEMBUF_H
+/*
+* The semid64_ds structure for AVR32 architecture.
+ * Note extra padding because this structure is passed back and forth
+ * between kernel and user space.
+ *
+ * Pad space is left for:
+ * - 64-bit time_t to solve y2038 problem
+ * - 2 miscellaneous 32-bit values
+ */
+struct semid64_ds {
+        struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */
+        __kernel_time_t sem_otime;              /* last semop time */
+        unsigned long   __unused1;
+        __kernel_time_t sem_ctime;              /* last change time */
+        unsigned long   __unused2;
+        unsigned long   sem_nsems;              /* no. of semaphores in array */
+        unsigned long   __unused3;
+        unsigned long   __unused4;
+};
+#endif /* __ASM_AVR32_SEMBUF_H */
diff --git a/include/asm-avr32/setup.h b/include/asm-avr32/setup.h
new file mode 100644
index 000000000000..10193da4113b
--- /dev/null
+++ b/include/asm-avr32/setup.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * Based on linux/include/asm-arm/setup.h
+ *   Copyright (C) 1997-1999 Russel 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.
+ */
+#ifndef __ASM_AVR32_SETUP_H__
+#define __ASM_AVR32_SETUP_H__
+#define COMMAND_LINE_SIZE 256
+/* Magic number indicating that a tag table is present */
+#define ATAG_MAGIC      0xa2a25441
+#ifndef __ASSEMBLY__
+/*
+ * Generic memory range, used by several tags.
+ *
+ *   addr is always physical.
+ *   size is measured in bytes.
+ *   next is for use by the OS, e.g. for grouping regions into
+ *        linked lists.
+ */
+struct tag_mem_range {
+        u32                     addr;
+        u32                     size;
+        struct tag_mem_range *  next;
+};
+/* The list ends with an ATAG_NONE node. */
+#define ATAG_NONE       0x00000000
+struct tag_header {
+        u32 size;
+        u32 tag;
+};
+/* The list must start with an ATAG_CORE node */
+#define ATAG_CORE       0x54410001
+struct tag_core {
+        u32 flags;
+        u32 pagesize;
+        u32 rootdev;
+};
+/* it is allowed to have multiple ATAG_MEM nodes */
+#define ATAG_MEM        0x54410002
+/* ATAG_MEM uses tag_mem_range */
+/* command line: \0 terminated string */
+#define ATAG_CMDLINE    0x54410003
+struct tag_cmdline {
+        char    cmdline[1];     /* this is the minimum size */
+};
+/* Ramdisk image (may be compressed) */
+#define ATAG_RDIMG      0x54410004
+/* ATAG_RDIMG uses tag_mem_range */
+/* Information about various clocks present in the system */
+#define ATAG_CLOCK      0x54410005
+struct tag_clock {
+        u32     clock_id;       /* Which clock are we talking about? */
+        u32     clock_flags;    /* Special features */
+        u64     clock_hz;       /* Clock speed in Hz */
+};
+/* The clock types we know about */
+#define CLOCK_BOOTCPU   0
+/* Memory reserved for the system (e.g. the bootloader) */
+#define ATAG_RSVD_MEM   0x54410006
+/* ATAG_RSVD_MEM uses tag_mem_range */
+/* Ethernet information */
+#define ATAG_ETHERNET   0x54410007
+struct tag_ethernet {
+        u8      mac_index;
+        u8      mii_phy_addr;
+        u8      hw_address[6];
+};
+#define ETH_INVALID_PHY 0xff
+struct tag {
+        struct tag_header hdr;
+        union {
+                struct tag_core core;
+                struct tag_mem_range mem_range;
+                struct tag_cmdline cmdline;
+                struct tag_clock clock;
+                struct tag_ethernet ethernet;
+        } u;
+};
+struct tagtable {
+        u32     tag;
+        int     (*parse)(struct tag *);
+};
+#define __tag __attribute_used__ __attribute__((__section__(".taglist")))
+#define __tagtable(tag, fn)                                             \
+        static struct tagtable __tagtable_##fn __tag = { tag, fn }
+#define tag_member_present(tag,member)                                  \
+        ((unsigned long)(&((struct tag *)0L)->member + 1)               \
+         <= (tag)->hdr.size * 4)
+#define tag_next(t)     ((struct tag *)((u32 *)(t) + (t)->hdr.size))
+#define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
+#define for_each_tag(t,base)                                            \
+        for (t = base; t->hdr.size; t = tag_next(t))
+extern struct tag_mem_range *mem_phys;
+extern struct tag_mem_range *mem_reserved;
+extern struct tag_mem_range *mem_ramdisk;
+extern struct tag *bootloader_tags;
+extern void setup_bootmem(void);
+extern void setup_processor(void);
+extern void board_setup_fbmem(unsigned long fbmem_start,
+                              unsigned long fbmem_size);
+/* Chip-specific hook to enable the use of SDRAM */
+void chip_enable_sdram(void);
+#endif /* !__ASSEMBLY__ */
+#endif /* __ASM_AVR32_SETUP_H__ */
diff --git a/include/asm-avr32/shmbuf.h b/include/asm-avr32/shmbuf.h
new file mode 100644
index 000000000000..c62fba41739a
--- /dev/null
+++ b/include/asm-avr32/shmbuf.h
@@ -0,0 +1,42 @@
+#ifndef __ASM_AVR32_SHMBUF_H
+#define __ASM_AVR32_SHMBUF_H
+/*
+ * The shmid64_ds structure for i386 architecture.
+ * Note extra padding because this structure is passed back and forth
+ * between kernel and user space.
+ *
+ * Pad space is left for:
+ * - 64-bit time_t to solve y2038 problem
+ * - 2 miscellaneous 32-bit values
+ */
+struct shmid64_ds {
+        struct ipc64_perm       shm_perm;       /* operation perms */
+        size_t                  shm_segsz;      /* size of segment (bytes) */
+        __kernel_time_t         shm_atime;      /* last attach time */
+        unsigned long           __unused1;
+        __kernel_time_t         shm_dtime;      /* last detach time */
+        unsigned long           __unused2;
+        __kernel_time_t         shm_ctime;      /* last change time */
+        unsigned long           __unused3;
+        __kernel_pid_t          shm_cpid;       /* pid of creator */
+        __kernel_pid_t          shm_lpid;       /* pid of last operator */
+        unsigned long           shm_nattch;     /* no. of current attaches */
+        unsigned long           __unused4;
+        unsigned long           __unused5;
+};
+struct shminfo64 {
+        unsigned long   shmmax;
+        unsigned long   shmmin;
+        unsigned long   shmmni;
+        unsigned long   shmseg;
+        unsigned long   shmall;
+        unsigned long   __unused1;
+        unsigned long   __unused2;
+        unsigned long   __unused3;
+        unsigned long   __unused4;
+};
+#endif /* __ASM_AVR32_SHMBUF_H */
diff --git a/include/asm-avr32/shmparam.h b/include/asm-avr32/shmparam.h
new file mode 100644
index 000000000000..3681266c77f7
--- /dev/null
+++ b/include/asm-avr32/shmparam.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_SHMPARAM_H
+#define __ASM_AVR32_SHMPARAM_H
+#define SHMLBA PAGE_SIZE        /* attach addr a multiple of this */
+#endif /* __ASM_AVR32_SHMPARAM_H */
diff --git a/include/asm-avr32/sigcontext.h b/include/asm-avr32/sigcontext.h
new file mode 100644
index 000000000000..e04062b5f39f
--- /dev/null
+++ b/include/asm-avr32/sigcontext.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_SIGCONTEXT_H
+#define __ASM_AVR32_SIGCONTEXT_H
+struct sigcontext {
+        unsigned long   oldmask;
+        /* CPU registers */
+        unsigned long   sr;
+        unsigned long   pc;
+        unsigned long   lr;
+        unsigned long   sp;
+        unsigned long   r12;
+        unsigned long   r11;
+        unsigned long   r10;
+        unsigned long   r9;
+        unsigned long   r8;
+        unsigned long   r7;
+        unsigned long   r6;
+        unsigned long   r5;
+        unsigned long   r4;
+        unsigned long   r3;
+        unsigned long   r2;
+        unsigned long   r1;
+        unsigned long   r0;
+};
+#endif /* __ASM_AVR32_SIGCONTEXT_H */
diff --git a/include/asm-avr32/siginfo.h b/include/asm-avr32/siginfo.h
new file mode 100644
index 000000000000..5ee93f40a8a8
--- /dev/null
+++ b/include/asm-avr32/siginfo.h
@@ -0,0 +1,6 @@
+#ifndef _AVR32_SIGINFO_H
+#define _AVR32_SIGINFO_H
+#include <asm-generic/siginfo.h>
+#endif
diff --git a/include/asm-avr32/signal.h b/include/asm-avr32/signal.h
new file mode 100644
index 000000000000..caffefeeba1f
--- /dev/null
+++ b/include/asm-avr32/signal.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_SIGNAL_H
+#define __ASM_AVR32_SIGNAL_H
+#include <linux/types.h>
+/* Avoid too many header ordering problems.  */
+struct siginfo;
+#ifdef __KERNEL__
+/* Most things should be clean enough to redefine this at will, if care
+   is taken to make libc match.  */
+#define _NSIG           64
+#define _NSIG_BPW       32
+#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
+typedef unsigned long old_sigset_t;             /* at least 32 bits */
+typedef struct {
+        unsigned long sig[_NSIG_WORDS];
+} sigset_t;
+#else
+/* Here we must cater to libcs that poke about in kernel headers.  */
+#define NSIG            32
+typedef unsigned long sigset_t;
+#endif /* __KERNEL__ */
+#define SIGHUP           1
+#define SIGINT           2
+#define SIGQUIT          3
+#define SIGILL           4
+#define SIGTRAP          5
+#define SIGABRT          6
+#define SIGIOT           6
+#define SIGBUS           7
+#define SIGFPE           8
+#define SIGKILL          9
+#define SIGUSR1         10
+#define SIGSEGV         11
+#define SIGUSR2         12
+#define SIGPIPE         13
+#define SIGALRM         14
+#define SIGTERM         15
+#define SIGSTKFLT       16
+#define SIGCHLD         17
+#define SIGCONT         18
+#define SIGSTOP         19
+#define SIGTSTP         20
+#define SIGTTIN         21
+#define SIGTTOU         22
+#define SIGURG          23
+#define SIGXCPU         24
+#define SIGXFSZ         25
+#define SIGVTALRM       26
+#define SIGPROF         27
+#define SIGWINCH        28
+#define SIGIO           29
+#define SIGPOLL         SIGIO
+/*
+#define SIGLOST         29
+*/
+#define SIGPWR          30
+#define SIGSYS          31
+#define SIGUNUSED       31
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        (_NSIG-1)
+/*
+ * SA_FLAGS values:
+ *
+ * SA_NOCLDSTOP         flag to turn off SIGCHLD when children stop.
+ * SA_NOCLDWAIT         flag on SIGCHLD to inhibit zombies.
+ * SA_SIGINFO           deliver the signal with SIGINFO structs
+ * SA_ONSTACK           indicates that a registered stack_t will be used.
+ * SA_RESTART           flag to get restarting signals (which were the default long ago)
+ * SA_NODEFER           prevents the current signal from being masked in the handler.
+ * SA_RESETHAND         clears the handler when the signal is delivered.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_NOCLDSTOP    0x00000001
+#define SA_NOCLDWAIT    0x00000002
+#define SA_SIGINFO      0x00000004
+#define SA_RESTORER     0x04000000
+#define SA_ONSTACK      0x08000000
+#define SA_RESTART      0x10000000
+#define SA_NODEFER      0x40000000
+#define SA_RESETHAND    0x80000000
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+/*
+ * sigaltstack controls
+ */
+#define SS_ONSTACK      1
+#define SS_DISABLE      2
+#define MINSIGSTKSZ     2048
+#define SIGSTKSZ        8192
+#include <asm-generic/signal.h>
+#ifdef __KERNEL__
+struct old_sigaction {
+        __sighandler_t sa_handler;
+        old_sigset_t sa_mask;
+        unsigned long sa_flags;
+        __sigrestore_t sa_restorer;
+};
+struct sigaction {
+        __sighandler_t sa_handler;
+        unsigned long sa_flags;
+        __sigrestore_t sa_restorer;
+        sigset_t sa_mask;               /* mask last for extensibility */
+};
+struct k_sigaction {
+        struct sigaction sa;
+};
+#else
+/* Here we must cater to libcs that poke about in kernel headers.  */
+struct sigaction {
+        union {
+                __sighandler_t _sa_handler;
+                void (*_sa_sigaction)(int, struct siginfo *, void *);
+        } _u;
+        sigset_t sa_mask;
+        unsigned long sa_flags;
+        void (*sa_restorer)(void);
+};
+#define sa_handler      _u._sa_handler
+#define sa_sigaction    _u._sa_sigaction
+#endif /* __KERNEL__ */
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        int ss_flags;
+        size_t ss_size;
+} stack_t;
+#ifdef __KERNEL__
+#include <asm/sigcontext.h>
+#undef __HAVE_ARCH_SIG_BITOPS
+#define ptrace_signal_deliver(regs, cookie) do { } while (0)
+#endif /* __KERNEL__ */
+#endif
diff --git a/include/asm-avr32/socket.h b/include/asm-avr32/socket.h
new file mode 100644
index 000000000000..543229de8173
--- /dev/null
+++ b/include/asm-avr32/socket.h
@@ -0,0 +1,53 @@
+#ifndef __ASM_AVR32_SOCKET_H
+#define __ASM_AVR32_SOCKET_H
+#include <asm/sockios.h>
+/* For setsockopt(2) */
+#define SOL_SOCKET      1
+#define SO_DEBUG        1
+#define SO_REUSEADDR    2
+#define SO_TYPE         3
+#define SO_ERROR        4
+#define SO_DONTROUTE    5
+#define SO_BROADCAST    6
+#define SO_SNDBUF       7
+#define SO_RCVBUF       8
+#define SO_SNDBUFFORCE  32
+#define SO_RCVBUFFORCE  33
+#define SO_KEEPALIVE    9
+#define SO_OOBINLINE    10
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_LINGER       13
+#define SO_BSDCOMPAT    14
+/* To add :#define SO_REUSEPORT 15 */
+#define SO_PASSCRED     16
+#define SO_PEERCRED     17
+#define SO_RCVLOWAT     18
+#define SO_SNDLOWAT     19
+#define SO_RCVTIMEO     20
+#define SO_SNDTIMEO     21
+/* Security levels - as per NRL IPv6 - don't actually do anything */
+#define SO_SECURITY_AUTHENTICATION              22
+#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
+#define SO_SECURITY_ENCRYPTION_NETWORK          24
+#define SO_BINDTODEVICE 25
+/* Socket filtering */
+#define SO_ATTACH_FILTER        26
+#define SO_DETACH_FILTER        27
+#define SO_PEERNAME             28
+#define SO_TIMESTAMP            29
+#define SCM_TIMESTAMP           SO_TIMESTAMP
+#define SO_ACCEPTCONN           30
+#define SO_PEERSEC              31
+#define SO_PASSSEC              34
+#endif /* __ASM_AVR32_SOCKET_H */
diff --git a/include/asm-avr32/sockios.h b/include/asm-avr32/sockios.h
new file mode 100644
index 000000000000..84f3d65b3b3b
--- /dev/null
+++ b/include/asm-avr32/sockios.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_AVR32_SOCKIOS_H
+#define __ASM_AVR32_SOCKIOS_H
+/* Socket-level I/O control calls. */
+#define FIOSETOWN       0x8901
+#define SIOCSPGRP       0x8902
+#define FIOGETOWN       0x8903
+#define SIOCGPGRP       0x8904
+#define SIOCATMARK      0x8905
+#define SIOCGSTAMP      0x8906          /* Get stamp */
+#endif /* __ASM_AVR32_SOCKIOS_H */
diff --git a/include/asm-avr32/stat.h b/include/asm-avr32/stat.h
new file mode 100644
index 000000000000..e72881e10230
--- /dev/null
+++ b/include/asm-avr32/stat.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_STAT_H
+#define __ASM_AVR32_STAT_H
+struct __old_kernel_stat {
+        unsigned short st_dev;
+        unsigned short st_ino;
+        unsigned short st_mode;
+        unsigned short st_nlink;
+        unsigned short st_uid;
+        unsigned short st_gid;
+        unsigned short st_rdev;
+        unsigned long  st_size;
+        unsigned long  st_atime;
+        unsigned long  st_mtime;
+        unsigned long  st_ctime;
+};
+struct stat {
+        unsigned long st_dev;
+        unsigned long st_ino;
+        unsigned short st_mode;
+        unsigned short st_nlink;
+        unsigned short st_uid;
+        unsigned short st_gid;
+        unsigned long  st_rdev;
+        unsigned long  st_size;
+        unsigned long  st_blksize;
+        unsigned long  st_blocks;
+        unsigned long  st_atime;
+        unsigned long  st_atime_nsec;
+        unsigned long  st_mtime;
+        unsigned long  st_mtime_nsec;
+        unsigned long  st_ctime;
+        unsigned long  st_ctime_nsec;
+        unsigned long  __unused4;
+        unsigned long  __unused5;
+};
+#define STAT_HAVE_NSEC 1
+struct stat64 {
+        unsigned long long st_dev;
+        unsigned long long st_ino;
+        unsigned int    st_mode;
+        unsigned int    st_nlink;
+        unsigned long   st_uid;
+        unsigned long   st_gid;
+        unsigned long long st_rdev;
+        long long       st_size;
+        unsigned long   __pad1;         /* align 64-bit st_blocks */
+        unsigned long   st_blksize;
+        unsigned long long st_blocks;   /* Number 512-byte blocks allocated. */
+        unsigned long   st_atime;
+        unsigned long   st_atime_nsec;
+        unsigned long   st_mtime;
+        unsigned long   st_mtime_nsec;
+        unsigned long   st_ctime;
+        unsigned long   st_ctime_nsec;
+        unsigned long   __unused1;
+        unsigned long   __unused2;
+};
+#endif /* __ASM_AVR32_STAT_H */
diff --git a/include/asm-avr32/statfs.h b/include/asm-avr32/statfs.h
new file mode 100644
index 000000000000..2961bd18c50e
--- /dev/null
+++ b/include/asm-avr32/statfs.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_STATFS_H
+#define __ASM_AVR32_STATFS_H
+#include <asm-generic/statfs.h>
+#endif /* __ASM_AVR32_STATFS_H */
diff --git a/include/asm-avr32/string.h b/include/asm-avr32/string.h
new file mode 100644
index 000000000000..c91a623cd585
--- /dev/null
+++ b/include/asm-avr32/string.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_STRING_H
+#define __ASM_AVR32_STRING_H
+#define __HAVE_ARCH_MEMSET
+extern void *memset(void *b, int c, size_t len);
+#define __HAVE_ARCH_MEMCPY
+extern void *memcpy(void *to, const void *from, size_t len);
+#endif /* __ASM_AVR32_STRING_H */
diff --git a/include/asm-avr32/sysreg.h b/include/asm-avr32/sysreg.h
new file mode 100644
index 000000000000..f91975f330f6
--- /dev/null
+++ b/include/asm-avr32/sysreg.h
@@ -0,0 +1,332 @@
+/*
+ * AVR32 System Registers
+ *
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_SYSREG_H__
+#define __ASM_AVR32_SYSREG_H__
+/* sysreg register offsets */
+#define SYSREG_SR                               0x0000
+#define SYSREG_EVBA                             0x0004
+#define SYSREG_ACBA                             0x0008
+#define SYSREG_CPUCR                            0x000c
+#define SYSREG_ECR                              0x0010
+#define SYSREG_RSR_SUP                          0x0014
+#define SYSREG_RSR_INT0                         0x0018
+#define SYSREG_RSR_INT1                         0x001c
+#define SYSREG_RSR_INT2                         0x0020
+#define SYSREG_RSR_INT3                         0x0024
+#define SYSREG_RSR_EX                           0x0028
+#define SYSREG_RSR_NMI                          0x002c
+#define SYSREG_RSR_DBG                          0x0030
+#define SYSREG_RAR_SUP                          0x0034
+#define SYSREG_RAR_INT0                         0x0038
+#define SYSREG_RAR_INT1                         0x003c
+#define SYSREG_RAR_INT2                         0x0040
+#define SYSREG_RAR_INT3                         0x0044
+#define SYSREG_RAR_EX                           0x0048
+#define SYSREG_RAR_NMI                          0x004c
+#define SYSREG_RAR_DBG                          0x0050
+#define SYSREG_JECR                             0x0054
+#define SYSREG_JOSP                             0x0058
+#define SYSREG_JAVA_LV0                         0x005c
+#define SYSREG_JAVA_LV1                         0x0060
+#define SYSREG_JAVA_LV2                         0x0064
+#define SYSREG_JAVA_LV3                         0x0068
+#define SYSREG_JAVA_LV4                         0x006c
+#define SYSREG_JAVA_LV5                         0x0070
+#define SYSREG_JAVA_LV6                         0x0074
+#define SYSREG_JAVA_LV7                         0x0078
+#define SYSREG_JTBA                             0x007c
+#define SYSREG_JBCR                             0x0080
+#define SYSREG_CONFIG0                          0x0100
+#define SYSREG_CONFIG1                          0x0104
+#define SYSREG_COUNT                            0x0108
+#define SYSREG_COMPARE                          0x010c
+#define SYSREG_TLBEHI                           0x0110
+#define SYSREG_TLBELO                           0x0114
+#define SYSREG_PTBR                             0x0118
+#define SYSREG_TLBEAR                           0x011c
+#define SYSREG_MMUCR                            0x0120
+#define SYSREG_TLBARLO                          0x0124
+#define SYSREG_TLBARHI                          0x0128
+#define SYSREG_PCCNT                            0x012c
+#define SYSREG_PCNT0                            0x0130
+#define SYSREG_PCNT1                            0x0134
+#define SYSREG_PCCR                             0x0138
+#define SYSREG_BEAR                             0x013c
+/* Bitfields in SR */
+#define SYSREG_SR_C_OFFSET                      0
+#define SYSREG_SR_C_SIZE                        1
+#define SYSREG_Z_OFFSET                         1
+#define SYSREG_Z_SIZE                           1
+#define SYSREG_SR_N_OFFSET                      2
+#define SYSREG_SR_N_SIZE                        1
+#define SYSREG_SR_V_OFFSET                      3
+#define SYSREG_SR_V_SIZE                        1
+#define SYSREG_Q_OFFSET                         4
+#define SYSREG_Q_SIZE                           1
+#define SYSREG_GM_OFFSET                        16
+#define SYSREG_GM_SIZE                          1
+#define SYSREG_I0M_OFFSET                       17
+#define SYSREG_I0M_SIZE                         1
+#define SYSREG_I1M_OFFSET                       18
+#define SYSREG_I1M_SIZE                         1
+#define SYSREG_I2M_OFFSET                       19
+#define SYSREG_I2M_SIZE                         1
+#define SYSREG_I3M_OFFSET                       20
+#define SYSREG_I3M_SIZE                         1
+#define SYSREG_EM_OFFSET                        21
+#define SYSREG_EM_SIZE                          1
+#define SYSREG_M0_OFFSET                        22
+#define SYSREG_M0_SIZE                          1
+#define SYSREG_M1_OFFSET                        23
+#define SYSREG_M1_SIZE                          1
+#define SYSREG_M2_OFFSET                        24
+#define SYSREG_M2_SIZE                          1
+#define SYSREG_SR_D_OFFSET                      26
+#define SYSREG_SR_D_SIZE                        1
+#define SYSREG_DM_OFFSET                        27
+#define SYSREG_DM_SIZE                          1
+#define SYSREG_SR_J_OFFSET                      28
+#define SYSREG_SR_J_SIZE                        1
+#define SYSREG_R_OFFSET                         29
+#define SYSREG_R_SIZE                           1
+#define SYSREG_H_OFFSET                         30
+#define SYSREG_H_SIZE                           1
+/* Bitfields in EVBA */
+/* Bitfields in ACBA */
+/* Bitfields in CPUCR */
+#define SYSREG_BI_OFFSET                        0
+#define SYSREG_BI_SIZE                          1
+#define SYSREG_BE_OFFSET                        1
+#define SYSREG_BE_SIZE                          1
+#define SYSREG_FE_OFFSET                        2
+#define SYSREG_FE_SIZE                          1
+#define SYSREG_RE_OFFSET                        3
+#define SYSREG_RE_SIZE                          1
+#define SYSREG_IBE_OFFSET                       4
+#define SYSREG_IBE_SIZE                         1
+#define SYSREG_IEE_OFFSET                       5
+#define SYSREG_IEE_SIZE                         1
+/* Bitfields in ECR */
+#define SYSREG_ECR_OFFSET                       0
+#define SYSREG_ECR_SIZE                         32
+/* Bitfields in RSR_SUP */
+/* Bitfields in RSR_INT0 */
+/* Bitfields in RSR_INT1 */
+/* Bitfields in RSR_INT2 */
+/* Bitfields in RSR_INT3 */
+/* Bitfields in RSR_EX */
+/* Bitfields in RSR_NMI */
+/* Bitfields in RSR_DBG */
+/* Bitfields in RAR_SUP */
+/* Bitfields in RAR_INT0 */
+/* Bitfields in RAR_INT1 */
+/* Bitfields in RAR_INT2 */
+/* Bitfields in RAR_INT3 */
+/* Bitfields in RAR_EX */
+/* Bitfields in RAR_NMI */
+/* Bitfields in RAR_DBG */
+/* Bitfields in JECR */
+/* Bitfields in JOSP */
+/* Bitfields in JAVA_LV0 */
+/* Bitfields in JAVA_LV1 */
+/* Bitfields in JAVA_LV2 */
+/* Bitfields in JAVA_LV3 */
+/* Bitfields in JAVA_LV4 */
+/* Bitfields in JAVA_LV5 */
+/* Bitfields in JAVA_LV6 */
+/* Bitfields in JAVA_LV7 */
+/* Bitfields in JTBA */
+/* Bitfields in JBCR */
+/* Bitfields in CONFIG0 */
+#define SYSREG_CONFIG0_D_OFFSET                 1
+#define SYSREG_CONFIG0_D_SIZE                   1
+#define SYSREG_CONFIG0_S_OFFSET                 2
+#define SYSREG_CONFIG0_S_SIZE                   1
+#define SYSREG_O_OFFSET                         3
+#define SYSREG_O_SIZE                           1
+#define SYSREG_P_OFFSET                         4
+#define SYSREG_P_SIZE                           1
+#define SYSREG_CONFIG0_J_OFFSET                 5
+#define SYSREG_CONFIG0_J_SIZE                   1
+#define SYSREG_F_OFFSET                         6
+#define SYSREG_F_SIZE                           1
+#define SYSREG_MMUT_OFFSET                      7
+#define SYSREG_MMUT_SIZE                        3
+#define SYSREG_AR_OFFSET                        10
+#define SYSREG_AR_SIZE                          3
+#define SYSREG_AT_OFFSET                        13
+#define SYSREG_AT_SIZE                          3
+#define SYSREG_PROCESSORREVISION_OFFSET         16
+#define SYSREG_PROCESSORREVISION_SIZE           8
+#define SYSREG_PROCESSORID_OFFSET               24
+#define SYSREG_PROCESSORID_SIZE                 8
+/* Bitfields in CONFIG1 */
+#define SYSREG_DASS_OFFSET                      0
+#define SYSREG_DASS_SIZE                        3
+#define SYSREG_DLSZ_OFFSET                      3
+#define SYSREG_DLSZ_SIZE                        3
+#define SYSREG_DSET_OFFSET                      6
+#define SYSREG_DSET_SIZE                        4
+#define SYSREG_IASS_OFFSET                      10
+#define SYSREG_IASS_SIZE                        2
+#define SYSREG_ILSZ_OFFSET                      13
+#define SYSREG_ILSZ_SIZE                        3
+#define SYSREG_ISET_OFFSET                      16
+#define SYSREG_ISET_SIZE                        4
+#define SYSREG_DMMUSZ_OFFSET                    20
+#define SYSREG_DMMUSZ_SIZE                      6
+#define SYSREG_IMMUSZ_OFFSET                    26
+#define SYSREG_IMMUSZ_SIZE                      6
+/* Bitfields in COUNT */
+/* Bitfields in COMPARE */
+/* Bitfields in TLBEHI */
+#define SYSREG_ASID_OFFSET                      0
+#define SYSREG_ASID_SIZE                        8
+#define SYSREG_TLBEHI_I_OFFSET                  8
+#define SYSREG_TLBEHI_I_SIZE                    1
+#define SYSREG_TLBEHI_V_OFFSET                  9
+#define SYSREG_TLBEHI_V_SIZE                    1
+#define SYSREG_VPN_OFFSET                       10
+#define SYSREG_VPN_SIZE                         22
+/* Bitfields in TLBELO */
+#define SYSREG_W_OFFSET                         0
+#define SYSREG_W_SIZE                           1
+#define SYSREG_TLBELO_D_OFFSET                  1
+#define SYSREG_TLBELO_D_SIZE                    1
+#define SYSREG_SZ_OFFSET                        2
+#define SYSREG_SZ_SIZE                          2
+#define SYSREG_AP_OFFSET                        4
+#define SYSREG_AP_SIZE                          3
+#define SYSREG_B_OFFSET                         7
+#define SYSREG_B_SIZE                           1
+#define SYSREG_G_OFFSET                         8
+#define SYSREG_G_SIZE                           1
+#define SYSREG_TLBELO_C_OFFSET                  9
+#define SYSREG_TLBELO_C_SIZE                    1
+#define SYSREG_PFN_OFFSET                       10
+#define SYSREG_PFN_SIZE                         22
+/* Bitfields in PTBR */
+/* Bitfields in TLBEAR */
+/* Bitfields in MMUCR */
+#define SYSREG_E_OFFSET                         0
+#define SYSREG_E_SIZE                           1
+#define SYSREG_M_OFFSET                         1
+#define SYSREG_M_SIZE                           1
+#define SYSREG_MMUCR_I_OFFSET                   2
+#define SYSREG_MMUCR_I_SIZE                     1
+#define SYSREG_MMUCR_N_OFFSET                   3
+#define SYSREG_MMUCR_N_SIZE                     1
+#define SYSREG_MMUCR_S_OFFSET                   4
+#define SYSREG_MMUCR_S_SIZE                     1
+#define SYSREG_DLA_OFFSET                       8
+#define SYSREG_DLA_SIZE                         6
+#define SYSREG_DRP_OFFSET                       14
+#define SYSREG_DRP_SIZE                         6
+#define SYSREG_ILA_OFFSET                       20
+#define SYSREG_ILA_SIZE                         6
+#define SYSREG_IRP_OFFSET                       26
+#define SYSREG_IRP_SIZE                         6
+/* Bitfields in TLBARLO */
+/* Bitfields in TLBARHI */
+/* Bitfields in PCCNT */
+/* Bitfields in PCNT0 */
+/* Bitfields in PCNT1 */
+/* Bitfields in PCCR */
+/* Bitfields in BEAR */
+/* Constants for ECR */
+#define ECR_UNRECOVERABLE                       0
+#define ECR_TLB_MULTIPLE                        1
+#define ECR_BUS_ERROR_WRITE                     2
+#define ECR_BUS_ERROR_READ                      3
+#define ECR_NMI                                 4
+#define ECR_ADDR_ALIGN_X                        5
+#define ECR_PROTECTION_X                        6
+#define ECR_DEBUG                               7
+#define ECR_ILLEGAL_OPCODE                      8
+#define ECR_UNIMPL_INSTRUCTION                  9
+#define ECR_PRIVILEGE_VIOLATION                 10
+#define ECR_FPE                                 11
+#define ECR_COPROC_ABSENT                       12
+#define ECR_ADDR_ALIGN_R                        13
+#define ECR_ADDR_ALIGN_W                        14
+#define ECR_PROTECTION_R                        15
+#define ECR_PROTECTION_W                        16
+#define ECR_DTLB_MODIFIED                       17
+#define ECR_TLB_MISS_X                          20
+#define ECR_TLB_MISS_R                          24
+#define ECR_TLB_MISS_W                          28
+/* Bit manipulation macros */
+#define SYSREG_BIT(name)                        (1 << SYSREG_##name##_OFFSET)
+#define SYSREG_BF(name,value)                   (((value) & ((1 << SYSREG_##name##_SIZE) - 1)) << SYSREG_##name##_OFFSET)
+#define SYSREG_BFEXT(name,value)                (((value) >> SYSREG_##name##_OFFSET) & ((1 << SYSREG_##name##_SIZE) - 1))
+#define SYSREG_BFINS(name,value,old)            (((old) & ~(((1 << SYSREG_##name##_SIZE) - 1) << SYSREG_##name##_OFFSET)) | SYSREG_BF(name,value))
+#ifdef __CHECKER__
+extern unsigned long __builtin_mfsr(unsigned long reg);
+extern void __builtin_mtsr(unsigned long reg, unsigned long value);
+#endif
+/* Register access macros */
+#define sysreg_read(reg)                        __builtin_mfsr(SYSREG_##reg)
+#define sysreg_write(reg, value)                __builtin_mtsr(SYSREG_##reg, value)
+#endif /* __ASM_AVR32_SYSREG_H__ */
diff --git a/include/asm-avr32/system.h b/include/asm-avr32/system.h
new file mode 100644
index 000000000000..ac596058697d
--- /dev/null
+++ b/include/asm-avr32/system.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_SYSTEM_H
+#define __ASM_AVR32_SYSTEM_H
+#include <linux/compiler.h>
+#include <linux/types.h>
+#include <asm/ptrace.h>
+#include <asm/sysreg.h>
+#define xchg(ptr,x) \
+        ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
+#define nop() asm volatile("nop")
+#define mb()                    asm volatile("" : : : "memory")
+#define rmb()                   mb()
+#define wmb()                   asm volatile("sync 0" : : : "memory")
+#define read_barrier_depends()  do { } while(0)
+#define set_mb(var, value)      do { var = value; mb(); } while(0)
+/*
+ * Help PathFinder and other Nexus-compliant debuggers keep track of
+ * the current PID by emitting an Ownership Trace Message each time we
+ * switch task.
+ */
+#ifdef CONFIG_OWNERSHIP_TRACE
+#include <asm/ocd.h>
+#define finish_arch_switch(prev)                        \
+        do {                                            \
+                __mtdr(DBGREG_PID, prev->pid);          \
+                __mtdr(DBGREG_PID, current->pid);       \
+        } while(0)
+#endif
+/*
+ * switch_to(prev, next, last) should switch from task `prev' to task
+ * `next'. `prev' will never be the same as `next'.
+ *
+ * We just delegate everything to the __switch_to assembly function,
+ * which is implemented in arch/avr32/kernel/switch_to.S
+ *
+ * mb() tells GCC not to cache `current' across this call.
+ */
+struct cpu_context;
+struct task_struct;
+extern struct task_struct *__switch_to(struct task_struct *,
+                                       struct cpu_context *,
+                                       struct cpu_context *);
+#define switch_to(prev, next, last)                                     \
+        do {                                                            \
+                last = __switch_to(prev, &prev->thread.cpu_context + 1, \
+                                   &next->thread.cpu_context);          \
+        } while (0)
+#ifdef CONFIG_SMP
+# error "The AVR32 port does not support SMP"
+#else
+# define smp_mb()               barrier()
+# define smp_rmb()              barrier()
+# define smp_wmb()              barrier()
+# define smp_read_barrier_depends() do { } while(0)
+#endif
+#include <linux/irqflags.h>
+extern void __xchg_called_with_bad_pointer(void);
+#ifdef __CHECKER__
+extern unsigned long __builtin_xchg(void *ptr, unsigned long x);
+#endif
+#define xchg_u32(val, m) __builtin_xchg((void *)m, val)
+static inline unsigned long __xchg(unsigned long x,
+                                       volatile void *ptr,
+                                       int size)
+{
+        switch(size) {
+        case 4:
+                return xchg_u32(x, ptr);
+        default:
+                __xchg_called_with_bad_pointer();
+                return x;
+        }
+}
+static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
+                                          unsigned long new)
+{
+        __u32 ret;
+        asm volatile(
+                "1:     ssrf    5\n"
+                "       ld.w    %[ret], %[m]\n"
+                "       cp.w    %[ret], %[old]\n"
+                "       brne    2f\n"
+                "       stcond  %[m], %[new]\n"
+                "       brne    1b\n"
+                "2:\n"
+                : [ret] "=&r"(ret), [m] "=m"(*m)
+                : "m"(m), [old] "ir"(old), [new] "r"(new)
+                : "memory", "cc");
+        return ret;
+}
+extern unsigned long __cmpxchg_u64_unsupported_on_32bit_kernels(
+        volatile int * m, unsigned long old, unsigned long new);
+#define __cmpxchg_u64 __cmpxchg_u64_unsupported_on_32bit_kernels
+/* This function doesn't exist, so you'll get a linker error
+   if something tries to do an invalid cmpxchg().  */
+extern void __cmpxchg_called_with_bad_pointer(void);
+#define __HAVE_ARCH_CMPXCHG 1
+static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
+                                      unsigned long new, int size)
+{
+        switch (size) {
+        case 4:
+                return __cmpxchg_u32(ptr, old, new);
+        case 8:
+                return __cmpxchg_u64(ptr, old, new);
+        }
+        __cmpxchg_called_with_bad_pointer();
+        return old;
+}
+#define cmpxchg(ptr, old, new)                                  \
+        ((typeof(*(ptr)))__cmpxchg((ptr), (unsigned long)(old), \
+                                   (unsigned long)(new),        \
+                                   sizeof(*(ptr))))
+struct pt_regs;
+extern void __die(const char *, struct pt_regs *, unsigned long,
+                  const char *, const char *, unsigned long);
+extern void __die_if_kernel(const char *, struct pt_regs *, unsigned long,
+                            const char *, const char *, unsigned long);
+#define die(msg, regs, err)                                     \
+        __die(msg, regs, err, __FILE__ ":", __FUNCTION__, __LINE__)
+#define die_if_kernel(msg, regs, err)                                   \
+        __die_if_kernel(msg, regs, err, __FILE__ ":", __FUNCTION__, __LINE__)
+#define arch_align_stack(x)     (x)
+#endif /* __ASM_AVR32_SYSTEM_H */
diff --git a/include/asm-avr32/termbits.h b/include/asm-avr32/termbits.h
new file mode 100644
index 000000000000..9dc6eacafa33
--- /dev/null
+++ b/include/asm-avr32/termbits.h
@@ -0,0 +1,173 @@
+#ifndef __ASM_AVR32_TERMBITS_H
+#define __ASM_AVR32_TERMBITS_H
+#include <linux/posix_types.h>
+typedef unsigned char   cc_t;
+typedef unsigned int    speed_t;
+typedef unsigned int    tcflag_t;
+#define NCCS 19
+struct termios {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+};
+/* c_cc characters */
+#define VINTR 0
+#define VQUIT 1
+#define VERASE 2
+#define VKILL 3
+#define VEOF 4
+#define VTIME 5
+#define VMIN 6
+#define VSWTC 7
+#define VSTART 8
+#define VSTOP 9
+#define VSUSP 10
+#define VEOL 11
+#define VREPRINT 12
+#define VDISCARD 13
+#define VWERASE 14
+#define VLNEXT 15
+#define VEOL2 16
+/* c_iflag bits */
+#define IGNBRK  0000001
+#define BRKINT  0000002
+#define IGNPAR  0000004
+#define PARMRK  0000010
+#define INPCK   0000020
+#define ISTRIP  0000040
+#define INLCR   0000100
+#define IGNCR   0000200
+#define ICRNL   0000400
+#define IUCLC   0001000
+#define IXON    0002000
+#define IXANY   0004000
+#define IXOFF   0010000
+#define IMAXBEL 0020000
+#define IUTF8   0040000
+/* c_oflag bits */
+#define OPOST   0000001
+#define OLCUC   0000002
+#define ONLCR   0000004
+#define OCRNL   0000010
+#define ONOCR   0000020
+#define ONLRET  0000040
+#define OFILL   0000100
+#define OFDEL   0000200
+#define NLDLY   0000400
+#define   NL0   0000000
+#define   NL1   0000400
+#define CRDLY   0003000
+#define   CR0   0000000
+#define   CR1   0001000
+#define   CR2   0002000
+#define   CR3   0003000
+#define TABDLY  0014000
+#define   TAB0  0000000
+#define   TAB1  0004000
+#define   TAB2  0010000
+#define   TAB3  0014000
+#define   XTABS 0014000
+#define BSDLY   0020000
+#define   BS0   0000000
+#define   BS1   0020000
+#define VTDLY   0040000
+#define   VT0   0000000
+#define   VT1   0040000
+#define FFDLY   0100000
+#define   FF0   0000000
+#define   FF1   0100000
+/* c_cflag bit meaning */
+#define CBAUD   0010017
+#define  B0     0000000         /* hang up */
+#define  B50    0000001
+#define  B75    0000002
+#define  B110   0000003
+#define  B134   0000004
+#define  B150   0000005
+#define  B200   0000006
+#define  B300   0000007
+#define  B600   0000010
+#define  B1200  0000011
+#define  B1800  0000012
+#define  B2400  0000013
+#define  B4800  0000014
+#define  B9600  0000015
+#define  B19200 0000016
+#define  B38400 0000017
+#define EXTA B19200
+#define EXTB B38400
+#define CSIZE   0000060
+#define   CS5   0000000
+#define   CS6   0000020
+#define   CS7   0000040
+#define   CS8   0000060
+#define CSTOPB  0000100
+#define CREAD   0000200
+#define PARENB  0000400
+#define PARODD  0001000
+#define HUPCL   0002000
+#define CLOCAL  0004000
+#define CBAUDEX 0010000
+#define    B57600 0010001
+#define   B115200 0010002
+#define   B230400 0010003
+#define   B460800 0010004
+#define   B500000 0010005
+#define   B576000 0010006
+#define   B921600 0010007
+#define  B1000000 0010010
+#define  B1152000 0010011
+#define  B1500000 0010012
+#define  B2000000 0010013
+#define  B2500000 0010014
+#define  B3000000 0010015
+#define  B3500000 0010016
+#define  B4000000 0010017
+#define CIBAUD    002003600000  /* input baud rate (not used) */
+#define CMSPAR    010000000000          /* mark or space (stick) parity */
+#define CRTSCTS   020000000000          /* flow control */
+/* c_lflag bits */
+#define ISIG    0000001
+#define ICANON  0000002
+#define XCASE   0000004
+#define ECHO    0000010
+#define ECHOE   0000020
+#define ECHOK   0000040
+#define ECHONL  0000100
+#define NOFLSH  0000200
+#define TOSTOP  0000400
+#define ECHOCTL 0001000
+#define ECHOPRT 0002000
+#define ECHOKE  0004000
+#define FLUSHO  0010000
+#define PENDIN  0040000
+#define IEXTEN  0100000
+/* tcflow() and TCXONC use these */
+#define TCOOFF          0
+#define TCOON           1
+#define TCIOFF          2
+#define TCION           3
+/* tcflush() and TCFLSH use these */
+#define TCIFLUSH        0
+#define TCOFLUSH        1
+#define TCIOFLUSH       2
+/* tcsetattr uses these */
+#define TCSANOW         0
+#define TCSADRAIN       1
+#define TCSAFLUSH       2
+#endif /* __ASM_AVR32_TERMBITS_H */
diff --git a/include/asm-avr32/termios.h b/include/asm-avr32/termios.h
new file mode 100644
index 000000000000..615bc0639e5c
--- /dev/null
+++ b/include/asm-avr32/termios.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_TERMIOS_H
+#define __ASM_AVR32_TERMIOS_H
+#include <asm/termbits.h>
+#include <asm/ioctls.h>
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+#define NCC 8
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        unsigned char c_line;           /* line discipline */
+        unsigned char c_cc[NCC];        /* control characters */
+};
+/* modem lines */
+#define TIOCM_LE        0x001
+#define TIOCM_DTR       0x002
+#define TIOCM_RTS       0x004
+#define TIOCM_ST        0x008
+#define TIOCM_SR        0x010
+#define TIOCM_CTS       0x020
+#define TIOCM_CAR       0x040
+#define TIOCM_RNG       0x080
+#define TIOCM_DSR       0x100
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+/* line disciplines */
+#define N_TTY           0
+#define N_SLIP          1
+#define N_MOUSE         2
+#define N_PPP           3
+#define N_STRIP         4
+#define N_AX25          5
+#define N_X25           6       /* X.25 async */
+#define N_6PACK         7
+#define N_MASC          8       /* Reserved for Mobitex module <kaz@cafe.net> */
+#define N_R3964         9       /* Reserved for Simatic R3964 module */
+#define N_PROFIBUS_FDL  10      /* Reserved for Profibus <Dave@mvhi.com> */
+#define N_IRDA          11      /* Linux IR - http://irda.sourceforge.net/ */
+#define N_SMSBLOCK      12      /* SMS block mode - for talking to GSM data cards about SMS messages */
+#define N_HDLC          13      /* synchronous HDLC */
+#define N_SYNC_PPP      14      /* synchronous PPP */
+#define N_HCI           15  /* Bluetooth HCI UART */
+#ifdef __KERNEL__
+/*      intr=^C         quit=^\         erase=del       kill=^U
+        eof=^D          vtime=\0        vmin=\1         sxtc=\0
+        start=^Q        stop=^S         susp=^Z         eol=\0
+        reprint=^R      discard=^U      werase=^W       lnext=^V
+        eol2=\0
+*/
+#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
+#include <asm-generic/termios.h>
+#endif  /* __KERNEL__ */
+#endif  /* __ASM_AVR32_TERMIOS_H */
diff --git a/include/asm-avr32/thread_info.h b/include/asm-avr32/thread_info.h
new file mode 100644
index 000000000000..d1f5b35ebd54
--- /dev/null
+++ b/include/asm-avr32/thread_info.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_THREAD_INFO_H
+#define __ASM_AVR32_THREAD_INFO_H
+#include <asm/page.h>
+#define THREAD_SIZE_ORDER       1
+#define THREAD_SIZE             (PAGE_SIZE << THREAD_SIZE_ORDER)
+#ifndef __ASSEMBLY__
+#include <asm/types.h>
+struct task_struct;
+struct exec_domain;
+struct thread_info {
+        struct task_struct      *task;          /* main task structure */
+        struct exec_domain      *exec_domain;   /* execution domain */
+        unsigned long           flags;          /* low level flags */
+        __u32                   cpu;
+        __s32                   preempt_count;  /* 0 => preemptable, <0 => BUG */
+        struct restart_block    restart_block;
+        __u8                    supervisor_stack[0];
+};
+#define INIT_THREAD_INFO(tsk)                                           \
+{                                                                       \
+        .task           = &tsk,                                         \
+        .exec_domain    = &default_exec_domain,                         \
+        .flags          = 0,                                            \
+        .cpu            = 0,                                            \
+        .preempt_count  = 1,                                            \
+        .restart_block  = {                                             \
+                .fn     = do_no_restart_syscall                         \
+        }                                                               \
+}
+#define init_thread_info        (init_thread_union.thread_info)
+#define init_stack              (init_thread_union.stack)
+/*
+ * Get the thread information struct from C.
+ * We do the usual trick and use the lower end of the stack for this
+ */
+static inline struct thread_info *current_thread_info(void)
+{
+        unsigned long addr = ~(THREAD_SIZE - 1);
+        asm("and %0, sp" : "=r"(addr) : "0"(addr));
+        return (struct thread_info *)addr;
+}
+/* thread information allocation */
+#define alloc_thread_info(ti) \
+        ((struct thread_info *) __get_free_pages(GFP_KERNEL, THREAD_SIZE_ORDER))
+#define free_thread_info(ti) free_pages((unsigned long)(ti), 1)
+#define get_thread_info(ti) get_task_struct((ti)->task)
+#define put_thread_info(ti) put_task_struct((ti)->task)
+#endif /* !__ASSEMBLY__ */
+#define PREEMPT_ACTIVE          0x40000000
+/*
+ * Thread information flags
+ * - these are process state flags that various assembly files may need to access
+ * - pending work-to-be-done flags are in LSW
+ * - other flags in MSW
+ */
+#define TIF_SYSCALL_TRACE       0       /* syscall trace active */
+#define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
+#define TIF_SIGPENDING          2       /* signal pending */
+#define TIF_NEED_RESCHED        3       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG      4       /* true if poll_idle() is polling
+                                           TIF_NEED_RESCHED */
+#define TIF_BREAKPOINT          5       /* true if we should break after return */
+#define TIF_SINGLE_STEP         6       /* single step after next break */
+#define TIF_MEMDIE              7
+#define TIF_RESTORE_SIGMASK     8       /* restore signal mask in do_signal */
+#define TIF_USERSPACE           31      /* true if FS sets userspace */
+#define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
+#define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
+#define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
+#define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
+#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
+#define _TIF_BREAKPOINT         (1 << TIF_BREAKPOINT)
+#define _TIF_SINGLE_STEP        (1 << TIF_SINGLE_STEP)
+#define _TIF_MEMDIE             (1 << TIF_MEMDIE)
+#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
+/* XXX: These two masks must never span more than 16 bits! */
+/* work to do on interrupt/exception return */
+#define _TIF_WORK_MASK          0x0000013e
+/* work to do on any return to userspace */
+#define _TIF_ALLWORK_MASK       0x0000013f
+/* work to do on return from debug mode */
+#define _TIF_DBGWORK_MASK       0x0000017e
+#endif /* __ASM_AVR32_THREAD_INFO_H */
diff --git a/include/asm-avr32/timex.h b/include/asm-avr32/timex.h
new file mode 100644
index 000000000000..5e44ecb3ce0c
--- /dev/null
+++ b/include/asm-avr32/timex.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_TIMEX_H
+#define __ASM_AVR32_TIMEX_H
+/*
+ * This is the frequency of the timer used for Linux's timer interrupt.
+ * The value should be defined as accurate as possible or under certain
+ * circumstances Linux timekeeping might become inaccurate or fail.
+ *
+ * For many system the exact clockrate of the timer isn't known but due to
+ * the way this value is used we can get away with a wrong value as long
+ * as this value is:
+ *
+ *  - a multiple of HZ
+ *  - a divisor of the actual rate
+ *
+ * 500000 is a good such cheat value.
+ *
+ * The obscure number 1193182 is the same as used by the original i8254
+ * time in legacy PC hardware; the chip is never found in AVR32 systems.
+ */
+#define CLOCK_TICK_RATE         500000  /* Underlying HZ */
+typedef unsigned long cycles_t;
+static inline cycles_t get_cycles (void)
+{
+        return 0;
+}
+extern int read_current_timer(unsigned long *timer_value);
+#define ARCH_HAS_READ_CURRENT_TIMER     1
+#endif /* __ASM_AVR32_TIMEX_H */
diff --git a/include/asm-avr32/tlb.h b/include/asm-avr32/tlb.h
new file mode 100644
index 000000000000..5c55f9ce7c7d
--- /dev/null
+++ b/include/asm-avr32/tlb.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_TLB_H
+#define __ASM_AVR32_TLB_H
+#define tlb_start_vma(tlb, vma) \
+        flush_cache_range(vma, vma->vm_start, vma->vm_end)
+#define tlb_end_vma(tlb, vma) \
+        flush_tlb_range(vma, vma->vm_start, vma->vm_end)
+#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while(0)
+/*
+ * Flush whole TLB for MM
+ */
+#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
+#include <asm-generic/tlb.h>
+/*
+ * For debugging purposes
+ */
+extern void show_dtlb_entry(unsigned int index);
+extern void dump_dtlb(void);
+#endif /* __ASM_AVR32_TLB_H */
diff --git a/include/asm-avr32/tlbflush.h b/include/asm-avr32/tlbflush.h
new file mode 100644
index 000000000000..730e268f81f3
--- /dev/null
+++ b/include/asm-avr32/tlbflush.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_TLBFLUSH_H
+#define __ASM_AVR32_TLBFLUSH_H
+#include <asm/mmu.h>
+/*
+ * TLB flushing:
+ *
+ *  - flush_tlb() flushes the current mm struct TLBs
+ *  - flush_tlb_all() flushes all processes' TLB entries
+ *  - flush_tlb_mm(mm) flushes the specified mm context TLBs
+ *  - flush_tlb_page(vma, vmaddr) flushes one page
+ *  - flush_tlb_range(vma, start, end) flushes a range of pages
+ *  - flush_tlb_kernel_range(start, end) flushes a range of kernel pages
+ *  - flush_tlb_pgtables(mm, start, end) flushes a range of page tables
+ */
+extern void flush_tlb(void);
+extern void flush_tlb_all(void);
+extern void flush_tlb_mm(struct mm_struct *mm);
+extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
+                            unsigned long end);
+extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long page);
+extern void __flush_tlb_page(unsigned long asid, unsigned long page);
+static inline void flush_tlb_pgtables(struct mm_struct *mm,
+                                      unsigned long start, unsigned long end)
+{
+        /* Nothing to do */
+}
+extern void flush_tlb_kernel_range(unsigned long start, unsigned long end);
+#endif /* __ASM_AVR32_TLBFLUSH_H */
diff --git a/include/asm-avr32/topology.h b/include/asm-avr32/topology.h
new file mode 100644
index 000000000000..5b766cbb4806
--- /dev/null
+++ b/include/asm-avr32/topology.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_AVR32_TOPOLOGY_H
+#define __ASM_AVR32_TOPOLOGY_H
+#include <asm-generic/topology.h>
+#endif /* __ASM_AVR32_TOPOLOGY_H */
diff --git a/include/asm-avr32/traps.h b/include/asm-avr32/traps.h
new file mode 100644
index 000000000000..6a8fb944f414
--- /dev/null
+++ b/include/asm-avr32/traps.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_TRAPS_H
+#define __ASM_AVR32_TRAPS_H
+#include <linux/list.h>
+struct undef_hook {
+        struct list_head node;
+        u32 insn_mask;
+        u32 insn_val;
+        int (*fn)(struct pt_regs *regs, u32 insn);
+};
+void register_undef_hook(struct undef_hook *hook);
+void unregister_undef_hook(struct undef_hook *hook);
+#endif /* __ASM_AVR32_TRAPS_H */
diff --git a/include/asm-avr32/types.h b/include/asm-avr32/types.h
new file mode 100644
index 000000000000..3f47db9675af
--- /dev/null
+++ b/include/asm-avr32/types.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_TYPES_H
+#define __ASM_AVR32_TYPES_H
+#ifndef __ASSEMBLY__
+typedef unsigned short umode_t;
+/*
+ * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
+ * header files exported to user space
+ */
+typedef __signed__ char __s8;
+typedef unsigned char __u8;
+typedef __signed__ short __s16;
+typedef unsigned short __u16;
+typedef __signed__ int __s32;
+typedef unsigned int __u32;
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+typedef __signed__ long long __s64;
+typedef unsigned long long __u64;
+#endif
+#endif /* __ASSEMBLY__ */
+/*
+ * These aren't exported outside the kernel to avoid name space clashes
+ */
+#ifdef __KERNEL__
+#define BITS_PER_LONG 32
+#ifndef __ASSEMBLY__
+typedef signed char s8;
+typedef unsigned char u8;
+typedef signed short s16;
+typedef unsigned short u16;
+typedef signed int s32;
+typedef unsigned int u32;
+typedef signed long long s64;
+typedef unsigned long long u64;
+/* Dma addresses are 32-bits wide.  */
+typedef u32 dma_addr_t;
+#ifdef CONFIG_LBD
+typedef u64 sector_t;
+#define HAVE_SECTOR_T
+#endif
+#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
+#endif /* __ASM_AVR32_TYPES_H */
diff --git a/include/asm-avr32/uaccess.h b/include/asm-avr32/uaccess.h
new file mode 100644
index 000000000000..821deb5a9d28
--- /dev/null
+++ b/include/asm-avr32/uaccess.h
@@ -0,0 +1,335 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_UACCESS_H
+#define __ASM_AVR32_UACCESS_H
+#include <linux/errno.h>
+#include <linux/sched.h>
+#define VERIFY_READ     0
+#define VERIFY_WRITE    1
+typedef struct {
+        unsigned int is_user_space;
+} mm_segment_t;
+/*
+ * The fs value determines whether argument validity checking should be
+ * performed or not.  If get_fs() == USER_DS, checking is performed, with
+ * get_fs() == KERNEL_DS, checking is bypassed.
+ *
+ * For historical reasons (Data Segment Register?), these macros are misnamed.
+ */
+#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
+#define segment_eq(a,b) ((a).is_user_space == (b).is_user_space)
+#define USER_ADDR_LIMIT 0x80000000
+#define KERNEL_DS       MAKE_MM_SEG(0)
+#define USER_DS         MAKE_MM_SEG(1)
+#define get_ds()        (KERNEL_DS)
+static inline mm_segment_t get_fs(void)
+{
+        return MAKE_MM_SEG(test_thread_flag(TIF_USERSPACE));
+}
+static inline void set_fs(mm_segment_t s)
+{
+        if (s.is_user_space)
+                set_thread_flag(TIF_USERSPACE);
+        else
+                clear_thread_flag(TIF_USERSPACE);
+}
+/*
+ * Test whether a block of memory is a valid user space address.
+ * Returns 0 if the range is valid, nonzero otherwise.
+ *
+ * We do the following checks:
+ *   1. Is the access from kernel space?
+ *   2. Does (addr + size) set the carry bit?
+ *   3. Is (addr + size) a negative number (i.e. >= 0x80000000)?
+ *
+ * If yes on the first check, access is granted.
+ * If no on any of the others, access is denied.
+ */
+#define __range_ok(addr, size)                                          \
+        (test_thread_flag(TIF_USERSPACE)                                \
+         && (((unsigned long)(addr) >= 0x80000000)                      \
+             || ((unsigned long)(size) > 0x80000000)                    \
+             || (((unsigned long)(addr) + (unsigned long)(size)) > 0x80000000)))
+#define access_ok(type, addr, size) (likely(__range_ok(addr, size) == 0))
+static inline int
+verify_area(int type, const void __user *addr, unsigned long size)
+{
+        return access_ok(type, addr, size) ? 0 : -EFAULT;
+}
+/* Generic arbitrary sized copy. Return the number of bytes NOT copied */
+extern __kernel_size_t __copy_user(void *to, const void *from,
+                                   __kernel_size_t n);
+extern __kernel_size_t copy_to_user(void __user *to, const void *from,
+                                    __kernel_size_t n);
+extern __kernel_size_t copy_from_user(void *to, const void __user *from,
+                                      __kernel_size_t n);
+static inline __kernel_size_t __copy_to_user(void __user *to, const void *from,
+                                             __kernel_size_t n)
+{
+        return __copy_user((void __force *)to, from, n);
+}
+static inline __kernel_size_t __copy_from_user(void *to,
+                                               const void __user *from,
+                                               __kernel_size_t n)
+{
+        return __copy_user(to, (const void __force *)from, n);
+}
+#define __copy_to_user_inatomic __copy_to_user
+#define __copy_from_user_inatomic __copy_from_user
+/*
+ * put_user: - Write a simple value into user space.
+ * @x:   Value to copy to user space.
+ * @ptr: Destination address, in user space.
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * This macro copies a single simple value from kernel space to user
+ * space.  It supports simple types like char and int, but not larger
+ * data types like structures or arrays.
+ *
+ * @ptr must have pointer-to-simple-variable type, and @x must be assignable
+ * to the result of dereferencing @ptr.
+ *
+ * Returns zero on success, or -EFAULT on error.
+ */
+#define put_user(x,ptr) \
+        __put_user_check((x),(ptr),sizeof(*(ptr)))
+/*
+ * get_user: - Get a simple variable from user space.
+ * @x:   Variable to store result.
+ * @ptr: Source address, in user space.
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * This macro copies a single simple variable from user space to kernel
+ * space.  It supports simple types like char and int, but not larger
+ * data types like structures or arrays.
+ *
+ * @ptr must have pointer-to-simple-variable type, and the result of
+ * dereferencing @ptr must be assignable to @x without a cast.
+ *
+ * Returns zero on success, or -EFAULT on error.
+ * On error, the variable @x is set to zero.
+ */
+#define get_user(x,ptr) \
+        __get_user_check((x),(ptr),sizeof(*(ptr)))
+/*
+ * __put_user: - Write a simple value into user space, with less checking.
+ * @x:   Value to copy to user space.
+ * @ptr: Destination address, in user space.
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * This macro copies a single simple value from kernel space to user
+ * space.  It supports simple types like char and int, but not larger
+ * data types like structures or arrays.
+ *
+ * @ptr must have pointer-to-simple-variable type, and @x must be assignable
+ * to the result of dereferencing @ptr.
+ *
+ * Caller must check the pointer with access_ok() before calling this
+ * function.
+ *
+ * Returns zero on success, or -EFAULT on error.
+ */
+#define __put_user(x,ptr) \
+        __put_user_nocheck((x),(ptr),sizeof(*(ptr)))
+/*
+ * __get_user: - Get a simple variable from user space, with less checking.
+ * @x:   Variable to store result.
+ * @ptr: Source address, in user space.
+ *
+ * Context: User context only.  This function may sleep.
+ *
+ * This macro copies a single simple variable from user space to kernel
+ * space.  It supports simple types like char and int, but not larger
+ * data types like structures or arrays.
+ *
+ * @ptr must have pointer-to-simple-variable type, and the result of
+ * dereferencing @ptr must be assignable to @x without a cast.
+ *
+ * Caller must check the pointer with access_ok() before calling this
+ * function.
+ *
+ * Returns zero on success, or -EFAULT on error.
+ * On error, the variable @x is set to zero.
+ */
+#define __get_user(x,ptr) \
+        __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+extern int __get_user_bad(void);
+extern int __put_user_bad(void);
+#define __get_user_nocheck(x, ptr, size)                                \
+({                                                                      \
+        typeof(*(ptr)) __gu_val = (typeof(*(ptr)) __force)0;            \
+        int __gu_err = 0;                                               \
+                                                                        \
+        switch (size) {                                                 \
+        case 1: __get_user_asm("ub", __gu_val, ptr, __gu_err); break;   \
+        case 2: __get_user_asm("uh", __gu_val, ptr, __gu_err); break;   \
+        case 4: __get_user_asm("w", __gu_val, ptr, __gu_err); break;    \
+        case 8: __get_user_asm("d", __gu_val, ptr, __gu_err); break;    \
+        default: __gu_err = __get_user_bad(); break;                    \
+        }                                                               \
+                                                                        \
+        x = __gu_val;                                                   \
+        __gu_err;                                                       \
+})
+#define __get_user_check(x, ptr, size)                                  \
+({                                                                      \
+        typeof(*(ptr)) __gu_val = (typeof(*(ptr)) __force)0;            \
+        const typeof(*(ptr)) __user * __gu_addr = (ptr);                \
+        int __gu_err = 0;                                               \
+                                                                        \
+        if (access_ok(VERIFY_READ, __gu_addr, size)) {                  \
+                switch (size) {                                         \
+                case 1:                                                 \
+                        __get_user_asm("ub", __gu_val, __gu_addr,       \
+                                       __gu_err);                       \
+                        break;                                          \
+                case 2:                                                 \
+                        __get_user_asm("uh", __gu_val, __gu_addr,       \
+                                       __gu_err);                       \
+                        break;                                          \
+                case 4:                                                 \
+                        __get_user_asm("w", __gu_val, __gu_addr,        \
+                                       __gu_err);                       \
+                        break;                                          \
+                case 8:                                                 \
+                        __get_user_asm("d", __gu_val, __gu_addr,        \
+                                       __gu_err);                       \
+                        break;                                          \
+                default:                                                \
+                        __gu_err = __get_user_bad();                    \
+                        break;                                          \
+                }                                                       \
+        } else {                                                        \
+                __gu_err = -EFAULT;                                     \
+        }                                                               \
+        x = __gu_val;                                                   \
+        __gu_err;                                                       \
+})
+#define __get_user_asm(suffix, __gu_val, ptr, __gu_err)                 \
+        asm volatile(                                                   \
+                "1:     ld." suffix "   %1, %3                  \n"     \
+                "2:                                             \n"     \
+                "       .section .fixup, \"ax\"                 \n"     \
+                "3:     mov     %0, %4                          \n"     \
+                "       rjmp    2b                              \n"     \
+                "       .previous                               \n"     \
+                "       .section __ex_table, \"a\"              \n"     \
+                "       .long   1b, 3b                          \n"     \
+                "       .previous                               \n"     \
+                : "=r"(__gu_err), "=r"(__gu_val)                        \
+                : "0"(__gu_err), "m"(*(ptr)), "i"(-EFAULT))
+#define __put_user_nocheck(x, ptr, size)                                \
+({                                                                      \
+        typeof(*(ptr)) __pu_val;                                        \
+        int __pu_err = 0;                                               \
+                                                                        \
+        __pu_val = (x);                                                 \
+        switch (size) {                                                 \
+        case 1: __put_user_asm("b", ptr, __pu_val, __pu_err); break;    \
+        case 2: __put_user_asm("h", ptr, __pu_val, __pu_err); break;    \
+        case 4: __put_user_asm("w", ptr, __pu_val, __pu_err); break;    \
+        case 8: __put_user_asm("d", ptr, __pu_val, __pu_err); break;    \
+        default: __pu_err = __put_user_bad(); break;                    \
+        }                                                               \
+        __pu_err;                                                       \
+})
+#define __put_user_check(x, ptr, size)                                  \
+({                                                                      \
+        typeof(*(ptr)) __pu_val;                                        \
+        typeof(*(ptr)) __user *__pu_addr = (ptr);                       \
+        int __pu_err = 0;                                               \
+                                                                        \
+        __pu_val = (x);                                                 \
+        if (access_ok(VERIFY_WRITE, __pu_addr, size)) {                 \
+                switch (size) {                                         \
+                case 1:                                                 \
+                        __put_user_asm("b", __pu_addr, __pu_val,        \
+                                       __pu_err);                       \
+                        break;                                          \
+                case 2:                                                 \
+                        __put_user_asm("h", __pu_addr, __pu_val,        \
+                                       __pu_err);                       \
+                        break;                                          \
+                case 4:                                                 \
+                        __put_user_asm("w", __pu_addr, __pu_val,        \
+                                       __pu_err);                       \
+                        break;                                          \
+                case 8:                                                 \
+                        __put_user_asm("d", __pu_addr, __pu_val,                \
+                                       __pu_err);                       \
+                        break;                                          \
+                default:                                                \
+                        __pu_err = __put_user_bad();                    \
+                        break;                                          \
+                }                                                       \
+        } else {                                                        \
+                __pu_err = -EFAULT;                                     \
+        }                                                               \
+        __pu_err;                                                       \
+})
+#define __put_user_asm(suffix, ptr, __pu_val, __gu_err)                 \
+        asm volatile(                                                   \
+                "1:     st." suffix "   %1, %3                  \n"     \
+                "2:                                             \n"     \
+                "       .section .fixup, \"ax\"                 \n"     \
+                "3:     mov     %0, %4                          \n"     \
+                "       rjmp    2b                              \n"     \
+                "       .previous                               \n"     \
+                "       .section __ex_table, \"a\"              \n"     \
+                "       .long   1b, 3b                          \n"     \
+                "       .previous                               \n"     \
+                : "=r"(__gu_err), "=m"(*(ptr))                          \
+                : "0"(__gu_err), "r"(__pu_val), "i"(-EFAULT))
+extern __kernel_size_t clear_user(void __user *addr, __kernel_size_t size);
+extern __kernel_size_t __clear_user(void __user *addr, __kernel_size_t size);
+extern long strncpy_from_user(char *dst, const char __user *src, long count);
+extern long __strncpy_from_user(char *dst, const char __user *src, long count);
+extern long strnlen_user(const char __user *__s, long __n);
+extern long __strnlen_user(const char __user *__s, long __n);
+#define strlen_user(s) strnlen_user(s, ~0UL >> 1)
+struct exception_table_entry
+{
+        unsigned long insn, fixup;
+};
+#endif /* __ASM_AVR32_UACCESS_H */
diff --git a/include/asm-avr32/ucontext.h b/include/asm-avr32/ucontext.h
new file mode 100644
index 000000000000..ac7259c2a799
--- /dev/null
+++ b/include/asm-avr32/ucontext.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_AVR32_UCONTEXT_H
+#define __ASM_AVR32_UCONTEXT_H
+struct ucontext {
+        unsigned long           uc_flags;
+        struct ucontext *       uc_link;
+        stack_t                 uc_stack;
+        struct sigcontext       uc_mcontext;
+        sigset_t                uc_sigmask;
+};
+#endif /* __ASM_AVR32_UCONTEXT_H */
diff --git a/include/asm-avr32/unaligned.h b/include/asm-avr32/unaligned.h
new file mode 100644
index 000000000000..3042723fcbfd
--- /dev/null
+++ b/include/asm-avr32/unaligned.h
@@ -0,0 +1,25 @@
+#ifndef __ASM_AVR32_UNALIGNED_H
+#define __ASM_AVR32_UNALIGNED_H
+/*
+ * AVR32 can handle some unaligned accesses, depending on the
+ * implementation.  The AVR32 AP implementation can handle unaligned
+ * words, but halfwords must be halfword-aligned, and doublewords must
+ * be word-aligned.
+ *
+ * TODO: Make all this CPU-specific and optimize.
+ */
+#include <linux/string.h>
+/* Use memmove here, so gcc does not insert a __builtin_memcpy. */
+#define get_unaligned(ptr) \
+  ({ __typeof__(*(ptr)) __tmp; memmove(&__tmp, (ptr), sizeof(*(ptr))); __tmp; })
+#define put_unaligned(val, ptr)                         \
+  ({ __typeof__(*(ptr)) __tmp = (val);                  \
+     memmove((ptr), &__tmp, sizeof(*(ptr)));            \
+     (void)0; })
+#endif /* __ASM_AVR32_UNALIGNED_H */
diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h
new file mode 100644
index 000000000000..1f528f92690d
--- /dev/null
+++ b/include/asm-avr32/unistd.h
@@ -0,0 +1,387 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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_AVR32_UNISTD_H
+#define __ASM_AVR32_UNISTD_H
+/*
+ * This file contains the system call numbers.
+ */
+#define __NR_restart_syscall      0
+#define __NR_exit                 1
+#define __NR_fork                 2
+#define __NR_read                 3
+#define __NR_write                4
+#define __NR_open                 5
+#define __NR_close                6
+#define __NR_umask                7
+#define __NR_creat                8
+#define __NR_link                 9
+#define __NR_unlink              10
+#define __NR_execve              11
+#define __NR_chdir               12
+#define __NR_time                13
+#define __NR_mknod               14
+#define __NR_chmod               15
+#define __NR_chown               16
+#define __NR_lchown              17
+#define __NR_lseek               18
+#define __NR__llseek             19
+#define __NR_getpid              20
+#define __NR_mount               21
+#define __NR_umount2             22
+#define __NR_setuid              23
+#define __NR_getuid              24
+#define __NR_stime               25
+#define __NR_ptrace              26
+#define __NR_alarm               27
+#define __NR_pause               28
+#define __NR_utime               29
+#define __NR_stat                30
+#define __NR_fstat               31
+#define __NR_lstat               32
+#define __NR_access              33
+#define __NR_chroot              34
+#define __NR_sync                35
+#define __NR_fsync               36
+#define __NR_kill                37
+#define __NR_rename              38
+#define __NR_mkdir               39
+#define __NR_rmdir               40
+#define __NR_dup                 41
+#define __NR_pipe                42
+#define __NR_times               43
+#define __NR_clone               44
+#define __NR_brk                 45
+#define __NR_setgid              46
+#define __NR_getgid              47
+#define __NR_getcwd              48
+#define __NR_geteuid             49
+#define __NR_getegid             50
+#define __NR_acct                51
+#define __NR_setfsuid            52
+#define __NR_setfsgid            53
+#define __NR_ioctl               54
+#define __NR_fcntl               55
+#define __NR_setpgid             56
+#define __NR_mremap              57
+#define __NR_setresuid           58
+#define __NR_getresuid           59
+#define __NR_setreuid            60
+#define __NR_setregid            61
+#define __NR_ustat               62
+#define __NR_dup2                63
+#define __NR_getppid             64
+#define __NR_getpgrp             65
+#define __NR_setsid              66
+#define __NR_rt_sigaction        67
+#define __NR_rt_sigreturn        68
+#define __NR_rt_sigprocmask      69
+#define __NR_rt_sigpending       70
+#define __NR_rt_sigtimedwait     71
+#define __NR_rt_sigqueueinfo     72
+#define __NR_rt_sigsuspend       73
+#define __NR_sethostname         74
+#define __NR_setrlimit           75
+#define __NR_getrlimit           76     /* SuS compliant getrlimit */
+#define __NR_getrusage           77
+#define __NR_gettimeofday        78
+#define __NR_settimeofday        79
+#define __NR_getgroups           80
+#define __NR_setgroups           81
+#define __NR_select              82
+#define __NR_symlink             83
+#define __NR_fchdir              84
+#define __NR_readlink            85
+#define __NR_pread               86
+#define __NR_pwrite              87
+#define __NR_swapon              88
+#define __NR_reboot              89
+#define __NR_mmap2               90
+#define __NR_munmap              91
+#define __NR_truncate            92
+#define __NR_ftruncate           93
+#define __NR_fchmod              94
+#define __NR_fchown              95
+#define __NR_getpriority         96
+#define __NR_setpriority         97
+#define __NR_wait4               98
+#define __NR_statfs              99
+#define __NR_fstatfs            100
+#define __NR_vhangup            101
+#define __NR_sigaltstack        102
+#define __NR_syslog             103
+#define __NR_setitimer          104
+#define __NR_getitimer          105
+#define __NR_swapoff            106
+#define __NR_sysinfo            107
+#define __NR_ipc                108
+#define __NR_sendfile           109
+#define __NR_setdomainname      110
+#define __NR_uname              111
+#define __NR_adjtimex           112
+#define __NR_mprotect           113
+#define __NR_vfork              114
+#define __NR_init_module        115
+#define __NR_delete_module      116
+#define __NR_quotactl           117
+#define __NR_getpgid            118
+#define __NR_bdflush            119
+#define __NR_sysfs              120
+#define __NR_personality        121
+#define __NR_afs_syscall        122 /* Syscall for Andrew File System */
+#define __NR_getdents           123
+#define __NR_flock              124
+#define __NR_msync              125
+#define __NR_readv              126
+#define __NR_writev             127
+#define __NR_getsid             128
+#define __NR_fdatasync          129
+#define __NR__sysctl            130
+#define __NR_mlock              131
+#define __NR_munlock            132
+#define __NR_mlockall           133
+#define __NR_munlockall         134
+#define __NR_sched_setparam             135
+#define __NR_sched_getparam             136
+#define __NR_sched_setscheduler         137
+#define __NR_sched_getscheduler         138
+#define __NR_sched_yield                139
+#define __NR_sched_get_priority_max     140
+#define __NR_sched_get_priority_min     141
+#define __NR_sched_rr_get_interval      142
+#define __NR_nanosleep          143
+#define __NR_poll               144
+#define __NR_nfsservctl         145
+#define __NR_setresgid          146
+#define __NR_getresgid          147
+#define __NR_prctl              148
+#define __NR_socket             149
+#define __NR_bind               150
+#define __NR_connect            151
+#define __NR_listen             152
+#define __NR_accept             153
+#define __NR_getsockname        154
+#define __NR_getpeername        155
+#define __NR_socketpair         156
+#define __NR_send               157
+#define __NR_recv               158
+#define __NR_sendto             159
+#define __NR_recvfrom           160
+#define __NR_shutdown           161
+#define __NR_setsockopt         162
+#define __NR_getsockopt         163
+#define __NR_sendmsg            164
+#define __NR_recvmsg            165
+#define __NR_truncate64         166
+#define __NR_ftruncate64        167
+#define __NR_stat64             168
+#define __NR_lstat64            169
+#define __NR_fstat64            170
+#define __NR_pivot_root         171
+#define __NR_mincore            172
+#define __NR_madvise            173
+#define __NR_getdents64         174
+#define __NR_fcntl64            175
+#define __NR_gettid             176
+#define __NR_readahead          177
+#define __NR_setxattr           178
+#define __NR_lsetxattr          179
+#define __NR_fsetxattr          180
+#define __NR_getxattr           181
+#define __NR_lgetxattr          182
+#define __NR_fgetxattr          183
+#define __NR_listxattr          184
+#define __NR_llistxattr         185
+#define __NR_flistxattr         186
+#define __NR_removexattr        187
+#define __NR_lremovexattr       188
+#define __NR_fremovexattr       189
+#define __NR_tkill              190
+#define __NR_sendfile64         191
+#define __NR_futex              192
+#define __NR_sched_setaffinity  193
+#define __NR_sched_getaffinity  194
+#define __NR_capget             195
+#define __NR_capset             196
+#define __NR_io_setup           197
+#define __NR_io_destroy         198
+#define __NR_io_getevents       199
+#define __NR_io_submit          200
+#define __NR_io_cancel          201
+#define __NR_fadvise64          202
+#define __NR_exit_group         203
+#define __NR_lookup_dcookie     204
+#define __NR_epoll_create       205
+#define __NR_epoll_ctl          206
+#define __NR_epoll_wait         207
+#define __NR_remap_file_pages   208
+#define __NR_set_tid_address    209
+#define __NR_timer_create       210
+#define __NR_timer_settime      211
+#define __NR_timer_gettime      212
+#define __NR_timer_getoverrun   213
+#define __NR_timer_delete       214
+#define __NR_clock_settime      215
+#define __NR_clock_gettime      216
+#define __NR_clock_getres       217
+#define __NR_clock_nanosleep    218
+#define __NR_statfs64           219
+#define __NR_fstatfs64          220
+#define __NR_tgkill             221
+                                /* 222 reserved for tux */
+#define __NR_utimes             223
+#define __NR_fadvise64_64       224
+#define __NR_cacheflush         225
+#define __NR_vserver            226
+#define __NR_mq_open            227
+#define __NR_mq_unlink          228
+#define __NR_mq_timedsend       229
+#define __NR_mq_timedreceive    230
+#define __NR_mq_notify          231
+#define __NR_mq_getsetattr      232
+#define __NR_kexec_load         233
+#define __NR_waitid             234
+#define __NR_add_key            235
+#define __NR_request_key        236
+#define __NR_keyctl             237
+#define __NR_ioprio_set         238
+#define __NR_ioprio_get         239
+#define __NR_inotify_init       240
+#define __NR_inotify_add_watch  241
+#define __NR_inotify_rm_watch   242
+#define __NR_openat             243
+#define __NR_mkdirat            244
+#define __NR_mknodat            245
+#define __NR_fchownat           246
+#define __NR_futimesat          247
+#define __NR_fstatat64          248
+#define __NR_unlinkat           249
+#define __NR_renameat           250
+#define __NR_linkat             251
+#define __NR_symlinkat          252
+#define __NR_readlinkat         253
+#define __NR_fchmodat           254
+#define __NR_faccessat          255
+#define __NR_pselect6           256
+#define __NR_ppoll              257
+#define __NR_unshare            258
+#define __NR_set_robust_list    259
+#define __NR_get_robust_list    260
+#define __NR_splice             261
+#define __NR_sync_file_range    262
+#define __NR_tee                263
+#define __NR_vmsplice           264
+#define NR_syscalls             265
+/*
+ * AVR32 calling convention for system calls:
+ *   - System call number in r8
+ *   - Parameters in r12 and downwards to r9 as well as r6 and r5.
+ *   - Return value in r12
+ */
+/*
+ * user-visible error numbers are in the range -1 - -124: see
+ * <asm-generic/errno.h>
+ */
+#define __syscall_return(type, res) do {                                \
+                if ((unsigned long)(res) >= (unsigned long)(-125)) {    \
+                        errno = -(res);                                 \
+                        res = -1;                                       \
+                }                                                       \
+                return (type) (res);                                    \
+        } while (0)
+#ifdef __KERNEL__
+#define __ARCH_WANT_IPC_PARSE_VERSION
+#define __ARCH_WANT_STAT64
+#define __ARCH_WANT_SYS_ALARM
+#define __ARCH_WANT_SYS_GETHOSTNAME
+#define __ARCH_WANT_SYS_PAUSE
+#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_WAITPID
+#define __ARCH_WANT_SYS_FADVISE64
+#define __ARCH_WANT_SYS_GETPGRP
+#define __ARCH_WANT_SYS_LLSEEK
+#define __ARCH_WANT_SYS_GETPGRP
+#define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#endif
+#if defined(__KERNEL_SYSCALLS__) || defined(__CHECKER__)
+#include <linux/types.h>
+#include <linux/linkage.h>
+#include <asm/signal.h>
+struct pt_regs;
+/*
+ * we need this inline - forking from kernel space will result
+ * in NO COPY ON WRITE (!!!), until an execve is executed. This
+ * is no problem, but for the stack. This is handled by not letting
+ * main() use the stack at all after fork(). Thus, no function
+ * calls - which means inline code for fork too, as otherwise we
+ * would use the stack upon exit from 'fork()'.
+ *
+ * Actually only pause and fork are needed inline, so that there
+ * won't be any messing with the stack from main(), but we define
+ * some others too.
+ */
+static inline int execve(const char *file, char **argv, char **envp)
+{
+        register long scno asm("r8") = __NR_execve;
+        register long sc1 asm("r12") = (long)file;
+        register long sc2 asm("r11") = (long)argv;
+        register long sc3 asm("r10") = (long)envp;
+        int res;
+        asm volatile("scall"
+                     : "=r"(sc1)
+                     : "r"(scno), "0"(sc1), "r"(sc2), "r"(sc3)
+                     : "lr", "memory");
+        res = sc1;
+        __syscall_return(int, res);
+}
+asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize);
+asmlinkage int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
+                               struct pt_regs *regs);
+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
+asmlinkage int sys_pipe(unsigned long __user *filedes);
+asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
+                          unsigned long prot, unsigned long flags,
+                          unsigned long fd, off_t offset);
+asmlinkage int sys_cacheflush(int operation, void __user *addr, size_t len);
+asmlinkage int sys_fork(struct pt_regs *regs);
+asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
+                         unsigned long parent_tidptr,
+                         unsigned long child_tidptr, struct pt_regs *regs);
+asmlinkage int sys_vfork(struct pt_regs *regs);
+asmlinkage int sys_execve(char __user *ufilename, char __user *__user *uargv,
+                          char __user *__user *uenvp, struct pt_regs *regs);
+#endif
+/*
+ * "Conditional" syscalls
+ *
+ * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+ * but it doesn't work on all toolchains, so we just do it by hand
+ */
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+#endif /* __ASM_AVR32_UNISTD_H */
diff --git a/include/asm-avr32/user.h b/include/asm-avr32/user.h
new file mode 100644
index 000000000000..060fb3acee49
--- /dev/null
+++ b/include/asm-avr32/user.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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.
+ *
+ * Note: We may not need these definitions for AVR32, as we don't
+ * support a.out.
+ */
+#ifndef __ASM_AVR32_USER_H
+#define __ASM_AVR32_USER_H
+#include <linux/types.h>
+#include <asm/ptrace.h>
+#include <asm/page.h>
+/*
+ * Core file format: The core file is written in such a way that gdb
+ * can understand it and provide useful information to the user (under
+ * linux we use the `trad-core' bfd).  The file contents are as follows:
+ *
+ *  upage: 1 page consisting of a user struct that tells gdb
+ *      what is present in the file.  Directly after this is a
+ *      copy of the task_struct, which is currently not used by gdb,
+ *      but it may come in handy at some point.  All of the registers
+ *      are stored as part of the upage.  The upage should always be
+ *      only one page long.
+ *  data: The data segment follows next.  We use current->end_text to
+ *      current->brk to pick up all of the user variables, plus any memory
+ *      that may have been sbrk'ed.  No attempt is made to determine if a
+ *      page is demand-zero or if a page is totally unused, we just cover
+ *      the entire range.  All of the addresses are rounded in such a way
+ *      that an integral number of pages is written.
+ *  stack: We need the stack information in order to get a meaningful
+ *      backtrace.  We need to write the data from usp to
+ *      current->start_stack, so we round each of these in order to be able
+ *      to write an integer number of pages.
+ */
+struct user_fpu_struct {
+        /* We have no FPU (yet) */
+};
+struct user {
+        struct pt_regs  regs;                   /* entire machine state */
+        size_t          u_tsize;                /* text size (pages) */
+        size_t          u_dsize;                /* data size (pages) */
+        size_t          u_ssize;                /* stack size (pages) */
+        unsigned long   start_code;             /* text starting address */
+        unsigned long   start_data;             /* data starting address */
+        unsigned long   start_stack;            /* stack starting address */
+        long int        signal;                 /* signal causing core dump */
+        struct regs *   u_ar0;                  /* help gdb find registers */
+        unsigned long   magic;                  /* identifies a core file */
+        char            u_comm[32];             /* user command name */
+};
+#define NBPG                    PAGE_SIZE
+#define UPAGES                  1
+#define HOST_TEXT_START_ADDR    (u.start_code)
+#define HOST_DATA_START_ADDR    (u.start_data)
+#define HOST_STACK_END_ADDR     (u.start_stack + u.u_ssize * NBPG)
+#endif /* __ASM_AVR32_USER_H */
diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild
index c68e1680da01..14498d5a2f65 100644
--- a/include/asm-cris/Kbuild
+++ b/include/asm-cris/Kbuild
@@ -1 +1,5 @@
 include include/asm-generic/Kbuild.asm
+header-y += arch-v10/ arch-v32/
+unifdef-y += rs485.h
diff --git a/include/asm-cris/arch-v10/Kbuild b/include/asm-cris/arch-v10/Kbuild
new file mode 100644
index 000000000000..d7f27dc0941a
--- /dev/null
+++ b/include/asm-cris/arch-v10/Kbuild
@@ -0,0 +1,2 @@
+header-y += ptrace.h
+header-y += user.h
diff --git a/include/asm-cris/arch-v32/Kbuild b/include/asm-cris/arch-v32/Kbuild
new file mode 100644
index 000000000000..d7f27dc0941a
--- /dev/null
+++ b/include/asm-cris/arch-v32/Kbuild
@@ -0,0 +1,2 @@
+header-y += ptrace.h
+header-y += user.h
diff --git a/include/asm-cris/arch-v32/spinlock.h b/include/asm-cris/arch-v32/spinlock.h
index 52df72a62232..5f43df0a5fb4 100644
--- a/include/asm-cris/arch-v32/spinlock.h
+++ b/include/asm-cris/arch-v32/spinlock.h
@@ -160,4 +160,8 @@ static __inline__ int is_write_locked(rwlock_t *rw)
        return rw->counter < 0;
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* __ASM_ARCH_SPINLOCK_H */
diff --git a/include/asm-cris/byteorder.h b/include/asm-cris/byteorder.h
index a1a222adaa9f..0cd9db1cc888 100644
--- a/include/asm-cris/byteorder.h
+++ b/include/asm-cris/byteorder.h
@@ -3,14 +3,15 @@
 #ifdef __GNUC__
+#ifdef __KERNEL__
 #include <asm/arch/byteorder.h>
 /* defines are necessary because the other files detect the presence
 * of a defined __arch_swab32, not an inline
 */
 #define __arch__swab32(x) ___arch__swab32(x)
 #define __arch__swab16(x) ___arch__swab16(x)
+#endif /* __KERNEL__ */
 #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
 #  define __BYTEORDER_HAS_U64__
diff --git a/include/asm-cris/elf.h b/include/asm-cris/elf.h
index 87a60bd8e667..96a40c1de57c 100644
--- a/include/asm-cris/elf.h
+++ b/include/asm-cris/elf.h
@@ -5,7 +5,6 @@
 * ELF register definitions..
 */
-#include <asm/arch/elf.h>
 #include <asm/user.h>
 #define R_CRIS_NONE             0
@@ -46,6 +45,9 @@ typedef unsigned long elf_fpregset_t;
 #define ELF_DATA        ELFDATA2LSB
 #define ELF_ARCH        EM_CRIS
+#ifdef __KERNEL__
+#include <asm/arch/elf.h>
 /* The master for these definitions is {binutils}/include/elf/cris.h:  */
 /* User symbols in this file have a leading underscore.  */
 #define EF_CRIS_UNDERSCORE              0x00000001
@@ -87,8 +89,8 @@ typedef unsigned long elf_fpregset_t;
 #define ELF_PLATFORM  (NULL)
-#ifdef __KERNEL__
 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-#endif
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h
index 81832e9e157f..9f13c32552bf 100644
--- a/include/asm-cris/page.h
+++ b/include/asm-cris/page.h
@@ -1,6 +1,8 @@
 #ifndef _CRIS_PAGE_H
 #define _CRIS_PAGE_H
+#ifdef __KERNEL__
 #include <asm/arch/page.h>
 /* PAGE_SHIFT determines the page size */
@@ -12,8 +14,6 @@
 #endif
 #define PAGE_MASK       (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
 #define clear_page(page)        memset((void *)(page), 0, PAGE_SIZE)
 #define copy_page(to,from)      memcpy((void *)(to), (void *)(from), PAGE_SIZE)
@@ -73,10 +73,10 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* __KERNEL__ */
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
+#endif /* __KERNEL__ */
 #endif /* _CRIS_PAGE_H */
diff --git a/include/asm-cris/pgtable.h b/include/asm-cris/pgtable.h
index 5d76c1c0d6c9..c94a7107019c 100644
--- a/include/asm-cris/pgtable.h
+++ b/include/asm-cris/pgtable.h
@@ -253,7 +253,7 @@ static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
 { pmd_val(*pmdp) = _PAGE_TABLE | (unsigned long) ptep; }
 #define pmd_page(pmd)           (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
-#define pmd_page_kernel(pmd)    ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+#define pmd_page_vaddr(pmd)     ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 /* to find an entry in a page-table-directory. */
 #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
@@ -271,7 +271,7 @@ static inline pgd_t * pgd_offset(struct mm_struct * mm, unsigned long address)
 #define __pte_offset(address) \
        (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_kernel(*(dir)) +  __pte_offset(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) +  __pte_offset(address))
 #define pte_offset_map(dir, address) \
        ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address))
 #define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)
diff --git a/include/asm-cris/posix_types.h b/include/asm-cris/posix_types.h
index 6d26fee4a614..7b9ed22ab5dd 100644
--- a/include/asm-cris/posix_types.h
+++ b/include/asm-cris/posix_types.h
@@ -6,8 +6,6 @@
 #ifndef __ARCH_CRIS_POSIX_TYPES_H
 #define __ARCH_CRIS_POSIX_TYPES_H
-#include <asm/bitops.h>
 /*
 * This file is generally used by user-level software, so you need to
 * be a little careful about namespace pollution etc.  Also, we cannot
@@ -53,9 +51,8 @@ typedef struct {
 #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
 } __kernel_fsid_t;
-/* should this ifdef be here ?  */
+#ifdef __KERNEL__
+#include <asm/bitops.h>
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
 #undef  __FD_SET
 #define __FD_SET(fd,fdsetp) set_bit(fd, (void *)(fdsetp))
@@ -69,6 +66,6 @@ typedef struct {
 #undef  __FD_ZERO
 #define __FD_ZERO(fdsetp) memset((void *)(fdsetp), 0, __FDSET_LONGS << 2)
-#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
+#endif /* __KERNEL__ */
 #endif /* __ARCH_CRIS_POSIX_TYPES_H */
diff --git a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h
index c2954e90aa24..7372efae0516 100644
--- a/include/asm-cris/unistd.h
+++ b/include/asm-cris/unistd.h
@@ -1,8 +1,6 @@
 #ifndef _ASM_CRIS_UNISTD_H_
 #define _ASM_CRIS_UNISTD_H_
-#include <asm/arch/unistd.h>
 /*
 * This file contains the system call numbers, and stub macros for libc.
 */
@@ -299,6 +297,7 @@
 #define NR_syscalls 289
+#include <asm/arch/unistd.h>
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
@@ -322,7 +321,6 @@
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
-#endif
 #ifdef __KERNEL_SYSCALLS__
diff --git a/include/asm-frv/bitops.h b/include/asm-frv/bitops.h
index 980ae1b0cd28..1f70d47148bd 100644
--- a/include/asm-frv/bitops.h
+++ b/include/asm-frv/bitops.h
@@ -157,23 +157,105 @@ static inline int __test_bit(int nr, const volatile void * addr)
 __constant_test_bit((nr),(addr)) : \
 __test_bit((nr),(addr)))
-#include <asm-generic/bitops/ffs.h>
-#include <asm-generic/bitops/__ffs.h>
 #include <asm-generic/bitops/find.h>
-/*
+/**
- * fls: find last bit set.
+ * fls - find last bit set
+ * @x: the word to search
+ *
+ * This is defined the same way as ffs:
+ * - return 32..1 to indicate bit 31..0 most significant bit set
+ * - return 0 to indicate no bits set
 */
 #define fls(x)                                          \
 ({                                                      \
        int bit;                                        \
                                                        \
-        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(x));     \
+        asm("   subcc   %1,gr0,gr0,icc0         \n"     \
+            "   ckne    icc0,cc4                \n"     \
+            "   cscan.p %1,gr0,%0       ,cc4,#1 \n"     \
+            "   csub    %0,%0,%0        ,cc4,#0 \n"     \
+            "   csub    %2,%0,%0        ,cc4,#1 \n"     \
+            : "=&r"(bit)                                \
+            : "r"(x), "r"(32)                           \
+            : "icc0", "cc4"                             \
+            );                                          \
                                                        \
-        bit ? 33 - bit : bit;                           \
+        bit;                                            \
 })
-#include <asm-generic/bitops/fls64.h>
+/**
+ * fls64 - find last bit set in a 64-bit value
+ * @n: the value to search
+ *
+ * This is defined the same way as ffs:
+ * - return 64..1 to indicate bit 63..0 most significant bit set
+ * - return 0 to indicate no bits set
+ */
+static inline __attribute__((const))
+int fls64(u64 n)
+{
+        union {
+                u64 ll;
+                struct { u32 h, l; };
+        } _;
+        int bit, x, y;
+        _.ll = n;
+        asm("   subcc.p         %3,gr0,gr0,icc0         \n"
+            "   subcc           %4,gr0,gr0,icc1         \n"
+            "   ckne            icc0,cc4                \n"
+            "   ckne            icc1,cc5                \n"
+            "   norcr           cc4,cc5,cc6             \n"
+            "   csub.p          %0,%0,%0        ,cc6,1  \n"
+            "   orcr            cc5,cc4,cc4             \n"
+            "   andcr           cc4,cc5,cc4             \n"
+            "   cscan.p         %3,gr0,%0       ,cc4,0  \n"
+            "   setlos          #64,%1                  \n"
+            "   cscan.p         %4,gr0,%0       ,cc4,1  \n"
+            "   setlos          #32,%2                  \n"
+            "   csub.p          %1,%0,%0        ,cc4,0  \n"
+            "   csub            %2,%0,%0        ,cc4,1  \n"
+            : "=&r"(bit), "=r"(x), "=r"(y)
+            : "0r"(_.h), "r"(_.l)
+            : "icc0", "icc1", "cc4", "cc5", "cc6"
+            );
+        return bit;
+}
+/**
+ * ffs - find first bit set
+ * @x: the word to search
+ *
+ * - return 32..1 to indicate bit 31..0 most least significant bit set
+ * - return 0 to indicate no bits set
+ */
+static inline __attribute__((const))
+int ffs(int x)
+{
+        /* Note: (x & -x) gives us a mask that is the least significant
+         * (rightmost) 1-bit of the value in x.
+         */
+        return fls(x & -x);
+}
+/**
+ * __ffs - find first bit set
+ * @x: the word to search
+ *
+ * - return 31..0 to indicate bit 31..0 most least significant bit set
+ * - if no bits are set in x, the result is undefined
+ */
+static inline __attribute__((const))
+int __ffs(unsigned long x)
+{
+        int bit;
+        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(x & -x));
+        return 31 - bit;
+}
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
diff --git a/include/asm-frv/cpu-irqs.h b/include/asm-frv/cpu-irqs.h
index 5cd691e1f8c4..478f3498fcfe 100644
--- a/include/asm-frv/cpu-irqs.h
+++ b/include/asm-frv/cpu-irqs.h
@@ -14,36 +14,6 @@
 #ifndef __ASSEMBLY__
-#include <asm/irq-routing.h>
-#define IRQ_BASE_CPU            (NR_IRQ_ACTIONS_PER_GROUP * 0)
-/* IRQ IDs presented to drivers */
-enum {
-        IRQ_CPU__UNUSED = IRQ_BASE_CPU,
-        IRQ_CPU_UART0,
-        IRQ_CPU_UART1,
-        IRQ_CPU_TIMER0,
-        IRQ_CPU_TIMER1,
-        IRQ_CPU_TIMER2,
-        IRQ_CPU_DMA0,
-        IRQ_CPU_DMA1,
-        IRQ_CPU_DMA2,
-        IRQ_CPU_DMA3,
-        IRQ_CPU_DMA4,
-        IRQ_CPU_DMA5,
-        IRQ_CPU_DMA6,
-        IRQ_CPU_DMA7,
-        IRQ_CPU_EXTERNAL0,
-        IRQ_CPU_EXTERNAL1,
-        IRQ_CPU_EXTERNAL2,
-        IRQ_CPU_EXTERNAL3,
-        IRQ_CPU_EXTERNAL4,
-        IRQ_CPU_EXTERNAL5,
-        IRQ_CPU_EXTERNAL6,
-        IRQ_CPU_EXTERNAL7,
-};
 /* IRQ to level mappings */
 #define IRQ_GDBSTUB_LEVEL       15
 #define IRQ_UART_LEVEL          13
@@ -82,6 +52,30 @@ enum {
 #define IRQ_XIRQ6_LEVEL         7
 #define IRQ_XIRQ7_LEVEL         8
+/* IRQ IDs presented to drivers */
+#define IRQ_CPU__UNUSED         IRQ_BASE_CPU
+#define IRQ_CPU_UART0           (IRQ_BASE_CPU + IRQ_UART0_LEVEL)
+#define IRQ_CPU_UART1           (IRQ_BASE_CPU + IRQ_UART1_LEVEL)
+#define IRQ_CPU_TIMER0          (IRQ_BASE_CPU + IRQ_TIMER0_LEVEL)
+#define IRQ_CPU_TIMER1          (IRQ_BASE_CPU + IRQ_TIMER1_LEVEL)
+#define IRQ_CPU_TIMER2          (IRQ_BASE_CPU + IRQ_TIMER2_LEVEL)
+#define IRQ_CPU_DMA0            (IRQ_BASE_CPU + IRQ_DMA0_LEVEL)
+#define IRQ_CPU_DMA1            (IRQ_BASE_CPU + IRQ_DMA1_LEVEL)
+#define IRQ_CPU_DMA2            (IRQ_BASE_CPU + IRQ_DMA2_LEVEL)
+#define IRQ_CPU_DMA3            (IRQ_BASE_CPU + IRQ_DMA3_LEVEL)
+#define IRQ_CPU_DMA4            (IRQ_BASE_CPU + IRQ_DMA4_LEVEL)
+#define IRQ_CPU_DMA5            (IRQ_BASE_CPU + IRQ_DMA5_LEVEL)
+#define IRQ_CPU_DMA6            (IRQ_BASE_CPU + IRQ_DMA6_LEVEL)
+#define IRQ_CPU_DMA7            (IRQ_BASE_CPU + IRQ_DMA7_LEVEL)
+#define IRQ_CPU_EXTERNAL0       (IRQ_BASE_CPU + IRQ_XIRQ0_LEVEL)
+#define IRQ_CPU_EXTERNAL1       (IRQ_BASE_CPU + IRQ_XIRQ1_LEVEL)
+#define IRQ_CPU_EXTERNAL2       (IRQ_BASE_CPU + IRQ_XIRQ2_LEVEL)
+#define IRQ_CPU_EXTERNAL3       (IRQ_BASE_CPU + IRQ_XIRQ3_LEVEL)
+#define IRQ_CPU_EXTERNAL4       (IRQ_BASE_CPU + IRQ_XIRQ4_LEVEL)
+#define IRQ_CPU_EXTERNAL5       (IRQ_BASE_CPU + IRQ_XIRQ5_LEVEL)
+#define IRQ_CPU_EXTERNAL6       (IRQ_BASE_CPU + IRQ_XIRQ6_LEVEL)
+#define IRQ_CPU_EXTERNAL7       (IRQ_BASE_CPU + IRQ_XIRQ7_LEVEL)
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_CPU_IRQS_H */
diff --git a/include/asm-frv/hardirq.h b/include/asm-frv/hardirq.h
index 7581b5a7559a..fc47515822a2 100644
--- a/include/asm-frv/hardirq.h
+++ b/include/asm-frv/hardirq.h
@@ -26,5 +26,10 @@ typedef struct {
 #error SMP not available on FR-V
 #endif /* CONFIG_SMP */
+extern atomic_t irq_err_count;
+static inline void ack_bad_irq(int irq)
+{
+        atomic_inc(&irq_err_count);
+}
 #endif
diff --git a/include/asm-frv/irq-routing.h b/include/asm-frv/irq-routing.h
deleted file mode 100644
index ac3ab900a1dc..000000000000
--- a/include/asm-frv/irq-routing.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* irq-routing.h: multiplexed IRQ routing
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * 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.
- */
-#ifndef _ASM_IRQ_ROUTING_H
-#define _ASM_IRQ_ROUTING_H
-#ifndef __ASSEMBLY__
-#include <linux/spinlock.h>
-#include <asm/irq.h>
-struct irq_source;
-struct irq_level;
-/*
- * IRQ action distribution sets
- */
-struct irq_group {
-        int                     first_irq;      /* first IRQ distributed here */
-        void (*control)(struct irq_group *group, int index, int on);
-        struct irqaction        *actions[NR_IRQ_ACTIONS_PER_GROUP];     /* IRQ action chains */
-        struct irq_source       *sources[NR_IRQ_ACTIONS_PER_GROUP];     /* IRQ sources */
-        int                     disable_cnt[NR_IRQ_ACTIONS_PER_GROUP];  /* disable counts */
-};
-/*
- * IRQ source manager
- */
-struct irq_source {
-        struct irq_source       *next;
-        struct irq_level        *level;
-        const char              *muxname;
-        volatile void __iomem   *muxdata;
-        unsigned long           irqmask;
-        void (*doirq)(struct irq_source *source);
-};
-/*
- * IRQ level management (per CPU IRQ priority / entry vector)
- */
-struct irq_level {
-        int                     usage;
-        int                     disable_count;
-        unsigned long           flags;          /* current IRQF_DISABLED and IRQF_SHARED settings */
-        spinlock_t              lock;
-        struct irq_source       *sources;
-};
-extern struct irq_level frv_irq_levels[16];
-extern struct irq_group *irq_groups[NR_IRQ_GROUPS];
-extern void frv_irq_route(struct irq_source *source, int irqlevel);
-extern void frv_irq_route_external(struct irq_source *source, int irq);
-extern void frv_irq_set_group(struct irq_group *group);
-extern void distribute_irqs(struct irq_group *group, unsigned long irqmask);
-extern void route_cpu_irqs(void);
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_IRQ_ROUTING_H */
diff --git a/include/asm-frv/irq.h b/include/asm-frv/irq.h
index 58b619215a50..8fefd6b827aa 100644
--- a/include/asm-frv/irq.h
+++ b/include/asm-frv/irq.h
@@ -1,6 +1,6 @@
 /* irq.h: FRV IRQ definitions
 *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
 * Written by David Howells (dhowells@redhat.com)
 *
 * This program is free software; you can redistribute it and/or
@@ -12,32 +12,22 @@
 #ifndef _ASM_IRQ_H_
 #define _ASM_IRQ_H_
-/*
- * the system has an on-CPU PIC and another PIC on the FPGA and other PICs on other peripherals,
- * so we do some routing in irq-routing.[ch] to reduce the number of false-positives seen by
- * drivers
- */
 /* this number is used when no interrupt has been assigned */
 #define NO_IRQ                          (-1)
-#define NR_IRQ_LOG2_ACTIONS_PER_GROUP   5
+#define NR_IRQS                         48
-#define NR_IRQ_ACTIONS_PER_GROUP        (1 << NR_IRQ_LOG2_ACTIONS_PER_GROUP)
+#define IRQ_BASE_CPU                    (0 * 16)
-#define NR_IRQ_GROUPS                   4
+#define IRQ_BASE_FPGA                   (1 * 16)
-#define NR_IRQS                         (NR_IRQ_ACTIONS_PER_GROUP * NR_IRQ_GROUPS)
+#define IRQ_BASE_MB93493                (2 * 16)
 /* probe returns a 32-bit IRQ mask:-/ */
-#define MIN_PROBE_IRQ   (NR_IRQS - 32)
+#define MIN_PROBE_IRQ                   (NR_IRQS - 32)
+#ifndef __ASSEMBLY__
 static inline int irq_canonicalize(int irq)
 {
        return irq;
 }
+#endif
-extern void disable_irq_nosync(unsigned int irq);
-extern void disable_irq(unsigned int irq);
-extern void enable_irq(unsigned int irq);
 #endif /* _ASM_IRQ_H_ */
diff --git a/include/asm-frv/mb93091-fpga-irqs.h b/include/asm-frv/mb93091-fpga-irqs.h
index 341bfc52a0eb..19778c5ba9d6 100644
--- a/include/asm-frv/mb93091-fpga-irqs.h
+++ b/include/asm-frv/mb93091-fpga-irqs.h
@@ -12,11 +12,9 @@
 #ifndef _ASM_MB93091_FPGA_IRQS_H
 #define _ASM_MB93091_FPGA_IRQS_H
-#ifndef __ASSEMBLY__
+#include <asm/irq.h>
-#include <asm/irq-routing.h>
-#define IRQ_BASE_FPGA           (NR_IRQ_ACTIONS_PER_GROUP * 1)
+#ifndef __ASSEMBLY__
 /* IRQ IDs presented to drivers */
 enum {
diff --git a/include/asm-frv/mb93093-fpga-irqs.h b/include/asm-frv/mb93093-fpga-irqs.h
index 1e0f11c2fcdb..590266b1a6d3 100644
--- a/include/asm-frv/mb93093-fpga-irqs.h
+++ b/include/asm-frv/mb93093-fpga-irqs.h
@@ -12,11 +12,9 @@
 #ifndef _ASM_MB93093_FPGA_IRQS_H
 #define _ASM_MB93093_FPGA_IRQS_H
-#ifndef __ASSEMBLY__
+#include <asm/irq.h>
-#include <asm/irq-routing.h>
-#define IRQ_BASE_FPGA           (NR_IRQ_ACTIONS_PER_GROUP * 1)
+#ifndef __ASSEMBLY__
 /* IRQ IDs presented to drivers */
 enum {
diff --git a/include/asm-frv/mb93493-irqs.h b/include/asm-frv/mb93493-irqs.h
index 15096e731325..82c7aeddd333 100644
--- a/include/asm-frv/mb93493-irqs.h
+++ b/include/asm-frv/mb93493-irqs.h
@@ -12,11 +12,9 @@
 #ifndef _ASM_MB93493_IRQS_H
 #define _ASM_MB93493_IRQS_H
-#ifndef __ASSEMBLY__
+#include <asm/irq.h>
-#include <asm/irq-routing.h>
-#define IRQ_BASE_MB93493        (NR_IRQ_ACTIONS_PER_GROUP * 2)
+#ifndef __ASSEMBLY__
 /* IRQ IDs presented to drivers */
 enum {
diff --git a/include/asm-frv/mb93493-regs.h b/include/asm-frv/mb93493-regs.h
index c54aa9d14468..8a1f6aac8cf1 100644
--- a/include/asm-frv/mb93493-regs.h
+++ b/include/asm-frv/mb93493-regs.h
@@ -15,6 +15,7 @@
 #include <asm/mb-regs.h>
 #include <asm/mb93493-irqs.h>
+#define __addr_MB93493(X)       ((volatile unsigned long *)(__region_CS3 + (X)))
 #define __get_MB93493(X)        ({ *(volatile unsigned long *)(__region_CS3 + (X)); })
 #define __set_MB93493(X,V)                                              \
@@ -26,6 +27,7 @@ do {									\
 #define __set_MB93493_STSR(X,V) __set_MB93493(0x3c0 + (X) * 4, (V))
 #define MB93493_STSR_EN
+#define __addr_MB93493_IQSR(X)  __addr_MB93493(0x3d0 + (X) * 4)
 #define __get_MB93493_IQSR(X)   __get_MB93493(0x3d0 + (X) * 4)
 #define __set_MB93493_IQSR(X,V) __set_MB93493(0x3d0 + (X) * 4, (V))
diff --git a/include/asm-frv/pgtable.h b/include/asm-frv/pgtable.h
index 7af7485e889e..ba1b37df69d5 100644
--- a/include/asm-frv/pgtable.h
+++ b/include/asm-frv/pgtable.h
@@ -176,8 +176,6 @@ do {							\
 } while(0)
 #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-#define set_pte_atomic(pteptr, pteval)          set_pte((pteptr), (pteval))
 /*
 * pgd_offset() returns a (pgd_t *)
 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
@@ -217,7 +215,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
 }
 #define pgd_page(pgd)                           (pud_page((pud_t){ pgd }))
-#define pgd_page_kernel(pgd)                    (pud_page_kernel((pud_t){ pgd }))
+#define pgd_page_vaddr(pgd)                     (pud_page_vaddr((pud_t){ pgd }))
 /*
 * allocating and freeing a pud is trivial: the 1-entry pud is
@@ -246,7 +244,7 @@ static inline void pud_clear(pud_t *pud)	{ }
 #define set_pud(pudptr, pudval)                 set_pmd((pmd_t *)(pudptr), (pmd_t) { pudval })
 #define pud_page(pud)                           (pmd_page((pmd_t){ pud }))
-#define pud_page_kernel(pud)                    (pmd_page_kernel((pmd_t){ pud }))
+#define pud_page_vaddr(pud)                     (pmd_page_vaddr((pmd_t){ pud }))
 /*
 * (pmds are folded into pgds so this doesn't get actually called,
@@ -362,7 +360,7 @@ static inline pmd_t *pmd_offset(pud_t *dir, unsigned long address)
 #define pmd_bad(x)      (pmd_val(x) & xAMPRx_SS)
 #define pmd_clear(xp)   do { __set_pmd(xp, 0); } while(0)
-#define pmd_page_kernel(pmd) \
+#define pmd_page_vaddr(pmd) \
        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 #ifndef CONFIG_DISCONTIGMEM
@@ -458,7 +456,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define pte_index(address) \
                (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) +  pte_index(address))
 #if defined(CONFIG_HIGHPTE)
 #define pte_offset_map(dir, address) \
diff --git a/include/asm-frv/timex.h b/include/asm-frv/timex.h
index 2aa562fa067b..a89bddefdacf 100644
--- a/include/asm-frv/timex.h
+++ b/include/asm-frv/timex.h
@@ -6,11 +6,6 @@
 #define CLOCK_TICK_RATE         1193180 /* Underlying HZ */
 #define CLOCK_TICK_FACTOR       20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-#define FINETUNE                                                        \
-((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) *                 \
-   (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR))   \
-  << (SHIFT_SCALE-SHIFT_HZ)) / HZ)
 typedef unsigned long cycles_t;
 static inline cycles_t get_cycles(void)
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
index b80dbd839475..d104d1b91d39 100644
--- a/include/asm-frv/unistd.h
+++ b/include/asm-frv/unistd.h
@@ -320,6 +320,7 @@
 #ifdef __KERNEL__
 #define NR_syscalls 310
+#include <linux/err.h>
 /*
 * process the return value of a syscall, consigning it to one of two possible fates
@@ -329,7 +330,7 @@
 #define __syscall_return(type, res)                                     \
 do {                                                                    \
        unsigned long __sr2 = (res);                                    \
-        if (__builtin_expect(__sr2 >= (unsigned long)(-4095), 0)) {     \
+        if (__builtin_expect(__sr2 >= (unsigned long)(-MAX_ERRNO), 0)) { \
                errno = (-__sr2);                                       \
                __sr2 = ~0UL;                                           \
        }                                                               \
diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
index 68c6fea994d9..7b88d3931e34 100644
--- a/include/asm-generic/4level-fixup.h
+++ b/include/asm-generic/4level-fixup.h
@@ -21,6 +21,10 @@
 #define pud_present(pud)                1
 #define pud_ERROR(pud)                  do { } while (0)
 #define pud_clear(pud)                  pgd_clear(pud)
+#define pud_val(pud)                    pgd_val(pud)
+#define pud_populate(mm, pud, pmd)      pgd_populate(mm, pud, pmd)
+#define pud_page(pud)                   pgd_page(pud)
+#define pud_page_vaddr(pud)             pgd_page_vaddr(pud)
 #undef pud_free_tlb
 #define pud_free_tlb(tlb, x)            do { } while (0)
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 70594b275a6e..3c06be381701 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -1,3 +1,12 @@
-header-y += atomic.h errno-base.h errno.h fcntl.h ioctl.h ipc.h mman.h \
+header-y += atomic.h
-        signal.h statfs.h
+header-y += errno-base.h
-unifdef-y := resource.h siginfo.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += ioctl.h
+header-y += ipc.h
+header-y += mman.h
+header-y += signal.h
+header-y += statfs.h
+unifdef-y += resource.h
+unifdef-y += siginfo.h
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index c00de6028fa8..a84c3d88a189 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -1,8 +1,34 @@
-unifdef-y += a.out.h auxvec.h byteorder.h errno.h fcntl.h ioctl.h       \
+unifdef-y += a.out.h
-        ioctls.h ipcbuf.h mman.h msgbuf.h param.h poll.h                \
+unifdef-y += auxvec.h
-        posix_types.h ptrace.h resource.h sembuf.h shmbuf.h shmparam.h  \
+unifdef-y += byteorder.h
-        sigcontext.h siginfo.h signal.h socket.h sockios.h stat.h       \
+unifdef-y += errno.h
-        statfs.h termbits.h termios.h types.h unistd.h user.h
+unifdef-y += fcntl.h
+unifdef-y += ioctl.h
+unifdef-y += ioctls.h
+unifdef-y += ipcbuf.h
+unifdef-y += mman.h
+unifdef-y += msgbuf.h
+unifdef-y += param.h
+unifdef-y += poll.h
+unifdef-y += posix_types.h
+unifdef-y += ptrace.h
+unifdef-y += resource.h
+unifdef-y += sembuf.h
+unifdef-y += shmbuf.h
+unifdef-y += sigcontext.h
+unifdef-y += siginfo.h
+unifdef-y += signal.h
+unifdef-y += socket.h
+unifdef-y += sockios.h
+unifdef-y += stat.h
+unifdef-y += statfs.h
+unifdef-y += termbits.h
+unifdef-y += termios.h
+unifdef-y += types.h
+unifdef-y += unistd.h
+unifdef-y += user.h
 # These probably shouldn't be exported
-unifdef-y += elf.h page.h
+unifdef-y += shmparam.h
+unifdef-y += elf.h
+unifdef-y += page.h
diff --git a/include/asm-generic/audit_change_attr.h b/include/asm-generic/audit_change_attr.h
index cb05bf69745a..50764550a60c 100644
--- a/include/asm-generic/audit_change_attr.h
+++ b/include/asm-generic/audit_change_attr.h
@@ -1,16 +1,20 @@
 __NR_chmod,
 __NR_fchmod,
+#ifdef __NR_chown
 __NR_chown,
 __NR_fchown,
 __NR_lchown,
+#endif
 __NR_setxattr,
 __NR_lsetxattr,
 __NR_fsetxattr,
 __NR_removexattr,
 __NR_lremovexattr,
 __NR_fremovexattr,
+#ifdef __NR_fchownat
 __NR_fchownat,
 __NR_fchmodat,
+#endif
 #ifdef __NR_chown32
 __NR_chown32,
 __NR_fchown32,
diff --git a/include/asm-generic/audit_dir_write.h b/include/asm-generic/audit_dir_write.h
index 161a7a58fbab..6621bd82cbe8 100644
--- a/include/asm-generic/audit_dir_write.h
+++ b/include/asm-generic/audit_dir_write.h
@@ -1,14 +1,18 @@
 __NR_rename,
 __NR_mkdir,
 __NR_rmdir,
+#ifdef __NR_creat
 __NR_creat,
+#endif
 __NR_link,
 __NR_unlink,
 __NR_symlink,
 __NR_mknod,
+#ifdef __NR_mkdirat
 __NR_mkdirat,
 __NR_mknodat,
 __NR_unlinkat,
 __NR_renameat,
 __NR_linkat,
 __NR_symlinkat,
+#endif
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 8ceab7bcd8b4..a5250895155e 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -16,12 +16,15 @@
 #endif
 #ifndef HAVE_ARCH_WARN_ON
-#define WARN_ON(condition) do { \
+#define WARN_ON(condition) ({                                           \
-        if (unlikely((condition)!=0)) { \
+        typeof(condition) __ret_warn_on = (condition);                  \
-                printk("BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \
+        if (unlikely(__ret_warn_on)) {                                  \
-                dump_stack(); \
+                printk("BUG: warning at %s:%d/%s()\n", __FILE__,        \
-        } \
+                        __LINE__, __FUNCTION__);                        \
-} while (0)
+                dump_stack();                                           \
+        }                                                               \
+        unlikely(__ret_warn_on);                                        \
+})
 #endif
 #else /* !CONFIG_BUG */
@@ -34,21 +37,18 @@
 #endif
 #ifndef HAVE_ARCH_WARN_ON
-#define WARN_ON(condition) do { if (condition) ; } while(0)
+#define WARN_ON(condition) unlikely((condition))
 #endif
 #endif
-#define WARN_ON_ONCE(condition)                         \
+#define WARN_ON_ONCE(condition) ({                      \
-({                                                      \
        static int __warn_once = 1;                     \
-        int __ret = 0;                                  \
+        typeof(condition) __ret_warn_once = (condition);\
                                                        \
-        if (unlikely((condition) && __warn_once)) {     \
+        if (likely(__warn_once))                        \
-                __warn_once = 0;                        \
+                if (WARN_ON(__ret_warn_once))           \
-                WARN_ON(1);                             \
+                        __warn_once = 0;                \
-                __ret = 1;                              \
+        unlikely(__ret_warn_once);                      \
-        }                                               \
-        __ret;                                          \
 })
 #ifdef CONFIG_SMP
diff --git a/include/asm-generic/libata-portmap.h b/include/asm-generic/libata-portmap.h
new file mode 100644
index 000000000000..9202fd02d5be
--- /dev/null
+++ b/include/asm-generic/libata-portmap.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_GENERIC_LIBATA_PORTMAP_H
+#define __ASM_GENERIC_LIBATA_PORTMAP_H
+#define ATA_PRIMARY_CMD         0x1F0
+#define ATA_PRIMARY_CTL         0x3F6
+#define ATA_PRIMARY_IRQ         14
+#define ATA_SECONDARY_CMD       0x170
+#define ATA_SECONDARY_CTL       0x376
+#define ATA_SECONDARY_IRQ       15
+#endif
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
index e160e04290fb..6d45ee5472af 100644
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@ -14,7 +14,9 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
    __attribute__((__section__(".data.percpu"))) __typeof__(type) per_cpu__##name
 /* var is in discarded region: offset to particular copy we want */
-#define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset[cpu]))
+#define per_cpu(var, cpu) (*({                          \
+        extern int simple_indentifier_##var(void);      \
+        RELOC_HIDE(&per_cpu__##var, __per_cpu_offset[cpu]); }))
 #define __get_cpu_var(var) per_cpu(var, smp_processor_id())
 #define __raw_get_cpu_var(var) per_cpu(var, raw_smp_processor_id())
diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
index c8d53ba20e19..29ff5d84d8c3 100644
--- a/include/asm-generic/pgtable-nopmd.h
+++ b/include/asm-generic/pgtable-nopmd.h
@@ -47,7 +47,7 @@ static inline pmd_t * pmd_offset(pud_t * pud, unsigned long address)
 #define __pmd(x)                                ((pmd_t) { __pud(x) } )
 #define pud_page(pud)                           (pmd_page((pmd_t){ pud }))
-#define pud_page_kernel(pud)                    (pmd_page_kernel((pmd_t){ pud }))
+#define pud_page_vaddr(pud)                     (pmd_page_vaddr((pmd_t){ pud }))
 /*
 * allocating and freeing a pmd is trivial: the 1-entry pmd is
diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
index 82e29f0ce467..566464500558 100644
--- a/include/asm-generic/pgtable-nopud.h
+++ b/include/asm-generic/pgtable-nopud.h
@@ -44,7 +44,7 @@ static inline pud_t * pud_offset(pgd_t * pgd, unsigned long address)
 #define __pud(x)                                ((pud_t) { __pgd(x) } )
 #define pgd_page(pgd)                           (pud_page((pud_t){ pgd }))
-#define pgd_page_kernel(pgd)                    (pud_page_kernel((pud_t){ pgd }))
+#define pgd_page_vaddr(pgd)                     (pud_page_vaddr((pud_t){ pgd }))
 /*
 * allocating and freeing a pud is trivial: the 1-entry pud is
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index c2059a3a0621..9d774d07d95b 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_GENERIC_PGTABLE_H
 #define _ASM_GENERIC_PGTABLE_H
+#ifndef __ASSEMBLY__
 #ifndef __HAVE_ARCH_PTEP_ESTABLISH
 /*
 * Establish a new mapping:
@@ -13,19 +15,11 @@
 * Note: the old pte is known to not be writable, so we don't need to
 * worry about dirty bits etc getting lost.
 */
-#ifndef __HAVE_ARCH_SET_PTE_ATOMIC
 #define ptep_establish(__vma, __address, __ptep, __entry)               \
 do {                                                                    \
        set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry);       \
        flush_tlb_page(__vma, __address);                               \
 } while (0)
-#else /* __HAVE_ARCH_SET_PTE_ATOMIC */
-#define ptep_establish(__vma, __address, __ptep, __entry)               \
-do {                                                                    \
-        set_pte_atomic(__ptep, __entry);                                \
-        flush_tlb_page(__vma, __address);                               \
-} while (0)
-#endif /* __HAVE_ARCH_SET_PTE_ATOMIC */
 #endif
 #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
@@ -110,8 +104,13 @@ do {				  					  \
 })
 #endif
-#ifndef __HAVE_ARCH_PTE_CLEAR_FULL
+/*
-#define pte_clear_full(__mm, __address, __ptep, __full)                 \
+ * Some architectures may be able to avoid expensive synchronization
+ * primitives when modifications are made to PTE's which are already
+ * not present, or in the process of an address space destruction.
+ */
+#ifndef __HAVE_ARCH_PTE_CLEAR_NOT_PRESENT_FULL
+#define pte_clear_not_present_full(__mm, __address, __ptep, __full)     \
 do {                                                                    \
        pte_clear((__mm), (__address), (__ptep));                       \
 } while (0)
@@ -164,6 +163,26 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
 #endif
 /*
+ * A facility to provide lazy MMU batching.  This allows PTE updates and
+ * page invalidations to be delayed until a call to leave lazy MMU mode
+ * is issued.  Some architectures may benefit from doing this, and it is
+ * beneficial for both shadow and direct mode hypervisors, which may batch
+ * the PTE updates which happen during this window.  Note that using this
+ * interface requires that read hazards be removed from the code.  A read
+ * hazard could result in the direct mode hypervisor case, since the actual
+ * write to the page tables may not yet have taken place, so reads though
+ * a raw PTE pointer after it has been modified are not guaranteed to be
+ * up to date.  This mode can only be entered and left under the protection of
+ * the page table locks for all page tables which may be modified.  In the UP
+ * case, this is required so that preemption is disabled, and in the SMP case,
+ * it must synchronize the delayed page table writes properly on other CPUs.
+ */
+#ifndef __HAVE_ARCH_ENTER_LAZY_MMU_MODE
+#define arch_enter_lazy_mmu_mode()      do {} while (0)
+#define arch_leave_lazy_mmu_mode()      do {} while (0)
+#endif
+/*
 * When walking page tables, get the address of the next boundary,
 * or the end address of the range if that comes earlier.  Although no
 * vma end wraps to 0, rounded up __boundary may wrap to 0 throughout.
@@ -188,7 +207,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
 })
 #endif
-#ifndef __ASSEMBLY__
 /*
 * When walking page tables, we usually want to skip any p?d_none entries;
 * and any p?d_bad entries - reporting the error before resetting to none.
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index db5a3732f106..69240b52f8e1 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -118,15 +118,15 @@
        __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
                *(__ksymtab_strings)                                    \
        }                                                               \
-        __end_rodata = .;                                               \
-        . = ALIGN(4096);                                                \
                                                                        \
        /* Built-in module parameters. */                               \
        __param : AT(ADDR(__param) - LOAD_OFFSET) {                     \
                VMLINUX_SYMBOL(__start___param) = .;                    \
                *(__param)                                              \
                VMLINUX_SYMBOL(__stop___param) = .;                     \
-        }
+        }                                                               \
+        __end_rodata = .;                                               \
+        . = ALIGN(4096);
 #define SECURITY_INIT                                                   \
        .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \
@@ -194,3 +194,6 @@
                .stab.index 0 : { *(.stab.index) }                      \
                .stab.indexstr 0 : { *(.stab.indexstr) }                \
                .comment 0 : { *(.comment) }
+#define NOTES                                                           \
+                .notes : { *(.note.*) } :note
diff --git a/include/asm-h8300/keyboard.h b/include/asm-h8300/keyboard.h
index fbad65e8a5c0..90efbd655390 100644
--- a/include/asm-h8300/keyboard.h
+++ b/include/asm-h8300/keyboard.h
@@ -18,14 +18,6 @@
 #define kbd_enable_irq(x...)    do {;} while (0)
 #define kbd_disable_irq(x...)   do {;} while (0)
-/* needed if MAGIC_SYSRQ is enabled for serial console */
-#ifndef SYSRQ_KEY
-#define SYSRQ_KEY               ((unsigned char)(-1))
-#define kbd_sysrq_xlate         ((unsigned char *)NULL)
-#endif
 #endif  /* _H8300_KEYBOARD_H */
diff --git a/include/asm-h8300/page.h b/include/asm-h8300/page.h
index d673077d2fd6..3b4f2903f91d 100644
--- a/include/asm-h8300/page.h
+++ b/include/asm-h8300/page.h
@@ -1,6 +1,7 @@
 #ifndef _H8300_PAGE_H
 #define _H8300_PAGE_H
+#ifdef __KERNEL__
 /* PAGE_SHIFT determines the page size */
@@ -8,8 +9,6 @@
 #define PAGE_SIZE       (1UL << PAGE_SHIFT)
 #define PAGE_MASK       (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
 #include <asm/setup.h>
 #ifndef __ASSEMBLY__
@@ -76,9 +75,9 @@ extern unsigned long memory_end;
 #endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
+#endif /* __KERNEL__ */
 #endif /* _H8300_PAGE_H */
diff --git a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h
index 226dd596c2da..a2dd90462d80 100644
--- a/include/asm-h8300/unistd.h
+++ b/include/asm-h8300/unistd.h
@@ -295,14 +295,14 @@
 #ifdef __KERNEL__
 #define NR_syscalls 289
+#include <linux/err.h>
+/* user-visible error numbers are in the range -1 - -MAX_ERRNO: see
-/* user-visible error numbers are in the range -1 - -122: see
   <asm-m68k/errno.h> */
 #define __syscall_return(type, res) \
 do { \
-        if ((unsigned long)(res) >= (unsigned long)(-125)) { \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
        /* avoid using res which is declared to be in register d0; \
           errno might expand to a function call and clobber it.  */ \
                int __err = -(res); \
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
index 2308190321da..147e4ac1ebf0 100644
--- a/include/asm-i386/Kbuild
+++ b/include/asm-i386/Kbuild
@@ -1,5 +1,11 @@
 include include/asm-generic/Kbuild.asm
-header-y += boot.h debugreg.h ldt.h ucontext.h
+header-y += boot.h
+header-y += debugreg.h
+header-y += ldt.h
+header-y += ptrace-abi.h
+header-y += ucontext.h
-unifdef-y += mtrr.h setup.h vm86.h
+unifdef-y += mtrr.h
+unifdef-y += setup.h
+unifdef-y += vm86.h
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
index 20f523954218..6016632d032f 100644
--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -131,21 +131,7 @@ static inline void disable_acpi(void)
 extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
 #ifdef CONFIG_X86_IO_APIC
-extern int skip_ioapic_setup;
 extern int acpi_skip_timer_override;
-static inline void disable_ioapic_setup(void)
-{
-        skip_ioapic_setup = 1;
-}
-static inline int ioapic_setup_disabled(void)
-{
-        return skip_ioapic_setup;
-}
-#else
-static inline void disable_ioapic_setup(void) { }
 #endif
 static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
diff --git a/include/asm-i386/alternative-asm.i b/include/asm-i386/alternative-asm.i
new file mode 100644
index 000000000000..6c47e3b9484b
--- /dev/null
+++ b/include/asm-i386/alternative-asm.i
@@ -0,0 +1,14 @@
+#include <linux/config.h>
+#ifdef CONFIG_SMP
+        .macro LOCK_PREFIX
+1:      lock
+        .section .smp_locks,"a"
+        .align 4
+        .long 1b
+        .previous
+        .endm
+#else
+        .macro LOCK_PREFIX
+        .endm
+#endif
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h
index 2c1e371cebb6..3a42b7d6fc92 100644
--- a/include/asm-i386/apic.h
+++ b/include/asm-i386/apic.h
@@ -16,20 +16,8 @@
 #define APIC_VERBOSE 1
 #define APIC_DEBUG   2
-extern int enable_local_apic;
 extern int apic_verbosity;
-static inline void lapic_disable(void)
-{
-        enable_local_apic = -1;
-        clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
-}
-static inline void lapic_enable(void)
-{
-        enable_local_apic = 1;
-}
 /*
 * Define the default level of output to be very little
 * This can be turned up by using apic=verbose for more
@@ -42,6 +30,8 @@ static inline void lapic_enable(void)
        } while (0)
+extern void generic_apic_probe(void);
 #ifdef CONFIG_X86_LOCAL_APIC
 /*
@@ -117,8 +107,6 @@ extern void enable_APIC_timer(void);
 extern void enable_NMI_through_LVT0 (void * dummy);
-extern int disable_timer_pin_1;
 void smp_send_timer_broadcast_ipi(struct pt_regs *regs);
 void switch_APIC_timer_to_ipi(void *cpumask);
 void switch_ipi_to_APIC_timer(void *cpumask);
diff --git a/include/asm-i386/desc.h b/include/asm-i386/desc.h
index 89b8b82c82b3..5874ef119ffd 100644
--- a/include/asm-i386/desc.h
+++ b/include/asm-i386/desc.h
@@ -33,50 +33,99 @@ static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
        return (struct desc_struct *)per_cpu(cpu_gdt_descr, cpu).address;
 }
+/*
+ * This is the ldt that every process will get unless we need
+ * something other than this.
+ */
+extern struct desc_struct default_ldt[];
+extern struct desc_struct idt_table[];
+extern void set_intr_gate(unsigned int irq, void * addr);
+static inline void pack_descriptor(__u32 *a, __u32 *b,
+        unsigned long base, unsigned long limit, unsigned char type, unsigned char flags)
+{
+        *a = ((base & 0xffff) << 16) | (limit & 0xffff);
+        *b = (base & 0xff000000) | ((base & 0xff0000) >> 16) |
+                (limit & 0x000f0000) | ((type & 0xff) << 8) | ((flags & 0xf) << 20);
+}
+static inline void pack_gate(__u32 *a, __u32 *b,
+        unsigned long base, unsigned short seg, unsigned char type, unsigned char flags)
+{
+        *a = (seg << 16) | (base & 0xffff);
+        *b = (base & 0xffff0000) | ((type & 0xff) << 8) | (flags & 0xff);
+}
+#define DESCTYPE_LDT    0x82    /* present, system, DPL-0, LDT */
+#define DESCTYPE_TSS    0x89    /* present, system, DPL-0, 32-bit TSS */
+#define DESCTYPE_TASK   0x85    /* present, system, DPL-0, task gate */
+#define DESCTYPE_INT    0x8e    /* present, system, DPL-0, interrupt gate */
+#define DESCTYPE_TRAP   0x8f    /* present, system, DPL-0, trap gate */
+#define DESCTYPE_DPL3   0x60    /* DPL-3 */
+#define DESCTYPE_S      0x10    /* !system */
 #define load_TR_desc() __asm__ __volatile__("ltr %w0"::"q" (GDT_ENTRY_TSS*8))
 #define load_LDT_desc() __asm__ __volatile__("lldt %w0"::"q" (GDT_ENTRY_LDT*8))
 #define load_gdt(dtr) __asm__ __volatile("lgdt %0"::"m" (*dtr))
 #define load_idt(dtr) __asm__ __volatile("lidt %0"::"m" (*dtr))
-#define load_tr(tr) __asm__ __volatile("ltr %0"::"mr" (tr))
+#define load_tr(tr) __asm__ __volatile("ltr %0"::"m" (tr))
-#define load_ldt(ldt) __asm__ __volatile("lldt %0"::"mr" (ldt))
+#define load_ldt(ldt) __asm__ __volatile("lldt %0"::"m" (ldt))
 #define store_gdt(dtr) __asm__ ("sgdt %0":"=m" (*dtr))
 #define store_idt(dtr) __asm__ ("sidt %0":"=m" (*dtr))
-#define store_tr(tr) __asm__ ("str %0":"=mr" (tr))
+#define store_tr(tr) __asm__ ("str %0":"=m" (tr))
-#define store_ldt(ldt) __asm__ ("sldt %0":"=mr" (ldt))
+#define store_ldt(ldt) __asm__ ("sldt %0":"=m" (ldt))
-/*
+#if TLS_SIZE != 24
- * This is the ldt that every process will get unless we need
+# error update this code.
- * something other than this.
+#endif
- */
-extern struct desc_struct default_ldt[];
-extern void set_intr_gate(unsigned int irq, void * addr);
-#define _set_tssldt_desc(n,addr,limit,type) \
+static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
-__asm__ __volatile__ ("movw %w3,0(%2)\n\t" \
-        "movw %w1,2(%2)\n\t" \
-        "rorl $16,%1\n\t" \
-        "movb %b1,4(%2)\n\t" \
-        "movb %4,5(%2)\n\t" \
-        "movb $0,6(%2)\n\t" \
-        "movb %h1,7(%2)\n\t" \
-        "rorl $16,%1" \
-        : "=m"(*(n)) : "q" (addr), "r"(n), "ir"(limit), "i"(type))
-static inline void __set_tss_desc(unsigned int cpu, unsigned int entry, void *addr)
 {
-        _set_tssldt_desc(&get_cpu_gdt_table(cpu)[entry], (int)addr,
+#define C(i) get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]
-                offsetof(struct tss_struct, __cacheline_filler) - 1, 0x89);
+        C(0); C(1); C(2);
+#undef C
 }
-#define set_tss_desc(cpu,addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr)
+static inline void write_dt_entry(void *dt, int entry, __u32 entry_a, __u32 entry_b)
+{
+        __u32 *lp = (__u32 *)((char *)dt + entry*8);
+        *lp = entry_a;
+        *(lp+1) = entry_b;
+}
+#define write_ldt_entry(dt, entry, a, b) write_dt_entry(dt, entry, a, b)
+#define write_gdt_entry(dt, entry, a, b) write_dt_entry(dt, entry, a, b)
+#define write_idt_entry(dt, entry, a, b) write_dt_entry(dt, entry, a, b)
+static inline void _set_gate(int gate, unsigned int type, void *addr, unsigned short seg)
+{
+        __u32 a, b;
+        pack_gate(&a, &b, (unsigned long)addr, seg, type, 0);
+        write_idt_entry(idt_table, gate, a, b);
+}
-static inline void set_ldt_desc(unsigned int cpu, void *addr, unsigned int size)
+static inline void __set_tss_desc(unsigned int cpu, unsigned int entry, const void *addr)
 {
-        _set_tssldt_desc(&get_cpu_gdt_table(cpu)[GDT_ENTRY_LDT], (int)addr, ((size << 3)-1), 0x82);
+        __u32 a, b;
+        pack_descriptor(&a, &b, (unsigned long)addr,
+                        offsetof(struct tss_struct, __cacheline_filler) - 1,
+                        DESCTYPE_TSS, 0);
+        write_gdt_entry(get_cpu_gdt_table(cpu), entry, a, b);
 }
+static inline void set_ldt_desc(unsigned int cpu, void *addr, unsigned int entries)
+{
+        __u32 a, b;
+        pack_descriptor(&a, &b, (unsigned long)addr,
+                        entries * sizeof(struct desc_struct) - 1,
+                        DESCTYPE_LDT, 0);
+        write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_LDT, a, b);
+}
+#define set_tss_desc(cpu,addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr)
 #define LDT_entry_a(info) \
        ((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff))
@@ -102,24 +151,6 @@ static inline void set_ldt_desc(unsigned int cpu, void *addr, unsigned int size)
        (info)->seg_not_present == 1    && \
        (info)->useable         == 0    )
-static inline void write_ldt_entry(void *ldt, int entry, __u32 entry_a, __u32 entry_b)
-{
-        __u32 *lp = (__u32 *)((char *)ldt + entry*8);
-        *lp = entry_a;
-        *(lp+1) = entry_b;
-}
-#if TLS_SIZE != 24
-# error update this code.
-#endif
-static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
-{
-#define C(i) get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]
-        C(0); C(1); C(2);
-#undef C
-}
 static inline void clear_LDT(void)
 {
        int cpu = get_cpu();
diff --git a/include/asm-i386/dma-mapping.h b/include/asm-i386/dma-mapping.h
index 9cf20cacf76e..81999a3ebe7c 100644
--- a/include/asm-i386/dma-mapping.h
+++ b/include/asm-i386/dma-mapping.h
@@ -21,8 +21,7 @@ static inline dma_addr_t
 dma_map_single(struct device *dev, void *ptr, size_t size,
               enum dma_data_direction direction)
 {
-        if (direction == DMA_NONE)
+        BUG_ON(!valid_dma_direction(direction));
-                BUG();
        WARN_ON(size == 0);
        flush_write_buffers();
        return virt_to_phys(ptr);
@@ -32,8 +31,7 @@ static inline void
 dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                 enum dma_data_direction direction)
 {
-        if (direction == DMA_NONE)
+        BUG_ON(!valid_dma_direction(direction));
-                BUG();
 }
 static inline int
@@ -42,8 +40,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 {
        int i;
-        if (direction == DMA_NONE)
+        BUG_ON(!valid_dma_direction(direction));
-                BUG();
        WARN_ON(nents == 0 || sg[0].length == 0);
        for (i = 0; i < nents; i++ ) {
@@ -60,7 +57,7 @@ static inline dma_addr_t
 dma_map_page(struct device *dev, struct page *page, unsigned long offset,
             size_t size, enum dma_data_direction direction)
 {
-        BUG_ON(direction == DMA_NONE);
+        BUG_ON(!valid_dma_direction(direction));
        return page_to_phys(page) + offset;
 }
@@ -68,7 +65,7 @@ static inline void
 dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
               enum dma_data_direction direction)
 {
-        BUG_ON(direction == DMA_NONE);
+        BUG_ON(!valid_dma_direction(direction));
 }
@@ -76,7 +73,7 @@ static inline void
 dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
             enum dma_data_direction direction)
 {
-        BUG_ON(direction == DMA_NONE);
+        BUG_ON(!valid_dma_direction(direction));
 }
 static inline void
diff --git a/include/asm-i386/dwarf2.h b/include/asm-i386/dwarf2.h
index 2280f6272f80..6d66398a307d 100644
--- a/include/asm-i386/dwarf2.h
+++ b/include/asm-i386/dwarf2.h
@@ -1,8 +1,6 @@
 #ifndef _DWARF2_H
 #define _DWARF2_H
-#include <linux/config.h>
 #ifndef __ASSEMBLY__
 #warning "asm/dwarf2.h should be only included in pure assembly files"
 #endif
@@ -28,6 +26,13 @@
 #define CFI_RESTORE .cfi_restore
 #define CFI_REMEMBER_STATE .cfi_remember_state
 #define CFI_RESTORE_STATE .cfi_restore_state
+#define CFI_UNDEFINED .cfi_undefined
+#ifdef CONFIG_AS_CFI_SIGNAL_FRAME
+#define CFI_SIGNAL_FRAME .cfi_signal_frame
+#else
+#define CFI_SIGNAL_FRAME
+#endif
 #else
@@ -48,6 +53,8 @@
 #define CFI_RESTORE     ignore
 #define CFI_REMEMBER_STATE ignore
 #define CFI_RESTORE_STATE ignore
+#define CFI_UNDEFINED ignore
+#define CFI_SIGNAL_FRAME ignore
 #endif
diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index ca82acb8cb1f..f7514fb6e8e4 100644
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -18,7 +18,7 @@
 #define E820_RAM        1
 #define E820_RESERVED   2
-#define E820_ACPI       3 /* usable as RAM once ACPI tables have been read */
+#define E820_ACPI       3
 #define E820_NVS        4
 #define HIGH_MEMORY     (1024*1024)
diff --git a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
index a48cc3f7ccc6..02428cb36621 100644
--- a/include/asm-i386/fixmap.h
+++ b/include/asm-i386/fixmap.h
@@ -19,7 +19,11 @@
 * Leave one empty page between vmalloc'ed areas and
 * the start of the fixmap.
 */
-#define __FIXADDR_TOP   0xfffff000
+#ifndef CONFIG_COMPAT_VDSO
+extern unsigned long __FIXADDR_TOP;
+#else
+#define __FIXADDR_TOP  0xfffff000
+#endif
 #ifndef __ASSEMBLY__
 #include <linux/kernel.h>
@@ -93,6 +97,7 @@ enum fixed_addresses {
 extern void __set_fixmap (enum fixed_addresses idx,
                                        unsigned long phys, pgprot_t flags);
+extern void reserve_top_address(unsigned long reserve);
 #define set_fixmap(idx, phys) \
                __set_fixmap(idx, phys, PAGE_KERNEL)
diff --git a/include/asm-i386/frame.i b/include/asm-i386/frame.i
new file mode 100644
index 000000000000..4d68ddce18b6
--- /dev/null
+++ b/include/asm-i386/frame.i
@@ -0,0 +1,24 @@
+#include <linux/config.h>
+#include <asm/dwarf2.h>
+/* The annotation hides the frame from the unwinder and makes it look
+   like a ordinary ebp save/restore. This avoids some special cases for
+   frame pointer later */
+#ifdef CONFIG_FRAME_POINTER
+        .macro FRAME
+        pushl %ebp
+        CFI_ADJUST_CFA_OFFSET 4
+        CFI_REL_OFFSET ebp,0
+        movl %esp,%ebp
+        .endm
+        .macro ENDFRAME
+        popl %ebp
+        CFI_ADJUST_CFA_OFFSET -4
+        CFI_RESTORE ebp
+        .endm
+#else
+        .macro FRAME
+        .endm
+        .macro ENDFRAME
+        .endm
+#endif
diff --git a/include/asm-i386/genapic.h b/include/asm-i386/genapic.h
index b3783a32abee..8ffbb0f07457 100644
--- a/include/asm-i386/genapic.h
+++ b/include/asm-i386/genapic.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_GENAPIC_H
 #define _ASM_GENAPIC_H 1
+#include <asm/mpspec.h>
 /*
 * Generic APIC driver interface.
 *
@@ -63,14 +65,25 @@ struct genapic {
        unsigned (*get_apic_id)(unsigned long x);
        unsigned long apic_id_mask;
        unsigned int (*cpu_mask_to_apicid)(cpumask_t cpumask);
-        
+#ifdef CONFIG_SMP
        /* ipi */
        void (*send_IPI_mask)(cpumask_t mask, int vector);
        void (*send_IPI_allbutself)(int vector);
        void (*send_IPI_all)(int vector);
+#endif
 }; 
-#define APICFUNC(x) .x = x
+#define APICFUNC(x) .x = x,
+/* More functions could be probably marked IPIFUNC and save some space
+   in UP GENERICARCH kernels, but I don't have the nerve right now
+   to untangle this mess. -AK  */
+#ifdef CONFIG_SMP
+#define IPIFUNC(x) APICFUNC(x)
+#else
+#define IPIFUNC(x)
+#endif
 #define APIC_INIT(aname, aprobe) { \
        .name = aname, \
@@ -80,33 +93,33 @@ struct genapic {
        .no_balance_irq = NO_BALANCE_IRQ, \
        .ESR_DISABLE = esr_disable, \
        .apic_destination_logical = APIC_DEST_LOGICAL, \
-        APICFUNC(apic_id_registered), \
+        APICFUNC(apic_id_registered) \
-        APICFUNC(target_cpus), \
+        APICFUNC(target_cpus) \
-        APICFUNC(check_apicid_used), \
+        APICFUNC(check_apicid_used) \
-        APICFUNC(check_apicid_present), \
+        APICFUNC(check_apicid_present) \
-        APICFUNC(init_apic_ldr), \
+        APICFUNC(init_apic_ldr) \
-        APICFUNC(ioapic_phys_id_map), \
+        APICFUNC(ioapic_phys_id_map) \
-        APICFUNC(clustered_apic_check), \
+        APICFUNC(clustered_apic_check) \
-        APICFUNC(multi_timer_check), \
+        APICFUNC(multi_timer_check) \
-        APICFUNC(apicid_to_node), \
+        APICFUNC(apicid_to_node) \
-        APICFUNC(cpu_to_logical_apicid), \
+        APICFUNC(cpu_to_logical_apicid) \
-        APICFUNC(cpu_present_to_apicid), \
+        APICFUNC(cpu_present_to_apicid) \
-        APICFUNC(apicid_to_cpu_present), \
+        APICFUNC(apicid_to_cpu_present) \
-        APICFUNC(mpc_apic_id), \
+        APICFUNC(mpc_apic_id) \
-        APICFUNC(setup_portio_remap), \
+        APICFUNC(setup_portio_remap) \
-        APICFUNC(check_phys_apicid_present), \
+        APICFUNC(check_phys_apicid_present) \
-        APICFUNC(mpc_oem_bus_info), \
+        APICFUNC(mpc_oem_bus_info) \
-        APICFUNC(mpc_oem_pci_bus), \
+        APICFUNC(mpc_oem_pci_bus) \
-        APICFUNC(mps_oem_check), \
+        APICFUNC(mps_oem_check) \
-        APICFUNC(get_apic_id), \
+        APICFUNC(get_apic_id) \
        .apic_id_mask = APIC_ID_MASK, \
-        APICFUNC(cpu_mask_to_apicid), \
+        APICFUNC(cpu_mask_to_apicid) \
-        APICFUNC(acpi_madt_oem_check), \
+        APICFUNC(acpi_madt_oem_check) \
-        APICFUNC(send_IPI_mask), \
+        IPIFUNC(send_IPI_mask) \
-        APICFUNC(send_IPI_allbutself), \
+        IPIFUNC(send_IPI_allbutself) \
-        APICFUNC(send_IPI_all), \
+        IPIFUNC(send_IPI_all) \
-        APICFUNC(enable_apic_mode), \
+        APICFUNC(enable_apic_mode) \
-        APICFUNC(phys_pkg_id), \
+        APICFUNC(phys_pkg_id) \
        }
 extern struct genapic *genapic;
diff --git a/include/asm-i386/intel_arch_perfmon.h b/include/asm-i386/intel_arch_perfmon.h
index 134ea9cc5283..b52cd60a075b 100644
--- a/include/asm-i386/intel_arch_perfmon.h
+++ b/include/asm-i386/intel_arch_perfmon.h
@@ -14,6 +14,18 @@
 #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL   (0x3c)
 #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK (0x00 << 8)
-#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT (1 << 0)
+#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX (0)
+#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT \
+                                (1 << (ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX))
+union cpuid10_eax {
+        struct {
+                unsigned int version_id:8;
+                unsigned int num_counters:8;
+                unsigned int bit_width:8;
+                unsigned int mask_length:8;
+        } split;
+        unsigned int full;
+};
 #endif  /* X86_INTEL_ARCH_PERFMON_H */
diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h
index 5092e819b8a2..5d309275a1dc 100644
--- a/include/asm-i386/io_apic.h
+++ b/include/asm-i386/io_apic.h
@@ -188,6 +188,16 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned
 /* 1 if "noapic" boot option passed */
 extern int skip_ioapic_setup;
+static inline void disable_ioapic_setup(void)
+{
+        skip_ioapic_setup = 1;
+}
+static inline int ioapic_setup_disabled(void)
+{
+        return skip_ioapic_setup;
+}
 /*
 * If we use the IO-APIC for IRQ routing, disable automatic
 * assignment of PCI IRQ's.
@@ -206,6 +216,7 @@ extern int (*ioapic_renumber_irq)(int ioapic, int irq);
 #else  /* !CONFIG_X86_IO_APIC */
 #define io_apic_assign_pci_irqs 0
+static inline void disable_ioapic_setup(void) { }
 #endif
 extern int assign_irq_vector(int irq);
diff --git a/include/asm-i386/kexec.h b/include/asm-i386/kexec.h
index 53f0e06672dc..4dfc9f5ed031 100644
--- a/include/asm-i386/kexec.h
+++ b/include/asm-i386/kexec.h
@@ -1,6 +1,26 @@
 #ifndef _I386_KEXEC_H
 #define _I386_KEXEC_H
+#define PA_CONTROL_PAGE  0
+#define VA_CONTROL_PAGE  1
+#define PA_PGD           2
+#define VA_PGD           3
+#define PA_PTE_0         4
+#define VA_PTE_0         5
+#define PA_PTE_1         6
+#define VA_PTE_1         7
+#ifdef CONFIG_X86_PAE
+#define PA_PMD_0         8
+#define VA_PMD_0         9
+#define PA_PMD_1         10
+#define VA_PMD_1         11
+#define PAGES_NR         12
+#else
+#define PAGES_NR         8
+#endif
+#ifndef __ASSEMBLY__
 #include <asm/fixmap.h>
 #include <asm/ptrace.h>
 #include <asm/string.h>
@@ -72,5 +92,12 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
               newregs->eip = (unsigned long)current_text_addr();
       }
 }
+asmlinkage NORET_TYPE void
+relocate_kernel(unsigned long indirection_page,
+                unsigned long control_page,
+                unsigned long start_address,
+                unsigned int has_pae) ATTRIB_NORET;
+#endif /* __ASSEMBLY__ */
 #endif /* _I386_KEXEC_H */
diff --git a/include/asm-i386/mach-default/do_timer.h b/include/asm-i386/mach-default/do_timer.h
index 6312c3e79814..4182c347ef85 100644
--- a/include/asm-i386/mach-default/do_timer.h
+++ b/include/asm-i386/mach-default/do_timer.h
@@ -16,7 +16,7 @@
 static inline void do_timer_interrupt_hook(struct pt_regs *regs)
 {
-        do_timer(regs);
+        do_timer(1);
 #ifndef CONFIG_SMP
        update_process_times(user_mode_vm(regs));
 #endif
diff --git a/include/asm-i386/mach-es7000/mach_apic.h b/include/asm-i386/mach-es7000/mach_apic.h
index b5f3f0d0b2bc..26333685a7fb 100644
--- a/include/asm-i386/mach-es7000/mach_apic.h
+++ b/include/asm-i386/mach-es7000/mach_apic.h
@@ -123,9 +123,13 @@ extern u8 cpu_2_logical_apicid[];
 /* Mapping from cpu number to logical apicid */
 static inline int cpu_to_logical_apicid(int cpu)
 {
+#ifdef CONFIG_SMP
       if (cpu >= NR_CPUS)
               return BAD_APICID;
       return (int)cpu_2_logical_apicid[cpu];
+#else
+        return logical_smp_processor_id();
+#endif
 }
 static inline int mpc_apic_id(struct mpc_config_processor *m, struct mpc_config_translation *unused)
diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h
index 9fd073286289..254a0fe01c6a 100644
--- a/include/asm-i386/mach-summit/mach_apic.h
+++ b/include/asm-i386/mach-summit/mach_apic.h
@@ -46,10 +46,12 @@ extern u8 cpu_2_logical_apicid[];
 static inline void init_apic_ldr(void)
 {
        unsigned long val, id;
-        int i, count;
+        int count = 0;
-        u8 lid;
        u8 my_id = (u8)hard_smp_processor_id();
        u8 my_cluster = (u8)apicid_cluster(my_id);
+#ifdef CONFIG_SMP
+        u8 lid;
+        int i;
        /* Create logical APIC IDs by counting CPUs already in cluster. */
        for (count = 0, i = NR_CPUS; --i >= 0; ) {
@@ -57,6 +59,7 @@ static inline void init_apic_ldr(void)
                if (lid != BAD_APICID && apicid_cluster(lid) == my_cluster)
                        ++count;
        }
+#endif
        /* We only have a 4 wide bitmap in cluster mode.  If a deranged
         * BIOS puts 5 CPUs in one APIC cluster, we're hosed. */
        BUG_ON(count >= XAPIC_DEST_CPUS_SHIFT);
@@ -85,15 +88,19 @@ static inline void clustered_apic_check(void)
 static inline int apicid_to_node(int logical_apicid)
 {
-        return logical_apicid >> 5;          /* 2 clusterids per CEC */
+        return apicid_2_node[logical_apicid];
 }
 /* Mapping from cpu number to logical apicid */
 static inline int cpu_to_logical_apicid(int cpu)
 {
+#ifdef CONFIG_SMP
       if (cpu >= NR_CPUS)
               return BAD_APICID;
        return (int)cpu_2_logical_apicid[cpu];
+#else
+        return logical_smp_processor_id();
+#endif
 }
 static inline int cpu_present_to_apicid(int mps_cpu)
diff --git a/include/asm-i386/mach-visws/do_timer.h b/include/asm-i386/mach-visws/do_timer.h
index 95568e6ca91c..8db618c5a72b 100644
--- a/include/asm-i386/mach-visws/do_timer.h
+++ b/include/asm-i386/mach-visws/do_timer.h
@@ -9,7 +9,7 @@ static inline void do_timer_interrupt_hook(struct pt_regs *regs)
        /* Clear the interrupt */
        co_cpu_write(CO_CPU_STAT,co_cpu_read(CO_CPU_STAT) & ~CO_STAT_TIMEINTR);
-        do_timer(regs);
+        do_timer(1);
 #ifndef CONFIG_SMP
        update_process_times(user_mode_vm(regs));
 #endif
diff --git a/include/asm-i386/mach-voyager/do_timer.h b/include/asm-i386/mach-voyager/do_timer.h
index eaf518098981..099fe9f5c1b2 100644
--- a/include/asm-i386/mach-voyager/do_timer.h
+++ b/include/asm-i386/mach-voyager/do_timer.h
@@ -3,7 +3,7 @@
 static inline void do_timer_interrupt_hook(struct pt_regs *regs)
 {
-        do_timer(regs);
+        do_timer(1);
 #ifndef CONFIG_SMP
        update_process_times(user_mode_vm(regs));
 #endif
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 22cb07cc8f32..61b073322006 100644
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -38,10 +38,16 @@ static inline void get_memcfg_numa(void)
 }
 extern int early_pfn_to_nid(unsigned long pfn);
+extern void numa_kva_reserve(void);
 #else /* !CONFIG_NUMA */
 #define get_memcfg_numa get_memcfg_numa_flat
 #define get_zholes_size(n) (0)
+static inline void numa_kva_reserve(void)
+{
+}
 #endif /* CONFIG_NUMA */
 #ifdef CONFIG_DISCONTIGMEM
diff --git a/include/asm-i386/mutex.h b/include/asm-i386/mutex.h
index 05a538531229..7a17d9e58ad6 100644
--- a/include/asm-i386/mutex.h
+++ b/include/asm-i386/mutex.h
@@ -30,14 +30,10 @@ do {									\
                                                                        \
        __asm__ __volatile__(                                           \
                LOCK_PREFIX "   decl (%%eax)    \n"                     \
-                        "   js 2f               \n"                     \
+                        "   jns 1f              \n"                     \
+                        "   call "#fail_fn"     \n"                     \
                        "1:                     \n"                     \
                                                                        \
-                LOCK_SECTION_START("")                                  \
-                        "2: call "#fail_fn"     \n"                     \
-                        "   jmp 1b              \n"                     \
-                LOCK_SECTION_END                                        \
-                                                                        \
                :"=a" (dummy)                                           \
                : "a" (count)                                           \
                : "memory", "ecx", "edx");                              \
@@ -86,14 +82,10 @@ do {									\
                                                                        \
        __asm__ __volatile__(                                           \
                LOCK_PREFIX "   incl (%%eax)    \n"                     \
-                        "   jle 2f              \n"                     \
+                        "   jg  1f              \n"                     \
+                        "   call "#fail_fn"     \n"                     \
                        "1:                     \n"                     \
                                                                        \
-                LOCK_SECTION_START("")                                  \
-                        "2: call "#fail_fn"     \n"                     \
-                        "   jmp 1b              \n"                     \
-                LOCK_SECTION_END                                        \
-                                                                        \
                :"=a" (dummy)                                           \
                : "a" (count)                                           \
                : "memory", "ecx", "edx");                              \
diff --git a/include/asm-i386/nmi.h b/include/asm-i386/nmi.h
index 67d994799999..269d315719ca 100644
--- a/include/asm-i386/nmi.h
+++ b/include/asm-i386/nmi.h
@@ -6,32 +6,29 @@
 #include <linux/pm.h>
-struct pt_regs;
-typedef int (*nmi_callback_t)(struct pt_regs * regs, int cpu);
-/**
- * set_nmi_callback
- *
- * Set a handler for an NMI. Only one handler may be
- * set. Return 1 if the NMI was handled.
- */
-void set_nmi_callback(nmi_callback_t callback);
 /**
- * unset_nmi_callback
+ * do_nmi_callback
 *
- * Remove the handler previously set.
+ * Check to see if a callback exists and execute it.  Return 1
+ * if the handler exists and was handled successfully.
 */
-void unset_nmi_callback(void);
+int do_nmi_callback(struct pt_regs *regs, int cpu);
-extern void setup_apic_nmi_watchdog (void);
+extern int nmi_watchdog_enabled;
-extern int reserve_lapic_nmi(void);
+extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
-extern void release_lapic_nmi(void);
+extern int avail_to_resrv_perfctr_nmi(unsigned int);
+extern int reserve_perfctr_nmi(unsigned int);
+extern void release_perfctr_nmi(unsigned int);
+extern int reserve_evntsel_nmi(unsigned int);
+extern void release_evntsel_nmi(unsigned int);
+extern void setup_apic_nmi_watchdog (void *);
+extern void stop_apic_nmi_watchdog (void *);
 extern void disable_timer_nmi_watchdog(void);
 extern void enable_timer_nmi_watchdog(void);
-extern void nmi_watchdog_tick (struct pt_regs * regs);
+extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);
+extern atomic_t nmi_active;
 extern unsigned int nmi_watchdog;
 #define NMI_DEFAULT     -1
 #define NMI_NONE        0
@@ -39,4 +36,10 @@ extern unsigned int nmi_watchdog;
 #define NMI_LOCAL_APIC  2
 #define NMI_INVALID     3
+struct ctl_table;
+struct file;
+extern int proc_nmi_enabled(struct ctl_table *, int , struct file *,
+                        void __user *, size_t *, loff_t *);
+extern int unknown_nmi_panic;
 #endif /* ASM_NMI_H */
diff --git a/include/asm-i386/pgtable-2level.h b/include/asm-i386/pgtable-2level.h
index 2756d4b04c27..8d8d3b9ecdb0 100644
--- a/include/asm-i386/pgtable-2level.h
+++ b/include/asm-i386/pgtable-2level.h
@@ -16,13 +16,15 @@
 #define set_pte(pteptr, pteval) (*(pteptr) = pteval)
 #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
 #define set_pte_atomic(pteptr, pteval) set_pte(pteptr,pteval)
+#define set_pte_present(mm,addr,ptep,pteval) set_pte_at(mm,addr,ptep,pteval)
 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
 #define pte_clear(mm,addr,xp)   do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
 #define pmd_clear(xp)   do { set_pmd(xp, __pmd(0)); } while (0)
+#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
 #define ptep_get_and_clear(mm,addr,xp)  __pte(xchg(&(xp)->pte_low, 0))
-#define pte_same(a, b)          ((a).pte_low == (b).pte_low)
 #define pte_page(x)             pfn_to_page(pte_pfn(x))
 #define pte_none(x)             (!(x).pte_low)
 #define pte_pfn(x)              ((unsigned long)(((x).pte_low >> PAGE_SHIFT)))
diff --git a/include/asm-i386/pgtable-3level.h b/include/asm-i386/pgtable-3level.h
index dccb1b3337ad..c2d701ea35be 100644
--- a/include/asm-i386/pgtable-3level.h
+++ b/include/asm-i386/pgtable-3level.h
@@ -58,7 +58,21 @@ static inline void set_pte(pte_t *ptep, pte_t pte)
 }
 #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-#define __HAVE_ARCH_SET_PTE_ATOMIC
+/*
+ * Since this is only called on user PTEs, and the page fault handler
+ * must handle the already racy situation of simultaneous page faults,
+ * we are justified in merely clearing the PTE present bit, followed
+ * by a set.  The ordering here is important.
+ */
+static inline void set_pte_present(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte)
+{
+        ptep->pte_low = 0;
+        smp_wmb();
+        ptep->pte_high = pte.pte_high;
+        smp_wmb();
+        ptep->pte_low = pte.pte_low;
+}
 #define set_pte_atomic(pteptr,pteval) \
                set_64bit((unsigned long long *)(pteptr),pte_val(pteval))
 #define set_pmd(pmdptr,pmdval) \
@@ -77,7 +91,7 @@ static inline void pud_clear (pud_t * pud) { }
 #define pud_page(pud) \
 ((struct page *) __va(pud_val(pud) & PAGE_MASK))
-#define pud_page_kernel(pud) \
+#define pud_page_vaddr(pud) \
 ((unsigned long) __va(pud_val(pud) & PAGE_MASK))
@@ -105,6 +119,7 @@ static inline void pmd_clear(pmd_t *pmd)
        *(tmp + 1) = 0;
 }
+#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
 static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
        pte_t res;
@@ -117,6 +132,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
        return res;
 }
+#define __HAVE_ARCH_PTE_SAME
 static inline int pte_same(pte_t a, pte_t b)
 {
        return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h
index 09697fec3d2b..7d398f493dde 100644
--- a/include/asm-i386/pgtable.h
+++ b/include/asm-i386/pgtable.h
@@ -246,20 +246,85 @@ static inline pte_t pte_mkhuge(pte_t pte)	{ (pte).pte_low |= _PAGE_PSE; return p
 # include <asm/pgtable-2level.h>
 #endif
-static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
+/*
-{
+ * Rules for using pte_update - it must be called after any PTE update which
-        if (!pte_dirty(*ptep))
+ * has not been done using the set_pte / clear_pte interfaces.  It is used by
-                return 0;
+ * shadow mode hypervisors to resynchronize the shadow page tables.  Kernel PTE
-        return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte_low);
+ * updates should either be sets, clears, or set_pte_atomic for P->P
-}
+ * transitions, which means this hook should only be called for user PTEs.
+ * This hook implies a P->P protection or access change has taken place, which
+ * requires a subsequent TLB flush.  The notification can optionally be delayed
+ * until the TLB flush event by using the pte_update_defer form of the
+ * interface, but care must be taken to assure that the flush happens while
+ * still holding the same page table lock so that the shadow and primary pages
+ * do not become out of sync on SMP.
+ */
+#define pte_update(mm, addr, ptep)              do { } while (0)
+#define pte_update_defer(mm, addr, ptep)        do { } while (0)
-static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
-{
-        if (!pte_young(*ptep))
-                return 0;
-        return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte_low);
-}
+/*
+ * We only update the dirty/accessed state if we set
+ * the dirty bit by hand in the kernel, since the hardware
+ * will do the accessed bit for us, and we don't want to
+ * race with other CPU's that might be updating the dirty
+ * bit at the same time.
+ */
+#define  __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
+#define ptep_set_access_flags(vma, address, ptep, entry, dirty)         \
+do {                                                                    \
+        if (dirty) {                                                    \
+                (ptep)->pte_low = (entry).pte_low;                      \
+                pte_update_defer((vma)->vm_mm, (addr), (ptep));         \
+                flush_tlb_page(vma, address);                           \
+        }                                                               \
+} while (0)
+/*
+ * We don't actually have these, but we want to advertise them so that
+ * we can encompass the flush here.
+ */
+#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
+#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
+/*
+ * Rules for using ptep_establish: the pte MUST be a user pte, and
+ * must be a present->present transition.
+ */
+#define __HAVE_ARCH_PTEP_ESTABLISH
+#define ptep_establish(vma, address, ptep, pteval)                      \
+do {                                                                    \
+        set_pte_present((vma)->vm_mm, address, ptep, pteval);           \
+        flush_tlb_page(vma, address);                                   \
+} while (0)
+#define __HAVE_ARCH_PTEP_CLEAR_DIRTY_FLUSH
+#define ptep_clear_flush_dirty(vma, address, ptep)                      \
+({                                                                      \
+        int __dirty;                                                    \
+        __dirty = pte_dirty(*(ptep));                                   \
+        if (__dirty) {                                                  \
+                clear_bit(_PAGE_BIT_DIRTY, &(ptep)->pte_low);           \
+                pte_update_defer((vma)->vm_mm, (addr), (ptep));         \
+                flush_tlb_page(vma, address);                           \
+        }                                                               \
+        __dirty;                                                        \
+})
+#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
+#define ptep_clear_flush_young(vma, address, ptep)                      \
+({                                                                      \
+        int __young;                                                    \
+        __young = pte_young(*(ptep));                                   \
+        if (__young) {                                                  \
+                clear_bit(_PAGE_BIT_ACCESSED, &(ptep)->pte_low);        \
+                pte_update_defer((vma)->vm_mm, (addr), (ptep));         \
+                flush_tlb_page(vma, address);                           \
+        }                                                               \
+        __young;                                                        \
+})
+#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
 static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long addr, pte_t *ptep, int full)
 {
        pte_t pte;
@@ -272,9 +337,11 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long
        return pte;
 }
+#define __HAVE_ARCH_PTEP_SET_WRPROTECT
 static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
        clear_bit(_PAGE_BIT_RW, &ptep->pte_low);
+        pte_update(mm, addr, ptep);
 }
 /*
@@ -364,11 +431,11 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define pte_index(address) \
                (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) +  pte_index(address))
 #define pmd_page(pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
-#define pmd_page_kernel(pmd) \
+#define pmd_page_vaddr(pmd) \
                ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 /*
@@ -391,8 +458,6 @@ extern pte_t *lookup_address(unsigned long address);
 static inline int set_kernel_exec(unsigned long vaddr, int enable) { return 0;}
 #endif
-extern void noexec_setup(const char *str);
 #if defined(CONFIG_HIGHPTE)
 #define pte_offset_map(dir, address) \
        ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address))
@@ -408,26 +473,18 @@ extern void noexec_setup(const char *str);
 #define pte_unmap_nested(pte) do { } while (0)
 #endif
+/* Clear a kernel PTE and flush it from the TLB */
+#define kpte_clear_flush(ptep, vaddr)                                   \
+do {                                                                    \
+        pte_clear(&init_mm, vaddr, ptep);                               \
+        __flush_tlb_one(vaddr);                                         \
+} while (0)
 /*
 * The i386 doesn't have any external MMU info: the kernel page
 * tables contain all the necessary information.
- *
- * Also, we only update the dirty/accessed state if we set
- * the dirty bit by hand in the kernel, since the hardware
- * will do the accessed bit for us, and we don't want to
- * race with other CPU's that might be updating the dirty
- * bit at the same time.
 */
 #define update_mmu_cache(vma,address,pte) do { } while (0)
-#define  __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
-#define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \
-        do {                                                              \
-                if (__dirty) {                                            \
-                        (__ptep)->pte_low = (__entry).pte_low;            \
-                        flush_tlb_page(__vma, __address);                 \
-                }                                                         \
-        } while (0)
 #endif /* !__ASSEMBLY__ */
 #ifdef CONFIG_FLATMEM
@@ -441,12 +498,6 @@ extern void noexec_setup(const char *str);
 #define GET_IOSPACE(pfn)                0
 #define GET_PFN(pfn)                    (pfn)
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
-#define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define __HAVE_ARCH_PTE_SAME
 #include <asm-generic/pgtable.h>
 #endif /* _I386_PGTABLE_H */
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h
index b32346d62e10..2277127696d2 100644
--- a/include/asm-i386/processor.h
+++ b/include/asm-i386/processor.h
@@ -143,6 +143,18 @@ static inline void detect_ht(struct cpuinfo_x86 *c) {}
 #define X86_EFLAGS_VIP  0x00100000 /* Virtual Interrupt Pending */
 #define X86_EFLAGS_ID   0x00200000 /* CPUID detection flag */
+static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
+                           unsigned int *ecx, unsigned int *edx)
+{
+        /* ecx is often an input as well as an output. */
+        __asm__("cpuid"
+                : "=a" (*eax),
+                  "=b" (*ebx),
+                  "=c" (*ecx),
+                  "=d" (*edx)
+                : "0" (*eax), "2" (*ecx));
+}
 /*
 * Generic CPUID function
 * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx
@@ -150,24 +162,18 @@ static inline void detect_ht(struct cpuinfo_x86 *c) {}
 */
 static inline void cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
 {
-        __asm__("cpuid"
+        *eax = op;
-                : "=a" (*eax),
+        *ecx = 0;
-                  "=b" (*ebx),
+        __cpuid(eax, ebx, ecx, edx);
-                  "=c" (*ecx),
-                  "=d" (*edx)
-                : "0" (op), "c"(0));
 }
 /* Some CPUID calls want 'count' to be placed in ecx */
 static inline void cpuid_count(int op, int count, int *eax, int *ebx, int *ecx,
-                int *edx)
+                               int *edx)
 {
-        __asm__("cpuid"
+        *eax = op;
-                : "=a" (*eax),
+        *ecx = count;
-                  "=b" (*ebx),
+        __cpuid(eax, ebx, ecx, edx);
-                  "=c" (*ecx),
-                  "=d" (*edx)
-                : "0" (op), "c" (count));
 }
 /*
@@ -175,42 +181,30 @@ static inline void cpuid_count(int op, int count, int *eax, int *ebx, int *ecx,
 */
 static inline unsigned int cpuid_eax(unsigned int op)
 {
-        unsigned int eax;
+        unsigned int eax, ebx, ecx, edx;
-        __asm__("cpuid"
+        cpuid(op, &eax, &ebx, &ecx, &edx);
-                : "=a" (eax)
-                : "0" (op)
-                : "bx", "cx", "dx");
        return eax;
 }
 static inline unsigned int cpuid_ebx(unsigned int op)
 {
-        unsigned int eax, ebx;
+        unsigned int eax, ebx, ecx, edx;
-        __asm__("cpuid"
+        cpuid(op, &eax, &ebx, &ecx, &edx);
-                : "=a" (eax), "=b" (ebx)
-                : "0" (op)
-                : "cx", "dx" );
        return ebx;
 }
 static inline unsigned int cpuid_ecx(unsigned int op)
 {
-        unsigned int eax, ecx;
+        unsigned int eax, ebx, ecx, edx;
-        __asm__("cpuid"
+        cpuid(op, &eax, &ebx, &ecx, &edx);
-                : "=a" (eax), "=c" (ecx)
-                : "0" (op)
-                : "bx", "dx" );
        return ecx;
 }
 static inline unsigned int cpuid_edx(unsigned int op)
 {
-        unsigned int eax, edx;
+        unsigned int eax, ebx, ecx, edx;
-        __asm__("cpuid"
+        cpuid(op, &eax, &ebx, &ecx, &edx);
-                : "=a" (eax), "=d" (edx)
-                : "0" (op)
-                : "bx", "cx");
        return edx;
 }
diff --git a/include/asm-i386/ptrace-abi.h b/include/asm-i386/ptrace-abi.h
new file mode 100644
index 000000000000..a44901817a26
--- /dev/null
+++ b/include/asm-i386/ptrace-abi.h
@@ -0,0 +1,39 @@
+#ifndef I386_PTRACE_ABI_H
+#define I386_PTRACE_ABI_H
+#define EBX 0
+#define ECX 1
+#define EDX 2
+#define ESI 3
+#define EDI 4
+#define EBP 5
+#define EAX 6
+#define DS 7
+#define ES 8
+#define FS 9
+#define GS 10
+#define ORIG_EAX 11
+#define EIP 12
+#define CS  13
+#define EFL 14
+#define UESP 15
+#define SS   16
+#define FRAME_SIZE 17
+/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
+#define PTRACE_GETREGS            12
+#define PTRACE_SETREGS            13
+#define PTRACE_GETFPREGS          14
+#define PTRACE_SETFPREGS          15
+#define PTRACE_GETFPXREGS         18
+#define PTRACE_SETFPXREGS         19
+#define PTRACE_OLDSETOPTIONS         21
+#define PTRACE_GET_THREAD_AREA    25
+#define PTRACE_SET_THREAD_AREA    26
+#define PTRACE_SYSEMU             31
+#define PTRACE_SYSEMU_SINGLESTEP  32
+#endif
diff --git a/include/asm-i386/ptrace.h b/include/asm-i386/ptrace.h
index f324c53b6f9a..a4a0e5207db5 100644
--- a/include/asm-i386/ptrace.h
+++ b/include/asm-i386/ptrace.h
@@ -1,24 +1,7 @@
 #ifndef _I386_PTRACE_H
 #define _I386_PTRACE_H
-#define EBX 0
+#include <asm/ptrace-abi.h>
-#define ECX 1
-#define EDX 2
-#define ESI 3
-#define EDI 4
-#define EBP 5
-#define EAX 6
-#define DS 7
-#define ES 8
-#define FS 9
-#define GS 10
-#define ORIG_EAX 11
-#define EIP 12
-#define CS  13
-#define EFL 14
-#define UESP 15
-#define SS   16
-#define FRAME_SIZE 17
 /* this struct defines the way the registers are stored on the 
   stack during a system call. */
@@ -41,25 +24,10 @@ struct pt_regs {
        int  xss;
 };
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS            12
-#define PTRACE_SETREGS            13
-#define PTRACE_GETFPREGS          14
-#define PTRACE_SETFPREGS          15
-#define PTRACE_GETFPXREGS         18
-#define PTRACE_SETFPXREGS         19
-#define PTRACE_OLDSETOPTIONS         21
-#define PTRACE_GET_THREAD_AREA    25
-#define PTRACE_SET_THREAD_AREA    26
-#define PTRACE_SYSEMU             31
-#define PTRACE_SYSEMU_SINGLESTEP  32
 #ifdef __KERNEL__
 #include <asm/vm86.h>
+#include <asm/segment.h>
 struct task_struct;
 extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code);
@@ -73,18 +41,14 @@ extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int erro
 */
 static inline int user_mode(struct pt_regs *regs)
 {
-        return (regs->xcs & 3) != 0;
+        return (regs->xcs & SEGMENT_RPL_MASK) == USER_RPL;
 }
 static inline int user_mode_vm(struct pt_regs *regs)
 {
-        return ((regs->xcs & 3) | (regs->eflags & VM_MASK)) != 0;
+        return ((regs->xcs & SEGMENT_RPL_MASK) | (regs->eflags & VM_MASK)) >= USER_RPL;
 }
 #define instruction_pointer(regs) ((regs)->eip)
-#if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER)
 extern unsigned long profile_pc(struct pt_regs *regs);
-#else
-#define profile_pc(regs) instruction_pointer(regs)
-#endif
 #endif /* __KERNEL__ */
 #endif
diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h
index 87c069ccba08..c3e5db32fa48 100644
--- a/include/asm-i386/rwlock.h
+++ b/include/asm-i386/rwlock.h
@@ -20,52 +20,6 @@
 #define RW_LOCK_BIAS             0x01000000
 #define RW_LOCK_BIAS_STR        "0x01000000"
-#define __build_read_lock_ptr(rw, helper)   \
+/* Code is in asm-i386/spinlock.h */
-        asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" \
-                        "jns 1f\n" \
-                        "call " helper "\n\t" \
-                        "1:\n" \
-                        ::"a" (rw) : "memory")
-#define __build_read_lock_const(rw, helper)   \
-        asm volatile(LOCK_PREFIX " subl $1,%0\n\t" \
-                        "jns 1f\n" \
-                        "pushl %%eax\n\t" \
-                        "leal %0,%%eax\n\t" \
-                        "call " helper "\n\t" \
-                        "popl %%eax\n\t" \
-                        "1:\n" \
-                        :"+m" (*(volatile int *)rw) : : "memory")
-#define __build_read_lock(rw, helper)   do { \
-                                                if (__builtin_constant_p(rw)) \
-                                                        __build_read_lock_const(rw, helper); \
-                                                else \
-                                                        __build_read_lock_ptr(rw, helper); \
-                                        } while (0)
-#define __build_write_lock_ptr(rw, helper) \
-        asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
-                        "jz 1f\n" \
-                        "call " helper "\n\t" \
-                        "1:\n" \
-                        ::"a" (rw) : "memory")
-#define __build_write_lock_const(rw, helper) \
-        asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
-                        "jz 1f\n" \
-                        "pushl %%eax\n\t" \
-                        "leal %0,%%eax\n\t" \
-                        "call " helper "\n\t" \
-                        "popl %%eax\n\t" \
-                        "1:\n" \
-                        :"+m" (*(volatile int *)rw) : : "memory")
-#define __build_write_lock(rw, helper)  do { \
-                                                if (__builtin_constant_p(rw)) \
-                                                        __build_write_lock_const(rw, helper); \
-                                                else \
-                                                        __build_write_lock_ptr(rw, helper); \
-                                        } while (0)
 #endif
diff --git a/include/asm-i386/rwsem.h b/include/asm-i386/rwsem.h
index 43113f5608eb..bc598d6388e3 100644
--- a/include/asm-i386/rwsem.h
+++ b/include/asm-i386/rwsem.h
@@ -99,17 +99,9 @@ static inline void __down_read(struct rw_semaphore *sem)
        __asm__ __volatile__(
                "# beginning down_read\n\t"
 LOCK_PREFIX     "  incl      (%%eax)\n\t" /* adds 0x00000001, returns the old value */
-                "  js        2f\n\t" /* jump if we weren't granted the lock */
+                "  jns        1f\n"
+                "  call call_rwsem_down_read_failed\n"
                "1:\n\t"
-                LOCK_SECTION_START("")
-                "2:\n\t"
-                "  pushl     %%ecx\n\t"
-                "  pushl     %%edx\n\t"
-                "  call      rwsem_down_read_failed\n\t"
-                "  popl      %%edx\n\t"
-                "  popl      %%ecx\n\t"
-                "  jmp       1b\n"
-                LOCK_SECTION_END
                "# ending down_read\n\t"
                : "+m" (sem->count)
                : "a" (sem)
@@ -151,15 +143,9 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
                "# beginning down_write\n\t"
 LOCK_PREFIX     "  xadd      %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */
                "  testl     %%edx,%%edx\n\t" /* was the count 0 before? */
-                "  jnz       2f\n\t" /* jump if we weren't granted the lock */
+                "  jz        1f\n"
-                "1:\n\t"
+                "  call call_rwsem_down_write_failed\n"
-                LOCK_SECTION_START("")
+                "1:\n"
-                "2:\n\t"
-                "  pushl     %%ecx\n\t"
-                "  call      rwsem_down_write_failed\n\t"
-                "  popl      %%ecx\n\t"
-                "  jmp       1b\n"
-                LOCK_SECTION_END
                "# ending down_write"
                : "+m" (sem->count), "=d" (tmp)
                : "a" (sem), "1" (tmp)
@@ -193,17 +179,9 @@ static inline void __up_read(struct rw_semaphore *sem)
        __asm__ __volatile__(
                "# beginning __up_read\n\t"
 LOCK_PREFIX     "  xadd      %%edx,(%%eax)\n\t" /* subtracts 1, returns the old value */
-                "  js        2f\n\t" /* jump if the lock is being waited upon */
+                "  jns        1f\n\t"
-                "1:\n\t"
+                "  call call_rwsem_wake\n"
-                LOCK_SECTION_START("")
+                "1:\n"
-                "2:\n\t"
-                "  decw      %%dx\n\t" /* do nothing if still outstanding active readers */
-                "  jnz       1b\n\t"
-                "  pushl     %%ecx\n\t"
-                "  call      rwsem_wake\n\t"
-                "  popl      %%ecx\n\t"
-                "  jmp       1b\n"
-                LOCK_SECTION_END
                "# ending __up_read\n"
                : "+m" (sem->count), "=d" (tmp)
                : "a" (sem), "1" (tmp)
@@ -219,17 +197,9 @@ static inline void __up_write(struct rw_semaphore *sem)
                "# beginning __up_write\n\t"
                "  movl      %2,%%edx\n\t"
 LOCK_PREFIX     "  xaddl     %%edx,(%%eax)\n\t" /* tries to transition 0xffff0001 -> 0x00000000 */
-                "  jnz       2f\n\t" /* jump if the lock is being waited upon */
+                "  jz       1f\n"
+                "  call call_rwsem_wake\n"
                "1:\n\t"
-                LOCK_SECTION_START("")
-                "2:\n\t"
-                "  decw      %%dx\n\t" /* did the active count reduce to 0? */
-                "  jnz       1b\n\t" /* jump back if not */
-                "  pushl     %%ecx\n\t"
-                "  call      rwsem_wake\n\t"
-                "  popl      %%ecx\n\t"
-                "  jmp       1b\n"
-                LOCK_SECTION_END
                "# ending __up_write\n"
                : "+m" (sem->count)
                : "a" (sem), "i" (-RWSEM_ACTIVE_WRITE_BIAS)
@@ -244,17 +214,9 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
        __asm__ __volatile__(
                "# beginning __downgrade_write\n\t"
 LOCK_PREFIX     "  addl      %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */
-                "  js        2f\n\t" /* jump if the lock is being waited upon */
+                "  jns       1f\n\t"
+                "  call call_rwsem_downgrade_wake\n"
                "1:\n\t"
-                LOCK_SECTION_START("")
-                "2:\n\t"
-                "  pushl     %%ecx\n\t"
-                "  pushl     %%edx\n\t"
-                "  call      rwsem_downgrade_wake\n\t"
-                "  popl      %%edx\n\t"
-                "  popl      %%ecx\n\t"
-                "  jmp       1b\n"
-                LOCK_SECTION_END
                "# ending __downgrade_write\n"
                : "+m" (sem->count)
                : "a" (sem), "i" (-RWSEM_WAITING_BIAS)
diff --git a/include/asm-i386/segment.h b/include/asm-i386/segment.h
index faf995307b9e..b7ab59685ba7 100644
--- a/include/asm-i386/segment.h
+++ b/include/asm-i386/segment.h
@@ -83,6 +83,11 @@
 #define GDT_SIZE (GDT_ENTRIES * 8)
+/* Matches __KERNEL_CS and __USER_CS (they must be 2 entries apart) */
+#define SEGMENT_IS_FLAT_CODE(x)  (((x) & 0xec) == GDT_ENTRY_KERNEL_CS * 8)
+/* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
+#define SEGMENT_IS_PNP_CODE(x)   (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
 /* Simple and small GDT entries for booting only */
 #define GDT_ENTRY_BOOT_CS               2
@@ -112,4 +117,16 @@
 */
 #define IDT_ENTRIES 256
+/* Bottom two bits of selector give the ring privilege level */
+#define SEGMENT_RPL_MASK        0x3
+/* Bit 2 is table indicator (LDT/GDT) */
+#define SEGMENT_TI_MASK         0x4
+/* User mode is privilege level 3 */
+#define USER_RPL                0x3
+/* LDT segment has TI set, GDT has it cleared */
+#define SEGMENT_LDT             0x4
+#define SEGMENT_GDT             0x0
+#define get_kernel_rpl()  0
 #endif
diff --git a/include/asm-i386/semaphore.h b/include/asm-i386/semaphore.h
index d51e800acf29..4e34a468c383 100644
--- a/include/asm-i386/semaphore.h
+++ b/include/asm-i386/semaphore.h
@@ -100,13 +100,10 @@ static inline void down(struct semaphore * sem)
        __asm__ __volatile__(
                "# atomic down operation\n\t"
                LOCK_PREFIX "decl %0\n\t"     /* --sem->count */
-                "js 2f\n"
+                "jns 2f\n"
-                "1:\n"
+                "\tlea %0,%%eax\n\t"
-                LOCK_SECTION_START("")
+                "call __down_failed\n"
-                "2:\tlea %0,%%eax\n\t"
+                "2:"
-                "call __down_failed\n\t"
-                "jmp 1b\n"
-                LOCK_SECTION_END
                :"+m" (sem->count)
                :
                :"memory","ax");
@@ -123,16 +120,13 @@ static inline int down_interruptible(struct semaphore * sem)
        might_sleep();
        __asm__ __volatile__(
                "# atomic interruptible down operation\n\t"
+                "xorl %0,%0\n\t"
                LOCK_PREFIX "decl %1\n\t"     /* --sem->count */
-                "js 2f\n\t"
+                "jns 2f\n\t"
-                "xorl %0,%0\n"
+                "lea %1,%%eax\n\t"
-                "1:\n"
+                "call __down_failed_interruptible\n"
-                LOCK_SECTION_START("")
+                "2:"
-                "2:\tlea %1,%%eax\n\t"
+                :"=&a" (result), "+m" (sem->count)
-                "call __down_failed_interruptible\n\t"
-                "jmp 1b\n"
-                LOCK_SECTION_END
-                :"=a" (result), "+m" (sem->count)
                :
                :"memory");
        return result;
@@ -148,16 +142,13 @@ static inline int down_trylock(struct semaphore * sem)
        __asm__ __volatile__(
                "# atomic interruptible down operation\n\t"
+                "xorl %0,%0\n\t"
                LOCK_PREFIX "decl %1\n\t"     /* --sem->count */
-                "js 2f\n\t"
+                "jns 2f\n\t"
-                "xorl %0,%0\n"
+                "lea %1,%%eax\n\t"
-                "1:\n"
-                LOCK_SECTION_START("")
-                "2:\tlea %1,%%eax\n\t"
                "call __down_failed_trylock\n\t"
-                "jmp 1b\n"
+                "2:\n"
-                LOCK_SECTION_END
+                :"=&a" (result), "+m" (sem->count)
-                :"=a" (result), "+m" (sem->count)
                :
                :"memory");
        return result;
@@ -166,22 +157,16 @@ static inline int down_trylock(struct semaphore * sem)
 /*
 * Note! This is subtle. We jump to wake people up only if
 * the semaphore was negative (== somebody was waiting on it).
- * The default case (no contention) will result in NO
- * jumps for both down() and up().
 */
 static inline void up(struct semaphore * sem)
 {
        __asm__ __volatile__(
                "# atomic up operation\n\t"
                LOCK_PREFIX "incl %0\n\t"     /* ++sem->count */
-                "jle 2f\n"
+                "jg 1f\n\t"
-                "1:\n"
+                "lea %0,%%eax\n\t"
-                LOCK_SECTION_START("")
+                "call __up_wakeup\n"
-                "2:\tlea %0,%%eax\n\t"
+                "1:"
-                "call __up_wakeup\n\t"
-                "jmp 1b\n"
-                LOCK_SECTION_END
-                ".subsection 0\n"
                :"+m" (sem->count)
                :
                :"memory","ax");
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h
index 142d10e34ade..6aa1206f6e2a 100644
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -46,6 +46,8 @@ extern u8 x86_cpu_to_apicid[];
 #define cpu_physical_id(cpu)    x86_cpu_to_apicid[cpu]
+extern u8 apicid_2_node[];
 #ifdef CONFIG_HOTPLUG_CPU
 extern void cpu_exit_clear(void);
 extern void cpu_uninit(void);
@@ -80,24 +82,32 @@ static inline int hard_smp_processor_id(void)
        return GET_APIC_ID(*(unsigned long *)(APIC_BASE+APIC_ID));
 }
 #endif
-static __inline int logical_smp_processor_id(void)
-{
-        /* we don't want to mark this access volatile - bad code generation */
-        return GET_APIC_LOGICAL_ID(*(unsigned long *)(APIC_BASE+APIC_LDR));
-}
 #endif
+extern int safe_smp_processor_id(void);
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
+extern unsigned int num_processors;
 #endif /* !__ASSEMBLY__ */
 #else /* CONFIG_SMP */
+#define safe_smp_processor_id()         0
 #define cpu_physical_id(cpu)            boot_cpu_physical_apicid
 #define NO_PROC_ID              0xFF            /* No processor magic marker */
 #endif
+#ifndef __ASSEMBLY__
+#ifdef CONFIG_X86_LOCAL_APIC
+static __inline int logical_smp_processor_id(void)
+{
+        /* we don't want to mark this access volatile - bad code generation */
+        return GET_APIC_LOGICAL_ID(*(unsigned long *)(APIC_BASE+APIC_LDR));
+}
+#endif
+#endif
 #endif
diff --git a/include/asm-i386/spinlock.h b/include/asm-i386/spinlock.h
index d1020363c41a..c18b71fae6b3 100644
--- a/include/asm-i386/spinlock.h
+++ b/include/asm-i386/spinlock.h
@@ -4,8 +4,12 @@
 #include <asm/atomic.h>
 #include <asm/rwlock.h>
 #include <asm/page.h>
+#include <asm/processor.h>
 #include <linux/compiler.h>
+#define CLI_STRING      "cli"
+#define STI_STRING      "sti"
 /*
 * Your basic SMP spinlocks, allowing only a single CPU anywhere
 *
@@ -17,67 +21,64 @@
 * (the type definitions are in asm/spinlock_types.h)
 */
-#define __raw_spin_is_locked(x) \
+static inline int __raw_spin_is_locked(raw_spinlock_t *x)
-                (*(volatile signed char *)(&(x)->slock) <= 0)
+{
+        return *(volatile signed char *)(&(x)->slock) <= 0;
-#define __raw_spin_lock_string \
+}
-        "\n1:\t" \
-        LOCK_PREFIX " ; decb %0\n\t" \
-        "jns 3f\n" \
-        "2:\t" \
-        "rep;nop\n\t" \
-        "cmpb $0,%0\n\t" \
-        "jle 2b\n\t" \
-        "jmp 1b\n" \
-        "3:\n\t"
-/*
- * NOTE: there's an irqs-on section here, which normally would have to be
- * irq-traced, but on CONFIG_TRACE_IRQFLAGS we never use
- * __raw_spin_lock_string_flags().
- */
-#define __raw_spin_lock_string_flags \
-        "\n1:\t" \
-        LOCK_PREFIX " ; decb %0\n\t" \
-        "jns 5f\n" \
-        "2:\t" \
-        "testl $0x200, %1\n\t" \
-        "jz 4f\n\t" \
-        "sti\n" \
-        "3:\t" \
-        "rep;nop\n\t" \
-        "cmpb $0, %0\n\t" \
-        "jle 3b\n\t" \
-        "cli\n\t" \
-        "jmp 1b\n" \
-        "4:\t" \
-        "rep;nop\n\t" \
-        "cmpb $0, %0\n\t" \
-        "jg 1b\n\t" \
-        "jmp 4b\n" \
-        "5:\n\t"
 static inline void __raw_spin_lock(raw_spinlock_t *lock)
 {
-        asm(__raw_spin_lock_string : "+m" (lock->slock) : : "memory");
+        asm volatile("\n1:\t"
+                     LOCK_PREFIX " ; decb %0\n\t"
+                     "jns 3f\n"
+                     "2:\t"
+                     "rep;nop\n\t"
+                     "cmpb $0,%0\n\t"
+                     "jle 2b\n\t"
+                     "jmp 1b\n"
+                     "3:\n\t"
+                     : "+m" (lock->slock) : : "memory");
 }
 /*
 * It is easier for the lock validator if interrupts are not re-enabled
 * in the middle of a lock-acquire. This is a performance feature anyway
 * so we turn it off:
+ *
+ * NOTE: there's an irqs-on section here, which normally would have to be
+ * irq-traced, but on CONFIG_TRACE_IRQFLAGS we never use this variant.
 */
 #ifndef CONFIG_PROVE_LOCKING
 static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
 {
-        asm(__raw_spin_lock_string_flags : "+m" (lock->slock) : "r" (flags) : "memory");
+        asm volatile(
+                "\n1:\t"
+                LOCK_PREFIX " ; decb %0\n\t"
+                "jns 5f\n"
+                "2:\t"
+                "testl $0x200, %1\n\t"
+                "jz 4f\n\t"
+                STI_STRING "\n"
+                "3:\t"
+                "rep;nop\n\t"
+                "cmpb $0, %0\n\t"
+                "jle 3b\n\t"
+                CLI_STRING "\n\t"
+                "jmp 1b\n"
+                "4:\t"
+                "rep;nop\n\t"
+                "cmpb $0, %0\n\t"
+                "jg 1b\n\t"
+                "jmp 4b\n"
+                "5:\n\t"
+                : "+m" (lock->slock) : "r" (flags) : "memory");
 }
 #endif
 static inline int __raw_spin_trylock(raw_spinlock_t *lock)
 {
        char oldval;
-        __asm__ __volatile__(
+        asm volatile(
                "xchgb %b0,%1"
                :"=q" (oldval), "+m" (lock->slock)
                :"0" (0) : "memory");
@@ -93,38 +94,29 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
 #if !defined(CONFIG_X86_OOSTORE) && !defined(CONFIG_X86_PPRO_FENCE)
-#define __raw_spin_unlock_string \
-        "movb $1,%0" \
-                :"+m" (lock->slock) : : "memory"
 static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
-        __asm__ __volatile__(
+        asm volatile("movb $1,%0" : "+m" (lock->slock) :: "memory");
-                __raw_spin_unlock_string
-        );
 }
 #else
-#define __raw_spin_unlock_string \
-        "xchgb %b0, %1" \
-                :"=q" (oldval), "+m" (lock->slock) \
-                :"0" (oldval) : "memory"
 static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
        char oldval = 1;
-        __asm__ __volatile__(
+        asm volatile("xchgb %b0, %1"
-                __raw_spin_unlock_string
+                     : "=q" (oldval), "+m" (lock->slock)
-        );
+                     : "0" (oldval) : "memory");
 }
 #endif
-#define __raw_spin_unlock_wait(lock) \
+static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
-        do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
+{
+        while (__raw_spin_is_locked(lock))
+                cpu_relax();
+}
 /*
 * Read-write spinlocks, allowing multiple readers
@@ -151,22 +143,36 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 * read_can_lock - would read_trylock() succeed?
 * @lock: the rwlock in question.
 */
-#define __raw_read_can_lock(x)          ((int)(x)->lock > 0)
+static inline int __raw_read_can_lock(raw_rwlock_t *x)
+{
+        return (int)(x)->lock > 0;
+}
 /**
 * write_can_lock - would write_trylock() succeed?
 * @lock: the rwlock in question.
 */
-#define __raw_write_can_lock(x)         ((x)->lock == RW_LOCK_BIAS)
+static inline int __raw_write_can_lock(raw_rwlock_t *x)
+{
+        return (x)->lock == RW_LOCK_BIAS;
+}
 static inline void __raw_read_lock(raw_rwlock_t *rw)
 {
-        __build_read_lock(rw, "__read_lock_failed");
+        asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
+                     "jns 1f\n"
+                     "call __read_lock_failed\n\t"
+                     "1:\n"
+                     ::"a" (rw) : "memory");
 }
 static inline void __raw_write_lock(raw_rwlock_t *rw)
 {
-        __build_write_lock(rw, "__write_lock_failed");
+        asm volatile(LOCK_PREFIX " subl $" RW_LOCK_BIAS_STR ",(%0)\n\t"
+                     "jz 1f\n"
+                     "call __write_lock_failed\n\t"
+                     "1:\n"
+                     ::"a" (rw) : "memory");
 }
 static inline int __raw_read_trylock(raw_rwlock_t *lock)
@@ -199,4 +205,8 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
                                 : "+m" (rw->lock) : : "memory");
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-i386/stacktrace.h b/include/asm-i386/stacktrace.h
new file mode 100644
index 000000000000..7d1f6a5cbfca
--- /dev/null
+++ b/include/asm-i386/stacktrace.h
@@ -0,0 +1 @@
+#include <asm-x86_64/stacktrace.h>
diff --git a/include/asm-i386/sync_bitops.h b/include/asm-i386/sync_bitops.h
new file mode 100644
index 000000000000..c94d51c993ee
--- /dev/null
+++ b/include/asm-i386/sync_bitops.h
@@ -0,0 +1,156 @@
+#ifndef _I386_SYNC_BITOPS_H
+#define _I386_SYNC_BITOPS_H
+/*
+ * Copyright 1992, Linus Torvalds.
+ */
+/*
+ * These have to be done with inline assembly: that way the bit-setting
+ * is guaranteed to be atomic. All bit operations return 0 if the bit
+ * was cleared before the operation and != 0 if it was not.
+ *
+ * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).
+ */
+#define ADDR (*(volatile long *) addr)
+/**
+ * sync_set_bit - Atomically set a bit in memory
+ * @nr: the bit to set
+ * @addr: the address to start counting from
+ *
+ * This function is atomic and may not be reordered.  See __set_bit()
+ * if you do not require the atomic guarantees.
+ *
+ * Note: there are no guarantees that this function will not be reordered
+ * on non x86 architectures, so if you are writting portable code,
+ * make sure not to rely on its reordering guarantees.
+ *
+ * Note that @nr may be almost arbitrarily large; this function is not
+ * restricted to acting on a single-word quantity.
+ */
+static inline void sync_set_bit(int nr, volatile unsigned long * addr)
+{
+        __asm__ __volatile__("lock; btsl %1,%0"
+                             :"+m" (ADDR)
+                             :"Ir" (nr)
+                             : "memory");
+}
+/**
+ * sync_clear_bit - Clears a bit in memory
+ * @nr: Bit to clear
+ * @addr: Address to start counting from
+ *
+ * sync_clear_bit() is atomic and may not be reordered.  However, it does
+ * not contain a memory barrier, so if it is used for locking purposes,
+ * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
+ * in order to ensure changes are visible on other processors.
+ */
+static inline void sync_clear_bit(int nr, volatile unsigned long * addr)
+{
+        __asm__ __volatile__("lock; btrl %1,%0"
+                             :"+m" (ADDR)
+                             :"Ir" (nr)
+                             : "memory");
+}
+/**
+ * sync_change_bit - Toggle a bit in memory
+ * @nr: Bit to change
+ * @addr: Address to start counting from
+ *
+ * change_bit() is atomic and may not be reordered. It may be
+ * reordered on other architectures than x86.
+ * Note that @nr may be almost arbitrarily large; this function is not
+ * restricted to acting on a single-word quantity.
+ */
+static inline void sync_change_bit(int nr, volatile unsigned long * addr)
+{
+        __asm__ __volatile__("lock; btcl %1,%0"
+                             :"+m" (ADDR)
+                             :"Ir" (nr)
+                             : "memory");
+}
+/**
+ * sync_test_and_set_bit - Set a bit and return its old value
+ * @nr: Bit to set
+ * @addr: Address to count from
+ *
+ * This operation is atomic and cannot be reordered.
+ * It may be reordered on other architectures than x86.
+ * It also implies a memory barrier.
+ */
+static inline int sync_test_and_set_bit(int nr, volatile unsigned long * addr)
+{
+        int oldbit;
+        __asm__ __volatile__("lock; btsl %2,%1\n\tsbbl %0,%0"
+                             :"=r" (oldbit),"+m" (ADDR)
+                             :"Ir" (nr) : "memory");
+        return oldbit;
+}
+/**
+ * sync_test_and_clear_bit - Clear a bit and return its old value
+ * @nr: Bit to clear
+ * @addr: Address to count from
+ *
+ * This operation is atomic and cannot be reordered.
+ * It can be reorderdered on other architectures other than x86.
+ * It also implies a memory barrier.
+ */
+static inline int sync_test_and_clear_bit(int nr, volatile unsigned long * addr)
+{
+        int oldbit;
+        __asm__ __volatile__("lock; btrl %2,%1\n\tsbbl %0,%0"
+                             :"=r" (oldbit),"+m" (ADDR)
+                             :"Ir" (nr) : "memory");
+        return oldbit;
+}
+/**
+ * sync_test_and_change_bit - Change a bit and return its old value
+ * @nr: Bit to change
+ * @addr: Address to count from
+ *
+ * This operation is atomic and cannot be reordered.
+ * It also implies a memory barrier.
+ */
+static inline int sync_test_and_change_bit(int nr, volatile unsigned long* addr)
+{
+        int oldbit;
+        __asm__ __volatile__("lock; btcl %2,%1\n\tsbbl %0,%0"
+                             :"=r" (oldbit),"+m" (ADDR)
+                             :"Ir" (nr) : "memory");
+        return oldbit;
+}
+static __always_inline int sync_const_test_bit(int nr, const volatile unsigned long *addr)
+{
+        return ((1UL << (nr & 31)) &
+                (((const volatile unsigned int *)addr)[nr >> 5])) != 0;
+}
+static inline int sync_var_test_bit(int nr, const volatile unsigned long * addr)
+{
+        int oldbit;
+        __asm__ __volatile__("btl %2,%1\n\tsbbl %0,%0"
+                             :"=r" (oldbit)
+                             :"m" (ADDR),"Ir" (nr));
+        return oldbit;
+}
+#define sync_test_bit(nr,addr)                  \
+        (__builtin_constant_p(nr) ?             \
+         sync_constant_test_bit((nr),(addr)) :  \
+         sync_var_test_bit((nr),(addr)))
+#undef ADDR
+#endif /* _I386_SYNC_BITOPS_H */
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 098bcee94e38..a6dabbcd6e6a 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -267,6 +267,9 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
 #define cmpxchg(ptr,o,n)\
        ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
                                        (unsigned long)(n),sizeof(*(ptr))))
+#define sync_cmpxchg(ptr,o,n)\
+        ((__typeof__(*(ptr)))__sync_cmpxchg((ptr),(unsigned long)(o),\
+                                        (unsigned long)(n),sizeof(*(ptr))))
 #endif
 static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
@@ -296,6 +299,39 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
        return old;
 }
+/*
+ * Always use locked operations when touching memory shared with a
+ * hypervisor, since the system may be SMP even if the guest kernel
+ * isn't.
+ */
+static inline unsigned long __sync_cmpxchg(volatile void *ptr,
+                                            unsigned long old,
+                                            unsigned long new, int size)
+{
+        unsigned long prev;
+        switch (size) {
+        case 1:
+                __asm__ __volatile__("lock; cmpxchgb %b1,%2"
+                                     : "=a"(prev)
+                                     : "q"(new), "m"(*__xg(ptr)), "0"(old)
+                                     : "memory");
+                return prev;
+        case 2:
+                __asm__ __volatile__("lock; cmpxchgw %w1,%2"
+                                     : "=a"(prev)
+                                     : "r"(new), "m"(*__xg(ptr)), "0"(old)
+                                     : "memory");
+                return prev;
+        case 4:
+                __asm__ __volatile__("lock; cmpxchgl %1,%2"
+                                     : "=a"(prev)
+                                     : "r"(new), "m"(*__xg(ptr)), "0"(old)
+                                     : "memory");
+                return prev;
+        }
+        return old;
+}
 #ifndef CONFIG_X86_CMPXCHG
 /*
 * Building a kernel capable running on 80386. It may be necessary to
diff --git a/include/asm-i386/therm_throt.h b/include/asm-i386/therm_throt.h
new file mode 100644
index 000000000000..399bf6026b16
--- /dev/null
+++ b/include/asm-i386/therm_throt.h
@@ -0,0 +1,9 @@
+#ifndef __ASM_I386_THERM_THROT_H__
+#define __ASM_I386_THERM_THROT_H__ 1
+#include <asm/atomic.h>
+extern atomic_t therm_throt_en;
+int therm_throt_process(int curr);
+#endif /* __ASM_I386_THERM_THROT_H__ */
diff --git a/include/asm-i386/tlbflush.h b/include/asm-i386/tlbflush.h
index d57ca5c540b6..360648b0f2b3 100644
--- a/include/asm-i386/tlbflush.h
+++ b/include/asm-i386/tlbflush.h
@@ -36,8 +36,6 @@
                        : "memory");                                    \
        } while (0)
-extern unsigned long pgkern_mask;
 # define __flush_tlb_all()                                              \
        do {                                                            \
                if (cpu_has_pge)                                        \
@@ -49,7 +47,7 @@ extern unsigned long pgkern_mask;
 #define cpu_has_invlpg  (boot_cpu_data.x86 > 3)
 #define __flush_tlb_single(addr) \
-        __asm__ __volatile__("invlpg %0": :"m" (*(char *) addr))
+        __asm__ __volatile__("invlpg (%0)" ::"r" (addr) : "memory")
 #ifdef CONFIG_X86_INVLPG
 # define __flush_tlb_one(addr) __flush_tlb_single(addr)
diff --git a/include/asm-i386/tsc.h b/include/asm-i386/tsc.h
index 97b828ce31e0..c13933185c1c 100644
--- a/include/asm-i386/tsc.h
+++ b/include/asm-i386/tsc.h
@@ -6,7 +6,6 @@
 #ifndef _ASM_i386_TSC_H
 #define _ASM_i386_TSC_H
-#include <linux/config.h>
 #include <asm/processor.h>
 /*
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index fc1c8ddae149..bd9987087adc 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -323,18 +323,20 @@
 #define __NR_tee                315
 #define __NR_vmsplice           316
 #define __NR_move_pages         317
+#define __NR_getcpu             318
 #ifdef __KERNEL__
-#define NR_syscalls 318
+#define NR_syscalls 319
+#include <linux/err.h>
 /*
- * user-visible error numbers are in the range -1 - -128: see
+ * user-visible error numbers are in the range -1 - -MAX_ERRNO: see
 * <asm-i386/errno.h>
 */
 #define __syscall_return(type, res) \
 do { \
-        if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
                errno = -(res); \
                res = -1; \
        } \
diff --git a/include/asm-i386/unwind.h b/include/asm-i386/unwind.h
index 4c1a0b968569..5031d693b89d 100644
--- a/include/asm-i386/unwind.h
+++ b/include/asm-i386/unwind.h
@@ -18,6 +18,7 @@ struct unwind_frame_info
 {
        struct pt_regs regs;
        struct task_struct *task;
+        unsigned call_frame:1;
 };
 #define UNW_PC(frame)        (frame)->regs.eip
@@ -28,6 +29,8 @@ struct unwind_frame_info
 #define FRAME_LINK_OFFSET    0
 #define STACK_BOTTOM(tsk)    STACK_LIMIT((tsk)->thread.esp0)
 #define STACK_TOP(tsk)       ((tsk)->thread.esp0)
+#else
+#define UNW_FP(frame) ((void)(frame), 0)
 #endif
 #define STACK_LIMIT(ptr)     (((ptr) - 1) & ~(THREAD_SIZE - 1))
@@ -42,6 +45,10 @@ struct unwind_frame_info
        PTREGS_INFO(edi), \
        PTREGS_INFO(eip)
+#define UNW_DEFAULT_RA(raItem, dataAlign) \
+        ((raItem).where == Memory && \
+         !((raItem).value * (dataAlign) + 4))
 static inline void arch_unw_init_frame_info(struct unwind_frame_info *info,
                                            /*const*/ struct pt_regs *regs)
 {
@@ -88,6 +95,7 @@ static inline int arch_unw_user_mode(const struct unwind_frame_info *info)
 #define UNW_PC(frame) ((void)(frame), 0)
 #define UNW_SP(frame) ((void)(frame), 0)
+#define UNW_FP(frame) ((void)(frame), 0)
 static inline int arch_unw_user_mode(const void *info)
 {
diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
index f1cb00f39c22..15818a18bc52 100644
--- a/include/asm-ia64/Kbuild
+++ b/include/asm-ia64/Kbuild
@@ -1,7 +1,17 @@
 include include/asm-generic/Kbuild.asm
-header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h               \
+header-y += break.h
-         intel_intrin.h intrinsics.h perfmon_default_smpl.h     \
+header-y += fpu.h
-         ptrace_offsets.h rse.h setup.h ucontext.h
+header-y += fpswa.h
+header-y += gcc_intrin.h
+header-y += ia64regs.h
+header-y += intel_intrin.h
+header-y += intrinsics.h
+header-y += perfmon_default_smpl.h
+header-y += ptrace_offsets.h
+header-y += rse.h
+header-y += setup.h
+header-y += ucontext.h
-unifdef-y += perfmon.h ustack.h
+unifdef-y += perfmon.h
+unifdef-y += ustack.h
diff --git a/include/asm-ia64/esi.h b/include/asm-ia64/esi.h
new file mode 100644
index 000000000000..84aac0e0b583
--- /dev/null
+++ b/include/asm-ia64/esi.h
@@ -0,0 +1,30 @@
+/*
+ * ESI service calls.
+ *
+ * Copyright (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P.
+ *      Alex Williamson <alex.williamson@hp.com>
+ */
+#ifndef esi_h
+#define esi_h
+#include <linux/efi.h>
+#define ESI_QUERY                       0x00000001
+#define ESI_OPEN_HANDLE                 0x02000000
+#define ESI_CLOSE_HANDLE                0x02000001
+enum esi_proc_type {
+        ESI_PROC_SERIALIZED,    /* calls need to be serialized */
+        ESI_PROC_MP_SAFE,       /* MP-safe, but not reentrant */
+        ESI_PROC_REENTRANT      /* MP-safe and reentrant */
+};
+extern int ia64_esi_init (void);
+extern struct ia64_sal_retval esi_call_phys (void *, u64 *);
+extern int ia64_esi_call(efi_guid_t, struct ia64_sal_retval *,
+                         enum esi_proc_type,
+                         u64, u64, u64, u64, u64, u64, u64, u64);
+extern int ia64_esi_call_phys(efi_guid_t, struct ia64_sal_retval *, u64, u64,
+                              u64, u64, u64, u64, u64, u64);
+#endif /* esi_h */
diff --git a/include/asm-ia64/futex.h b/include/asm-ia64/futex.h
index 6a332a9f099c..07d77f3a8cbe 100644
--- a/include/asm-ia64/futex.h
+++ b/include/asm-ia64/futex.h
@@ -1,6 +1,124 @@
 #ifndef _ASM_FUTEX_H
 #define _ASM_FUTEX_H
-#include <asm-generic/futex.h>
+#include <linux/futex.h>
+#include <asm/errno.h>
+#include <asm/system.h>
+#include <asm/uaccess.h>
-#endif
+#define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
+do {                                                                    \
+        register unsigned long r8 __asm ("r8") = 0;                     \
+        __asm__ __volatile__(                                           \
+                "       mf;;                                    \n"     \
+                "[1:] " insn ";;                                \n"     \
+                "       .xdata4 \"__ex_table\", 1b-., 2f-.      \n"     \
+                "[2:]"                                                  \
+                : "+r" (r8), "=r" (oldval)                              \
+                : "r" (uaddr), "r" (oparg)                              \
+                : "memory");                                            \
+        ret = r8;                                                       \
+} while (0)
+#define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
+do {                                                                    \
+        register unsigned long r8 __asm ("r8") = 0;                     \
+        int val, newval;                                                \
+        do {                                                            \
+                __asm__ __volatile__(                                   \
+                        "       mf;;                              \n"   \
+                        "[1:]   ld4 %3=[%4];;                     \n"   \
+                        "       mov %2=%3                         \n"   \
+                                insn    ";;                       \n"   \
+                        "       mov ar.ccv=%2;;                   \n"   \
+                        "[2:]   cmpxchg4.acq %1=[%4],%3,ar.ccv;;  \n"   \
+                        "       .xdata4 \"__ex_table\", 1b-., 3f-.\n"   \
+                        "       .xdata4 \"__ex_table\", 2b-., 3f-.\n"   \
+                        "[3:]"                                          \
+                        : "+r" (r8), "=r" (val), "=&r" (oldval),        \
+                           "=&r" (newval)                               \
+                        : "r" (uaddr), "r" (oparg)                      \
+                        : "memory");                                    \
+                if (unlikely (r8))                                      \
+                        break;                                          \
+        } while (unlikely (val != oldval));                             \
+        ret = r8;                                                       \
+} while (0)
+static inline int
+futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
+{
+        int op = (encoded_op >> 28) & 7;
+        int cmp = (encoded_op >> 24) & 15;
+        int oparg = (encoded_op << 8) >> 20;
+        int cmparg = (encoded_op << 20) >> 20;
+        int oldval = 0, ret;
+        if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
+                oparg = 1 << oparg;
+        if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
+                return -EFAULT;
+        inc_preempt_count();
+        switch (op) {
+        case FUTEX_OP_SET:
+                __futex_atomic_op1("xchg4 %1=[%2],%3", ret, oldval, uaddr,
+                                   oparg);
+                break;
+        case FUTEX_OP_ADD:
+                __futex_atomic_op2("add %3=%3,%5", ret, oldval, uaddr, oparg);
+                break;
+        case FUTEX_OP_OR:
+                __futex_atomic_op2("or %3=%3,%5", ret, oldval, uaddr, oparg);
+                break;
+        case FUTEX_OP_ANDN:
+                __futex_atomic_op2("and %3=%3,%5", ret, oldval, uaddr,
+                                   ~oparg);
+                break;
+        case FUTEX_OP_XOR:
+                __futex_atomic_op2("xor %3=%3,%5", ret, oldval, uaddr, oparg);
+                break;
+        default:
+                ret = -ENOSYS;
+        }
+        dec_preempt_count();
+        if (!ret) {
+                switch (cmp) {
+                case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;
+                case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
+                case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;
+                case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;
+                case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;
+                case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;
+                default: ret = -ENOSYS;
+                }
+        }
+        return ret;
+}
+static inline int
+futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
+{
+        if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
+                return -EFAULT;
+        {
+                register unsigned long r8 __asm ("r8");
+                __asm__ __volatile__(
+                        "       mf;;                                    \n"
+                        "       mov ar.ccv=%3;;                         \n"
+                        "[1:]   cmpxchg4.acq %0=[%1],%2,ar.ccv          \n"
+                        "       .xdata4 \"__ex_table\", 1b-., 2f-.      \n"
+                        "[2:]"
+                        : "=r" (r8)
+                        : "r" (uaddr), "r" (newval),
+                          "rO" ((long) (unsigned) oldval)
+                        : "memory");
+                return r8;
+        }
+}
+#endif /* _ASM_FUTEX_H */
diff --git a/include/asm-ia64/kprobes.h b/include/asm-ia64/kprobes.h
index 938904910115..1b45b71c79b9 100644
--- a/include/asm-ia64/kprobes.h
+++ b/include/asm-ia64/kprobes.h
@@ -29,7 +29,8 @@
 #include <linux/percpu.h>
 #include <asm/break.h>
-#define MAX_INSN_SIZE   16
+#define __ARCH_WANT_KPROBES_INSN_SLOT
+#define MAX_INSN_SIZE   1
 #define BREAK_INST      (long)(__IA64_BREAK_KPROBE << 6)
 typedef union cmp_inst {
@@ -94,7 +95,7 @@ struct kprobe_ctlblk {
 #define IP_RELATIVE_PREDICT_OPCODE      (7)
 #define LONG_BRANCH_OPCODE              (0xC)
 #define LONG_CALL_OPCODE                (0xD)
-#define arch_remove_kprobe(p)           do {} while (0)
+#define flush_insn_slot(p)              do { } while (0)
 typedef struct kprobe_opcode {
        bundle_t bundle;
@@ -108,7 +109,7 @@ struct fnptr {
 /* Architecture specific copy of original instruction*/
 struct arch_specific_insn {
        /* copy of the instruction to be emulated */
-        kprobe_opcode_t insn;
+        kprobe_opcode_t *insn;
 #define INST_FLAG_FIX_RELATIVE_IP_ADDR         1
 #define INST_FLAG_FIX_BRANCH_REG               2
 #define INST_FLAG_BREAK_INST                   4
@@ -125,6 +126,6 @@ static inline void jprobe_return(void)
 }
 extern void invalidate_stacked_regs(void);
 extern void flush_register_stack(void);
-extern void flush_insn_slot(struct kprobe *p);
+extern void arch_remove_kprobe(struct kprobe *p);
 #endif                          /* _ASM_KPROBES_H */
diff --git a/include/asm-ia64/mca_asm.h b/include/asm-ia64/mca_asm.h
index 27c9203d8ce3..76203f9a8718 100644
--- a/include/asm-ia64/mca_asm.h
+++ b/include/asm-ia64/mca_asm.h
@@ -197,9 +197,9 @@
        movl    temp2 = start_addr;                             \
        ;;                                                      \
        mov     cr.iip = temp2;                                 \
+        movl    gp = __gp                                       \
        ;;                                                      \
        DATA_PA_TO_VA(sp, temp1);                               \
-        DATA_PA_TO_VA(gp, temp2);                               \
        srlz.i;                                                 \
        ;;                                                      \
        nop     1;                                              \
diff --git a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h
index 6a33a07b3f1d..c3b1f862e6e7 100644
--- a/include/asm-ia64/meminit.h
+++ b/include/asm-ia64/meminit.h
@@ -55,6 +55,7 @@ extern void efi_memmap_init(unsigned long *, unsigned long *);
  extern unsigned long vmalloc_end;
  extern struct page *vmem_map;
  extern int find_largest_hole (u64 start, u64 end, void *arg);
+  extern int register_active_ranges (u64 start, u64 end, void *arg);
  extern int create_mem_map_page_table (u64 start, u64 end, void *arg);
  extern int vmemmap_find_next_valid_pfn(int, int);
 #else
diff --git a/include/asm-ia64/module.h b/include/asm-ia64/module.h
index 85c82bd819f2..d2da61e4c49b 100644
--- a/include/asm-ia64/module.h
+++ b/include/asm-ia64/module.h
@@ -28,7 +28,8 @@ struct mod_arch_specific {
 #define Elf_Ehdr        Elf64_Ehdr
 #define MODULE_PROC_FAMILY      "ia64"
-#define MODULE_ARCH_VERMAGIC    MODULE_PROC_FAMILY
+#define MODULE_ARCH_VERMAGIC    MODULE_PROC_FAMILY \
+        "gcc-" __stringify(__GNUC__) "." __stringify(__GNUC_MINOR__)
 #define ARCH_SHF_SMALL  SHF_IA_64_SHORT
diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
index e5a8260593a5..7d5e2ccc37a0 100644
--- a/include/asm-ia64/numa.h
+++ b/include/asm-ia64/numa.h
@@ -64,7 +64,13 @@ extern int paddr_to_nid(unsigned long paddr);
 #define local_nodeid (cpu_to_node_map[smp_processor_id()])
+extern void map_cpu_to_node(int cpu, int nid);
+extern void unmap_cpu_from_node(int cpu, int nid);
 #else /* !CONFIG_NUMA */
+#define map_cpu_to_node(cpu, nid)       do{}while(0)
+#define unmap_cpu_from_node(cpu, nid)   do{}while(0)
 #define paddr_to_nid(addr)      0
diff --git a/include/asm-ia64/pal.h b/include/asm-ia64/pal.h
index 20a8d618c845..2c8fd92d0ece 100644
--- a/include/asm-ia64/pal.h
+++ b/include/asm-ia64/pal.h
@@ -78,6 +78,7 @@
 #define PAL_VM_TR_READ          261     /* read contents of translation register */
 #define PAL_GET_PSTATE          262     /* get the current P-state */
 #define PAL_SET_PSTATE          263     /* set the P-state */
+#define PAL_BRAND_INFO          274     /* Processor branding information */
 #ifndef __ASSEMBLY__
@@ -963,7 +964,8 @@ static inline s64
 ia64_pal_cache_read (pal_cache_line_id_u_t line_id, u64 physical_addr)
 {
        struct ia64_pal_retval iprv;
-        PAL_CALL(iprv, PAL_CACHE_READ, line_id.pclid_data, physical_addr, 0);
+        PAL_CALL_PHYS_STK(iprv, PAL_CACHE_READ, line_id.pclid_data,
+                                physical_addr, 0);
        return iprv.status;
 }
@@ -985,7 +987,8 @@ static inline s64
 ia64_pal_cache_write (pal_cache_line_id_u_t line_id, u64 physical_addr, u64 data)
 {
        struct ia64_pal_retval iprv;
-        PAL_CALL(iprv, PAL_CACHE_WRITE, line_id.pclid_data, physical_addr, data);
+        PAL_CALL_PHYS_STK(iprv, PAL_CACHE_WRITE, line_id.pclid_data,
+                                physical_addr, data);
        return iprv.status;
 }
@@ -1133,6 +1136,15 @@ ia64_pal_set_pstate (u64 pstate_index)
        return iprv.status;
 }
+/* Processor branding information*/
+static inline s64
+ia64_pal_get_brand_info (char *brand_info)
+{
+        struct ia64_pal_retval iprv;
+        PAL_CALL_STK(iprv, PAL_BRAND_INFO, 0, (u64)brand_info, 0);
+        return iprv.status;
+}
 /* Cause the processor to enter LIGHT HALT state, where prefetching and execution are
 * suspended, but cache and TLB coherency is maintained.
 */
diff --git a/include/asm-ia64/pgtable.h b/include/asm-ia64/pgtable.h
index 228981cadf8f..553182747722 100644
--- a/include/asm-ia64/pgtable.h
+++ b/include/asm-ia64/pgtable.h
@@ -275,21 +275,23 @@ ia64_phys_addr_valid (unsigned long addr)
 #define pmd_bad(pmd)                    (!ia64_phys_addr_valid(pmd_val(pmd)))
 #define pmd_present(pmd)                (pmd_val(pmd) != 0UL)
 #define pmd_clear(pmdp)                 (pmd_val(*(pmdp)) = 0UL)
-#define pmd_page_kernel(pmd)            ((unsigned long) __va(pmd_val(pmd) & _PFN_MASK))
+#define pmd_page_vaddr(pmd)             ((unsigned long) __va(pmd_val(pmd) & _PFN_MASK))
 #define pmd_page(pmd)                   virt_to_page((pmd_val(pmd) + PAGE_OFFSET))
 #define pud_none(pud)                   (!pud_val(pud))
 #define pud_bad(pud)                    (!ia64_phys_addr_valid(pud_val(pud)))
 #define pud_present(pud)                (pud_val(pud) != 0UL)
 #define pud_clear(pudp)                 (pud_val(*(pudp)) = 0UL)
-#define pud_page(pud)                   ((unsigned long) __va(pud_val(pud) & _PFN_MASK))
+#define pud_page_vaddr(pud)             ((unsigned long) __va(pud_val(pud) & _PFN_MASK))
+#define pud_page(pud)                   virt_to_page((pud_val(pud) + PAGE_OFFSET))
 #ifdef CONFIG_PGTABLE_4
 #define pgd_none(pgd)                   (!pgd_val(pgd))
 #define pgd_bad(pgd)                    (!ia64_phys_addr_valid(pgd_val(pgd)))
 #define pgd_present(pgd)                (pgd_val(pgd) != 0UL)
 #define pgd_clear(pgdp)                 (pgd_val(*(pgdp)) = 0UL)
-#define pgd_page(pgd)                   ((unsigned long) __va(pgd_val(pgd) & _PFN_MASK))
+#define pgd_page_vaddr(pgd)             ((unsigned long) __va(pgd_val(pgd) & _PFN_MASK))
+#define pgd_page(pgd)                   virt_to_page((pgd_val(pgd) + PAGE_OFFSET))
 #endif
 /*
@@ -360,19 +362,19 @@ pgd_offset (struct mm_struct *mm, unsigned long address)
 #ifdef CONFIG_PGTABLE_4
 /* Find an entry in the second-level page table.. */
 #define pud_offset(dir,addr) \
-        ((pud_t *) pgd_page(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))
+        ((pud_t *) pgd_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))
 #endif
 /* Find an entry in the third-level page table.. */
 #define pmd_offset(dir,addr) \
-        ((pmd_t *) pud_page(*(dir)) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)))
+        ((pmd_t *) pud_page_vaddr(*(dir)) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)))
 /*
 * Find an entry in the third-level page table.  This looks more complicated than it
 * should be because some platforms place page tables in high memory.
 */
 #define pte_index(addr)         (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset_kernel(dir,addr)     ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(addr))
+#define pte_offset_kernel(dir,addr)     ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr))
 #define pte_offset_map(dir,addr)        pte_offset_kernel(dir, addr)
 #define pte_offset_map_nested(dir,addr) pte_offset_map(dir, addr)
 #define pte_unmap(pte)                  do { } while (0)
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 265f4824db0e..5830d36fd8e6 100644
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -20,12 +20,6 @@
 #include <asm/ustack.h>
 #define IA64_NUM_DBG_REGS       8
-/*
- * Limits for PMC and PMD are set to less than maximum architected values
- * but should be sufficient for a while
- */
-#define IA64_NUM_PMC_REGS       64
-#define IA64_NUM_PMD_REGS       64
 #define DEFAULT_MAP_BASE        __IA64_UL_CONST(0x2000000000000000)
 #define DEFAULT_TASK_SIZE       __IA64_UL_CONST(0xa000000000000000)
@@ -163,6 +157,7 @@ struct cpuinfo_ia64 {
        __u8 family;
        __u8 archrev;
        char vendor[16];
+        char *model_name;
 #ifdef CONFIG_NUMA
        struct ia64_node_data *node_data;
@@ -262,13 +257,9 @@ struct thread_struct {
 # define INIT_THREAD_IA32
 #endif /* CONFIG_IA32_SUPPORT */
 #ifdef CONFIG_PERFMON
-        __u64 pmcs[IA64_NUM_PMC_REGS];
-        __u64 pmds[IA64_NUM_PMD_REGS];
        void *pfm_context;                   /* pointer to detailed PMU context */
        unsigned long pfm_needs_checking;    /* when >0, pending perfmon work on kernel exit */
-# define INIT_THREAD_PM         .pmcs =                 {0UL, },  \
+# define INIT_THREAD_PM         .pfm_context =          NULL,     \
-                                .pmds =                 {0UL, },  \
-                                .pfm_context =          NULL,     \
                                .pfm_needs_checking =   0UL,
 #else
 # define INIT_THREAD_PM
diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index 719ff309ce09..60fd4ae014f6 100644
--- a/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@ -122,12 +122,11 @@ extern void __init smp_build_cpu_map(void);
 extern void __init init_smp_config (void);
 extern void smp_do_timer (struct pt_regs *regs);
-extern int smp_call_function_single (int cpuid, void (*func) (void *info), void *info,
-                                     int retry, int wait);
 extern void smp_send_reschedule (int cpu);
 extern void lock_ipi_calllock(void);
 extern void unlock_ipi_calllock(void);
 extern void identify_siblings (struct cpuinfo_ia64 *);
+extern int is_multithreading_enabled(void);
 #else
diff --git a/include/asm-ia64/spinlock.h b/include/asm-ia64/spinlock.h
index 9e83210dc312..ff857e31738a 100644
--- a/include/asm-ia64/spinlock.h
+++ b/include/asm-ia64/spinlock.h
@@ -213,4 +213,8 @@ static inline int __raw_read_trylock(raw_rwlock_t *x)
        return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word;
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /*  _ASM_IA64_SPINLOCK_H */
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index f581662c5ab8..bb0eb727dcd0 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -286,7 +286,8 @@
 /* 1294, 1295 reserved for pselect/ppoll */
 #define __NR_unshare                    1296
 #define __NR_splice                     1297
-/* 1298, 1299 reserved for set_robust_list/get_robust_list */
+#define __NR_set_robust_list            1298
+#define __NR_get_robust_list            1299
 #define __NR_sync_file_range            1300
 #define __NR_tee                        1301
 #define __NR_vmsplice                   1302
diff --git a/include/asm-m32r/page.h b/include/asm-m32r/page.h
index 9688be003620..404a4c24007b 100644
--- a/include/asm-m32r/page.h
+++ b/include/asm-m32r/page.h
@@ -87,10 +87,9 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define devmem_is_allowed(x) 1
-#endif /* __KERNEL__ */
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
+#endif /* __KERNEL__ */
 #endif /* _ASM_M32R_PAGE_H */
diff --git a/include/asm-m32r/pgtable-2level.h b/include/asm-m32r/pgtable-2level.h
index be0f167e344a..84152760e0b5 100644
--- a/include/asm-m32r/pgtable-2level.h
+++ b/include/asm-m32r/pgtable-2level.h
@@ -44,7 +44,7 @@ static inline int pgd_present(pgd_t pgd)	{ return 1; }
 */
 #define set_pte(pteptr, pteval) (*(pteptr) = pteval)
 #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
-#define set_pte_atomic(pteptr, pteval)  set_pte(pteptr, pteval)
 /*
 * (pmds are folded into pgds so this doesnt get actually called,
 * but the define is needed for a generic inline function.)
@@ -52,9 +52,13 @@ static inline int pgd_present(pgd_t pgd)	{ return 1; }
 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
 #define set_pgd(pgdptr, pgdval) (*(pgdptr) = pgdval)
-#define pgd_page(pgd) \
+#define pgd_page_vaddr(pgd) \
 ((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))
+#ifndef CONFIG_DISCONTIGMEM
+#define pgd_page(pgd)   (mem_map + ((pgd_val(pgd) >> PAGE_SHIFT) - PFN_BASE))
+#endif /* !CONFIG_DISCONTIGMEM */
 static inline pmd_t *pmd_offset(pgd_t * dir, unsigned long address)
 {
        return (pmd_t *) dir;
diff --git a/include/asm-m32r/pgtable.h b/include/asm-m32r/pgtable.h
index 1983b7f4527a..1c15ba7ce319 100644
--- a/include/asm-m32r/pgtable.h
+++ b/include/asm-m32r/pgtable.h
@@ -336,7 +336,7 @@ static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
        pmd_val(*pmdp) = (((unsigned long) ptep) & PAGE_MASK);
 }
-#define pmd_page_kernel(pmd)    \
+#define pmd_page_vaddr(pmd)     \
        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 #ifndef CONFIG_DISCONTIGMEM
@@ -358,7 +358,7 @@ static inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
 #define pte_index(address)      \
        (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
-        ((pte_t *)pmd_page_kernel(*(dir)) + pte_index(address))
+        ((pte_t *)pmd_page_vaddr(*(dir)) + pte_index(address))
 #define pte_offset_map(dir, address)    \
        ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
 #define pte_offset_map_nested(dir, address)     pte_offset_map(dir, address)
diff --git a/include/asm-m32r/ptrace.h b/include/asm-m32r/ptrace.h
index a07fa90314d2..2d2a6c97331e 100644
--- a/include/asm-m32r/ptrace.h
+++ b/include/asm-m32r/ptrace.h
@@ -12,8 +12,6 @@
 *   Copyright (C) 2001-2002, 2004  Hirokazu Takata <takata at linux-m32r.org>
 */
-#include <asm/m32r.h>           /* M32R_PSW_BSM, M32R_PSW_BPM */
 /* 0 - 13 are integer registers (general purpose registers).  */
 #define PT_R4           0
 #define PT_R5           1
@@ -140,6 +138,8 @@ struct pt_regs {
 #ifdef __KERNEL__
+#include <asm/m32r.h>           /* M32R_PSW_BSM, M32R_PSW_BPM */
 #define __ARCH_SYS_PTRACE       1
 #if defined(CONFIG_ISA_M32R2) || defined(CONFIG_CHIP_VDEC2)
diff --git a/include/asm-m32r/signal.h b/include/asm-m32r/signal.h
index e750045164d4..65423bed32b1 100644
--- a/include/asm-m32r/signal.h
+++ b/include/asm-m32r/signal.h
@@ -6,7 +6,6 @@
 /* orig : i386 2.4.18 */
 #include <linux/types.h>
-#include <linux/linkage.h>
 #include <linux/time.h>
 #include <linux/compiler.h>
diff --git a/include/asm-m32r/spinlock.h b/include/asm-m32r/spinlock.h
index f94c1a673569..f5cfba81ee10 100644
--- a/include/asm-m32r/spinlock.h
+++ b/include/asm-m32r/spinlock.h
@@ -298,7 +298,14 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
        );
 }
-#define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
+static inline int __raw_read_trylock(raw_rwlock_t *lock)
+{
+        atomic_t *count = (atomic_t*)lock;
+        if (atomic_dec_return(count) >= 0)
+                return 1;
+        atomic_inc(count);
+        return 0;
+}
 static inline int __raw_write_trylock(raw_rwlock_t *lock)
 {
@@ -309,4 +316,8 @@ static inline int __raw_write_trylock(raw_rwlock_t *lock)
        return 0;
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif  /* _ASM_M32R_SPINLOCK_H */
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 9e618afec6ed..4ce0619f6989 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -328,15 +328,15 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 #define smp_rmb()       rmb()
 #define smp_wmb()       wmb()
 #define smp_read_barrier_depends()      read_barrier_depends()
+#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 #else
 #define smp_mb()        barrier()
 #define smp_rmb()       barrier()
 #define smp_wmb()       barrier()
 #define smp_read_barrier_depends()      do { } while (0)
+#define set_mb(var, value) do { var = value; barrier(); } while (0)
 #endif
-#define set_mb(var, value) do { xchg(&var, value); } while (0)
 #define arch_align_stack(x) (x)
 #endif  /* _ASM_M32R_SYSTEM_H */
diff --git a/include/asm-m32r/timex.h b/include/asm-m32r/timex.h
index e89bfd17db51..019441c1d7a0 100644
--- a/include/asm-m32r/timex.h
+++ b/include/asm-m32r/timex.h
@@ -12,9 +12,6 @@
 #define CLOCK_TICK_RATE (CONFIG_BUS_CLOCK / CONFIG_TIMER_DIVIDE)
 #define CLOCK_TICK_FACTOR       20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
-        (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \
-                << (SHIFT_SCALE-SHIFT_HZ)) / HZ)
 #ifdef __KERNEL__
 /*
diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h
index cc31790d8077..5c6a9ac6cf1a 100644
--- a/include/asm-m32r/unistd.h
+++ b/include/asm-m32r/unistd.h
@@ -3,8 +3,6 @@
 /* $Id$ */
-#include <asm/syscall.h>        /* SYSCALL_* */
 /*
 * This file contains the system call numbers.
 */
@@ -298,14 +296,17 @@
 #ifdef __KERNEL__
 #define NR_syscalls 285
+#include <linux/err.h>
-/* user-visible error numbers are in the range -1 - -124: see
+/* user-visible error numbers are in the range -1 - -MAX_ERRNO: see
 * <asm-m32r/errno.h>
 */
+#include <asm/syscall.h>        /* SYSCALL_* */
 #define __syscall_return(type, res) \
 do { \
-        if ((unsigned long)(res) >= (unsigned long)(-(124 + 1))) { \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
        /* Avoid using "res" which is declared to be in register r0; \
           errno might expand to a function call and clobber it.  */ \
                int __err = -(res); \
diff --git a/include/asm-m32r/user.h b/include/asm-m32r/user.h
index 2ffd0c65a782..1ad4ded8483b 100644
--- a/include/asm-m32r/user.h
+++ b/include/asm-m32r/user.h
@@ -8,7 +8,6 @@
 */
 #include <linux/types.h>
-#include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
diff --git a/include/asm-m68k/motorola_pgtable.h b/include/asm-m68k/motorola_pgtable.h
index 1ccc7338a54b..61e4406ed96a 100644
--- a/include/asm-m68k/motorola_pgtable.h
+++ b/include/asm-m68k/motorola_pgtable.h
@@ -150,6 +150,7 @@ static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)
 #define pgd_bad(pgd)            ((pgd_val(pgd) & _DESCTYPE_MASK) != _PAGE_TABLE)
 #define pgd_present(pgd)        (pgd_val(pgd) & _PAGE_TABLE)
 #define pgd_clear(pgdp)         ({ pgd_val(*pgdp) = 0; })
+#define pgd_page(pgd)           (mem_map + ((unsigned long)(__va(pgd_val(pgd)) - PAGE_OFFSET) >> PAGE_SHIFT))
 #define pte_ERROR(e) \
        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h
index 7c0b6296b45c..751632b904db 100644
--- a/include/asm-m68k/unistd.h
+++ b/include/asm-m68k/unistd.h
@@ -288,13 +288,14 @@
 #ifdef __KERNEL__
 #define NR_syscalls             282
+#include <linux/err.h>
-/* user-visible error numbers are in the range -1 - -124: see
+/* user-visible error numbers are in the range -1 - -MAX_ERRNO: see
   <asm-m68k/errno.h> */
 #define __syscall_return(type, res) \
 do { \
-        if ((unsigned long)(res) >= (unsigned long)(-125)) { \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
        /* avoid using res which is declared to be in register d0; \
           errno might expand to a function call and clobber it.  */ \
                int __err = -(res); \
diff --git a/include/asm-m68knommu/page.h b/include/asm-m68knommu/page.h
index a22bf5a88160..2a1b8bdcb29c 100644
--- a/include/asm-m68knommu/page.h
+++ b/include/asm-m68knommu/page.h
@@ -1,6 +1,7 @@
 #ifndef _M68KNOMMU_PAGE_H
 #define _M68KNOMMU_PAGE_H
+#ifdef __KERNEL__
 /* PAGE_SHIFT determines the page size */
@@ -8,8 +9,6 @@
 #define PAGE_SIZE       (1UL << PAGE_SHIFT)
 #define PAGE_MASK       (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
 #include <asm/setup.h>
 #ifndef __ASSEMBLY__
@@ -76,8 +75,8 @@ extern unsigned long memory_end;
 #endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #include <asm-generic/page.h>
+#endif /* __KERNEL__ */
 #endif /* _M68KNOMMU_PAGE_H */
diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h
index 1b2abdf281e1..21fdc37c5c2c 100644
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
@@ -289,13 +289,14 @@
 #ifdef __KERNEL__
 #define NR_syscalls             282
+#include <linux/err.h>
-/* user-visible error numbers are in the range -1 - -122: see
+/* user-visible error numbers are in the range -1 - -MAX_ERRNO: see
   <asm-m68k/errno.h> */
 #define __syscall_return(type, res) \
 do { \
-        if ((unsigned long)(res) >= (unsigned long)(-125)) { \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
        /* avoid using res which is declared to be in register d0; \
           errno might expand to a function call and clobber it.  */ \
                int __err = -(res); \
diff --git a/include/asm-mips/Kbuild b/include/asm-mips/Kbuild
index c68e1680da01..7897f05e3165 100644
--- a/include/asm-mips/Kbuild
+++ b/include/asm-mips/Kbuild
@@ -1 +1,3 @@
 include include/asm-generic/Kbuild.asm
+header-y += cachectl.h sgidefs.h sysmips.h
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index 3b745e76f429..78c35ec46362 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -112,8 +112,7 @@
 * Valid machtype for group GALILEO
 */
 #define MACH_GROUP_GALILEO     11       /* Galileo Eval Boards          */
-#define  MACH_EV96100           0       /* EV96100 */
+#define  MACH_EV64120A          0       /* EV64120A */
-#define  MACH_EV64120A          1       /* EV64120A */
 /*
 * Valid machtype for group MOMENCO
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h
index 47bc8f6c20d2..36416fdfcf68 100644
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
@@ -21,7 +21,6 @@
 *  - flush_cache_range(vma, start, end) flushes a range of pages
 *  - flush_icache_range(start, end) flush a range of instructions
 *  - flush_dcache_page(pg) flushes(wback&invalidates) a page for dcache
- *  - flush_icache_page(vma, pg) flushes(invalidates) a page for icache
 *
 * MIPS specific flush operations:
 *
@@ -39,7 +38,7 @@ extern void __flush_dcache_page(struct page *page);
 static inline void flush_dcache_page(struct page *page)
 {
-        if (cpu_has_dc_aliases)
+        if (cpu_has_dc_aliases || !cpu_has_ic_fills_f_dc)
                __flush_dcache_page(page);
 }
@@ -47,8 +46,13 @@ static inline void flush_dcache_page(struct page *page)
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-extern void (*flush_icache_page)(struct vm_area_struct *vma,
+extern void (*__flush_icache_page)(struct vm_area_struct *vma,
        struct page *page);
+static inline void flush_icache_page(struct vm_area_struct *vma,
+        struct page *page)
+{
+}
 extern void (*flush_icache_range)(unsigned long start, unsigned long end);
 #define flush_cache_vmap(start, end)            flush_cache_all()
 #define flush_cache_vunmap(start, end)          flush_cache_all()
@@ -60,7 +64,7 @@ static inline void copy_to_user_page(struct vm_area_struct *vma,
        if (cpu_has_dc_aliases)
                flush_cache_page(vma, vaddr, page_to_pfn(page));
        memcpy(dst, src, len);
-        flush_icache_page(vma, page);
+        __flush_icache_page(vma, page);
 }
 static inline void copy_from_user_page(struct vm_area_struct *vma,
diff --git a/include/asm-mips/fcntl.h b/include/asm-mips/fcntl.h
index 787220e6c1fc..00a50ec1c19f 100644
--- a/include/asm-mips/fcntl.h
+++ b/include/asm-mips/fcntl.h
@@ -25,8 +25,6 @@
 #define F_SETOWN        24      /*  for sockets. */
 #define F_GETOWN        23      /*  for sockets. */
-#define F_SETSIG        10      /*  for sockets. */
-#define F_GETSIG        11      /*  for sockets. */
 #ifndef __mips64
 #define F_GETLK64       33      /*  using 'struct flock64' */
diff --git a/include/asm-mips/galileo-boards/gt96100.h b/include/asm-mips/galileo-boards/gt96100.h
deleted file mode 100644
index aabd1b629c19..000000000000
--- a/include/asm-mips/galileo-boards/gt96100.h
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Copyright 2000 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *              stevel@mvista.com or source@mvista.com
- *
- *  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.
- *
- * Register offsets of the MIPS GT96100 Advanced Communication Controller.
- */
-#ifndef _GT96100_H
-#define _GT96100_H
-/*
- * Galileo GT96100 internal register base.
- */
-#define MIPS_GT96100_BASE (KSEG1ADDR(0x14000000))
-#define GT96100_WRITE(ofs, data) \
-    *(volatile u32 *)(MIPS_GT96100_BASE+ofs) = cpu_to_le32(data)
-#define GT96100_READ(ofs) \
-    le32_to_cpu(*(volatile u32 *)(MIPS_GT96100_BASE+ofs))
-#define GT96100_ETH_IO_SIZE 0x4000
-/************************************************************************
- *  Register offset addresses follow
- ************************************************************************/
-/* CPU Interface Control Registers */
-#define GT96100_CPU_INTERF_CONFIG 0x000000
-/* Ethernet Ports */
-#define GT96100_ETH_PHY_ADDR_REG             0x080800
-#define GT96100_ETH_SMI_REG                  0x080810
-/*
-  These are offsets to port 0 registers. Add GT96100_ETH_IO_SIZE to
-  get offsets to port 1 registers.
-*/
-#define GT96100_ETH_PORT_CONFIG          0x084800
-#define GT96100_ETH_PORT_CONFIG_EXT      0x084808
-#define GT96100_ETH_PORT_COMM            0x084810
-#define GT96100_ETH_PORT_STATUS          0x084818
-#define GT96100_ETH_SER_PARAM            0x084820
-#define GT96100_ETH_HASH_TBL_PTR         0x084828
-#define GT96100_ETH_FLOW_CNTRL_SRC_ADDR_L    0x084830
-#define GT96100_ETH_FLOW_CNTRL_SRC_ADDR_H    0x084838
-#define GT96100_ETH_SDMA_CONFIG          0x084840
-#define GT96100_ETH_SDMA_COMM            0x084848
-#define GT96100_ETH_INT_CAUSE            0x084850
-#define GT96100_ETH_INT_MASK             0x084858
-#define GT96100_ETH_1ST_RX_DESC_PTR0         0x084880
-#define GT96100_ETH_1ST_RX_DESC_PTR1         0x084884
-#define GT96100_ETH_1ST_RX_DESC_PTR2         0x084888
-#define GT96100_ETH_1ST_RX_DESC_PTR3         0x08488C
-#define GT96100_ETH_CURR_RX_DESC_PTR0        0x0848A0
-#define GT96100_ETH_CURR_RX_DESC_PTR1        0x0848A4
-#define GT96100_ETH_CURR_RX_DESC_PTR2        0x0848A8
-#define GT96100_ETH_CURR_RX_DESC_PTR3        0x0848AC
-#define GT96100_ETH_CURR_TX_DESC_PTR0        0x0848E0
-#define GT96100_ETH_CURR_TX_DESC_PTR1        0x0848E4
-#define GT96100_ETH_MIB_COUNT_BASE           0x085800
-/* SDMAs */
-#define GT96100_SDMA_GROUP_CONFIG           0x101AF0
-/* SDMA Group 0 */
-#define GT96100_SDMA_G0_CHAN0_CONFIG        0x000900
-#define GT96100_SDMA_G0_CHAN0_COMM          0x000908
-#define GT96100_SDMA_G0_CHAN0_RX_DESC_BASE      0x008900
-#define GT96100_SDMA_G0_CHAN0_CURR_RX_DESC_PTR  0x008910
-#define GT96100_SDMA_G0_CHAN0_TX_DESC_BASE      0x00C900
-#define GT96100_SDMA_G0_CHAN0_CURR_TX_DESC_PTR  0x00C910
-#define GT96100_SDMA_G0_CHAN0_1ST_TX_DESC_PTR   0x00C914
-#define GT96100_SDMA_G0_CHAN1_CONFIG        0x010900
-#define GT96100_SDMA_G0_CHAN1_COMM          0x010908
-#define GT96100_SDMA_G0_CHAN1_RX_DESC_BASE      0x018900
-#define GT96100_SDMA_G0_CHAN1_CURR_RX_DESC_PTR  0x018910
-#define GT96100_SDMA_G0_CHAN1_TX_DESC_BASE      0x01C900
-#define GT96100_SDMA_G0_CHAN1_CURR_TX_DESC_PTR  0x01C910
-#define GT96100_SDMA_G0_CHAN1_1ST_TX_DESC_PTR   0x01C914
-#define GT96100_SDMA_G0_CHAN2_CONFIG        0x020900
-#define GT96100_SDMA_G0_CHAN2_COMM          0x020908
-#define GT96100_SDMA_G0_CHAN2_RX_DESC_BASE      0x028900
-#define GT96100_SDMA_G0_CHAN2_CURR_RX_DESC_PTR  0x028910
-#define GT96100_SDMA_G0_CHAN2_TX_DESC_BASE      0x02C900
-#define GT96100_SDMA_G0_CHAN2_CURR_TX_DESC_PTR  0x02C910
-#define GT96100_SDMA_G0_CHAN2_1ST_TX_DESC_PTR   0x02C914
-#define GT96100_SDMA_G0_CHAN3_CONFIG        0x030900
-#define GT96100_SDMA_G0_CHAN3_COMM          0x030908
-#define GT96100_SDMA_G0_CHAN3_RX_DESC_BASE      0x038900
-#define GT96100_SDMA_G0_CHAN3_CURR_RX_DESC_PTR  0x038910
-#define GT96100_SDMA_G0_CHAN3_TX_DESC_BASE      0x03C900
-#define GT96100_SDMA_G0_CHAN3_CURR_TX_DESC_PTR  0x03C910
-#define GT96100_SDMA_G0_CHAN3_1ST_TX_DESC_PTR   0x03C914
-#define GT96100_SDMA_G0_CHAN4_CONFIG        0x040900
-#define GT96100_SDMA_G0_CHAN4_COMM          0x040908
-#define GT96100_SDMA_G0_CHAN4_RX_DESC_BASE      0x048900
-#define GT96100_SDMA_G0_CHAN4_CURR_RX_DESC_PTR  0x048910
-#define GT96100_SDMA_G0_CHAN4_TX_DESC_BASE      0x04C900
-#define GT96100_SDMA_G0_CHAN4_CURR_TX_DESC_PTR  0x04C910
-#define GT96100_SDMA_G0_CHAN4_1ST_TX_DESC_PTR   0x04C914
-#define GT96100_SDMA_G0_CHAN5_CONFIG        0x050900
-#define GT96100_SDMA_G0_CHAN5_COMM          0x050908
-#define GT96100_SDMA_G0_CHAN5_RX_DESC_BASE      0x058900
-#define GT96100_SDMA_G0_CHAN5_CURR_RX_DESC_PTR  0x058910
-#define GT96100_SDMA_G0_CHAN5_TX_DESC_BASE      0x05C900
-#define GT96100_SDMA_G0_CHAN5_CURR_TX_DESC_PTR  0x05C910
-#define GT96100_SDMA_G0_CHAN5_1ST_TX_DESC_PTR   0x05C914
-#define GT96100_SDMA_G0_CHAN6_CONFIG        0x060900
-#define GT96100_SDMA_G0_CHAN6_COMM          0x060908
-#define GT96100_SDMA_G0_CHAN6_RX_DESC_BASE      0x068900
-#define GT96100_SDMA_G0_CHAN6_CURR_RX_DESC_PTR  0x068910
-#define GT96100_SDMA_G0_CHAN6_TX_DESC_BASE      0x06C900
-#define GT96100_SDMA_G0_CHAN6_CURR_TX_DESC_PTR  0x06C910
-#define GT96100_SDMA_G0_CHAN6_1ST_TX_DESC_PTR   0x06C914
-#define GT96100_SDMA_G0_CHAN7_CONFIG        0x070900
-#define GT96100_SDMA_G0_CHAN7_COMM          0x070908
-#define GT96100_SDMA_G0_CHAN7_RX_DESC_BASE      0x078900
-#define GT96100_SDMA_G0_CHAN7_CURR_RX_DESC_PTR  0x078910
-#define GT96100_SDMA_G0_CHAN7_TX_DESC_BASE      0x07C900
-#define GT96100_SDMA_G0_CHAN7_CURR_TX_DESC_PTR  0x07C910
-#define GT96100_SDMA_G0_CHAN7_1ST_TX_DESC_PTR   0x07C914
-/* SDMA Group 1 */
-#define GT96100_SDMA_G1_CHAN0_CONFIG        0x100900
-#define GT96100_SDMA_G1_CHAN0_COMM          0x100908
-#define GT96100_SDMA_G1_CHAN0_RX_DESC_BASE      0x108900
-#define GT96100_SDMA_G1_CHAN0_CURR_RX_DESC_PTR  0x108910
-#define GT96100_SDMA_G1_CHAN0_TX_DESC_BASE      0x10C900
-#define GT96100_SDMA_G1_CHAN0_CURR_TX_DESC_PTR  0x10C910
-#define GT96100_SDMA_G1_CHAN0_1ST_TX_DESC_PTR   0x10C914
-#define GT96100_SDMA_G1_CHAN1_CONFIG        0x110900
-#define GT96100_SDMA_G1_CHAN1_COMM          0x110908
-#define GT96100_SDMA_G1_CHAN1_RX_DESC_BASE      0x118900
-#define GT96100_SDMA_G1_CHAN1_CURR_RX_DESC_PTR  0x118910
-#define GT96100_SDMA_G1_CHAN1_TX_DESC_BASE      0x11C900
-#define GT96100_SDMA_G1_CHAN1_CURR_TX_DESC_PTR  0x11C910
-#define GT96100_SDMA_G1_CHAN1_1ST_TX_DESC_PTR   0x11C914
-#define GT96100_SDMA_G1_CHAN2_CONFIG        0x120900
-#define GT96100_SDMA_G1_CHAN2_COMM          0x120908
-#define GT96100_SDMA_G1_CHAN2_RX_DESC_BASE      0x128900
-#define GT96100_SDMA_G1_CHAN2_CURR_RX_DESC_PTR  0x128910
-#define GT96100_SDMA_G1_CHAN2_TX_DESC_BASE      0x12C900
-#define GT96100_SDMA_G1_CHAN2_CURR_TX_DESC_PTR  0x12C910
-#define GT96100_SDMA_G1_CHAN2_1ST_TX_DESC_PTR   0x12C914
-#define GT96100_SDMA_G1_CHAN3_CONFIG        0x130900
-#define GT96100_SDMA_G1_CHAN3_COMM          0x130908
-#define GT96100_SDMA_G1_CHAN3_RX_DESC_BASE      0x138900
-#define GT96100_SDMA_G1_CHAN3_CURR_RX_DESC_PTR  0x138910
-#define GT96100_SDMA_G1_CHAN3_TX_DESC_BASE      0x13C900
-#define GT96100_SDMA_G1_CHAN3_CURR_TX_DESC_PTR  0x13C910
-#define GT96100_SDMA_G1_CHAN3_1ST_TX_DESC_PTR   0x13C914
-#define GT96100_SDMA_G1_CHAN4_CONFIG        0x140900
-#define GT96100_SDMA_G1_CHAN4_COMM          0x140908
-#define GT96100_SDMA_G1_CHAN4_RX_DESC_BASE      0x148900
-#define GT96100_SDMA_G1_CHAN4_CURR_RX_DESC_PTR  0x148910
-#define GT96100_SDMA_G1_CHAN4_TX_DESC_BASE      0x14C900
-#define GT96100_SDMA_G1_CHAN4_CURR_TX_DESC_PTR  0x14C910
-#define GT96100_SDMA_G1_CHAN4_1ST_TX_DESC_PTR   0x14C914
-#define GT96100_SDMA_G1_CHAN5_CONFIG        0x150900
-#define GT96100_SDMA_G1_CHAN5_COMM          0x150908
-#define GT96100_SDMA_G1_CHAN5_RX_DESC_BASE      0x158900
-#define GT96100_SDMA_G1_CHAN5_CURR_RX_DESC_PTR  0x158910
-#define GT96100_SDMA_G1_CHAN5_TX_DESC_BASE      0x15C900
-#define GT96100_SDMA_G1_CHAN5_CURR_TX_DESC_PTR  0x15C910
-#define GT96100_SDMA_G1_CHAN5_1ST_TX_DESC_PTR   0x15C914
-#define GT96100_SDMA_G1_CHAN6_CONFIG        0x160900
-#define GT96100_SDMA_G1_CHAN6_COMM          0x160908
-#define GT96100_SDMA_G1_CHAN6_RX_DESC_BASE      0x168900
-#define GT96100_SDMA_G1_CHAN6_CURR_RX_DESC_PTR  0x168910
-#define GT96100_SDMA_G1_CHAN6_TX_DESC_BASE      0x16C900
-#define GT96100_SDMA_G1_CHAN6_CURR_TX_DESC_PTR  0x16C910
-#define GT96100_SDMA_G1_CHAN6_1ST_TX_DESC_PTR   0x16C914
-#define GT96100_SDMA_G1_CHAN7_CONFIG        0x170900
-#define GT96100_SDMA_G1_CHAN7_COMM          0x170908
-#define GT96100_SDMA_G1_CHAN7_RX_DESC_BASE      0x178900
-#define GT96100_SDMA_G1_CHAN7_CURR_RX_DESC_PTR  0x178910
-#define GT96100_SDMA_G1_CHAN7_TX_DESC_BASE      0x17C900
-#define GT96100_SDMA_G1_CHAN7_CURR_TX_DESC_PTR  0x17C910
-#define GT96100_SDMA_G1_CHAN7_1ST_TX_DESC_PTR   0x17C914
-/*  MPSCs  */
-#define GT96100_MPSC0_MAIN_CONFIG_LOW   0x000A00
-#define GT96100_MPSC0_MAIN_CONFIG_HIGH  0x000A04
-#define GT96100_MPSC0_PROTOCOL_CONFIG   0x000A08
-#define GT96100_MPSC_CHAN0_REG1         0x000A0C
-#define GT96100_MPSC_CHAN0_REG2         0x000A10
-#define GT96100_MPSC_CHAN0_REG3         0x000A14
-#define GT96100_MPSC_CHAN0_REG4         0x000A18
-#define GT96100_MPSC_CHAN0_REG5         0x000A1C
-#define GT96100_MPSC_CHAN0_REG6         0x000A20
-#define GT96100_MPSC_CHAN0_REG7         0x000A24
-#define GT96100_MPSC_CHAN0_REG8         0x000A28
-#define GT96100_MPSC_CHAN0_REG9         0x000A2C
-#define GT96100_MPSC_CHAN0_REG10        0x000A30
-#define GT96100_MPSC_CHAN0_REG11        0x000A34
-#define GT96100_MPSC1_MAIN_CONFIG_LOW   0x008A00
-#define GT96100_MPSC1_MAIN_CONFIG_HIGH  0x008A04
-#define GT96100_MPSC1_PROTOCOL_CONFIG   0x008A08
-#define GT96100_MPSC_CHAN1_REG1         0x008A0C
-#define GT96100_MPSC_CHAN1_REG2         0x008A10
-#define GT96100_MPSC_CHAN1_REG3         0x008A14
-#define GT96100_MPSC_CHAN1_REG4         0x008A18
-#define GT96100_MPSC_CHAN1_REG5         0x008A1C
-#define GT96100_MPSC_CHAN1_REG6         0x008A20
-#define GT96100_MPSC_CHAN1_REG7         0x008A24
-#define GT96100_MPSC_CHAN1_REG8         0x008A28
-#define GT96100_MPSC_CHAN1_REG9         0x008A2C
-#define GT96100_MPSC_CHAN1_REG10        0x008A30
-#define GT96100_MPSC_CHAN1_REG11        0x008A34
-#define GT96100_MPSC2_MAIN_CONFIG_LOW   0x010A00
-#define GT96100_MPSC2_MAIN_CONFIG_HIGH  0x010A04
-#define GT96100_MPSC2_PROTOCOL_CONFIG   0x010A08
-#define GT96100_MPSC_CHAN2_REG1         0x010A0C
-#define GT96100_MPSC_CHAN2_REG2         0x010A10
-#define GT96100_MPSC_CHAN2_REG3         0x010A14
-#define GT96100_MPSC_CHAN2_REG4         0x010A18
-#define GT96100_MPSC_CHAN2_REG5         0x010A1C
-#define GT96100_MPSC_CHAN2_REG6         0x010A20
-#define GT96100_MPSC_CHAN2_REG7         0x010A24
-#define GT96100_MPSC_CHAN2_REG8         0x010A28
-#define GT96100_MPSC_CHAN2_REG9         0x010A2C
-#define GT96100_MPSC_CHAN2_REG10        0x010A30
-#define GT96100_MPSC_CHAN2_REG11        0x010A34
-#define GT96100_MPSC3_MAIN_CONFIG_LOW   0x018A00
-#define GT96100_MPSC3_MAIN_CONFIG_HIGH  0x018A04
-#define GT96100_MPSC3_PROTOCOL_CONFIG   0x018A08
-#define GT96100_MPSC_CHAN3_REG1         0x018A0C
-#define GT96100_MPSC_CHAN3_REG2         0x018A10
-#define GT96100_MPSC_CHAN3_REG3         0x018A14
-#define GT96100_MPSC_CHAN3_REG4         0x018A18
-#define GT96100_MPSC_CHAN3_REG5         0x018A1C
-#define GT96100_MPSC_CHAN3_REG6         0x018A20
-#define GT96100_MPSC_CHAN3_REG7         0x018A24
-#define GT96100_MPSC_CHAN3_REG8         0x018A28
-#define GT96100_MPSC_CHAN3_REG9         0x018A2C
-#define GT96100_MPSC_CHAN3_REG10        0x018A30
-#define GT96100_MPSC_CHAN3_REG11        0x018A34
-#define GT96100_MPSC4_MAIN_CONFIG_LOW   0x020A00
-#define GT96100_MPSC4_MAIN_CONFIG_HIGH  0x020A04
-#define GT96100_MPSC4_PROTOCOL_CONFIG   0x020A08
-#define GT96100_MPSC_CHAN4_REG1         0x020A0C
-#define GT96100_MPSC_CHAN4_REG2         0x020A10
-#define GT96100_MPSC_CHAN4_REG3         0x020A14
-#define GT96100_MPSC_CHAN4_REG4         0x020A18
-#define GT96100_MPSC_CHAN4_REG5         0x020A1C
-#define GT96100_MPSC_CHAN4_REG6         0x020A20
-#define GT96100_MPSC_CHAN4_REG7         0x020A24
-#define GT96100_MPSC_CHAN4_REG8         0x020A28
-#define GT96100_MPSC_CHAN4_REG9         0x020A2C
-#define GT96100_MPSC_CHAN4_REG10        0x020A30
-#define GT96100_MPSC_CHAN4_REG11        0x020A34
-#define GT96100_MPSC5_MAIN_CONFIG_LOW   0x028A00
-#define GT96100_MPSC5_MAIN_CONFIG_HIGH  0x028A04
-#define GT96100_MPSC5_PROTOCOL_CONFIG   0x028A08
-#define GT96100_MPSC_CHAN5_REG1         0x028A0C
-#define GT96100_MPSC_CHAN5_REG2         0x028A10
-#define GT96100_MPSC_CHAN5_REG3         0x028A14
-#define GT96100_MPSC_CHAN5_REG4         0x028A18
-#define GT96100_MPSC_CHAN5_REG5         0x028A1C
-#define GT96100_MPSC_CHAN5_REG6         0x028A20
-#define GT96100_MPSC_CHAN5_REG7         0x028A24
-#define GT96100_MPSC_CHAN5_REG8         0x028A28
-#define GT96100_MPSC_CHAN5_REG9         0x028A2C
-#define GT96100_MPSC_CHAN5_REG10        0x028A30
-#define GT96100_MPSC_CHAN5_REG11        0x028A34
-#define GT96100_MPSC6_MAIN_CONFIG_LOW   0x030A00
-#define GT96100_MPSC6_MAIN_CONFIG_HIGH  0x030A04
-#define GT96100_MPSC6_PROTOCOL_CONFIG   0x030A08
-#define GT96100_MPSC_CHAN6_REG1         0x030A0C
-#define GT96100_MPSC_CHAN6_REG2         0x030A10
-#define GT96100_MPSC_CHAN6_REG3         0x030A14
-#define GT96100_MPSC_CHAN6_REG4         0x030A18
-#define GT96100_MPSC_CHAN6_REG5         0x030A1C
-#define GT96100_MPSC_CHAN6_REG6         0x030A20
-#define GT96100_MPSC_CHAN6_REG7         0x030A24
-#define GT96100_MPSC_CHAN6_REG8         0x030A28
-#define GT96100_MPSC_CHAN6_REG9         0x030A2C
-#define GT96100_MPSC_CHAN6_REG10        0x030A30
-#define GT96100_MPSC_CHAN6_REG11        0x030A34
-#define GT96100_MPSC7_MAIN_CONFIG_LOW   0x038A00
-#define GT96100_MPSC7_MAIN_CONFIG_HIGH  0x038A04
-#define GT96100_MPSC7_PROTOCOL_CONFIG   0x038A08
-#define GT96100_MPSC_CHAN7_REG1         0x038A0C
-#define GT96100_MPSC_CHAN7_REG2         0x038A10
-#define GT96100_MPSC_CHAN7_REG3         0x038A14
-#define GT96100_MPSC_CHAN7_REG4         0x038A18
-#define GT96100_MPSC_CHAN7_REG5         0x038A1C
-#define GT96100_MPSC_CHAN7_REG6         0x038A20
-#define GT96100_MPSC_CHAN7_REG7         0x038A24
-#define GT96100_MPSC_CHAN7_REG8         0x038A28
-#define GT96100_MPSC_CHAN7_REG9         0x038A2C
-#define GT96100_MPSC_CHAN7_REG10        0x038A30
-#define GT96100_MPSC_CHAN7_REG11        0x038A34
-/*  FlexTDMs  */
-/* TDPR0 - Transmit Dual Port RAM. block size 0xff */
-#define GT96100_FXTDM0_TDPR0_BLK0_BASE  0x000B00
-#define GT96100_FXTDM0_TDPR0_BLK1_BASE  0x001B00
-#define GT96100_FXTDM0_TDPR0_BLK2_BASE  0x002B00
-#define GT96100_FXTDM0_TDPR0_BLK3_BASE  0x003B00
-/* RDPR0 - Receive Dual Port RAM. block size 0xff */
-#define GT96100_FXTDM0_RDPR0_BLK0_BASE  0x004B00
-#define GT96100_FXTDM0_RDPR0_BLK1_BASE  0x005B00
-#define GT96100_FXTDM0_RDPR0_BLK2_BASE  0x006B00
-#define GT96100_FXTDM0_RDPR0_BLK3_BASE  0x007B00
-#define GT96100_FXTDM0_TX_READ_PTR      0x008B00
-#define GT96100_FXTDM0_RX_READ_PTR      0x008B04
-#define GT96100_FXTDM0_CONFIG       0x008B08
-#define GT96100_FXTDM0_AUX_CHANA_TX 0x008B0C
-#define GT96100_FXTDM0_AUX_CHANA_RX 0x008B10
-#define GT96100_FXTDM0_AUX_CHANB_TX 0x008B14
-#define GT96100_FXTDM0_AUX_CHANB_RX 0x008B18
-#define GT96100_FXTDM1_TDPR1_BLK0_BASE  0x010B00
-#define GT96100_FXTDM1_TDPR1_BLK1_BASE  0x011B00
-#define GT96100_FXTDM1_TDPR1_BLK2_BASE  0x012B00
-#define GT96100_FXTDM1_TDPR1_BLK3_BASE  0x013B00
-#define GT96100_FXTDM1_RDPR1_BLK0_BASE  0x014B00
-#define GT96100_FXTDM1_RDPR1_BLK1_BASE  0x015B00
-#define GT96100_FXTDM1_RDPR1_BLK2_BASE  0x016B00
-#define GT96100_FXTDM1_RDPR1_BLK3_BASE  0x017B00
-#define GT96100_FXTDM1_TX_READ_PTR      0x018B00
-#define GT96100_FXTDM1_RX_READ_PTR      0x018B04
-#define GT96100_FXTDM1_CONFIG       0x018B08
-#define GT96100_FXTDM1_AUX_CHANA_TX 0x018B0C
-#define GT96100_FXTDM1_AUX_CHANA_RX 0x018B10
-#define GT96100_FLTDM1_AUX_CHANB_TX 0x018B14
-#define GT96100_FLTDM1_AUX_CHANB_RX 0x018B18
-#define GT96100_FLTDM2_TDPR2_BLK0_BASE  0x020B00
-#define GT96100_FLTDM2_TDPR2_BLK1_BASE  0x021B00
-#define GT96100_FLTDM2_TDPR2_BLK2_BASE  0x022B00
-#define GT96100_FLTDM2_TDPR2_BLK3_BASE  0x023B00
-#define GT96100_FLTDM2_RDPR2_BLK0_BASE  0x024B00
-#define GT96100_FLTDM2_RDPR2_BLK1_BASE  0x025B00
-#define GT96100_FLTDM2_RDPR2_BLK2_BASE  0x026B00
-#define GT96100_FLTDM2_RDPR2_BLK3_BASE  0x027B00
-#define GT96100_FLTDM2_TX_READ_PTR      0x028B00
-#define GT96100_FLTDM2_RX_READ_PTR      0x028B04
-#define GT96100_FLTDM2_CONFIG       0x028B08
-#define GT96100_FLTDM2_AUX_CHANA_TX 0x028B0C
-#define GT96100_FLTDM2_AUX_CHANA_RX 0x028B10
-#define GT96100_FLTDM2_AUX_CHANB_TX 0x028B14
-#define GT96100_FLTDM2_AUX_CHANB_RX 0x028B18
-#define GT96100_FLTDM3_TDPR3_BLK0_BASE  0x030B00
-#define GT96100_FLTDM3_TDPR3_BLK1_BASE  0x031B00
-#define GT96100_FLTDM3_TDPR3_BLK2_BASE  0x032B00
-#define GT96100_FLTDM3_TDPR3_BLK3_BASE  0x033B00
-#define GT96100_FXTDM3_RDPR3_BLK0_BASE  0x034B00
-#define GT96100_FXTDM3_RDPR3_BLK1_BASE  0x035B00
-#define GT96100_FXTDM3_RDPR3_BLK2_BASE  0x036B00
-#define GT96100_FXTDM3_RDPR3_BLK3_BASE  0x037B00
-#define GT96100_FXTDM3_TX_READ_PTR      0x038B00
-#define GT96100_FXTDM3_RX_READ_PTR      0x038B04
-#define GT96100_FXTDM3_CONFIG       0x038B08
-#define GT96100_FXTDM3_AUX_CHANA_TX 0x038B0C
-#define GT96100_FXTDM3_AUX_CHANA_RX 0x038B10
-#define GT96100_FXTDM3_AUX_CHANB_TX 0x038B14
-#define GT96100_FXTDM3_AUX_CHANB_RX 0x038B18
-/*  Baud Rate Generators  */
-#define GT96100_BRG0_CONFIG     0x102A00
-#define GT96100_BRG0_BAUD_TUNE  0x102A04
-#define GT96100_BRG1_CONFIG     0x102A08
-#define GT96100_BRG1_BAUD_TUNE  0x102A0C
-#define GT96100_BRG2_CONFIG     0x102A10
-#define GT96100_BRG2_BAUD_TUNE  0x102A14
-#define GT96100_BRG3_CONFIG     0x102A18
-#define GT96100_BRG3_BAUD_TUNE  0x102A1C
-#define GT96100_BRG4_CONFIG     0x102A20
-#define GT96100_BRG4_BAUD_TUNE  0x102A24
-#define GT96100_BRG5_CONFIG     0x102A28
-#define GT96100_BRG5_BAUD_TUNE  0x102A2C
-#define GT96100_BRG6_CONFIG     0x102A30
-#define GT96100_BRG6_BAUD_TUNE  0x102A34
-#define GT96100_BRG7_CONFIG     0x102A38
-#define GT96100_BRG7_BAUD_TUNE  0x102A3C
-/*  Routing Registers  */
-#define GT96100_ROUTE_MAIN      0x101A00
-#define GT96100_ROUTE_RX_CLOCK  0x101A10
-#define GT96100_ROUTE_TX_CLOCK  0x101A20
-/*  General Purpose Ports  */
-#define GT96100_GPP_CONFIG0     0x100A00
-#define GT96100_GPP_CONFIG1     0x100A04
-#define GT96100_GPP_CONFIG2     0x100A08
-#define GT96100_GPP_CONFIG3     0x100A0C
-#define GT96100_GPP_IO0         0x100A20
-#define GT96100_GPP_IO1         0x100A24
-#define GT96100_GPP_IO2         0x100A28
-#define GT96100_GPP_IO3         0x100A2C
-#define GT96100_GPP_DATA0       0x100A40
-#define GT96100_GPP_DATA1       0x100A44
-#define GT96100_GPP_DATA2       0x100A48
-#define GT96100_GPP_DATA3       0x100A4C
-#define GT96100_GPP_LEVEL0      0x100A60
-#define GT96100_GPP_LEVEL1      0x100A64
-#define GT96100_GPP_LEVEL2      0x100A68
-#define GT96100_GPP_LEVEL3      0x100A6C
-/*  Watchdog  */
-#define GT96100_WD_CONFIG   0x101A80
-#define GT96100_WD_VALUE    0x101A84
-/* Communication Unit Arbiter  */
-#define GT96100_COMM_UNIT_ARBTR_CONFIG 0x101AC0
-/*  PCI Arbiters  */
-#define GT96100_PCI0_ARBTR_CONFIG 0x101AE0
-#define GT96100_PCI1_ARBTR_CONFIG 0x101AE4
-/* CIU Arbiter */
-#define GT96100_CIU_ARBITER_CONFIG 0x101AC0
-/* Interrupt Controller */
-#define GT96100_MAIN_CAUSE     0x000C18
-#define GT96100_INT0_MAIN_MASK 0x000C1C
-#define GT96100_INT1_MAIN_MASK 0x000C24
-#define GT96100_HIGH_CAUSE     0x000C98
-#define GT96100_INT0_HIGH_MASK 0x000C9C
-#define GT96100_INT1_HIGH_MASK 0x000CA4
-#define GT96100_INT0_SELECT    0x000C70
-#define GT96100_INT1_SELECT    0x000C74
-#define GT96100_SERIAL_CAUSE   0x103A00
-#define GT96100_SERINT0_MASK   0x103A80
-#define GT96100_SERINT1_MASK   0x103A88
-#endif /*  _GT96100_H */
diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h
index 25f5e8a4177d..0fe02945feba 100644
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
@@ -12,102 +12,95 @@
 #ifdef __ASSEMBLY__
+#define ASMMACRO(name, code...) .macro name; code; .endm
-        .macro  _ssnop
-        sll     $0, $0, 1
-        .endm
-        .macro  _ehb
-        sll     $0, $0, 3
-        .endm
-/*
- * RM9000 hazards.  When the JTLB is updated by tlbwi or tlbwr, a subsequent
- * use of the JTLB for instructions should not occur for 4 cpu cycles and use
- * for data translations should not occur for 3 cpu cycles.
- */
-#ifdef CONFIG_CPU_RM9000
-        .macro  mtc0_tlbw_hazard
-        .set    push
-        .set    mips32
-        _ssnop; _ssnop; _ssnop; _ssnop
-        .set    pop
-        .endm
-        .macro  tlbw_eret_hazard
-        .set    push
-        .set    mips32
-        _ssnop; _ssnop; _ssnop; _ssnop
-        .set    pop
-        .endm
 #else
-/*
+#define ASMMACRO(name, code...)                                         \
- * The taken branch will result in a two cycle penalty for the two killed
+__asm__(".macro " #name "; " #code "; .endm");                          \
- * instructions on R4000 / R4400.  Other processors only have a single cycle
+                                                                        \
- * hazard so this is nice trick to have an optimal code for a range of
+static inline void name(void)                                           \
- * processors.
+{                                                                       \
- */
+        __asm__ __volatile__ (#name);                                   \
-        .macro  mtc0_tlbw_hazard
+}
-        b       . + 8
-        .endm
-        .macro  tlbw_eret_hazard
-        .endm
 #endif
+ASMMACRO(_ssnop,
+         sll    $0, $0, 1
+        )
+ASMMACRO(_ehb,
+         sll    $0, $0, 3
+        )
 /*
- * mtc0->mfc0 hazard
+ * TLB hazards
- * The 24K has a 2 cycle mtc0/mfc0 execution hazard.
- * It is a MIPS32R2 processor so ehb will clear the hazard.
 */
+#if defined(CONFIG_CPU_MIPSR2)
-#ifdef CONFIG_CPU_MIPSR2
 /*
- * Use a macro for ehb unless explicit support for MIPSR2 is enabled
+ * MIPSR2 defines ehb for hazard avoidance
 */
-#define irq_enable_hazard                                               \
+ASMMACRO(mtc0_tlbw_hazard,
+         _ehb
+        )
+ASMMACRO(tlbw_use_hazard,
+         _ehb
+        )
+ASMMACRO(tlb_probe_hazard,
+         _ehb
+        )
+ASMMACRO(irq_enable_hazard,
+        )
+ASMMACRO(irq_disable_hazard,
        _ehb
+        )
-#define irq_disable_hazard                                              \
+ASMMACRO(back_to_back_c0_hazard,
-        _ehb
+         _ehb
+        )
-#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000)
 /*
- * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.
+ * gcc has a tradition of misscompiling the previous construct using the
+ * address of a label as argument to inline assembler.  Gas otoh has the
+ * annoying difference between la and dla which are only usable for 32-bit
+ * rsp. 64-bit code, so can't be used without conditional compilation.
+ * The alterantive is switching the assembler to 64-bit code which happens
+ * to work right even for 32-bit code ...
 */
+#define instruction_hazard()                                            \
+do {                                                                    \
+        unsigned long tmp;                                              \
+                                                                        \
+        __asm__ __volatile__(                                           \
+        "       .set    mips64r2                                \n"     \
+        "       dla     %0, 1f                                  \n"     \
+        "       jr.hb   %0                                      \n"     \
+        "       .set    mips0                                   \n"     \
+        "1:                                                     \n"     \
+        : "=r" (tmp));                                                  \
+} while (0)
-#define irq_enable_hazard
+#elif defined(CONFIG_CPU_R10000)
-#define irq_disable_hazard
-#else
 /*
- * Classic MIPS needs 1 - 3 nops or ssnops
+ * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.
 */
-#define irq_enable_hazard
-#define irq_disable_hazard                                              \
-        _ssnop; _ssnop; _ssnop
-#endif
+ASMMACRO(mtc0_tlbw_hazard,
+        )
-#else /* __ASSEMBLY__ */
+ASMMACRO(tlbw_use_hazard,
+        )
-__asm__(
+ASMMACRO(tlb_probe_hazard,
-        "       .macro  _ssnop                                  \n"
+        )
-        "       sll     $0, $0, 1                               \n"
+ASMMACRO(irq_enable_hazard,
-        "       .endm                                           \n"
+        )
-        "                                                       \n"
+ASMMACRO(irq_disable_hazard,
-        "       .macro  _ehb                                    \n"
+        )
-        "       sll     $0, $0, 3                               \n"
+ASMMACRO(back_to_back_c0_hazard,
-        "       .endm                                           \n");
+        )
+#define instruction_hazard() do { } while (0)
-#ifdef CONFIG_CPU_RM9000
+#elif defined(CONFIG_CPU_RM9000)
 /*
 * RM9000 hazards.  When the JTLB is updated by tlbwi or tlbwr, a subsequent
@@ -115,176 +108,73 @@ __asm__(
 * for data translations should not occur for 3 cpu cycles.
 */
-#define mtc0_tlbw_hazard()                                              \
+ASMMACRO(mtc0_tlbw_hazard,
-        __asm__ __volatile__(                                           \
+         _ssnop; _ssnop; _ssnop; _ssnop
-        "       .set    mips32                                  \n"     \
+        )
-        "       _ssnop                                          \n"     \
+ASMMACRO(tlbw_use_hazard,
-        "       _ssnop                                          \n"     \
+         _ssnop; _ssnop; _ssnop; _ssnop
-        "       _ssnop                                          \n"     \
+        )
-        "       _ssnop                                          \n"     \
+ASMMACRO(tlb_probe_hazard,
-        "       .set    mips0                                   \n")
+         _ssnop; _ssnop; _ssnop; _ssnop
+        )
-#define tlbw_use_hazard()                                               \
+ASMMACRO(irq_enable_hazard,
-        __asm__ __volatile__(                                           \
+        )
-        "       .set    mips32                                  \n"     \
+ASMMACRO(irq_disable_hazard,
-        "       _ssnop                                          \n"     \
+        )
-        "       _ssnop                                          \n"     \
+ASMMACRO(back_to_back_c0_hazard,
-        "       _ssnop                                          \n"     \
+        )
-        "       _ssnop                                          \n"     \
+#define instruction_hazard() do { } while (0)
-        "       .set    mips0                                   \n")
-#else
-/*
- * Overkill warning ...
- */
-#define mtc0_tlbw_hazard()                                              \
-        __asm__ __volatile__(                                           \
-        "       .set    noreorder                               \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       .set    reorder                                 \n")
-#define tlbw_use_hazard()                                               \
-        __asm__ __volatile__(                                           \
-        "       .set    noreorder                               \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       nop                                             \n"     \
-        "       .set    reorder                                 \n")
-#endif
-/*
- * Interrupt enable/disable hazards
- * Some processors have hazards when modifying
- * the status register to change the interrupt state
- */
-#ifdef CONFIG_CPU_MIPSR2
-__asm__("       .macro  irq_enable_hazard                       \n"
-        "       _ehb                                            \n"
-        "       .endm                                           \n"
-        "                                                       \n"
-        "       .macro  irq_disable_hazard                      \n"
-        "       _ehb                                            \n"
-        "       .endm                                           \n");
-#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000)
+#elif defined(CONFIG_CPU_SB1)
 /*
- * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.
+ * Mostly like R4000 for historic reasons
 */
+ASMMACRO(mtc0_tlbw_hazard,
-__asm__(
+        )
-        "       .macro  irq_enable_hazard                       \n"
+ASMMACRO(tlbw_use_hazard,
-        "       .endm                                           \n"
+        )
-        "                                                       \n"
+ASMMACRO(tlb_probe_hazard,
-        "       .macro  irq_disable_hazard                      \n"
+        )
-        "       .endm                                           \n");
+ASMMACRO(irq_enable_hazard,
+        )
+ASMMACRO(irq_disable_hazard,
+         _ssnop; _ssnop; _ssnop
+        )
+ASMMACRO(back_to_back_c0_hazard,
+        )
+#define instruction_hazard() do { } while (0)
 #else
 /*
- * Default for classic MIPS processors.  Assume worst case hazards but don't
+ * Finally the catchall case for all other processors including R4000, R4400,
- * care about the irq_enable_hazard - sooner or later the hardware will
+ * R4600, R4700, R5000, RM7000, NEC VR41xx etc.
- * enable it and we don't care when exactly.
- */
-__asm__(
-        "       #                                               \n"
-        "       # There is a hazard but we do not care          \n"
-        "       #                                               \n"
-        "       .macro\tirq_enable_hazard                       \n"
-        "       .endm                                           \n"
-        "                                                       \n"
-        "       .macro\tirq_disable_hazard                      \n"
-        "       _ssnop                                          \n"
-        "       _ssnop                                          \n"
-        "       _ssnop                                          \n"
-        "       .endm                                           \n");
-#endif
-#define irq_enable_hazard()                                             \
-        __asm__ __volatile__("irq_enable_hazard")
-#define irq_disable_hazard()                                            \
-        __asm__ __volatile__("irq_disable_hazard")
-/*
- * Back-to-back hazards -
 *
- * What is needed to separate a move to cp0 from a subsequent read from the
+ * The taken branch will result in a two cycle penalty for the two killed
- * same cp0 register?
+ * instructions on R4000 / R4400.  Other processors only have a single cycle
- */
+ * hazard so this is nice trick to have an optimal code for a range of
-#ifdef CONFIG_CPU_MIPSR2
+ * processors.
-__asm__("       .macro  back_to_back_c0_hazard                  \n"
-        "       _ehb                                            \n"
-        "       .endm                                           \n");
-#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000) || \
-      defined(CONFIG_CPU_SB1)
-__asm__("       .macro  back_to_back_c0_hazard                  \n"
-        "       .endm                                           \n");
-#else
-__asm__("       .macro  back_to_back_c0_hazard                  \n"
-        "       .set    noreorder                               \n"
-        "       _ssnop                                          \n"
-        "       _ssnop                                          \n"
-        "       _ssnop                                          \n"
-        "       .set    reorder                                 \n"
-        "       .endm");
-#endif
-#define back_to_back_c0_hazard()                                        \
-        __asm__ __volatile__("back_to_back_c0_hazard")
-/*
- * Instruction execution hazard
- */
-#ifdef CONFIG_CPU_MIPSR2
-/*
- * gcc has a tradition of misscompiling the previous construct using the
- * address of a label as argument to inline assembler.  Gas otoh has the
- * annoying difference between la and dla which are only usable for 32-bit
- * rsp. 64-bit code, so can't be used without conditional compilation.
- * The alterantive is switching the assembler to 64-bit code which happens
- * to work right even for 32-bit code ...
 */
-#define instruction_hazard()                                            \
+ASMMACRO(mtc0_tlbw_hazard,
-do {                                                                    \
+        nop
-        unsigned long tmp;                                              \
+        )
-                                                                        \
+ASMMACRO(tlbw_use_hazard,
-        __asm__ __volatile__(                                           \
+        nop; nop; nop
-        "       .set    mips64r2                                \n"     \
+        )
-        "       dla     %0, 1f                                  \n"     \
+ASMMACRO(tlb_probe_hazard,
-        "       jr.hb   %0                                      \n"     \
+         nop; nop; nop
-        "       .set    mips0                                   \n"     \
+        )
-        "1:                                                     \n"     \
+ASMMACRO(irq_enable_hazard,
-        : "=r" (tmp));                                                  \
+        )
-} while (0)
+ASMMACRO(irq_disable_hazard,
+        nop; nop; nop
-#else
+        )
+ASMMACRO(back_to_back_c0_hazard,
+         _ssnop; _ssnop; _ssnop;
+        )
 #define instruction_hazard() do { } while (0)
-#endif
-extern void mips_ihb(void);
-#endif /* __ASSEMBLY__ */
+#endif
 #endif /* _ASM_HAZARDS_H */
diff --git a/include/asm-mips/irq.h b/include/asm-mips/irq.h
index 896550bad322..d35c61776a02 100644
--- a/include/asm-mips/irq.h
+++ b/include/asm-mips/irq.h
@@ -76,8 +76,4 @@ extern int setup_irq_smtc(unsigned int irq, struct irqaction * new,
                          unsigned long hwmask);
 #endif /* CONFIG_MIPS_MT_SMTC */
-#ifdef CONFIG_SMP
-#define ARCH_HAS_IRQ_PER_CPU
-#endif
 #endif /* _ASM_IRQ_H */
diff --git a/include/asm-mips/mach-atlas/mc146818rtc.h b/include/asm-mips/mach-atlas/mc146818rtc.h
index 397522ea5565..a73a5698420c 100644
--- a/include/asm-mips/mach-atlas/mc146818rtc.h
+++ b/include/asm-mips/mach-atlas/mc146818rtc.h
@@ -28,10 +28,12 @@
 #include <asm/mips-boards/atlas.h>
 #include <asm/mips-boards/atlasint.h>
+#define ARCH_RTC_LOCATION
 #define RTC_PORT(x)     (ATLAS_RTC_ADR_REG + (x) * 8)
 #define RTC_IO_EXTENT   0x100
 #define RTC_IOMAPPED    0
-#define RTC_IRQ         ATLASINT_RTC
+#define RTC_IRQ         ATLAS_INT_RTC
 static inline unsigned char CMOS_READ(unsigned long addr)
 {
diff --git a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h b/include/asm-mips/mach-au1x00/au1xxx_dbdma.h
index d5b38a247e5a..eeb0c3115b6a 100644
--- a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h
+++ b/include/asm-mips/mach-au1x00/au1xxx_dbdma.h
@@ -316,7 +316,7 @@ typedef struct dbdma_chan_config {
        au1x_ddma_desc_t        *chan_desc_base;
        au1x_ddma_desc_t        *get_ptr, *put_ptr, *cur_ptr;
        void                    *chan_callparam;
-        void (*chan_callback)(int, void *, struct pt_regs *);
+        void (*chan_callback)(int, void *);
 } chan_tab_t;
 #define DEV_FLAGS_INUSE         (1 << 0)
@@ -334,8 +334,8 @@ typedef struct dbdma_chan_config {
 * meaningful name.  The 'callback' is called during dma completion
 * interrupt.
 */
-u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
+extern u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
-       void (*callback)(int, void *, struct pt_regs *), void *callparam);
+        void (*callback)(int, void *), void *callparam);
 #define DBDMA_MEM_CHAN  DSCR_CMD0_ALWAYS
diff --git a/include/asm-mips/mach-ev96100/mach-gt64120.h b/include/asm-mips/mach-ev96100/mach-gt64120.h
deleted file mode 100644
index 0ef1e6c25acf..000000000000
--- a/include/asm-mips/mach-ev96100/mach-gt64120.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  This is a direct copy of the ev96100.h file, with a global
- * search and replace.  The numbers are the same.
- *
- *  The reason I'm duplicating this is so that the 64120/96100
- * defines won't be confusing in the source code.
- */
-#ifndef _ASM_GT64120_EV96100_GT64120_DEP_H
-#define _ASM_GT64120_EV96100_GT64120_DEP_H
-/*
- *   GT96100 config space base address
- */
-#define GT64120_BASE    (KSEG1ADDR(0x14000000))
-/*
- *   PCI Bus allocation
- *
- *   (Guessing ...)
- */
-#define GT_PCI_MEM_BASE 0x12000000UL
-#define GT_PCI_MEM_SIZE 0x02000000UL
-#define GT_PCI_IO_BASE  0x10000000UL
-#define GT_PCI_IO_SIZE  0x02000000UL
-#define GT_ISA_IO_BASE  PCI_IO_BASE
-/*
- *   Duart I/O ports.
- */
-#define EV96100_COM1_BASE_ADDR  (0xBD000000 + 0x20)
-#define EV96100_COM2_BASE_ADDR  (0xBD000000 + 0x00)
-/*
- *   EV96100 interrupt controller register base.
- */
-#define EV96100_ICTRL_REGS_BASE (KSEG1ADDR(0x1f000000))
-/*
- *   EV96100 UART register base.
- */
-#define EV96100_UART0_REGS_BASE EV96100_COM1_BASE_ADDR
-#define EV96100_UART1_REGS_BASE EV96100_COM2_BASE_ADDR
-#define EV96100_BASE_BAUD       ( 3686400 / 16 )
-#endif /* _ASM_GT64120_EV96100_GT64120_DEP_H */
diff --git a/include/asm-mips/mach-excite/excite.h b/include/asm-mips/mach-excite/excite.h
index 130bd4b8edce..4c29ba44992c 100644
--- a/include/asm-mips/mach-excite/excite.h
+++ b/include/asm-mips/mach-excite/excite.h
@@ -7,7 +7,7 @@
 #define EXCITE_CPU_EXT_CLOCK 100000000
-#if !defined(__ASSEMBLER__)
+#if !defined(__ASSEMBLY__)
 void __init excite_kgdb_init(void);
 void excite_procfs_init(void);
 extern unsigned long memsize;
diff --git a/include/asm-mips/mach-excite/excite_fpga.h b/include/asm-mips/mach-excite/excite_fpga.h
new file mode 100644
index 000000000000..38fcda703a0b
--- /dev/null
+++ b/include/asm-mips/mach-excite/excite_fpga.h
@@ -0,0 +1,80 @@
+#ifndef EXCITE_FPGA_H_INCLUDED
+#define EXCITE_FPGA_H_INCLUDED
+/**
+ * Adress alignment of the individual FPGA bytes.
+ * The address arrangement of the individual bytes of the FPGA is two
+ * byte aligned at the embedded MK2 platform.
+ */
+#ifdef EXCITE_CCI_FPGA_MK2
+typedef unsigned char excite_cci_fpga_align_t __attribute__ ((aligned(2)));
+#else
+typedef unsigned char excite_cci_fpga_align_t;
+#endif
+/**
+ * Size of Dual Ported RAM.
+ */
+#define EXCITE_DPR_SIZE 263
+/**
+ * Size of Reserved Status Fields in Dual Ported RAM.
+ */
+#define EXCITE_DPR_STATUS_SIZE 7
+/**
+ * FPGA.
+ * Hardware register layout of the FPGA interface. The FPGA must accessed
+ * byte wise solely.
+ * @see EXCITE_CCI_DPR_MK2
+ */
+typedef struct excite_fpga {
+        /**
+         * Dual Ported RAM.
+         */
+        excite_cci_fpga_align_t dpr[EXCITE_DPR_SIZE];
+        /**
+         * Status.
+         */
+        excite_cci_fpga_align_t status[EXCITE_DPR_STATUS_SIZE];
+#ifdef EXCITE_CCI_FPGA_MK2
+        /**
+         * RM9000 Interrupt.
+         * Write access initiates interrupt at the RM9000 (MIPS) processor of the eXcite.
+         */
+        excite_cci_fpga_align_t rm9k_int;
+#else
+        /**
+         * MK2 Interrupt.
+         * Write access initiates interrupt at the ARM processor of the MK2.
+         */
+        excite_cci_fpga_align_t mk2_int;
+        excite_cci_fpga_align_t gap[0x1000-0x10f];
+        /**
+         * IRQ Source/Acknowledge.
+         */
+        excite_cci_fpga_align_t rm9k_irq_src;
+        /**
+         * IRQ Mask.
+         * Set bits enable the related interrupt.
+         */
+        excite_cci_fpga_align_t rm9k_irq_mask;
+#endif
+} excite_fpga;
+#endif  /* ndef EXCITE_FPGA_H_INCLUDED */
diff --git a/include/asm-mips/mach-qemu/cpu-feature-overrides.h b/include/asm-mips/mach-qemu/cpu-feature-overrides.h
index f4e370e27168..529445dacedb 100644
--- a/include/asm-mips/mach-qemu/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-qemu/cpu-feature-overrides.h
@@ -20,7 +20,7 @@
 #define cpu_has_llsc            1
 #define cpu_has_vtag_icache     0
-#define cpu_has_dc_aliases      (PAGE_SIZE < 0x4000)
+#define cpu_has_dc_aliases      0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
diff --git a/include/asm-mips/mips-boards/atlasint.h b/include/asm-mips/mips-boards/atlasint.h
index fd7ebc54fa90..b15e4ea0b091 100644
--- a/include/asm-mips/mips-boards/atlasint.h
+++ b/include/asm-mips/mips-boards/atlasint.h
@@ -1,6 +1,7 @@
 /*
- * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999, 2006  MIPS Technologies, Inc.  All rights reserved.
- * Copyright (C) 1999 MIPS Technologies, Inc.  All rights reserved.
+ *      Authors: Carsten Langgaard <carstenl@mips.com>
+ *               Maciej W. Rozycki <macro@mips.com>
 *
 * ########################################################################
 *
@@ -25,41 +26,88 @@
 #ifndef _MIPS_ATLASINT_H
 #define _MIPS_ATLASINT_H
-#define ATLASINT_BASE           1
+/*
-#define ATLASINT_UART           (ATLASINT_BASE+0)
+ * Interrupts 0..7 are used for Atlas CPU interrupts (nonEIC mode)
-#define ATLASINT_TIM0           (ATLASINT_BASE+1)
+ */
-#define ATLASINT_RES2           (ATLASINT_BASE+2)
+#define MIPSCPU_INT_BASE        0
-#define ATLASINT_RES3           (ATLASINT_BASE+3)
-#define ATLASINT_RTC            (ATLASINT_BASE+4)
+/* CPU interrupt offsets */
-#define ATLASINT_COREHI         (ATLASINT_BASE+5)
+#define MIPSCPU_INT_SW0         0
-#define ATLASINT_CORELO         (ATLASINT_BASE+6)
+#define MIPSCPU_INT_SW1         1
-#define ATLASINT_RES7           (ATLASINT_BASE+7)
+#define MIPSCPU_INT_MB0         2
-#define ATLASINT_PCIA           (ATLASINT_BASE+8)
+#define MIPSCPU_INT_ATLAS       MIPSCPU_INT_MB0
-#define ATLASINT_PCIB           (ATLASINT_BASE+9)
+#define MIPSCPU_INT_MB1         3
-#define ATLASINT_PCIC           (ATLASINT_BASE+10)
+#define MIPSCPU_INT_MB2         4
-#define ATLASINT_PCID           (ATLASINT_BASE+11)
+#define MIPSCPU_INT_MB3         5
-#define ATLASINT_ENUM           (ATLASINT_BASE+12)
+#define MIPSCPU_INT_MB4         6
-#define ATLASINT_DEG            (ATLASINT_BASE+13)
+#define MIPSCPU_INT_CPUCTR      7
-#define ATLASINT_ATXFAIL        (ATLASINT_BASE+14)
-#define ATLASINT_INTA           (ATLASINT_BASE+15)
+/*
-#define ATLASINT_INTB           (ATLASINT_BASE+16)
+ * Interrupts 8..39 are used for Atlas interrupt controller interrupts
-#define ATLASINT_ETH            ATLASINT_INTB
+ */
-#define ATLASINT_INTC           (ATLASINT_BASE+17)
+#define ATLAS_INT_BASE          8
-#define ATLASINT_SCSI           ATLASINT_INTC
+#define ATLAS_INT_UART          (ATLAS_INT_BASE + 0)
-#define ATLASINT_INTD           (ATLASINT_BASE+18)
+#define ATLAS_INT_TIM0          (ATLAS_INT_BASE + 1)
-#define ATLASINT_SERR           (ATLASINT_BASE+19)
+#define ATLAS_INT_RES2          (ATLAS_INT_BASE + 2)
-#define ATLASINT_RES20          (ATLASINT_BASE+20)
+#define ATLAS_INT_RES3          (ATLAS_INT_BASE + 3)
-#define ATLASINT_RES21          (ATLASINT_BASE+21)
+#define ATLAS_INT_RTC           (ATLAS_INT_BASE + 4)
-#define ATLASINT_RES22          (ATLASINT_BASE+22)
+#define ATLAS_INT_COREHI        (ATLAS_INT_BASE + 5)
-#define ATLASINT_RES23          (ATLASINT_BASE+23)
+#define ATLAS_INT_CORELO        (ATLAS_INT_BASE + 6)
-#define ATLASINT_RES24          (ATLASINT_BASE+24)
+#define ATLAS_INT_RES7          (ATLAS_INT_BASE + 7)
-#define ATLASINT_RES25          (ATLASINT_BASE+25)
+#define ATLAS_INT_PCIA          (ATLAS_INT_BASE + 8)
-#define ATLASINT_RES26          (ATLASINT_BASE+26)
+#define ATLAS_INT_PCIB          (ATLAS_INT_BASE + 9)
-#define ATLASINT_RES27          (ATLASINT_BASE+27)
+#define ATLAS_INT_PCIC          (ATLAS_INT_BASE + 10)
-#define ATLASINT_RES28          (ATLASINT_BASE+28)
+#define ATLAS_INT_PCID          (ATLAS_INT_BASE + 11)
-#define ATLASINT_RES29          (ATLASINT_BASE+29)
+#define ATLAS_INT_ENUM          (ATLAS_INT_BASE + 12)
-#define ATLASINT_RES30          (ATLASINT_BASE+30)
+#define ATLAS_INT_DEG           (ATLAS_INT_BASE + 13)
-#define ATLASINT_RES31          (ATLASINT_BASE+31)
+#define ATLAS_INT_ATXFAIL       (ATLAS_INT_BASE + 14)
-#define ATLASINT_END            (ATLASINT_BASE+31)
+#define ATLAS_INT_INTA          (ATLAS_INT_BASE + 15)
+#define ATLAS_INT_INTB          (ATLAS_INT_BASE + 16)
+#define ATLAS_INT_ETH           ATLAS_INT_INTB
+#define ATLAS_INT_INTC          (ATLAS_INT_BASE + 17)
+#define ATLAS_INT_SCSI          ATLAS_INT_INTC
+#define ATLAS_INT_INTD          (ATLAS_INT_BASE + 18)
+#define ATLAS_INT_SERR          (ATLAS_INT_BASE + 19)
+#define ATLAS_INT_RES20         (ATLAS_INT_BASE + 20)
+#define ATLAS_INT_RES21         (ATLAS_INT_BASE + 21)
+#define ATLAS_INT_RES22         (ATLAS_INT_BASE + 22)
+#define ATLAS_INT_RES23         (ATLAS_INT_BASE + 23)
+#define ATLAS_INT_RES24         (ATLAS_INT_BASE + 24)
+#define ATLAS_INT_RES25         (ATLAS_INT_BASE + 25)
+#define ATLAS_INT_RES26         (ATLAS_INT_BASE + 26)
+#define ATLAS_INT_RES27         (ATLAS_INT_BASE + 27)
+#define ATLAS_INT_RES28         (ATLAS_INT_BASE + 28)
+#define ATLAS_INT_RES29         (ATLAS_INT_BASE + 29)
+#define ATLAS_INT_RES30         (ATLAS_INT_BASE + 30)
+#define ATLAS_INT_RES31         (ATLAS_INT_BASE + 31)
+#define ATLAS_INT_END           (ATLAS_INT_BASE + 31)
+/*
+ * Interrupts 64..127 are used for Soc-it Classic interrupts
+ */
+#define MSC01C_INT_BASE         64
+/* SOC-it Classic interrupt offsets */
+#define MSC01C_INT_TMR          0
+#define MSC01C_INT_PCI          1
+/*
+ * Interrupts 64..127 are used for Soc-it EIC interrupts
+ */
+#define MSC01E_INT_BASE         64
+/* SOC-it EIC interrupt offsets */
+#define MSC01E_INT_SW0          1
+#define MSC01E_INT_SW1          2
+#define MSC01E_INT_MB0          3
+#define MSC01E_INT_ATLAS        MSC01E_INT_MB0
+#define MSC01E_INT_MB1          4
+#define MSC01E_INT_MB2          5
+#define MSC01E_INT_MB3          6
+#define MSC01E_INT_MB4          7
+#define MSC01E_INT_TMR          8
+#define MSC01E_INT_PCI          9
+#define MSC01E_INT_PERFCTR      10
+#define MSC01E_INT_CPUCTR       11
 #endif /* !(_MIPS_ATLASINT_H) */
diff --git a/include/asm-mips/mmu_context.h b/include/asm-mips/mmu_context.h
index 18b69de87daa..fe065d6070ca 100644
--- a/include/asm-mips/mmu_context.h
+++ b/include/asm-mips/mmu_context.h
@@ -262,10 +262,10 @@ drop_mmu_context(struct mm_struct *mm, unsigned cpu)
                /* See comments for similar code above */
                prevvpe = dvpe();
                oldasid = (read_c0_entryhi() & ASID_MASK);
-                if(smtc_live_asid[mytlb][oldasid]) {
+                if (smtc_live_asid[mytlb][oldasid]) {
-                  smtc_live_asid[mytlb][oldasid] &= ~(0x1 << cpu);
+                        smtc_live_asid[mytlb][oldasid] &= ~(0x1 << cpu);
-                  if(smtc_live_asid[mytlb][oldasid] == 0)
+                        if(smtc_live_asid[mytlb][oldasid] == 0)
-                        smtc_flush_tlb_asid(oldasid);
+                                smtc_flush_tlb_asid(oldasid);
                }
                /* See comments for similar code above */
                write_c0_entryhi((read_c0_entryhi() & ~HW_ASID_MASK)
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index 219d359861f3..85b258ee7090 100644
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -34,6 +34,8 @@
 #ifndef __ASSEMBLY__
+#include <asm/cpu-features.h>
 extern void clear_page(void * page);
 extern void copy_page(void * to, void * from);
@@ -53,7 +55,7 @@ static inline void clear_user_page(void *addr, unsigned long vaddr,
        extern void (*flush_data_cache_page)(unsigned long addr);
        clear_page(addr);
-        if (pages_do_alias((unsigned long) addr, vaddr))
+        if (pages_do_alias((unsigned long) addr, vaddr & PAGE_MASK))
                flush_data_cache_page((unsigned long)addr);
 }
@@ -63,7 +65,8 @@ static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
        extern void (*flush_data_cache_page)(unsigned long addr);
        copy_page(vto, vfrom);
-        if (pages_do_alias((unsigned long)vto, vaddr))
+        if (!cpu_has_ic_fills_f_dc ||
+            pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
                flush_data_cache_page((unsigned long)vto);
 }
@@ -74,15 +77,17 @@ static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
  #ifdef CONFIG_CPU_MIPS32
    typedef struct { unsigned long pte_low, pte_high; } pte_t;
    #define pte_val(x)    ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
+    #define __pte(x)      ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
  #else
     typedef struct { unsigned long long pte; } pte_t;
     #define pte_val(x) ((x).pte)
+     #define __pte(x)   ((pte_t) { (x) } )
  #endif
 #else
 typedef struct { unsigned long pte; } pte_t;
 #define pte_val(x)      ((x).pte)
-#endif
 #define __pte(x)        ((pte_t) { (x) } )
+#endif
 /*
 * For 3-level pagetables we defines these ourselves, for 2-level the
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h
index 4b26d8528133..d20f2e9b28be 100644
--- a/include/asm-mips/pgtable-32.h
+++ b/include/asm-mips/pgtable-32.h
@@ -156,9 +156,9 @@ pfn_pte(unsigned long pfn, pgprot_t prot)
 #define __pte_offset(address)                                           \
        (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset(dir, address)                                        \
-        ((pte_t *) (pmd_page_kernel(*dir)) + __pte_offset(address))
+        ((pte_t *) (pmd_page_vaddr(*dir)) + __pte_offset(address))
 #define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_kernel(*(dir)) +  __pte_offset(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) +  __pte_offset(address))
 #define pte_offset_map(dir, address)                                    \
        ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address))
diff --git a/include/asm-mips/pgtable-64.h b/include/asm-mips/pgtable-64.h
index e3db93212eab..d05fb6f38aa7 100644
--- a/include/asm-mips/pgtable-64.h
+++ b/include/asm-mips/pgtable-64.h
@@ -93,8 +93,12 @@
 #define PTRS_PER_PMD    ((PAGE_SIZE << PMD_ORDER) / sizeof(pmd_t))
 #define PTRS_PER_PTE    ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t))
+#if PGDIR_SIZE >= TASK_SIZE
+#define USER_PTRS_PER_PGD       (1)
+#else
 #define USER_PTRS_PER_PGD       (TASK_SIZE / PGDIR_SIZE)
-#define FIRST_USER_ADDRESS      0
+#endif
+#define FIRST_USER_ADDRESS      0UL
 #define VMALLOC_START           MAP_BASE
 #define VMALLOC_END     \
@@ -178,24 +182,26 @@ static inline void pud_clear(pud_t *pudp)
 /* to find an entry in a page-table-directory */
 #define pgd_offset(mm,addr)     ((mm)->pgd + pgd_index(addr))
-static inline unsigned long pud_page(pud_t pud)
+static inline unsigned long pud_page_vaddr(pud_t pud)
 {
        return pud_val(pud);
 }
+#define pud_phys(pud)           (pud_val(pud) - PAGE_OFFSET)
+#define pud_page(pud)           (pfn_to_page(pud_phys(pud) >> PAGE_SHIFT))
 /* Find an entry in the second-level page table.. */
 static inline pmd_t *pmd_offset(pud_t * pud, unsigned long address)
 {
-        return (pmd_t *) pud_page(*pud) + pmd_index(address);
+        return (pmd_t *) pud_page_vaddr(*pud) + pmd_index(address);
 }
 /* Find an entry in the third-level page table.. */
 #define __pte_offset(address)                                           \
        (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset(dir, address)                                        \
-        ((pte_t *) (pmd_page_kernel(*dir)) + __pte_offset(address))
+        ((pte_t *) (pmd_page_vaddr(*dir)) + __pte_offset(address))
 #define pte_offset_kernel(dir, address)                                 \
-        ((pte_t *) pmd_page_kernel(*(dir)) +  __pte_offset(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) +  __pte_offset(address))
 #define pte_offset_map(dir, address)                                    \
        ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address))
 #define pte_offset_map_nested(dir, address)                             \
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h
index a36ca1be17f2..1ca4d1e185c7 100644
--- a/include/asm-mips/pgtable.h
+++ b/include/asm-mips/pgtable.h
@@ -87,7 +87,7 @@ extern void paging_init(void);
 */
 #define pmd_phys(pmd)           (pmd_val(pmd) - PAGE_OFFSET)
 #define pmd_page(pmd)           (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))
-#define pmd_page_kernel(pmd)    pmd_val(pmd)
+#define pmd_page_vaddr(pmd)     pmd_val(pmd)
 #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1)
diff --git a/include/asm-mips/ptrace.h b/include/asm-mips/ptrace.h
index 4113316ee0da..4fb0fc43ffd7 100644
--- a/include/asm-mips/ptrace.h
+++ b/include/asm-mips/ptrace.h
@@ -10,8 +10,6 @@
 #define _ASM_PTRACE_H
-#include <asm/isadep.h>
 /* 0 - 31 are integer registers, 32 - 63 are fp registers.  */
 #define FPR_BASE        32
 #define PC              64
@@ -73,6 +71,7 @@ struct pt_regs {
 #ifdef __KERNEL__
 #include <linux/linkage.h>
+#include <asm/isadep.h>
 /*
 * Does the process account for user or for system time?
diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h
index 584bd9c0ab2e..035637c67e7c 100644
--- a/include/asm-mips/serial.h
+++ b/include/asm-mips/serial.h
@@ -52,9 +52,9 @@
 #endif
 /*
- * Both Galileo boards have the same UART mappings.
+ * Galileo EV64120 evaluation board
 */
-#if defined (CONFIG_MIPS_EV96100) || defined (CONFIG_MIPS_EV64120)
+#ifdef CONFIG_MIPS_EV64120
 #include <asm/galileo-boards/ev96100.h>
 #include <asm/galileo-boards/ev96100int.h>
 #define EV96100_SERIAL_PORT_DEFNS                                  \
diff --git a/include/asm-mips/sibyte/sb1250_defs.h b/include/asm-mips/sibyte/sb1250_defs.h
index 335dbaf1d831..a885491217c1 100644
--- a/include/asm-mips/sibyte/sb1250_defs.h
+++ b/include/asm-mips/sibyte/sb1250_defs.h
@@ -212,7 +212,7 @@
 * Note: you'll need to define uint32_t and uint64_t in your headers.
 */
-#if !defined(__ASSEMBLER__)
+#if !defined(__ASSEMBLY__)
 #define _SB_MAKE64(x) ((uint64_t)(x))
 #define _SB_MAKE32(x) ((uint32_t)(x))
 #else
@@ -251,9 +251,9 @@
 */
-#if defined(__mips64) && !defined(__ASSEMBLER__)
+#if defined(__mips64) && !defined(__ASSEMBLY__)
 #define SBWRITECSR(csr,val) *((volatile uint64_t *) PHYS_TO_K1(csr)) = (val)
 #define SBREADCSR(csr) (*((volatile uint64_t *) PHYS_TO_K1(csr)))
-#endif /* __ASSEMBLER__ */
+#endif /* __ASSEMBLY__ */
 #endif
diff --git a/include/asm-mips/sibyte/sb1250_scd.h b/include/asm-mips/sibyte/sb1250_scd.h
index f4178bdcfcb0..7ed0bb611e56 100644
--- a/include/asm-mips/sibyte/sb1250_scd.h
+++ b/include/asm-mips/sibyte/sb1250_scd.h
@@ -149,7 +149,7 @@
 * (For the assembler version, sysrev and dest may be the same register.
 * Also, it clobbers AT.)
 */
-#ifdef __ASSEMBLER__
+#ifdef __ASSEMBLY__
 #define SYS_SOC_TYPE(dest, sysrev)                                      \
        .set push ;                                                     \
        .set reorder ;                                                  \
diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h
index 87a1dff95199..8b391a2f0814 100644
--- a/include/asm-mips/signal.h
+++ b/include/asm-mips/signal.h
@@ -108,17 +108,8 @@ typedef unsigned long old_sigset_t;		/* at least 32 bits */
 #define SIG_BLOCK       1       /* for blocking signals */
 #define SIG_UNBLOCK     2       /* for unblocking signals */
 #define SIG_SETMASK     3       /* for setting the signal mask */
-#define SIG_SETMASK32   256     /* Goodie from SGI for BSD compatibility:
-                                   set only the low 32 bit of the sigset.  */
-/* Type of a signal handler.  */
+#include <asm-generic/signal.h>
-typedef void __signalfn_t(int);
-typedef __signalfn_t __user *__sighandler_t;
-/* Fake signal functions */
-#define SIG_DFL ((__sighandler_t)0)     /* default signal handling */
-#define SIG_IGN ((__sighandler_t)1)     /* ignore signal */
-#define SIG_ERR ((__sighandler_t)-1)    /* error return from signal */
 struct sigaction {
        unsigned int    sa_flags;
diff --git a/include/asm-mips/spinlock.h b/include/asm-mips/spinlock.h
index 669b8e349ff2..c8d5587467bb 100644
--- a/include/asm-mips/spinlock.h
+++ b/include/asm-mips/spinlock.h
@@ -239,7 +239,51 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
        : "memory");
 }
-#define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
+static inline int __raw_read_trylock(raw_rwlock_t *rw)
+{
+        unsigned int tmp;
+        int ret;
+        if (R10000_LLSC_WAR) {
+                __asm__ __volatile__(
+                "       .set    noreorder       # __raw_read_trylock    \n"
+                "       li      %2, 0                                   \n"
+                "1:     ll      %1, %3                                  \n"
+                "       bnez    %1, 2f                                  \n"
+                "        addu   %1, 1                                   \n"
+                "       sc      %1, %0                                  \n"
+                "       beqzl   %1, 1b                                  \n"
+                "       .set    reorder                                 \n"
+#ifdef CONFIG_SMP
+                "        sync                                           \n"
+#endif
+                "       li      %2, 1                                   \n"
+                "2:                                                     \n"
+                : "=m" (rw->lock), "=&r" (tmp), "=&r" (ret)
+                : "m" (rw->lock)
+                : "memory");
+        } else {
+                __asm__ __volatile__(
+                "       .set    noreorder       # __raw_read_trylock    \n"
+                "       li      %2, 0                                   \n"
+                "1:     ll      %1, %3                                  \n"
+                "       bnez    %1, 2f                                  \n"
+                "        addu   %1, 1                                   \n"
+                "       sc      %1, %0                                  \n"
+                "       beqz    %1, 1b                                  \n"
+                "       .set    reorder                                 \n"
+#ifdef CONFIG_SMP
+                "        sync                                           \n"
+#endif
+                "       li      %2, 1                                   \n"
+                "2:                                                     \n"
+                : "=m" (rw->lock), "=&r" (tmp), "=&r" (ret)
+                : "m" (rw->lock)
+                : "memory");
+        }
+        return ret;
+}
 static inline int __raw_write_trylock(raw_rwlock_t *rw)
 {
@@ -283,4 +327,9 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
        return ret;
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* _ASM_SPINLOCK_H */
diff --git a/include/asm-mips/timex.h b/include/asm-mips/timex.h
index 98aa737b34aa..b80de8e0fbbd 100644
--- a/include/asm-mips/timex.h
+++ b/include/asm-mips/timex.h
@@ -8,6 +8,8 @@
 #ifndef _ASM_TIMEX_H
 #define _ASM_TIMEX_H
+#ifdef __KERNEL__
 #include <asm/mipsregs.h>
 /*
@@ -51,4 +53,6 @@ static inline cycles_t get_cycles (void)
        return read_c0_count();
 }
+#endif /* __KERNEL__ */
 #endif /*  _ASM_TIMEX_H */
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
index 610ccb8a50b3..c39142920fe6 100644
--- a/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
@@ -313,7 +313,7 @@
 #define __NR_mknodat                    (__NR_Linux + 290)
 #define __NR_fchownat                   (__NR_Linux + 291)
 #define __NR_futimesat                  (__NR_Linux + 292)
-#define __NR_fstatat                    (__NR_Linux + 293)
+#define __NR_fstatat64                  (__NR_Linux + 293)
 #define __NR_unlinkat                   (__NR_Linux + 294)
 #define __NR_renameat                   (__NR_Linux + 295)
 #define __NR_linkat                     (__NR_Linux + 296)
@@ -329,16 +329,18 @@
 #define __NR_tee                        (__NR_Linux + 306)
 #define __NR_vmsplice                   (__NR_Linux + 307)
 #define __NR_move_pages                 (__NR_Linux + 308)
+#define __NR_set_robust_list            (__NR_Linux + 309)
+#define __NR_get_robust_list            (__NR_Linux + 310)
 /*
 * Offset of the last Linux o32 flavoured syscall
 */
-#define __NR_Linux_syscalls             308
+#define __NR_Linux_syscalls             310
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         308
+#define __NR_O32_Linux_syscalls         310
 #if _MIPS_SIM == _MIPS_SIM_ABI64
@@ -598,7 +600,7 @@
 #define __NR_mknodat                    (__NR_Linux + 249)
 #define __NR_fchownat                   (__NR_Linux + 250)
 #define __NR_futimesat                  (__NR_Linux + 251)
-#define __NR_fstatat                    (__NR_Linux + 252)
+#define __NR_newfstatat                 (__NR_Linux + 252)
 #define __NR_unlinkat                   (__NR_Linux + 253)
 #define __NR_renameat                   (__NR_Linux + 254)
 #define __NR_linkat                     (__NR_Linux + 255)
@@ -614,16 +616,18 @@
 #define __NR_tee                        (__NR_Linux + 265)
 #define __NR_vmsplice                   (__NR_Linux + 266)
 #define __NR_move_pages                 (__NR_Linux + 267)
+#define __NR_set_robust_list            (__NR_Linux + 268)
+#define __NR_get_robust_list            (__NR_Linux + 269)
 /*
 * Offset of the last Linux 64-bit flavoured syscall
 */
-#define __NR_Linux_syscalls             267
+#define __NR_Linux_syscalls             269
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          267
+#define __NR_64_Linux_syscalls          269
 #if _MIPS_SIM == _MIPS_SIM_NABI32
@@ -887,7 +891,7 @@
 #define __NR_mknodat                    (__NR_Linux + 253)
 #define __NR_fchownat                   (__NR_Linux + 254)
 #define __NR_futimesat                  (__NR_Linux + 255)
-#define __NR_fstatat                    (__NR_Linux + 256)
+#define __NR_newfstatat                 (__NR_Linux + 256)
 #define __NR_unlinkat                   (__NR_Linux + 257)
 #define __NR_renameat                   (__NR_Linux + 258)
 #define __NR_linkat                     (__NR_Linux + 259)
@@ -903,16 +907,18 @@
 #define __NR_tee                        (__NR_Linux + 269)
 #define __NR_vmsplice                   (__NR_Linux + 270)
 #define __NR_move_pages                 (__NR_Linux + 271)
+#define __NR_set_robust_list            (__NR_Linux + 272)
+#define __NR_get_robust_list            (__NR_Linux + 273)
 /*
 * Offset of the last N32 flavoured syscall
 */
-#define __NR_Linux_syscalls             271
+#define __NR_Linux_syscalls             273
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         271
+#define __NR_N32_Linux_syscalls         273
 #ifdef __KERNEL__
diff --git a/include/asm-mips/user.h b/include/asm-mips/user.h
index 89bf8b4cab3c..61f2a093b91b 100644
--- a/include/asm-mips/user.h
+++ b/include/asm-mips/user.h
@@ -8,6 +8,8 @@
 #ifndef _ASM_USER_H
 #define _ASM_USER_H
+#ifdef __KERNEL__
 #include <asm/page.h>
 #include <asm/reg.h>
@@ -55,4 +57,6 @@ struct user {
 #define HOST_DATA_START_ADDR    (u.start_data)
 #define HOST_STACK_END_ADDR     (u.start_stack + u.u_ssize * NBPG)
+#endif /* __KERNEL__ */
 #endif /* _ASM_USER_H */
diff --git a/include/asm-parisc/pgtable.h b/include/asm-parisc/pgtable.h
index 5066c54dae0a..c0b61e0d1497 100644
--- a/include/asm-parisc/pgtable.h
+++ b/include/asm-parisc/pgtable.h
@@ -303,7 +303,8 @@ static inline void pmd_clear(pmd_t *pmd) {
 #if PT_NLEVELS == 3
-#define pgd_page(pgd) ((unsigned long) __va(pgd_address(pgd)))
+#define pgd_page_vaddr(pgd) ((unsigned long) __va(pgd_address(pgd)))
+#define pgd_page(pgd)   virt_to_page((void *)pgd_page_vaddr(pgd))
 /* For 64 bit we have three level tables */
@@ -382,7 +383,7 @@ extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define pte_page(pte)           (pfn_to_page(pte_pfn(pte)))
-#define pmd_page_kernel(pmd)    ((unsigned long) __va(pmd_address(pmd)))
+#define pmd_page_vaddr(pmd)     ((unsigned long) __va(pmd_address(pmd)))
 #define __pmd_page(pmd) ((unsigned long) __va(pmd_address(pmd)))
 #define pmd_page(pmd)   virt_to_page((void *)__pmd_page(pmd))
@@ -400,7 +401,7 @@ extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #if PT_NLEVELS == 3
 #define pmd_offset(dir,address) \
-((pmd_t *) pgd_page(*(dir)) + (((address)>>PMD_SHIFT) & (PTRS_PER_PMD-1)))
+((pmd_t *) pgd_page_vaddr(*(dir)) + (((address)>>PMD_SHIFT) & (PTRS_PER_PMD-1)))
 #else
 #define pmd_offset(dir,addr) ((pmd_t *) dir)
 #endif
@@ -408,7 +409,7 @@ extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 /* Find an entry in the third-level page table.. */ 
 #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
 #define pte_offset_kernel(pmd, address) \
-        ((pte_t *) pmd_page_kernel(*(pmd)) + pte_index(address))
+        ((pte_t *) pmd_page_vaddr(*(pmd)) + pte_index(address))
 #define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_unmap(pte) do { } while (0)
diff --git a/include/asm-parisc/spinlock.h b/include/asm-parisc/spinlock.h
index a93960e232cf..e1825530365d 100644
--- a/include/asm-parisc/spinlock.h
+++ b/include/asm-parisc/spinlock.h
@@ -152,4 +152,8 @@ static __inline__ int __raw_write_can_lock(raw_rwlock_t *rw)
        return !rw->counter;
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild
index ac61d7eb6021..9827849953a3 100644
--- a/include/asm-powerpc/Kbuild
+++ b/include/asm-powerpc/Kbuild
@@ -1,10 +1,41 @@
 include include/asm-generic/Kbuild.asm
-unifdef-y += a.out.h asm-compat.h bootx.h byteorder.h cputable.h elf.h  \
+header-y += auxvec.h
-        nvram.h param.h posix_types.h ptrace.h seccomp.h signal.h       \
+header-y += ioctls.h
-        termios.h types.h unistd.h
+header-y += mman.h
+header-y += sembuf.h
+header-y += siginfo.h
+header-y += stat.h
+header-y += errno.h
+header-y += ipcbuf.h
+header-y += msgbuf.h
+header-y += shmbuf.h
+header-y += socket.h
+header-y += termbits.h
+header-y += fcntl.h
+header-y += ipc.h
+header-y += poll.h
+header-y += shmparam.h
+header-y += sockios.h
+header-y += ucontext.h
+header-y += ioctl.h
+header-y += linkage.h
+header-y += resource.h
+header-y += sigcontext.h
+header-y += statfs.h
-header-y += auxvec.h ioctls.h mman.h sembuf.h siginfo.h stat.h errno.h  \
+unifdef-y += a.out.h
-        ipcbuf.h msgbuf.h shmbuf.h socket.h termbits.h fcntl.h ipc.h    \
+unifdef-y += asm-compat.h
-        poll.h shmparam.h sockios.h ucontext.h ioctl.h linkage.h        \
+unifdef-y += bootx.h
-        resource.h sigcontext.h statfs.h
+unifdef-y += byteorder.h
+unifdef-y += cputable.h
+unifdef-y += elf.h
+unifdef-y += nvram.h
+unifdef-y += param.h
+unifdef-y += posix_types.h
+unifdef-y += ptrace.h
+unifdef-y += seccomp.h
+unifdef-y += signal.h
+unifdef-y += termios.h
+unifdef-y += types.h
+unifdef-y += unistd.h
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h
index f44b529e3298..978b2c7e84ea 100644
--- a/include/asm-powerpc/bug.h
+++ b/include/asm-powerpc/bug.h
@@ -70,9 +70,10 @@ struct bug_entry *find_bug(unsigned long bugaddr);
                    "i" (__FILE__), "i" (__FUNCTION__));        \
 } while (0)
-#define WARN_ON(x) do {                                         \
+#define WARN_ON(x) ({                                           \
-        if (__builtin_constant_p(x)) {                          \
+        typeof(x) __ret_warn_on = (x);                          \
-                if (x)                                          \
+        if (__builtin_constant_p(__ret_warn_on)) {              \
+                if (__ret_warn_on)                              \
                        __WARN();                               \
        } else {                                                \
                __asm__ __volatile__(                           \
@@ -80,11 +81,12 @@ struct bug_entry *find_bug(unsigned long bugaddr);
                ".section __bug_table,\"a\"\n"                  \
                "\t"PPC_LONG"   1b,%1,%2,%3\n"                  \
                ".previous"                                     \
-                : : "r" ((long)(x)),                            \
+                : : "r" (__ret_warn_on),                        \
                    "i" (__LINE__ + BUG_WARNING_TRAP),          \
                    "i" (__FILE__), "i" (__FUNCTION__));        \
        }                                                       \
-} while (0)
+        unlikely(__ret_warn_on);                                \
+})
 #define HAVE_ARCH_BUG
 #define HAVE_ARCH_BUG_ON
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h
index 1ba3c9983614..12707ab9dc98 100644
--- a/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
@@ -23,6 +23,7 @@
 #define PPC_FEATURE_SMT                 0x00004000
 #define PPC_FEATURE_ICACHE_SNOOP        0x00002000
 #define PPC_FEATURE_ARCH_2_05           0x00001000
+#define PPC_FEATURE_PA6T                0x00000800
 #define PPC_FEATURE_TRUE_LE             0x00000002
 #define PPC_FEATURE_PPC_LE              0x00000001
@@ -36,6 +37,7 @@
 struct cpu_spec;
 typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec);
+typedef void (*cpu_restore_t)(void);
 enum powerpc_oprofile_type {
        PPC_OPROFILE_INVALID = 0,
@@ -65,6 +67,8 @@ struct cpu_spec {
         * BHT, SPD, etc... from head.S before branching to identify_machine
         */
        cpu_setup_t     cpu_setup;
+        /* Used to restore cpu setup on secondary processors and at resume */
+        cpu_restore_t   cpu_restore;
        /* Used by oprofile userspace to select the right counters */
        char            *oprofile_cpu_type;
@@ -145,7 +149,7 @@ extern void do_cpu_ftr_fixups(unsigned long offset);
 #define CPU_FTR_PPCAS_ARCH_V2_BASE (CPU_FTR_SLB | \
                                        CPU_FTR_TLBIEL | CPU_FTR_NOEXECUTE | \
-                                        CPU_FTR_NODSISRALIGN | CPU_FTR_CTRL)
+                                        CPU_FTR_NODSISRALIGN)
 /* iSeries doesn't support large pages */
 #ifdef CONFIG_PPC_ISERIES
@@ -310,24 +314,29 @@ extern void do_cpu_ftr_fixups(unsigned long offset);
            CPU_FTR_HPTE_TABLE | CPU_FTR_IABR | \
            CPU_FTR_MMCRA | CPU_FTR_CTRL)
 #define CPU_FTRS_POWER4 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_MMCRA)
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
+            CPU_FTR_MMCRA)
 #define CPU_FTRS_PPC970 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_ALTIVEC_COMP | CPU_FTR_CAN_NAP | CPU_FTR_MMCRA)
 #define CPU_FTRS_POWER5 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_MMCRA | CPU_FTR_SMT | \
            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
            CPU_FTR_PURR)
 #define CPU_FTRS_POWER6 (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_MMCRA | CPU_FTR_SMT | \
            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
            CPU_FTR_PURR | CPU_FTR_CI_LARGE_PAGE | CPU_FTR_REAL_LE)
 #define CPU_FTRS_CELL   (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
-            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
            CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
-            CPU_FTR_CTRL | CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE)
+            CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE)
+#define CPU_FTRS_PA6T (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
+            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
+            CPU_FTR_ALTIVEC_COMP | CPU_FTR_CI_LARGE_PAGE | \
+            CPU_FTR_PURR | CPU_FTR_REAL_LE)
 #define CPU_FTRS_COMPATIBLE     (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \
            CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2)
 #endif
@@ -336,7 +345,7 @@ extern void do_cpu_ftr_fixups(unsigned long offset);
 #define CPU_FTRS_POSSIBLE       \
            (CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 |        \
            CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_POWER6 |       \
-            CPU_FTRS_CELL | CPU_FTR_CI_LARGE_PAGE)
+            CPU_FTRS_CELL | CPU_FTRS_PA6T)
 #else
 enum {
        CPU_FTRS_POSSIBLE =
@@ -375,7 +384,7 @@ enum {
 #define CPU_FTRS_ALWAYS         \
            (CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 &        \
            CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_POWER6 &       \
-            CPU_FTRS_CELL & CPU_FTRS_POSSIBLE)
+            CPU_FTRS_CELL & CPU_FTRS_PA6T & CPU_FTRS_POSSIBLE)
 #else
 enum {
        CPU_FTRS_ALWAYS =
diff --git a/include/asm-powerpc/hvcall.h b/include/asm-powerpc/hvcall.h
index 0d3c4e85711a..257d1cecb8c9 100644
--- a/include/asm-powerpc/hvcall.h
+++ b/include/asm-powerpc/hvcall.h
@@ -164,9 +164,15 @@
 #define H_VIO_SIGNAL            0x104
 #define H_SEND_CRQ              0x108
 #define H_COPY_RDMA             0x110
+#define H_REGISTER_LOGICAL_LAN  0x114
+#define H_FREE_LOGICAL_LAN      0x118
+#define H_ADD_LOGICAL_LAN_BUFFER 0x11C
+#define H_SEND_LOGICAL_LAN      0x120
+#define H_MULTICAST_CTRL        0x130
 #define H_SET_XDABR             0x134
 #define H_STUFF_TCE             0x138
 #define H_PUT_TCE_INDIRECT      0x13C
+#define H_CHANGE_LOGICAL_LAN_MAC 0x14C
 #define H_VTERM_PARTNER_INFO    0x150
 #define H_REGISTER_VTERM        0x154
 #define H_FREE_VTERM            0x158
@@ -196,102 +202,59 @@
 #define H_GET_HCA_INFO          0x1B8
 #define H_GET_PERF_COUNT        0x1BC
 #define H_MANAGE_TRACE          0x1C0
+#define H_FREE_LOGICAL_LAN_BUFFER 0x1D4
 #define H_QUERY_INT_STATE       0x1E4
 #define H_POLL_PENDING          0x1D8
 #define H_JOIN                  0x298
 #define H_VASI_STATE            0x2A4
 #define H_ENABLE_CRQ            0x2B0
+#define MAX_HCALL_OPCODE        H_ENABLE_CRQ
 #ifndef __ASSEMBLY__
-/* plpar_hcall() -- Generic call interface using above opcodes
+/**
+ * plpar_hcall_norets: - Make a pseries hypervisor call with no return arguments
+ * @opcode: The hypervisor call to make.
 *
- * The actual call interface is a hypervisor call instruction with
+ * This call supports up to 7 arguments and only returns the status of
- * the opcode in R3 and input args in R4-R7.
+ * the hcall. Use this version where possible, its slightly faster than
- * Status is returned in R3 with variable output values in R4-R11.
+ * the other plpar_hcalls.
- * Only H_PTE_READ with H_READ_4 uses R6-R11 so we ignore it for now
- * and return only two out args which MUST ALWAYS BE PROVIDED.
- */
-long plpar_hcall(unsigned long opcode,
-                 unsigned long arg1,
-                 unsigned long arg2,
-                 unsigned long arg3,
-                 unsigned long arg4,
-                 unsigned long *out1,
-                 unsigned long *out2,
-                 unsigned long *out3);
-/* Same as plpar_hcall but for those opcodes that return no values
- * other than status.  Slightly more efficient.
 */
 long plpar_hcall_norets(unsigned long opcode, ...);
-/*
+/**
- * Special hcall interface for ibmveth support.
+ * plpar_hcall: - Make a pseries hypervisor call
- * Takes 8 input parms. Returns a rc and stores the
+ * @opcode: The hypervisor call to make.
- * R4 return value in *out1.
+ * @retbuf: Buffer to store up to 4 return arguments in.
- */
-long plpar_hcall_8arg_2ret(unsigned long opcode,
-                           unsigned long arg1,
-                           unsigned long arg2,
-                           unsigned long arg3,
-                           unsigned long arg4,
-                           unsigned long arg5,
-                           unsigned long arg6,
-                           unsigned long arg7,
-                           unsigned long arg8,
-                           unsigned long *out1);
-/* plpar_hcall_4out()
 *
- * same as plpar_hcall except with 4 output arguments.
+ * This call supports up to 6 arguments and 4 return arguments. Use
+ * PLPAR_HCALL_BUFSIZE to size the return argument buffer.
 *
+ * Used for all but the craziest of phyp interfaces (see plpar_hcall9)
 */
-long plpar_hcall_4out(unsigned long opcode,
+#define PLPAR_HCALL_BUFSIZE 4
-                      unsigned long arg1,
+long plpar_hcall(unsigned long opcode, unsigned long *retbuf, ...);
-                      unsigned long arg2,
-                      unsigned long arg3,
-                      unsigned long arg4,
-                      unsigned long *out1,
-                      unsigned long *out2,
-                      unsigned long *out3,
-                      unsigned long *out4);
-long plpar_hcall_7arg_7ret(unsigned long opcode,
+/**
-                           unsigned long arg1,
+ * plpar_hcall9: - Make a pseries hypervisor call with up to 9 return arguments
-                           unsigned long arg2,
+ * @opcode: The hypervisor call to make.
-                           unsigned long arg3,
+ * @retbuf: Buffer to store up to 9 return arguments in.
-                           unsigned long arg4,
+ *
-                           unsigned long arg5,
+ * This call supports up to 9 arguments and 9 return arguments. Use
-                           unsigned long arg6,
+ * PLPAR_HCALL9_BUFSIZE to size the return argument buffer.
-                           unsigned long arg7,
+ */
-                           unsigned long *out1,
+#define PLPAR_HCALL9_BUFSIZE 9
-                           unsigned long *out2,
+long plpar_hcall9(unsigned long opcode, unsigned long *retbuf, ...);
-                           unsigned long *out3,
-                           unsigned long *out4,
-                           unsigned long *out5,
-                           unsigned long *out6,
-                           unsigned long *out7);
-long plpar_hcall_9arg_9ret(unsigned long opcode,
+/* For hcall instrumentation.  One structure per-hcall, per-CPU */
-                           unsigned long arg1,
+struct hcall_stats {
-                           unsigned long arg2,
+        unsigned long   num_calls;      /* number of calls (on this CPU) */
-                           unsigned long arg3,
+        unsigned long   tb_total;       /* total wall time (mftb) of calls. */
-                           unsigned long arg4,
+        unsigned long   purr_total;     /* total cpu time (PURR) of calls. */
-                           unsigned long arg5,
+};
-                           unsigned long arg6,
+void update_hcall_stats(unsigned long opcode, unsigned long tb_delta,
-                           unsigned long arg7,
+                        unsigned long purr_delta);
-                           unsigned long arg8,
+#define HCALL_STAT_ARRAY_SIZE   ((MAX_HCALL_OPCODE >> 2) + 1)
-                           unsigned long arg9,
-                           unsigned long *out1,
-                           unsigned long *out2,
-                           unsigned long *out3,
-                           unsigned long *out4,
-                           unsigned long *out5,
-                           unsigned long *out6,
-                           unsigned long *out7,
-                           unsigned long *out8,
-                           unsigned long *out9);
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
diff --git a/include/asm-powerpc/ibmebus.h b/include/asm-powerpc/ibmebus.h
index 7a42723d107c..7ab195a27888 100644
--- a/include/asm-powerpc/ibmebus.h
+++ b/include/asm-powerpc/ibmebus.h
@@ -48,7 +48,7 @@ extern struct dma_mapping_ops ibmebus_dma_ops;
 extern struct bus_type ibmebus_bus_type;
 struct ibmebus_dev {    
-        char *name;
+        const char *name;
        struct of_device ofdev;
 };
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h
index b09b42af6a1e..c8390f9485de 100644
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -12,6 +12,7 @@
 #include <linux/sched.h>
 #include <asm/mpc8xx.h>
 #endif
+#include <asm/io.h>
 #ifndef MAX_HWIFS
 #ifdef __powerpc64__
@@ -21,15 +22,14 @@
 #endif
 #endif
+#define __ide_mm_insw(p, a, c)  _insw_ns((volatile u16 __iomem *)(p), (a), (c))
+#define __ide_mm_insl(p, a, c)  _insl_ns((volatile u32 __iomem *)(p), (a), (c))
+#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
+#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
 #ifndef  __powerpc64__
 #include <linux/hdreg.h>
 #include <linux/ioport.h>
-#include <asm/io.h>
-extern void __ide_mm_insw(void __iomem *port, void *addr, u32 count);
-extern void __ide_mm_outsw(void __iomem *port, void *addr, u32 count);
-extern void __ide_mm_insl(void __iomem *port, void *addr, u32 count);
-extern void __ide_mm_outsl(void __iomem *port, void *addr, u32 count);
 struct ide_machdep_calls {
        int         (*default_irq)(unsigned long base);
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 212428db0d8b..19b2ec1ec665 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -11,6 +11,8 @@
 /* Check of existence of legacy devices */
 extern int check_legacy_ioport(unsigned long base_port);
+#define PARALLEL_BASE   0x378
+#define PNPBIOS_BASE    0xf000  /* only relevant for PReP */
 #ifndef CONFIG_PPC64
 #include <asm-ppc/io.h>
@@ -20,20 +22,11 @@ extern int check_legacy_ioport(unsigned long base_port);
 #include <asm/page.h>
 #include <asm/byteorder.h>
 #include <asm/paca.h>
-#ifdef CONFIG_PPC_ISERIES 
-#include <asm/iseries/iseries_io.h>
-#endif  
 #include <asm/synch.h>
 #include <asm/delay.h>
 #include <asm-generic/iomap.h>
-#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))
-#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))
-#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
-#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
 #define SIO_CONFIG_RA   0x398
 #define SIO_CONFIG_RD   0x399
@@ -43,42 +36,53 @@ extern unsigned long isa_io_base;
 extern unsigned long pci_io_base;
 #ifdef CONFIG_PPC_ISERIES
-/* __raw_* accessors aren't supported on iSeries */
-#define __raw_readb(addr)       { BUG(); 0; }
+extern int in_8(const volatile unsigned char __iomem *addr);
-#define __raw_readw(addr)       { BUG(); 0; }
+extern void out_8(volatile unsigned char __iomem *addr, int val);
-#define __raw_readl(addr)       { BUG(); 0; }
+extern int in_le16(const volatile unsigned short __iomem *addr);
-#define __raw_readq(addr)       { BUG(); 0; }
+extern int in_be16(const volatile unsigned short __iomem *addr);
-#define __raw_writeb(v, addr)   { BUG(); 0; }
+extern void out_le16(volatile unsigned short __iomem *addr, int val);
-#define __raw_writew(v, addr)   { BUG(); 0; }
+extern void out_be16(volatile unsigned short __iomem *addr, int val);
-#define __raw_writel(v, addr)   { BUG(); 0; }
+extern unsigned in_le32(const volatile unsigned __iomem *addr);
-#define __raw_writeq(v, addr)   { BUG(); 0; }
+extern unsigned in_be32(const volatile unsigned __iomem *addr);
-#define readb(addr)             iSeries_Read_Byte(addr)
+extern void out_le32(volatile unsigned __iomem *addr, int val);
-#define readw(addr)             iSeries_Read_Word(addr)
+extern void out_be32(volatile unsigned __iomem *addr, int val);
-#define readl(addr)             iSeries_Read_Long(addr)
+extern unsigned long in_le64(const volatile unsigned long __iomem *addr);
-#define writeb(data, addr)      iSeries_Write_Byte((data),(addr))
+extern unsigned long in_be64(const volatile unsigned long __iomem *addr);
-#define writew(data, addr)      iSeries_Write_Word((data),(addr))
+extern void out_le64(volatile unsigned long __iomem *addr, unsigned long val);
-#define writel(data, addr)      iSeries_Write_Long((data),(addr))
+extern void out_be64(volatile unsigned long __iomem *addr, unsigned long val);
-#define memset_io(a,b,c)        iSeries_memset_io((a),(b),(c))
-#define memcpy_fromio(a,b,c)    iSeries_memcpy_fromio((a), (b), (c))
+extern unsigned char __raw_readb(const volatile void __iomem *addr);
-#define memcpy_toio(a,b,c)      iSeries_memcpy_toio((a), (b), (c))
+extern unsigned short __raw_readw(const volatile void __iomem *addr);
+extern unsigned int __raw_readl(const volatile void __iomem *addr);
-#define inb(addr)               readb(((void __iomem *)(long)(addr)))
+extern unsigned long __raw_readq(const volatile void __iomem *addr);
-#define inw(addr)               readw(((void __iomem *)(long)(addr)))
+extern void __raw_writeb(unsigned char v, volatile void __iomem *addr);
-#define inl(addr)               readl(((void __iomem *)(long)(addr)))
+extern void __raw_writew(unsigned short v, volatile void __iomem *addr);
-#define outb(data,addr)         writeb(data,((void __iomem *)(long)(addr)))
+extern void __raw_writel(unsigned int v, volatile void __iomem *addr);
-#define outw(data,addr)         writew(data,((void __iomem *)(long)(addr)))
+extern void __raw_writeq(unsigned long v, volatile void __iomem *addr);
-#define outl(data,addr)         writel(data,((void __iomem *)(long)(addr)))
-/*
+extern void memset_io(volatile void __iomem *addr, int c, unsigned long n);
- * The *_ns versions below don't do byte-swapping.
+extern void memcpy_fromio(void *dest, const volatile void __iomem *src,
- * Neither do the standard versions now, these are just here
+                                 unsigned long n);
- * for older code.
+extern void memcpy_toio(volatile void __iomem *dest, const void *src,
- */
+                                 unsigned long n);
-#define insb(port, buf, ns)     _insb((u8 __iomem *)((port)+pci_io_base), (buf), (ns))
-#define insw(port, buf, ns)     _insw_ns((u8 __iomem *)((port)+pci_io_base), (buf), (ns))
+#else /* CONFIG_PPC_ISERIES */
-#define insl(port, buf, nl)     _insl_ns((u8 __iomem *)((port)+pci_io_base), (buf), (nl))
-#define insw_ns(port, buf, ns)  _insw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))
+#define in_8(addr)              __in_8((addr))
-#define insl_ns(port, buf, nl)  _insl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))
+#define out_8(addr, val)        __out_8((addr), (val))
-#else
+#define in_le16(addr)           __in_le16((addr))
+#define in_be16(addr)           __in_be16((addr))
+#define out_le16(addr, val)     __out_le16((addr), (val))
+#define out_be16(addr, val)     __out_be16((addr), (val))
+#define in_le32(addr)           __in_le32((addr))
+#define in_be32(addr)           __in_be32((addr))
+#define out_le32(addr, val)     __out_le32((addr), (val))
+#define out_be32(addr, val)     __out_be32((addr), (val))
+#define in_le64(addr)           __in_le64((addr))
+#define in_be64(addr)           __in_be64((addr))
+#define out_le64(addr, val)     __out_le64((addr), (val))
+#define out_be64(addr, val)     __out_be64((addr), (val))
 static inline unsigned char __raw_readb(const volatile void __iomem *addr)
 {
@@ -112,23 +116,11 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
 {
        *(volatile unsigned long __force *)addr = v;
 }
-#define readb(addr)             eeh_readb(addr)
-#define readw(addr)             eeh_readw(addr)
-#define readl(addr)             eeh_readl(addr)
-#define readq(addr)             eeh_readq(addr)
-#define writeb(data, addr)      eeh_writeb((data), (addr))
-#define writew(data, addr)      eeh_writew((data), (addr))
-#define writel(data, addr)      eeh_writel((data), (addr))
-#define writeq(data, addr)      eeh_writeq((data), (addr))
 #define memset_io(a,b,c)        eeh_memset_io((a),(b),(c))
 #define memcpy_fromio(a,b,c)    eeh_memcpy_fromio((a),(b),(c))
 #define memcpy_toio(a,b,c)      eeh_memcpy_toio((a),(b),(c))
-#define inb(port)               eeh_inb((unsigned long)port)
-#define outb(val, port)         eeh_outb(val, (unsigned long)port)
+#endif /* CONFIG_PPC_ISERIES */
-#define inw(port)               eeh_inw((unsigned long)port)
-#define outw(val, port)         eeh_outw(val, (unsigned long)port)
-#define inl(port)               eeh_inl((unsigned long)port)
-#define outl(val, port)         eeh_outl(val, (unsigned long)port)
 /*
 * The insw/outsw/insl/outsl macros don't do byte-swapping.
@@ -138,30 +130,37 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
 #define insb(port, buf, ns)     eeh_insb((port), (buf), (ns))
 #define insw(port, buf, ns)     eeh_insw_ns((port), (buf), (ns))
 #define insl(port, buf, nl)     eeh_insl_ns((port), (buf), (nl))
-#define insw_ns(port, buf, ns)  eeh_insw_ns((port), (buf), (ns))
-#define insl_ns(port, buf, nl)  eeh_insl_ns((port), (buf), (nl))
-#endif
 #define outsb(port, buf, ns)  _outsb((u8 __iomem *)((port)+pci_io_base), (buf), (ns))
 #define outsw(port, buf, ns)  _outsw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))
 #define outsl(port, buf, nl)  _outsl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))
+#define readb(addr)             eeh_readb(addr)
+#define readw(addr)             eeh_readw(addr)
+#define readl(addr)             eeh_readl(addr)
+#define readq(addr)             eeh_readq(addr)
+#define writeb(data, addr)      eeh_writeb((data), (addr))
+#define writew(data, addr)      eeh_writew((data), (addr))
+#define writel(data, addr)      eeh_writel((data), (addr))
+#define writeq(data, addr)      eeh_writeq((data), (addr))
+#define inb(port)               eeh_inb((unsigned long)port)
+#define outb(val, port)         eeh_outb(val, (unsigned long)port)
+#define inw(port)               eeh_inw((unsigned long)port)
+#define outw(val, port)         eeh_outw(val, (unsigned long)port)
+#define inl(port)               eeh_inl((unsigned long)port)
+#define outl(val, port)         eeh_outl(val, (unsigned long)port)
 #define readb_relaxed(addr) readb(addr)
 #define readw_relaxed(addr) readw(addr)
 #define readl_relaxed(addr) readl(addr)
 #define readq_relaxed(addr) readq(addr)
-extern void _insb(volatile u8 __iomem *port, void *buf, int ns);
+extern void _insb(volatile u8 __iomem *port, void *buf, long count);
-extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns);
+extern void _outsb(volatile u8 __iomem *port, const void *buf, long count);
-extern void _insw(volatile u16 __iomem *port, void *buf, int ns);
+extern void _insw_ns(volatile u16 __iomem *port, void *buf, long count);
-extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns);
+extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count);
-extern void _insl(volatile u32 __iomem *port, void *buf, int nl);
+extern void _insl_ns(volatile u32 __iomem *port, void *buf, long count);
-extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl);
+extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count);
-extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns);
-extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
-extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);
-extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl);
 static inline void mmiowb(void)
 {
@@ -180,14 +179,6 @@ static inline void mmiowb(void)
 #define inl_p(port)             inl(port)
 #define outl_p(val, port)       (udelay(1), outl((val), (port)))
-/*
- * The *_ns versions below don't do byte-swapping.
- * Neither do the standard versions now, these are just here
- * for older code.
- */
-#define outsw_ns(port, buf, ns) _outsw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))
-#define outsl_ns(port, buf, nl) _outsl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))
 #define IO_SPACE_LIMIT ~(0UL)
@@ -279,7 +270,7 @@ static inline void iosync(void)
 * and should not be used directly by device drivers.  Use inb/readb
 * instead.
 */
-static inline int in_8(const volatile unsigned char __iomem *addr)
+static inline int __in_8(const volatile unsigned char __iomem *addr)
 {
        int ret;
@@ -288,14 +279,14 @@ static inline int in_8(const volatile unsigned char __iomem *addr)
        return ret;
 }
-static inline void out_8(volatile unsigned char __iomem *addr, int val)
+static inline void __out_8(volatile unsigned char __iomem *addr, int val)
 {
        __asm__ __volatile__("sync; stb%U0%X0 %1,%0"
                             : "=m" (*addr) : "r" (val));
        get_paca()->io_sync = 1;
 }
-static inline int in_le16(const volatile unsigned short __iomem *addr)
+static inline int __in_le16(const volatile unsigned short __iomem *addr)
 {
        int ret;
@@ -304,7 +295,7 @@ static inline int in_le16(const volatile unsigned short __iomem *addr)
        return ret;
 }
-static inline int in_be16(const volatile unsigned short __iomem *addr)
+static inline int __in_be16(const volatile unsigned short __iomem *addr)
 {
        int ret;
@@ -313,21 +304,21 @@ static inline int in_be16(const volatile unsigned short __iomem *addr)
        return ret;
 }
-static inline void out_le16(volatile unsigned short __iomem *addr, int val)
+static inline void __out_le16(volatile unsigned short __iomem *addr, int val)
 {
        __asm__ __volatile__("sync; sthbrx %1,0,%2"
                             : "=m" (*addr) : "r" (val), "r" (addr));
        get_paca()->io_sync = 1;
 }
-static inline void out_be16(volatile unsigned short __iomem *addr, int val)
+static inline void __out_be16(volatile unsigned short __iomem *addr, int val)
 {
        __asm__ __volatile__("sync; sth%U0%X0 %1,%0"
                             : "=m" (*addr) : "r" (val));
        get_paca()->io_sync = 1;
 }
-static inline unsigned in_le32(const volatile unsigned __iomem *addr)
+static inline unsigned __in_le32(const volatile unsigned __iomem *addr)
 {
        unsigned ret;
@@ -336,7 +327,7 @@ static inline unsigned in_le32(const volatile unsigned __iomem *addr)
        return ret;
 }
-static inline unsigned in_be32(const volatile unsigned __iomem *addr)
+static inline unsigned __in_be32(const volatile unsigned __iomem *addr)
 {
        unsigned ret;
@@ -345,21 +336,21 @@ static inline unsigned in_be32(const volatile unsigned __iomem *addr)
        return ret;
 }
-static inline void out_le32(volatile unsigned __iomem *addr, int val)
+static inline void __out_le32(volatile unsigned __iomem *addr, int val)
 {
        __asm__ __volatile__("sync; stwbrx %1,0,%2" : "=m" (*addr)
                             : "r" (val), "r" (addr));
        get_paca()->io_sync = 1;
 }
-static inline void out_be32(volatile unsigned __iomem *addr, int val)
+static inline void __out_be32(volatile unsigned __iomem *addr, int val)
 {
        __asm__ __volatile__("sync; stw%U0%X0 %1,%0"
                             : "=m" (*addr) : "r" (val));
        get_paca()->io_sync = 1;
 }
-static inline unsigned long in_le64(const volatile unsigned long __iomem *addr)
+static inline unsigned long __in_le64(const volatile unsigned long __iomem *addr)
 {
        unsigned long tmp, ret;
@@ -379,7 +370,7 @@ static inline unsigned long in_le64(const volatile unsigned long __iomem *addr)
        return ret;
 }
-static inline unsigned long in_be64(const volatile unsigned long __iomem *addr)
+static inline unsigned long __in_be64(const volatile unsigned long __iomem *addr)
 {
        unsigned long ret;
@@ -388,7 +379,7 @@ static inline unsigned long in_be64(const volatile unsigned long __iomem *addr)
        return ret;
 }
-static inline void out_le64(volatile unsigned long __iomem *addr, unsigned long val)
+static inline void __out_le64(volatile unsigned long __iomem *addr, unsigned long val)
 {
        unsigned long tmp;
@@ -406,15 +397,13 @@ static inline void out_le64(volatile unsigned long __iomem *addr, unsigned long
        get_paca()->io_sync = 1;
 }
-static inline void out_be64(volatile unsigned long __iomem *addr, unsigned long val)
+static inline void __out_be64(volatile unsigned long __iomem *addr, unsigned long val)
 {
        __asm__ __volatile__("sync; std%U0%X0 %1,%0" : "=m" (*addr) : "r" (val));
        get_paca()->io_sync = 1;
 }
-#ifndef CONFIG_PPC_ISERIES 
 #include <asm/eeh.h>
-#endif
 /**
 *      check_signature         -       find BIOS signatures
@@ -430,7 +419,6 @@ static inline int check_signature(const volatile void __iomem * io_addr,
        const unsigned char *signature, int length)
 {
        int retval = 0;
-#ifndef CONFIG_PPC_ISERIES 
        do {
                if (readb(io_addr) != *signature)
                        goto out;
@@ -440,7 +428,6 @@ static inline int check_signature(const volatile void __iomem * io_addr,
        } while (length);
        retval = 1;
 out:
-#endif
        return retval;
 }
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
index d903a62959da..4da41efb1319 100644
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -137,7 +137,7 @@ struct irq_map_entry {
 extern struct irq_map_entry irq_map[NR_IRQS];
-/***
+/**
 * irq_alloc_host - Allocate a new irq_host data structure
 * @node: device-tree node of the interrupt controller
 * @revmap_type: type of reverse mapping to use
@@ -159,14 +159,14 @@ extern struct irq_host *irq_alloc_host(unsigned int revmap_type,
                                       irq_hw_number_t inval_irq);
-/***
+/**
 * irq_find_host - Locates a host for a given device node
 * @node: device-tree node of the interrupt controller
 */
 extern struct irq_host *irq_find_host(struct device_node *node);
-/***
+/**
 * irq_set_default_host - Set a "default" host
 * @host: default host pointer
 *
@@ -178,7 +178,7 @@ extern struct irq_host *irq_find_host(struct device_node *node);
 extern void irq_set_default_host(struct irq_host *host);
-/***
+/**
 * irq_set_virq_count - Set the maximum number of virt irqs
 * @count: number of linux virtual irqs, capped with NR_IRQS
 *
@@ -188,7 +188,7 @@ extern void irq_set_default_host(struct irq_host *host);
 extern void irq_set_virq_count(unsigned int count);
-/***
+/**
 * irq_create_mapping - Map a hardware interrupt into linux virq space
 * @host: host owning this hardware interrupt or NULL for default host
 * @hwirq: hardware irq number in that host space
@@ -202,13 +202,13 @@ extern unsigned int irq_create_mapping(struct irq_host *host,
                                       irq_hw_number_t hwirq);
-/***
+/**
 * irq_dispose_mapping - Unmap an interrupt
 * @virq: linux virq number of the interrupt to unmap
 */
 extern void irq_dispose_mapping(unsigned int virq);
-/***
+/**
 * irq_find_mapping - Find a linux virq from an hw irq number.
 * @host: host owning this hardware interrupt
 * @hwirq: hardware irq number in that host space
@@ -221,7 +221,7 @@ extern unsigned int irq_find_mapping(struct irq_host *host,
                                     irq_hw_number_t hwirq);
-/***
+/**
 * irq_radix_revmap - Find a linux virq from a hw irq number.
 * @host: host owning this hardware interrupt
 * @hwirq: hardware irq number in that host space
@@ -232,7 +232,7 @@ extern unsigned int irq_find_mapping(struct irq_host *host,
 extern unsigned int irq_radix_revmap(struct irq_host *host,
                                     irq_hw_number_t hwirq);
-/***
+/**
 * irq_linear_revmap - Find a linux virq from a hw irq number.
 * @host: host owning this hardware interrupt
 * @hwirq: hardware irq number in that host space
@@ -247,7 +247,7 @@ extern unsigned int irq_linear_revmap(struct irq_host *host,
-/***
+/**
 * irq_alloc_virt - Allocate virtual irq numbers
 * @host: host owning these new virtual irqs
 * @count: number of consecutive numbers to allocate
@@ -261,7 +261,7 @@ extern unsigned int irq_alloc_virt(struct irq_host *host,
                                   unsigned int count,
                                   unsigned int hint);
-/***
+/**
 * irq_free_virt - Free virtual irq numbers
 * @virq: virtual irq number of the first interrupt to free
 * @count: number of interrupts to free
@@ -300,7 +300,7 @@ extern unsigned int irq_of_parse_and_map(struct device_node *dev, int index);
 /* -- End OF helpers -- */
-/***
+/**
 * irq_early_init - Init irq remapping subsystem
 */
 extern void irq_early_init(void);
diff --git a/include/asm-powerpc/iseries/hv_call_xm.h b/include/asm-powerpc/iseries/hv_call_xm.h
index ca9202cb01ed..392ac3f54df0 100644
--- a/include/asm-powerpc/iseries/hv_call_xm.h
+++ b/include/asm-powerpc/iseries/hv_call_xm.h
@@ -16,23 +16,6 @@
 #define HvCallXmSetTce                  HvCallXm + 11
 #define HvCallXmSetTces                 HvCallXm + 13
-/*
- * Structure passed to HvCallXm_getTceTableParms
- */
-struct iommu_table_cb {
-        unsigned long   itc_busno;      /* Bus number for this tce table */
-        unsigned long   itc_start;      /* Will be NULL for secondary */
-        unsigned long   itc_totalsize;  /* Size (in pages) of whole table */
-        unsigned long   itc_offset;     /* Index into real tce table of the
-                                           start of our section */
-        unsigned long   itc_size;       /* Size (in pages) of our section */
-        unsigned long   itc_index;      /* Index of this tce table */
-        unsigned short  itc_maxtables;  /* Max num of tables for partition */
-        unsigned char   itc_virtbus;    /* Flag to indicate virtual bus */
-        unsigned char   itc_slotno;     /* IOA Tce Slot Index */
-        unsigned char   itc_rsvd[4];
-};
 static inline void HvCallXm_getTceTableParms(u64 cb)
 {
        HvCall1(HvCallXmGetTceTableParms, cb);
diff --git a/include/asm-powerpc/iseries/hv_lp_config.h b/include/asm-powerpc/iseries/hv_lp_config.h
index df8b20739719..a006fd1e4a2c 100644
--- a/include/asm-powerpc/iseries/hv_lp_config.h
+++ b/include/asm-powerpc/iseries/hv_lp_config.h
@@ -25,7 +25,6 @@
 #include <asm/iseries/hv_call_sc.h>
 #include <asm/iseries/hv_types.h>
-#include <asm/iseries/it_lp_naca.h>
 enum {
        HvCallCfg_Cur   = 0,
@@ -44,16 +43,8 @@ enum {
 #define HvCallCfgGetHostingLpIndex                      HvCallCfg + 32
 extern HvLpIndex HvLpConfig_getLpIndex_outline(void);
+extern HvLpIndex HvLpConfig_getLpIndex(void);
-static inline HvLpIndex HvLpConfig_getLpIndex(void)
+extern HvLpIndex HvLpConfig_getPrimaryLpIndex(void);
-{
-        return itLpNaca.xLpIndex;
-}
-static inline HvLpIndex HvLpConfig_getPrimaryLpIndex(void)
-{
-        return itLpNaca.xPrimaryLpIndex;
-}
 static inline u64 HvLpConfig_getMsChunks(void)
 {
diff --git a/include/asm-powerpc/iseries/iseries_io.h b/include/asm-powerpc/iseries/iseries_io.h
deleted file mode 100644
index f29009bd63c9..000000000000
--- a/include/asm-powerpc/iseries/iseries_io.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _ASM_POWERPC_ISERIES_ISERIES_IO_H
-#define _ASM_POWERPC_ISERIES_ISERIES_IO_H
-#ifdef CONFIG_PPC_ISERIES
-#include <linux/types.h>
-/*
- * Created by Allan Trautman on Thu Dec 28 2000.
- *
- * Remaps the io.h for the iSeries Io
- * Copyright (C) 2000  Allan H Trautman, IBM Corporation
- *
- * 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
- *
- * Change Activity:
- *   Created December 28, 2000
- * End Change Activity
- */
-#ifdef CONFIG_PCI
-extern u8   iSeries_Read_Byte(const volatile void __iomem * IoAddress);
-extern u16  iSeries_Read_Word(const volatile void __iomem * IoAddress);
-extern u32  iSeries_Read_Long(const volatile void __iomem * IoAddress);
-extern void iSeries_Write_Byte(u8  IoData, volatile void __iomem * IoAddress);
-extern void iSeries_Write_Word(u16 IoData, volatile void __iomem * IoAddress);
-extern void iSeries_Write_Long(u32 IoData, volatile void __iomem * IoAddress);
-extern void iSeries_memset_io(volatile void __iomem *dest, char x, size_t n);
-extern void iSeries_memcpy_toio(volatile void __iomem *dest, void *source,
-                size_t n);
-extern void iSeries_memcpy_fromio(void *dest,
-                const volatile void __iomem *source, size_t n);
-#else
-static inline u8 iSeries_Read_Byte(const volatile void __iomem *IoAddress)
-{
-        return 0xff;
-}
-static inline void iSeries_Write_Byte(u8 IoData,
-                volatile void __iomem *IoAddress)
-{
-}
-#endif  /* CONFIG_PCI */
-#endif /* CONFIG_PPC_ISERIES */
-#endif /* _ASM_POWERPC_ISERIES_ISERIES_IO_H */
diff --git a/include/asm-powerpc/iseries/it_exp_vpd_panel.h b/include/asm-powerpc/iseries/it_exp_vpd_panel.h
deleted file mode 100644
index 304a609ae21a..000000000000
--- a/include/asm-powerpc/iseries/it_exp_vpd_panel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2002  Dave Boutcher IBM Corporation
- *
- * 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
- */
-#ifndef _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H
-#define _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H
-/*
- *      This struct maps the panel information
- *
- * Warning:
- *      This data must match the architecture for the panel information
- */
-#include <asm/types.h>
-struct ItExtVpdPanel {
-        /* Definition of the Extended Vpd On Panel Data Area */
-        char    systemSerial[8];
-        char    mfgID[4];
-        char    reserved1[24];
-        char    machineType[4];
-        char    systemID[6];
-        char    somUniqueCnt[4];
-        char    serialNumberCount;
-        char    reserved2[7];
-        u16     bbu3;
-        u16     bbu2;
-        u16     bbu1;
-        char    xLocationLabel[8];
-        u8      xRsvd1[6];
-        u16     xFrameId;
-        u8      xRsvd2[48];
-};
-extern struct ItExtVpdPanel     xItExtVpdPanel;
-#endif /* _ASM_POWERPC_ISERIES_IT_EXT_VPD_PANEL_H */
diff --git a/include/asm-powerpc/iseries/it_lp_naca.h b/include/asm-powerpc/iseries/it_lp_naca.h
deleted file mode 100644
index 4fdcf052927f..000000000000
--- a/include/asm-powerpc/iseries/it_lp_naca.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2001  Mike Corrigan IBM Corporation
- *
- * 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
- */
-#ifndef _ASM_POWERPC_ISERIES_IT_LP_NACA_H
-#define _ASM_POWERPC_ISERIES_IT_LP_NACA_H
-#include <linux/types.h>
-/*
- *      This control block contains the data that is shared between the
- *      hypervisor (PLIC) and the OS.
- */
-struct ItLpNaca {
-// CACHE_LINE_1 0x0000 - 0x007F Contains read-only data
-        u32     xDesc;                  // Eye catcher                  x00-x03
-        u16     xSize;                  // Size of this class           x04-x05
-        u16     xIntHdlrOffset;         // Offset to IntHdlr array      x06-x07
-        u8      xMaxIntHdlrEntries;     // Number of entries in array   x08-x08
-        u8      xPrimaryLpIndex;        // LP Index of Primary          x09-x09
-        u8      xServiceLpIndex;        // LP Ind of Service Focal Pointx0A-x0A
-        u8      xLpIndex;               // LP Index                     x0B-x0B
-        u16     xMaxLpQueues;           // Number of allocated queues   x0C-x0D
-        u16     xLpQueueOffset;         // Offset to start of LP queues x0E-x0F
-        u8      xPirEnvironMode;        // Piranha or hardware          x10-x10
-        u8      xPirConsoleMode;        // Piranha console indicator    x11-x11
-        u8      xPirDasdMode;           // Piranha dasd indicator       x12-x12
-        u8      xRsvd1_0[5];            // Reserved for Piranha related x13-x17
-        u8      flags;                  // flags, see below             x18-x1F
-        u8      xSpVpdFormat;           // VPD areas are in CSP format  ...
-        u8      xIntProcRatio;          // Ratio of int procs to procs  ...
-        u8      xRsvd1_2[5];            // Reserved                     ...
-        u16     xRsvd1_3;               // Reserved                     x20-x21
-        u16     xPlicVrmIndex;          // VRM index of PLIC            x22-x23
-        u16     xMinSupportedSlicVrmInd;// Min supported OS VRM index   x24-x25
-        u16     xMinCompatableSlicVrmInd;// Min compatible OS VRM index x26-x27
-        u64     xLoadAreaAddr;          // ER address of load area      x28-x2F
-        u32     xLoadAreaChunks;        // Chunks for the load area     x30-x33
-        u32     xPaseSysCallCRMask;     // Mask used to test CR before  x34-x37
-                                        // doing an ASR switch on PASE
-                                        // system call.
-        u64     xSlicSegmentTablePtr;   // Pointer to Slic seg table.   x38-x3f
-        u8      xRsvd1_4[64];           //                              x40-x7F
-// CACHE_LINE_2 0x0080 - 0x00FF Contains local read-write data
-        u8      xRsvd2_0[128];          // Reserved                     x00-x7F
-// CACHE_LINE_3-6 0x0100 - 0x02FF Contains LP Queue indicators
-// NB: Padding required to keep xInterrruptHdlr at x300 which is required
-// for v4r4 PLIC.
-        u8      xOldLpQueue[128];       // LP Queue needed for v4r4     100-17F
-        u8      xRsvd3_0[384];          // Reserved                     180-2FF
-// CACHE_LINE_7-8 0x0300 - 0x03FF Contains the address of the OS interrupt
-//  handlers
-        u64     xInterruptHdlr[32];     // Interrupt handlers           300-x3FF
-};
-extern struct ItLpNaca          itLpNaca;
-#define ITLPNACA_LPAR           0x80    /* Is LPAR installed on the system */
-#define ITLPNACA_PARTITIONED    0x40    /* Is the system partitioned */
-#define ITLPNACA_HWSYNCEDTBS    0x20    /* Hardware synced TBs */
-#define ITLPNACA_HMTINT         0x10    /* Utilize MHT for interrupts */
-#endif /* _ASM_POWERPC_ISERIES_IT_LP_NACA_H */
diff --git a/include/asm-powerpc/iseries/it_lp_queue.h b/include/asm-powerpc/iseries/it_lp_queue.h
index 284c5a7db3ac..3f6814769295 100644
--- a/include/asm-powerpc/iseries/it_lp_queue.h
+++ b/include/asm-powerpc/iseries/it_lp_queue.h
@@ -27,8 +27,6 @@
 #include <asm/types.h>
 #include <asm/ptrace.h>
-struct HvLpEvent;
 #define IT_LP_MAX_QUEUES        8
 #define IT_LP_NOT_USED          0       /* Queue will not be used by PLIC */
diff --git a/include/asm-powerpc/iseries/vio.h b/include/asm-powerpc/iseries/vio.h
index 72a97d37aac3..7a95d296abd1 100644
--- a/include/asm-powerpc/iseries/vio.h
+++ b/include/asm-powerpc/iseries/vio.h
@@ -122,6 +122,34 @@ enum viorc {
        viorc_openRejected = 0x0301
 };
+/*
+ * The structure of the events that flow between us and OS/400 for chario
+ * events.  You can't mess with this unless the OS/400 side changes too.
+ */
+struct viocharlpevent {
+        struct HvLpEvent event;
+        u32 reserved;
+        u16 version;
+        u16 subtype_result_code;
+        u8 virtual_device;
+        u8 len;
+        u8 data[VIOCHAR_MAX_DATA];
+};
+#define VIOCHAR_WINDOW          10
+enum viocharsubtype {
+        viocharopen = 0x0001,
+        viocharclose = 0x0002,
+        viochardata = 0x0003,
+        viocharack = 0x0004,
+        viocharconfig = 0x0005
+};
+enum viochar_rc {
+        viochar_rc_ebusy = 1
+};
 struct device;
 extern struct device *iSeries_vio_dev;
diff --git a/include/asm-powerpc/lppaca.h b/include/asm-powerpc/lppaca.h
index 4dc514aabfe7..821ea0c512b4 100644
--- a/include/asm-powerpc/lppaca.h
+++ b/include/asm-powerpc/lppaca.h
@@ -27,7 +27,9 @@
 //
 //
 //----------------------------------------------------------------------------
+#include <linux/cache.h>
 #include <asm/types.h>
+#include <asm/mmu.h>
 /* The Hypervisor barfs if the lppaca crosses a page boundary.  A 1k
 * alignment is sufficient to prevent this */
@@ -114,7 +116,7 @@ struct lppaca {
 //=============================================================================
-// CACHE_LINE_3 0x0100 - 0x007F: This line is shared with other processors
+// CACHE_LINE_3 0x0100 - 0x017F: This line is shared with other processors
 //=============================================================================
        // This is the yield_count.  An "odd" value (low bit on) means that
        // the processor is yielded (either because of an OS yield or a PLIC
@@ -126,12 +128,29 @@ struct lppaca {
        u8      reserved6[124];         // Reserved                     x04-x7F
 //=============================================================================
-// CACHE_LINE_4-5 0x0100 - 0x01FF Contains PMC interrupt data
+// CACHE_LINE_4-5 0x0180 - 0x027F Contains PMC interrupt data
 //=============================================================================
        u8      pmc_save_area[256];     // PMC interrupt Area           x00-xFF
 } __attribute__((__aligned__(0x400)));
 extern struct lppaca lppaca[];
+/*
+ * SLB shadow buffer structure as defined in the PAPR.  The save_area
+ * contains adjacent ESID and VSID pairs for each shadowed SLB.  The
+ * ESID is stored in the lower 64bits, then the VSID.
+ */
+struct slb_shadow {
+        u32     persistent;             // Number of persistent SLBs    x00-x03
+        u32     buffer_length;          // Total shadow buffer length   x04-x07
+        u64     reserved;               // Alignment                    x08-x0f
+        struct  {
+                u64     esid;
+                u64     vsid;
+        } save_area[SLB_NUM_BOLTED];    //                              x10-x40
+} ____cacheline_aligned;
+extern struct slb_shadow slb_shadow[];
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_LPPACA_H */
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index 3d5d590bc4b0..0a4e5c93e8e6 100644
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -23,6 +23,7 @@
 register struct paca_struct *local_paca asm("r13");
 #define get_paca()      local_paca
 #define get_lppaca()    (get_paca()->lppaca_ptr)
+#define get_slb_shadow()        (get_paca()->slb_shadow_ptr)
 struct task_struct;
@@ -99,6 +100,8 @@ struct paca_struct {
        u64 user_time;                  /* accumulated usermode TB ticks */
        u64 system_time;                /* accumulated system TB ticks */
        u64 startpurr;                  /* PURR/TB value snapshot */
+        struct slb_shadow *slb_shadow_ptr;
 };
 extern struct paca_struct paca[];
diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h
index fb597b37c2a2..b4d38b0b15f8 100644
--- a/include/asm-powerpc/page.h
+++ b/include/asm-powerpc/page.h
@@ -55,12 +55,6 @@
 #define PAGE_OFFSET     ASM_CONST(CONFIG_KERNEL_START)
 #define KERNELBASE      (PAGE_OFFSET + PHYSICAL_START)
-#ifdef CONFIG_DISCONTIGMEM
-#define page_to_pfn(page)       discontigmem_page_to_pfn(page)
-#define pfn_to_page(pfn)        discontigmem_pfn_to_page(pfn)
-#define pfn_valid(pfn)          discontigmem_pfn_valid(pfn)
-#endif
 #ifdef CONFIG_FLATMEM
 #define pfn_valid(pfn)          ((pfn) < max_mapnr)
 #endif
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h
index e7036155672e..345d9b07b3e2 100644
--- a/include/asm-powerpc/pgtable-4k.h
+++ b/include/asm-powerpc/pgtable-4k.h
@@ -88,10 +88,11 @@
 #define pgd_bad(pgd)            (pgd_val(pgd) == 0)
 #define pgd_present(pgd)        (pgd_val(pgd) != 0)
 #define pgd_clear(pgdp)         (pgd_val(*(pgdp)) = 0)
-#define pgd_page(pgd)           (pgd_val(pgd) & ~PGD_MASKED_BITS)
+#define pgd_page_vaddr(pgd)     (pgd_val(pgd) & ~PGD_MASKED_BITS)
+#define pgd_page(pgd)           virt_to_page(pgd_page_vaddr(pgd))
 #define pud_offset(pgdp, addr)  \
-  (((pud_t *) pgd_page(*(pgdp))) + \
+  (((pud_t *) pgd_page_vaddr(*(pgdp))) + \
    (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))
 #define pud_ERROR(e) \
diff --git a/include/asm-powerpc/pgtable.h b/include/asm-powerpc/pgtable.h
index 8dbf5ad8150f..10f52743f4ff 100644
--- a/include/asm-powerpc/pgtable.h
+++ b/include/asm-powerpc/pgtable.h
@@ -196,8 +196,8 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
                                 || (pmd_val(pmd) & PMD_BAD_BITS))
 #define pmd_present(pmd)        (pmd_val(pmd) != 0)
 #define pmd_clear(pmdp)         (pmd_val(*(pmdp)) = 0)
-#define pmd_page_kernel(pmd)    (pmd_val(pmd) & ~PMD_MASKED_BITS)
+#define pmd_page_vaddr(pmd)     (pmd_val(pmd) & ~PMD_MASKED_BITS)
-#define pmd_page(pmd)           virt_to_page(pmd_page_kernel(pmd))
+#define pmd_page(pmd)           virt_to_page(pmd_page_vaddr(pmd))
 #define pud_set(pudp, pudval)   (pud_val(*(pudp)) = (pudval))
 #define pud_none(pud)           (!pud_val(pud))
@@ -205,7 +205,8 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
                                 || (pud_val(pud) & PUD_BAD_BITS))
 #define pud_present(pud)        (pud_val(pud) != 0)
 #define pud_clear(pudp)         (pud_val(*(pudp)) = 0)
-#define pud_page(pud)           (pud_val(pud) & ~PUD_MASKED_BITS)
+#define pud_page_vaddr(pud)     (pud_val(pud) & ~PUD_MASKED_BITS)
+#define pud_page(pud)           virt_to_page(pud_page_vaddr(pud))
 #define pgd_set(pgdp, pudp)     ({pgd_val(*(pgdp)) = (unsigned long)(pudp);})
@@ -219,10 +220,10 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
 #define pgd_offset(mm, address)  ((mm)->pgd + pgd_index(address))
 #define pmd_offset(pudp,addr) \
-  (((pmd_t *) pud_page(*(pudp))) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)))
+  (((pmd_t *) pud_page_vaddr(*(pudp))) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)))
 #define pte_offset_kernel(dir,addr) \
-  (((pte_t *) pmd_page_kernel(*(dir))) + (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)))
+  (((pte_t *) pmd_page_vaddr(*(dir))) + (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)))
 #define pte_offset_map(dir,addr)        pte_offset_kernel((dir), (addr))
 #define pte_offset_map_nested(dir,addr) pte_offset_kernel((dir), (addr))
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index cf79bc7ebb55..1115756c79f9 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -69,6 +69,17 @@ struct pci_dev *pci_get_device_by_addr(unsigned long addr);
 void eeh_slot_error_detail (struct pci_dn *pdn, int severity);
 /**
+ * rtas_pci_enableo - enable IO transfers for this slot
+ * @pdn:       pci device node
+ * @function:  either EEH_THAW_MMIO or EEH_THAW_DMA 
+ *
+ * Enable I/O transfers to this slot 
+ */
+#define EEH_THAW_MMIO 2
+#define EEH_THAW_DMA  3
+int rtas_pci_enable(struct pci_dn *pdn, int function);
+/**
 * rtas_set_slot_reset -- unfreeze a frozen slot
 *
 * Clear the EEH-frozen condition on a slot.  This routine
diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h
index 22e54a2a6604..6cb6fb19e57f 100644
--- a/include/asm-powerpc/processor.h
+++ b/include/asm-powerpc/processor.h
@@ -32,6 +32,7 @@
 #define _CHRP_Motorola  0x04    /* motorola chrp, the cobra */
 #define _CHRP_IBM       0x05    /* IBM chrp, the longtrail and longtrail 2 */
 #define _CHRP_Pegasos   0x06    /* Genesi/bplan's Pegasos and Pegasos2 */
+#define _CHRP_briq      0x07    /* TotalImpact's briQ */
 #if defined(__KERNEL__) && defined(CONFIG_PPC32)
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index d0fa1b9aed35..524629769336 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -72,8 +72,8 @@ struct property {
 };
 struct device_node {
-        char    *name;
+        const char *name;
-        char    *type;
+        const char *type;
        phandle node;
        phandle linux_phandle;
        char    *full_name;
@@ -160,7 +160,7 @@ extern void unflatten_device_tree(void);
 extern void early_init_devtree(void *);
 extern int device_is_compatible(struct device_node *device, const char *);
 extern int machine_is_compatible(const char *compat);
-extern void *get_property(struct device_node *node, const char *name,
+extern const void *get_property(struct device_node *node, const char *name,
                int *lenp);
 extern void print_properties(struct device_node *node);
 extern int prom_n_addr_cells(struct device_node* np);
@@ -197,8 +197,8 @@ extern int release_OF_resource(struct device_node* node, int index);
 */
-/* Helper to read a big number */
+/* Helper to read a big number; size is in cells (not bytes) */
-static inline u64 of_read_number(u32 *cell, int size)
+static inline u64 of_read_number(const u32 *cell, int size)
 {
        u64 r = 0;
        while (size--)
@@ -206,18 +206,28 @@ static inline u64 of_read_number(u32 *cell, int size)
        return r;
 }
+/* Like of_read_number, but we want an unsigned long result */
+#ifdef CONFIG_PPC32
+static inline unsigned long of_read_ulong(const u32 *cell, int size)
+{
+        return cell[size-1];
+}
+#else
+#define of_read_ulong(cell, size)       of_read_number(cell, size)
+#endif
 /* Translate an OF address block into a CPU physical address
 */
 #define OF_BAD_ADDR     ((u64)-1)
-extern u64 of_translate_address(struct device_node *np, u32 *addr);
+extern u64 of_translate_address(struct device_node *np, const u32 *addr);
 /* Extract an address from a device, returns the region size and
 * the address space flags too. The PCI version uses a BAR number
 * instead of an absolute index
 */
-extern u32 *of_get_address(struct device_node *dev, int index,
+extern const u32 *of_get_address(struct device_node *dev, int index,
                           u64 *size, unsigned int *flags);
-extern u32 *of_get_pci_address(struct device_node *dev, int bar_no,
+extern const u32 *of_get_pci_address(struct device_node *dev, int bar_no,
                               u64 *size, unsigned int *flags);
 /* Get an address as a resource. Note that if your address is
@@ -234,7 +244,7 @@ extern int of_pci_address_to_resource(struct device_node *dev, int bar,
 /* Parse the ibm,dma-window property of an OF node into the busno, phys and
 * size parameters.
 */
-void of_parse_dma_window(struct device_node *dn, unsigned char *dma_window_prop,
+void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
                unsigned long *busno, unsigned long *phys, unsigned long *size);
 extern void kdump_move_device_tree(void);
@@ -259,7 +269,7 @@ struct of_irq {
        u32 specifier[OF_MAX_IRQ_SPEC]; /* Specifier copy */
 };
-/***
+/**
 * of_irq_map_init - Initialize the irq remapper
 * @flags:      flags defining workarounds to enable
 *
@@ -272,7 +282,7 @@ struct of_irq {
 extern void of_irq_map_init(unsigned int flags);
-/***
+/**
 * of_irq_map_raw - Low level interrupt tree parsing
 * @parent:     the device interrupt parent
 * @intspec:    interrupt specifier ("interrupts" property of the device)
@@ -289,12 +299,12 @@ extern void of_irq_map_init(unsigned int flags);
 *
 */
-extern int of_irq_map_raw(struct device_node *parent, u32 *intspec,
+extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
-                          u32 ointsize, u32 *addr,
+                          u32 ointsize, const u32 *addr,
                          struct of_irq *out_irq);
-/***
+/**
 * of_irq_map_one - Resolve an interrupt for a device
 * @device:     the device whose interrupt is to be resolved
 * @index:      index of the interrupt to resolve
@@ -307,7 +317,7 @@ extern int of_irq_map_raw(struct device_node *parent, u32 *intspec,
 extern int of_irq_map_one(struct device_node *device, int index,
                          struct of_irq *out_irq);
-/***
+/**
 * of_irq_map_pci - Resolve the interrupt for a PCI device
 * @pdev:       the device whose interrupt is to be resolved
 * @out_irq:    structure of_irq filled by this function
diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h
index dc4cb9cc73a1..4435efe85d0e 100644
--- a/include/asm-powerpc/ptrace.h
+++ b/include/asm-powerpc/ptrace.h
@@ -215,12 +215,10 @@ do {									      \
 #define PTRACE_GETVRREGS        18
 #define PTRACE_SETVRREGS        19
-#ifndef __powerpc64__
 /* Get/set all the upper 32-bits of the SPE registers, accumulator, and
 * spefscr, in one go */
 #define PTRACE_GETEVRREGS       20
 #define PTRACE_SETEVRREGS       21
-#endif /* __powerpc64__ */
 /*
 * Get or set a debug register. The first 16 are DABR registers and the
@@ -235,7 +233,6 @@ do {									      \
 #define PPC_PTRACE_GETFPREGS    0x97    /* Get FPRs 0 - 31 */
 #define PPC_PTRACE_SETFPREGS    0x96    /* Set FPRs 0 - 31 */
-#ifdef __powerpc64__
 /* Calls to trace a 64bit program from a 32bit program */
 #define PPC_PTRACE_PEEKTEXT_3264 0x95
 #define PPC_PTRACE_PEEKDATA_3264 0x94
@@ -243,6 +240,5 @@ do {									      \
 #define PPC_PTRACE_POKEDATA_3264 0x92
 #define PPC_PTRACE_PEEKUSR_3264  0x91
 #define PPC_PTRACE_POKEUSR_3264  0x90
-#endif /* __powerpc64__ */
 #endif /* _ASM_POWERPC_PTRACE_H */
diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h
index cf73475a0c69..3a9fcc15811b 100644
--- a/include/asm-powerpc/reg.h
+++ b/include/asm-powerpc/reg.h
@@ -592,6 +592,7 @@
 #define PV_630p 0x0041
 #define PV_970MP        0x0044
 #define PV_BE           0x0070
+#define PV_PA6T         0x0090
 /*
 * Number of entries in the SLB. If this ever changes we should handle
diff --git a/include/asm-powerpc/rtas.h b/include/asm-powerpc/rtas.h
index 82a27e9a041f..d34f9e1f242c 100644
--- a/include/asm-powerpc/rtas.h
+++ b/include/asm-powerpc/rtas.h
@@ -230,5 +230,21 @@ extern unsigned long rtas_rmo_buf;
 #define GLOBAL_INTERRUPT_QUEUE 9005
+/**
+ * rtas_config_addr - Format a busno, devfn and reg for RTAS.
+ * @busno: The bus number.
+ * @devfn: The device and function number as encoded by PCI_DEVFN().
+ * @reg: The register number.
+ *
+ * This function encodes the given busno, devfn and register number as
+ * required for RTAS calls that take a "config_addr" parameter.
+ * See PAPR requirement 7.3.4-1 for more info.
+ */
+static inline u32 rtas_config_addr(int busno, int devfn, int reg)
+{
+        return ((reg & 0xf00) << 20) | ((busno & 0xff) << 16) |
+                        (devfn << 8) | (reg & 0xff);
+}
 #endif /* __KERNEL__ */
 #endif /* _POWERPC_RTAS_H */
diff --git a/include/asm-powerpc/smu.h b/include/asm-powerpc/smu.h
index 51e65fc46a03..e49f644ca63a 100644
--- a/include/asm-powerpc/smu.h
+++ b/include/asm-powerpc/smu.h
@@ -517,7 +517,7 @@ struct smu_sdbp_cpupiddata {
 * This returns the pointer to an SMU "sdb" partition data or NULL
 * if not found. The data format is described below
 */
-extern struct smu_sdbp_header *smu_get_sdb_partition(int id,
+extern const struct smu_sdbp_header *smu_get_sdb_partition(int id,
                                        unsigned int *size);
 /* Get "sdb" partition data from an SMU satellite */
diff --git a/include/asm-powerpc/spinlock.h b/include/asm-powerpc/spinlock.h
index c31e4382a775..cc4cfceac67c 100644
--- a/include/asm-powerpc/spinlock.h
+++ b/include/asm-powerpc/spinlock.h
@@ -285,5 +285,9 @@ static __inline__ void __raw_write_unlock(raw_rwlock_t *rw)
        rw->lock = 0;
 }
+#define _raw_spin_relax(lock)   __spin_yield(lock)
+#define _raw_read_relax(lock)   __rw_yield(lock)
+#define _raw_write_relax(lock)  __rw_yield(lock)
 #endif /* __KERNEL__ */
 #endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index c02d105d8294..b42b53c40f5d 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -106,7 +106,7 @@ struct spu_context;
 struct spu_runqueue;
 struct spu {
-        char *name;
+        const char *name;
        unsigned long local_store_phys;
        u8 *local_store;
        unsigned long problem_phys;
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index 4c9f5229e833..4b41deaa8d8d 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -177,11 +177,6 @@ extern u32 booke_wdt_enabled;
 extern u32 booke_wdt_period;
 #endif /* CONFIG_BOOKE_WDT */
-/* EBCDIC -> ASCII conversion for [0-9A-Z] on iSeries */
-extern unsigned char e2a(unsigned char);
-extern unsigned char* strne2a(unsigned char *dest,
-                const unsigned char *src, size_t n);
 struct device_node;
 extern void note_scsi_host(struct device_node *, void *);
diff --git a/include/asm-powerpc/vio.h b/include/asm-powerpc/vio.h
index dc9bd101ca14..4b51d42e1419 100644
--- a/include/asm-powerpc/vio.h
+++ b/include/asm-powerpc/vio.h
@@ -46,8 +46,8 @@ struct iommu_table;
 */
 struct vio_dev {
        struct iommu_table *iommu_table;     /* vio_map_* uses this */
-        char *name;
+        const char *name;
-        char *type;
+        const char *type;
        uint32_t unit_address;
        unsigned int irq;
        struct device dev;
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h
index cf62b69cb69a..499c14691c71 100644
--- a/include/asm-ppc/ibm4xx.h
+++ b/include/asm-ppc/ibm4xx.h
@@ -86,7 +86,7 @@ void ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5,
 #define PCI_DRAM_OFFSET 0
 #endif
-#elif CONFIG_44x
+#elif defined(CONFIG_44x)
 #if defined(CONFIG_BAMBOO)
 #include <platforms/4xx/bamboo.h>
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 680555be22ec..3d9a9e6f3321 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -327,26 +327,12 @@ __do_out_asm(outl, "stwbrx")
 #define inl_p(port)             inl((port))
 #define outl_p(val, port)       outl((val), (port))
-extern void _insb(volatile u8 __iomem *port, void *buf, int ns);
+extern void _insb(volatile u8 __iomem *port, void *buf, long count);
-extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns);
+extern void _outsb(volatile u8 __iomem *port, const void *buf, long count);
-extern void _insw(volatile u16 __iomem *port, void *buf, int ns);
+extern void _insw_ns(volatile u16 __iomem *port, void *buf, long count);
-extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns);
+extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count);
-extern void _insl(volatile u32 __iomem *port, void *buf, int nl);
+extern void _insl_ns(volatile u32 __iomem *port, void *buf, long count);
-extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl);
+extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count);
-extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns);
-extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
-extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);
-extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl);
-/*
- * The *_ns versions below don't do byte-swapping.
- * Neither do the standard versions now, these are just here
- * for older code.
- */
-#define insw_ns(port, buf, ns)  _insw_ns((port)+___IO_BASE, (buf), (ns))
-#define outsw_ns(port, buf, ns) _outsw_ns((port)+___IO_BASE, (buf), (ns))
-#define insl_ns(port, buf, nl)  _insl_ns((port)+___IO_BASE, (buf), (nl))
-#define outsl_ns(port, buf, nl) _outsl_ns((port)+___IO_BASE, (buf), (nl))
 #define IO_SPACE_LIMIT ~0
diff --git a/include/asm-ppc/mpc8260_pci9.h b/include/asm-ppc/mpc8260_pci9.h
index 26b3f6e787bc..9f7176881c56 100644
--- a/include/asm-ppc/mpc8260_pci9.h
+++ b/include/asm-ppc/mpc8260_pci9.h
@@ -30,8 +30,6 @@
 #undef inb
 #undef inw
 #undef inl
-#undef insw_ns
-#undef insl_ns
 #undef memcpy_fromio
 extern int readb(volatile unsigned char *addr);
@@ -43,8 +41,6 @@ extern void insl(unsigned port, void *buf, int nl);
 extern int inb(unsigned port);
 extern int inw(unsigned port);
 extern unsigned inl(unsigned port);
-extern void insw_ns(unsigned port, void *buf, int ns);
-extern void insl_ns(unsigned port, void *buf, int nl);
 extern void *memcpy_fromio(void *dest, unsigned long src, size_t count);
 #endif /* !__CONFIG_8260_PCI9_DEFS */
diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h
index 51fa7c662917..b1fdbf40dba2 100644
--- a/include/asm-ppc/pgtable.h
+++ b/include/asm-ppc/pgtable.h
@@ -526,7 +526,7 @@ static inline int pgd_bad(pgd_t pgd)		{ return 0; }
 static inline int pgd_present(pgd_t pgd)        { return 1; }
 #define pgd_clear(xp)                           do { } while (0)
-#define pgd_page(pgd) \
+#define pgd_page_vaddr(pgd) \
        ((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))
 /*
@@ -720,12 +720,12 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
 * of the pte page.  -- paulus
 */
 #ifndef CONFIG_BOOKE
-#define pmd_page_kernel(pmd)    \
+#define pmd_page_vaddr(pmd)     \
        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 #define pmd_page(pmd)           \
        (mem_map + (pmd_val(pmd) >> PAGE_SHIFT))
 #else
-#define pmd_page_kernel(pmd)    \
+#define pmd_page_vaddr(pmd)     \
        ((unsigned long) (pmd_val(pmd) & PAGE_MASK))
 #define pmd_page(pmd)           \
        (mem_map + (__pa(pmd_val(pmd)) >> PAGE_SHIFT))
@@ -748,7 +748,7 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 #define pte_index(address)              \
        (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, addr)    \
-        ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(addr))
+        ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr))
 #define pte_offset_map(dir, addr)               \
        ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE0) + pte_index(addr))
 #define pte_offset_map_nested(dir, addr)        \
diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h
index 4944c0fb8bea..602fbadeaf48 100644
--- a/include/asm-ppc/reg_booke.h
+++ b/include/asm-ppc/reg_booke.h
@@ -300,14 +300,14 @@ do {						\
 #define DBSR_IC         0x80000000      /* Instruction Completion */
 #define DBSR_BT         0x40000000      /* Branch taken */
 #define DBSR_TIE        0x10000000      /* Trap Instruction debug Event */
-#define DBSR_IAC1       0x00800000      /* Instruction Address Compare 1 Event */
+#define DBSR_IAC1       0x04000000      /* Instruction Address Compare 1 Event */
-#define DBSR_IAC2       0x00400000      /* Instruction Address Compare 2 Event */
+#define DBSR_IAC2       0x02000000      /* Instruction Address Compare 2 Event */
-#define DBSR_IAC3       0x00200000      /* Instruction Address Compare 3 Event */
+#define DBSR_IAC3       0x00080000      /* Instruction Address Compare 3 Event */
-#define DBSR_IAC4       0x00100000      /* Instruction Address Compare 4 Event */
+#define DBSR_IAC4       0x00040000      /* Instruction Address Compare 4 Event */
-#define DBSR_DAC1R      0x00080000      /* Data Address Compare 1 Read Event */
+#define DBSR_DAC1R      0x01000000      /* Data Address Compare 1 Read Event */
-#define DBSR_DAC1W      0x00040000      /* Data Address Compare 1 Write Event */
+#define DBSR_DAC1W      0x00800000      /* Data Address Compare 1 Write Event */
-#define DBSR_DAC2R      0x00020000      /* Data Address Compare 2 Read Event */
+#define DBSR_DAC2R      0x00400000      /* Data Address Compare 2 Read Event */
-#define DBSR_DAC2W      0x00010000      /* Data Address Compare 2 Write Event */
+#define DBSR_DAC2W      0x00200000      /* Data Address Compare 2 Write Event */
 #endif
 /* Bit definitions related to the ESR. */
diff --git a/include/asm-ppc/spinlock.h b/include/asm-ppc/spinlock.h
index 5c64b75f0295..fccaf5531e57 100644
--- a/include/asm-ppc/spinlock.h
+++ b/include/asm-ppc/spinlock.h
@@ -161,4 +161,8 @@ static __inline__ void __raw_write_unlock(raw_rwlock_t *rw)
        rw->lock = 0;
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
index ed8955f49e47..e92b429d2be1 100644
--- a/include/asm-s390/Kbuild
+++ b/include/asm-s390/Kbuild
@@ -1,4 +1,12 @@
 include include/asm-generic/Kbuild.asm
-unifdef-y += cmb.h debug.h
+header-y += dasd.h
-header-y += dasd.h qeth.h tape390.h ucontext.h vtoc.h z90crypt.h
+header-y += monwriter.h
+header-y += qeth.h
+header-y += tape390.h
+header-y += ucontext.h
+header-y += vtoc.h
+header-y += zcrypt.h
+unifdef-y += cmb.h
+unifdef-y += debug.h
diff --git a/include/asm-s390/appldata.h b/include/asm-s390/appldata.h
new file mode 100644
index 000000000000..79283dac8281
--- /dev/null
+++ b/include/asm-s390/appldata.h
@@ -0,0 +1,90 @@
+/*
+ * include/asm-s390/appldata.h
+ *
+ * Copyright (C) IBM Corp. 2006
+ *
+ * Author(s): Melissa Howland <melissah@us.ibm.com>
+ */
+#ifndef _ASM_S390_APPLDATA_H
+#define _ASM_S390_APPLDATA_H
+#include <asm/io.h>
+#ifndef CONFIG_64BIT
+#define APPLDATA_START_INTERVAL_REC     0x00    /* Function codes for */
+#define APPLDATA_STOP_REC               0x01    /* DIAG 0xDC          */
+#define APPLDATA_GEN_EVENT_REC          0x02
+#define APPLDATA_START_CONFIG_REC       0x03
+/*
+ * Parameter list for DIAGNOSE X'DC'
+ */
+struct appldata_parameter_list {
+        u16 diag;               /* The DIAGNOSE code X'00DC'          */
+        u8  function;           /* The function code for the DIAGNOSE */
+        u8  parlist_length;     /* Length of the parameter list       */
+        u32 product_id_addr;    /* Address of the 16-byte product ID  */
+        u16 reserved;
+        u16 buffer_length;      /* Length of the application data buffer  */
+        u32 buffer_addr;        /* Address of the application data buffer */
+} __attribute__ ((packed));
+#else /* CONFIG_64BIT */
+#define APPLDATA_START_INTERVAL_REC     0x80
+#define APPLDATA_STOP_REC               0x81
+#define APPLDATA_GEN_EVENT_REC          0x82
+#define APPLDATA_START_CONFIG_REC       0x83
+/*
+ * Parameter list for DIAGNOSE X'DC'
+ */
+struct appldata_parameter_list {
+        u16 diag;
+        u8  function;
+        u8  parlist_length;
+        u32 unused01;
+        u16 reserved;
+        u16 buffer_length;
+        u32 unused02;
+        u64 product_id_addr;
+        u64 buffer_addr;
+} __attribute__ ((packed));
+#endif /* CONFIG_64BIT */
+struct appldata_product_id {
+        char prod_nr[7];        /* product number */
+        u16  prod_fn;           /* product function */
+        u8   record_nr;         /* record number */
+        u16  version_nr;        /* version */
+        u16  release_nr;        /* release */
+        u16  mod_lvl;           /* modification level */
+} __attribute__ ((packed));
+static inline int appldata_asm(struct appldata_product_id *id,
+                               unsigned short fn, void *buffer,
+                               unsigned short length)
+{
+        struct appldata_parameter_list parm_list;
+        int ry;
+        if (!MACHINE_IS_VM)
+                return -ENOSYS;
+        parm_list.diag = 0xdc;
+        parm_list.function = fn;
+        parm_list.parlist_length = sizeof(parm_list);
+        parm_list.buffer_length = length;
+        parm_list.product_id_addr = (unsigned long) id;
+        parm_list.buffer_addr = virt_to_phys(buffer);
+        asm volatile(
+                "       diag    %1,%0,0xdc"
+                : "=d" (ry)
+                : "d" (&parm_list), "m" (parm_list), "m" (*id)
+                : "cc");
+        return ry;
+}
+#endif /* _ASM_S390_APPLDATA_H */
diff --git a/include/asm-s390/atomic.h b/include/asm-s390/atomic.h
index 399bf02894dd..af20c7462485 100644
--- a/include/asm-s390/atomic.h
+++ b/include/asm-s390/atomic.h
@@ -30,20 +30,43 @@ typedef struct {
 #ifdef __KERNEL__
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
 #define __CS_LOOP(ptr, op_val, op_string) ({                            \
        typeof(ptr->counter) old_val, new_val;                          \
-        __asm__ __volatile__("   l     %0,0(%3)\n"                      \
+        asm volatile(                                                   \
-                             "0: lr    %1,%0\n"                         \
+                "       l       %0,%2\n"                                \
-                             op_string "  %1,%4\n"                      \
+                "0:     lr      %1,%0\n"                                \
-                             "   cs    %0,%1,0(%3)\n"                   \
+                op_string "     %1,%3\n"                                \
-                             "   jl    0b"                              \
+                "       cs      %0,%1,%2\n"                             \
-                             : "=&d" (old_val), "=&d" (new_val),        \
+                "       jl      0b"                                     \
-                               "=m" (((atomic_t *)(ptr))->counter)      \
+                : "=&d" (old_val), "=&d" (new_val),                     \
-                             : "a" (ptr), "d" (op_val),                 \
+                  "=Q" (((atomic_t *)(ptr))->counter)                   \
-                               "m" (((atomic_t *)(ptr))->counter)       \
+                : "d" (op_val),  "Q" (((atomic_t *)(ptr))->counter)     \
-                             : "cc", "memory" );                        \
+                : "cc", "memory");                                      \
        new_val;                                                        \
 })
+#else /* __GNUC__ */
+#define __CS_LOOP(ptr, op_val, op_string) ({                            \
+        typeof(ptr->counter) old_val, new_val;                          \
+        asm volatile(                                                   \
+                "       l       %0,0(%3)\n"                             \
+                "0:     lr      %1,%0\n"                                \
+                op_string "     %1,%4\n"                                \
+                "       cs      %0,%1,0(%3)\n"                          \
+                "       jl      0b"                                     \
+                : "=&d" (old_val), "=&d" (new_val),                     \
+                  "=m" (((atomic_t *)(ptr))->counter)                   \
+                : "a" (ptr), "d" (op_val),                              \
+                  "m" (((atomic_t *)(ptr))->counter)                    \
+                : "cc", "memory");                                      \
+        new_val;                                                        \
+})
+#endif /* __GNUC__ */
 #define atomic_read(v)          ((v)->counter)
 #define atomic_set(v,i)         (((v)->counter) = (i))
@@ -81,10 +104,19 @@ static __inline__ void atomic_set_mask(unsigned long mask, atomic_t * v)
 static __inline__ int atomic_cmpxchg(atomic_t *v, int old, int new)
 {
-        __asm__ __volatile__("  cs   %0,%3,0(%2)\n"
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-                             : "+d" (old), "=m" (v->counter)
+        asm volatile(
-                             : "a" (v), "d" (new), "m" (v->counter)
+                "       cs      %0,%2,%1"
-                             : "cc", "memory" );
+                : "+d" (old), "=Q" (v->counter)
+                : "d" (new), "Q" (v->counter)
+                : "cc", "memory");
+#else /* __GNUC__ */
+        asm volatile(
+                "       cs      %0,%3,0(%2)"
+                : "+d" (old), "=m" (v->counter)
+                : "a" (v), "d" (new), "m" (v->counter)
+                : "cc", "memory");
+#endif /* __GNUC__ */
        return old;
 }
@@ -113,20 +145,43 @@ typedef struct {
 } __attribute__ ((aligned (8))) atomic64_t;
 #define ATOMIC64_INIT(i)  { (i) }
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
 #define __CSG_LOOP(ptr, op_val, op_string) ({                           \
        typeof(ptr->counter) old_val, new_val;                          \
-        __asm__ __volatile__("   lg    %0,0(%3)\n"                      \
+        asm volatile(                                                   \
-                             "0: lgr   %1,%0\n"                         \
+                "       lg      %0,%2\n"                                \
-                             op_string "  %1,%4\n"                      \
+                "0:     lgr     %1,%0\n"                                \
-                             "   csg   %0,%1,0(%3)\n"                   \
+                op_string "     %1,%3\n"                                \
-                             "   jl    0b"                              \
+                "       csg     %0,%1,%2\n"                             \
-                             : "=&d" (old_val), "=&d" (new_val),        \
+                "       jl      0b"                                     \
-                               "=m" (((atomic_t *)(ptr))->counter)      \
+                : "=&d" (old_val), "=&d" (new_val),                     \
-                             : "a" (ptr), "d" (op_val),                 \
+                  "=Q" (((atomic_t *)(ptr))->counter)                   \
-                               "m" (((atomic_t *)(ptr))->counter)       \
+                : "d" (op_val), "Q" (((atomic_t *)(ptr))->counter)      \
-                             : "cc", "memory" );                        \
+                : "cc", "memory" );                                     \
        new_val;                                                        \
 })
+#else /* __GNUC__ */
+#define __CSG_LOOP(ptr, op_val, op_string) ({                           \
+        typeof(ptr->counter) old_val, new_val;                          \
+        asm volatile(                                                   \
+                "       lg      %0,0(%3)\n"                             \
+                "0:     lgr     %1,%0\n"                                \
+                op_string "     %1,%4\n"                                \
+                "       csg     %0,%1,0(%3)\n"                          \
+                "       jl      0b"                                     \
+                : "=&d" (old_val), "=&d" (new_val),                     \
+                  "=m" (((atomic_t *)(ptr))->counter)                   \
+                : "a" (ptr), "d" (op_val),                              \
+                  "m" (((atomic_t *)(ptr))->counter)                    \
+                : "cc", "memory" );                                     \
+        new_val;                                                        \
+})
+#endif /* __GNUC__ */
 #define atomic64_read(v)          ((v)->counter)
 #define atomic64_set(v,i)         (((v)->counter) = (i))
@@ -163,10 +218,19 @@ static __inline__ void atomic64_set_mask(unsigned long mask, atomic64_t * v)
 static __inline__ long long atomic64_cmpxchg(atomic64_t *v,
                                             long long old, long long new)
 {
-        __asm__ __volatile__("  csg  %0,%3,0(%2)\n"
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-                             : "+d" (old), "=m" (v->counter)
+        asm volatile(
-                             : "a" (v), "d" (new), "m" (v->counter)
+                "       csg     %0,%2,%1"
-                             : "cc", "memory" );
+                : "+d" (old), "=Q" (v->counter)
+                : "d" (new), "Q" (v->counter)
+                : "cc", "memory");
+#else /* __GNUC__ */
+        asm volatile(
+                "       csg     %0,%3,0(%2)"
+                : "+d" (old), "=m" (v->counter)
+                : "a" (v), "d" (new), "m" (v->counter)
+                : "cc", "memory");
+#endif /* __GNUC__ */
        return old;
 }
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h
index 0ddcdba79e4a..f79c9b792af1 100644
--- a/include/asm-s390/bitops.h
+++ b/include/asm-s390/bitops.h
@@ -67,16 +67,35 @@ extern const char _sb_findmap[];
 #define __BITOPS_AND            "nr"
 #define __BITOPS_XOR            "xr"
-#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string)         \
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-        __asm__ __volatile__("   l   %0,0(%4)\n"                        \
-                             "0: lr  %1,%0\n"                           \
+#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string) \
-                             __op_string "  %1,%3\n"                    \
+        asm volatile(                                           \
-                             "   cs  %0,%1,0(%4)\n"                     \
+                "       l       %0,%2\n"                        \
-                             "   jl  0b"                                \
+                "0:     lr      %1,%0\n"                        \
-                             : "=&d" (__old), "=&d" (__new),            \
+                __op_string "   %1,%3\n"                        \
-                               "=m" (*(unsigned long *) __addr)         \
+                "       cs      %0,%1,%2\n"                     \
-                             : "d" (__val), "a" (__addr),               \
+                "       jl      0b"                             \
-                               "m" (*(unsigned long *) __addr) : "cc" );
+                : "=&d" (__old), "=&d" (__new),                 \
+                  "=Q" (*(unsigned long *) __addr)              \
+                : "d" (__val), "Q" (*(unsigned long *) __addr)  \
+                : "cc");
+#else /* __GNUC__ */
+#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string) \
+        asm volatile(                                           \
+                "       l       %0,0(%4)\n"                     \
+                "0:     lr      %1,%0\n"                        \
+                __op_string "   %1,%3\n"                        \
+                "       cs      %0,%1,0(%4)\n"                  \
+                "       jl      0b"                             \
+                : "=&d" (__old), "=&d" (__new),                 \
+                  "=m" (*(unsigned long *) __addr)              \
+                : "d" (__val), "a" (__addr),                    \
+                  "m" (*(unsigned long *) __addr) : "cc");
+#endif /* __GNUC__ */
 #else /* __s390x__ */
@@ -86,21 +105,41 @@ extern const char _sb_findmap[];
 #define __BITOPS_AND            "ngr"
 #define __BITOPS_XOR            "xgr"
-#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string)         \
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-        __asm__ __volatile__("   lg  %0,0(%4)\n"                        \
-                             "0: lgr %1,%0\n"                           \
+#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string) \
-                             __op_string "  %1,%3\n"                    \
+        asm volatile(                                           \
-                             "   csg %0,%1,0(%4)\n"                     \
+                "       lg      %0,%2\n"                        \
-                             "   jl  0b"                                \
+                "0:     lgr     %1,%0\n"                        \
-                             : "=&d" (__old), "=&d" (__new),            \
+                __op_string "   %1,%3\n"                        \
-                               "=m" (*(unsigned long *) __addr)         \
+                "       csg     %0,%1,%2\n"                     \
-                             : "d" (__val), "a" (__addr),               \
+                "       jl      0b"                             \
-                               "m" (*(unsigned long *) __addr) : "cc" );
+                : "=&d" (__old), "=&d" (__new),                 \
+                  "=Q" (*(unsigned long *) __addr)              \
+                : "d" (__val), "Q" (*(unsigned long *) __addr)  \
+                : "cc");
+#else /* __GNUC__ */
+#define __BITOPS_LOOP(__old, __new, __addr, __val, __op_string) \
+        asm volatile(                                           \
+                "       lg      %0,0(%4)\n"                     \
+                "0:     lgr     %1,%0\n"                        \
+                __op_string "   %1,%3\n"                        \
+                "       csg     %0,%1,0(%4)\n"                  \
+                "       jl      0b"                             \
+                : "=&d" (__old), "=&d" (__new),                 \
+                  "=m" (*(unsigned long *) __addr)              \
+                : "d" (__val), "a" (__addr),                    \
+                  "m" (*(unsigned long *) __addr) : "cc");
+#endif /* __GNUC__ */
 #endif /* __s390x__ */
 #define __BITOPS_WORDS(bits) (((bits)+__BITOPS_WORDSIZE-1)/__BITOPS_WORDSIZE)
-#define __BITOPS_BARRIER() __asm__ __volatile__ ( "" : : : "memory" )
+#define __BITOPS_BARRIER() asm volatile("" : : : "memory")
 #ifdef CONFIG_SMP
 /*
@@ -217,10 +256,10 @@ static inline void __set_bit(unsigned long nr, volatile unsigned long *ptr)
        unsigned long addr;
        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        asm volatile("oc 0(1,%1),0(%2)"
+        asm volatile(
-                     : "=m" (*(char *) addr)
+                "       oc      0(1,%1),0(%2)"
-                     : "a" (addr), "a" (_oi_bitmap + (nr & 7)),
+                : "=m" (*(char *) addr) : "a" (addr),
-                       "m" (*(char *) addr) : "cc" );
+                  "a" (_oi_bitmap + (nr & 7)), "m" (*(char *) addr) : "cc" );
 }
 static inline void 
@@ -229,40 +268,7 @@ __constant_set_bit(const unsigned long nr, volatile unsigned long *ptr)
        unsigned long addr;
        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        switch (nr&7) {
+        *(unsigned char *) addr |= 1 << (nr & 7);
-        case 0:
-                asm volatile ("oi 0(%1),0x01" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 1:
-                asm volatile ("oi 0(%1),0x02" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 2:
-                asm volatile ("oi 0(%1),0x04" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 3:
-                asm volatile ("oi 0(%1),0x08" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 4:
-                asm volatile ("oi 0(%1),0x10" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 5:
-                asm volatile ("oi 0(%1),0x20" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 6:
-                asm volatile ("oi 0(%1),0x40" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 7:
-                asm volatile ("oi 0(%1),0x80" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        }
 }
 #define set_bit_simple(nr,addr) \
@@ -279,10 +285,10 @@ __clear_bit(unsigned long nr, volatile unsigned long *ptr)
        unsigned long addr;
        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        asm volatile("nc 0(1,%1),0(%2)"
+        asm volatile(
-                     : "=m" (*(char *) addr)
+                "       nc      0(1,%1),0(%2)"
-                     : "a" (addr), "a" (_ni_bitmap + (nr & 7)),
+                : "=m" (*(char *) addr) : "a" (addr),
-                       "m" (*(char *) addr) : "cc" );
+                  "a" (_ni_bitmap + (nr & 7)), "m" (*(char *) addr) : "cc");
 }
 static inline void 
@@ -291,40 +297,7 @@ __constant_clear_bit(const unsigned long nr, volatile unsigned long *ptr)
        unsigned long addr;
        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        switch (nr&7) {
+        *(unsigned char *) addr &= ~(1 << (nr & 7));
-        case 0:
-                asm volatile ("ni 0(%1),0xFE" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 1:
-                asm volatile ("ni 0(%1),0xFD": "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 2:
-                asm volatile ("ni 0(%1),0xFB" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 3:
-                asm volatile ("ni 0(%1),0xF7" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 4:
-                asm volatile ("ni 0(%1),0xEF" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 5:
-                asm volatile ("ni 0(%1),0xDF" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 6:
-                asm volatile ("ni 0(%1),0xBF" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 7:
-                asm volatile ("ni 0(%1),0x7F" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        }
 }
 #define clear_bit_simple(nr,addr) \
@@ -340,10 +313,10 @@ static inline void __change_bit(unsigned long nr, volatile unsigned long *ptr)
        unsigned long addr;
        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        asm volatile("xc 0(1,%1),0(%2)"
+        asm volatile(
-                     :  "=m" (*(char *) addr)
+                "       xc      0(1,%1),0(%2)"
-                     : "a" (addr), "a" (_oi_bitmap + (nr & 7)),
+                :  "=m" (*(char *) addr) : "a" (addr),
-                       "m" (*(char *) addr) : "cc" );
+                   "a" (_oi_bitmap + (nr & 7)), "m" (*(char *) addr) : "cc" );
 }
 static inline void 
@@ -352,40 +325,7 @@ __constant_change_bit(const unsigned long nr, volatile unsigned long *ptr)
        unsigned long addr;
        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
-        switch (nr&7) {
+        *(unsigned char *) addr ^= 1 << (nr & 7);
-        case 0:
-                asm volatile ("xi 0(%1),0x01" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 1:
-                asm volatile ("xi 0(%1),0x02" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 2:
-                asm volatile ("xi 0(%1),0x04" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 3:
-                asm volatile ("xi 0(%1),0x08" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 4:
-                asm volatile ("xi 0(%1),0x10" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 5:
-                asm volatile ("xi 0(%1),0x20" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 6:
-                asm volatile ("xi 0(%1),0x40" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        case 7:
-                asm volatile ("xi 0(%1),0x80" : "=m" (*(char *) addr)
-                              : "a" (addr), "m" (*(char *) addr) : "cc" );
-                break;
-        }
 }
 #define change_bit_simple(nr,addr) \
@@ -404,10 +344,11 @@ test_and_set_bit_simple(unsigned long nr, volatile unsigned long *ptr)
        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
        ch = *(unsigned char *) addr;
-        asm volatile("oc 0(1,%1),0(%2)"
+        asm volatile(
-                     : "=m" (*(char *) addr)
+                "       oc      0(1,%1),0(%2)"
-                     : "a" (addr), "a" (_oi_bitmap + (nr & 7)),
+                : "=m" (*(char *) addr)
-                       "m" (*(char *) addr) : "cc", "memory" );
+                : "a" (addr), "a" (_oi_bitmap + (nr & 7)),
+                  "m" (*(char *) addr) : "cc", "memory");
        return (ch >> (nr & 7)) & 1;
 }
 #define __test_and_set_bit(X,Y)         test_and_set_bit_simple(X,Y)
@@ -423,10 +364,11 @@ test_and_clear_bit_simple(unsigned long nr, volatile unsigned long *ptr)
        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
        ch = *(unsigned char *) addr;
-        asm volatile("nc 0(1,%1),0(%2)"
+        asm volatile(
-                     : "=m" (*(char *) addr)
+                "       nc      0(1,%1),0(%2)"
-                     : "a" (addr), "a" (_ni_bitmap + (nr & 7)),
+                : "=m" (*(char *) addr)
-                       "m" (*(char *) addr) : "cc", "memory" );
+                : "a" (addr), "a" (_ni_bitmap + (nr & 7)),
+                  "m" (*(char *) addr) : "cc", "memory");
        return (ch >> (nr & 7)) & 1;
 }
 #define __test_and_clear_bit(X,Y)       test_and_clear_bit_simple(X,Y)
@@ -442,10 +384,11 @@ test_and_change_bit_simple(unsigned long nr, volatile unsigned long *ptr)
        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
        ch = *(unsigned char *) addr;
-        asm volatile("xc 0(1,%1),0(%2)"
+        asm volatile(
-                     : "=m" (*(char *) addr)
+                "       xc      0(1,%1),0(%2)"
-                     : "a" (addr), "a" (_oi_bitmap + (nr & 7)),
+                : "=m" (*(char *) addr)
-                       "m" (*(char *) addr) : "cc", "memory" );
+                : "a" (addr), "a" (_oi_bitmap + (nr & 7)),
+                  "m" (*(char *) addr) : "cc", "memory");
        return (ch >> (nr & 7)) & 1;
 }
 #define __test_and_change_bit(X,Y)      test_and_change_bit_simple(X,Y)
@@ -557,35 +500,36 @@ find_first_zero_bit(const unsigned long * addr, unsigned long size)
        if (!size)
                return 0;
-        __asm__("   lhi  %1,-1\n"
+        asm volatile(
-                "   lr   %2,%3\n"
+                "       lhi     %1,-1\n"
-                "   slr  %0,%0\n"
+                "       lr      %2,%3\n"
-                "   ahi  %2,31\n"
+                "       slr     %0,%0\n"
-                "   srl  %2,5\n"
+                "       ahi     %2,31\n"
-                "0: c    %1,0(%0,%4)\n"
+                "       srl     %2,5\n"
-                "   jne  1f\n"
+                "0:     c       %1,0(%0,%4)\n"
-                "   la   %0,4(%0)\n"
+                "       jne     1f\n"
-                "   brct %2,0b\n"
+                "       la      %0,4(%0)\n"
-                "   lr   %0,%3\n"
+                "       brct    %2,0b\n"
-                "   j    4f\n"
+                "       lr      %0,%3\n"
-                "1: l    %2,0(%0,%4)\n"
+                "       j       4f\n"
-                "   sll  %0,3\n"
+                "1:     l       %2,0(%0,%4)\n"
-                "   lhi  %1,0xff\n"
+                "       sll     %0,3\n"
-                "   tml  %2,0xffff\n"
+                "       lhi     %1,0xff\n"
-                "   jno  2f\n"
+                "       tml     %2,0xffff\n"
-                "   ahi  %0,16\n"
+                "       jno     2f\n"
-                "   srl  %2,16\n"
+                "       ahi     %0,16\n"
-                "2: tml  %2,0x00ff\n"
+                "       srl     %2,16\n"
-                "   jno  3f\n"
+                "2:     tml     %2,0x00ff\n"
-                "   ahi  %0,8\n"
+                "       jno     3f\n"
-                "   srl  %2,8\n"
+                "       ahi     %0,8\n"
-                "3: nr   %2,%1\n"
+                "       srl     %2,8\n"
-                "   ic   %2,0(%2,%5)\n"
+                "3:     nr      %2,%1\n"
-                "   alr  %0,%2\n"
+                "       ic      %2,0(%2,%5)\n"
-                "4:"
+                "       alr     %0,%2\n"
-                : "=&a" (res), "=&d" (cmp), "=&a" (count)
+                "4:"
-                : "a" (size), "a" (addr), "a" (&_zb_findmap),
+                : "=&a" (res), "=&d" (cmp), "=&a" (count)
-                  "m" (*(addrtype *) addr) : "cc" );
+                : "a" (size), "a" (addr), "a" (&_zb_findmap),
+                  "m" (*(addrtype *) addr) : "cc");
        return (res < size) ? res : size;
 }
@@ -598,35 +542,36 @@ find_first_bit(const unsigned long * addr, unsigned long size)
        if (!size)
                return 0;
-        __asm__("   slr  %1,%1\n"
+        asm volatile(
-                "   lr   %2,%3\n"
+                "       slr     %1,%1\n"
-                "   slr  %0,%0\n"
+                "       lr      %2,%3\n"
-                "   ahi  %2,31\n"
+                "       slr     %0,%0\n"
-                "   srl  %2,5\n"
+                "       ahi     %2,31\n"
-                "0: c    %1,0(%0,%4)\n"
+                "       srl     %2,5\n"
-                "   jne  1f\n"
+                "0:     c       %1,0(%0,%4)\n"
-                "   la   %0,4(%0)\n"
+                "       jne     1f\n"
-                "   brct %2,0b\n"
+                "       la      %0,4(%0)\n"
-                "   lr   %0,%3\n"
+                "       brct    %2,0b\n"
-                "   j    4f\n"
+                "       lr      %0,%3\n"
-                "1: l    %2,0(%0,%4)\n"
+                "       j       4f\n"
-                "   sll  %0,3\n"
+                "1:     l       %2,0(%0,%4)\n"
-                "   lhi  %1,0xff\n"
+                "       sll     %0,3\n"
-                "   tml  %2,0xffff\n"
+                "       lhi     %1,0xff\n"
-                "   jnz  2f\n"
+                "       tml     %2,0xffff\n"
-                "   ahi  %0,16\n"
+                "       jnz     2f\n"
-                "   srl  %2,16\n"
+                "       ahi     %0,16\n"
-                "2: tml  %2,0x00ff\n"
+                "       srl     %2,16\n"
-                "   jnz  3f\n"
+                "2:     tml     %2,0x00ff\n"
-                "   ahi  %0,8\n"
+                "       jnz     3f\n"
-                "   srl  %2,8\n"
+                "       ahi     %0,8\n"
-                "3: nr   %2,%1\n"
+                "       srl     %2,8\n"
-                "   ic   %2,0(%2,%5)\n"
+                "3:     nr      %2,%1\n"
-                "   alr  %0,%2\n"
+                "       ic      %2,0(%2,%5)\n"
-                "4:"
+                "       alr     %0,%2\n"
-                : "=&a" (res), "=&d" (cmp), "=&a" (count)
+                "4:"
-                : "a" (size), "a" (addr), "a" (&_sb_findmap),
+                : "=&a" (res), "=&d" (cmp), "=&a" (count)
-                  "m" (*(addrtype *) addr) : "cc" );
+                : "a" (size), "a" (addr), "a" (&_sb_findmap),
+                  "m" (*(addrtype *) addr) : "cc");
        return (res < size) ? res : size;
 }
@@ -640,39 +585,40 @@ find_first_zero_bit(const unsigned long * addr, unsigned long size)
        if (!size)
                return 0;
-        __asm__("   lghi  %1,-1\n"
+        asm volatile(
-                "   lgr   %2,%3\n"
+                "       lghi    %1,-1\n"
-                "   slgr  %0,%0\n"
+                "       lgr     %2,%3\n"
-                "   aghi  %2,63\n"
+                "       slgr    %0,%0\n"
-                "   srlg  %2,%2,6\n"
+                "       aghi    %2,63\n"
-                "0: cg    %1,0(%0,%4)\n"
+                "       srlg    %2,%2,6\n"
-                "   jne   1f\n"
+                "0:     cg      %1,0(%0,%4)\n"
-                "   la    %0,8(%0)\n"
+                "       jne     1f\n"
-                "   brct  %2,0b\n"
+                "       la      %0,8(%0)\n"
-                "   lgr   %0,%3\n"
+                "       brct    %2,0b\n"
-                "   j     5f\n"
+                "       lgr     %0,%3\n"
-                "1: lg    %2,0(%0,%4)\n"
+                "       j       5f\n"
-                "   sllg  %0,%0,3\n"
+                "1:     lg      %2,0(%0,%4)\n"
-                "   clr   %2,%1\n"
+                "       sllg    %0,%0,3\n"
-                "   jne   2f\n"
+                "       clr     %2,%1\n"
-                "   aghi  %0,32\n"
+                "       jne     2f\n"
-                "   srlg  %2,%2,32\n"
+                "       aghi    %0,32\n"
-                "2: lghi  %1,0xff\n"
+                "       srlg    %2,%2,32\n"
-                "   tmll  %2,0xffff\n"
+                "2:     lghi    %1,0xff\n"
-                "   jno   3f\n"
+                "       tmll    %2,0xffff\n"
-                "   aghi  %0,16\n"
+                "       jno     3f\n"
-                "   srl   %2,16\n"
+                "       aghi    %0,16\n"
-                "3: tmll  %2,0x00ff\n"
+                "       srl     %2,16\n"
-                "   jno   4f\n"
+                "3:     tmll    %2,0x00ff\n"
-                "   aghi  %0,8\n"
+                "       jno     4f\n"
-                "   srl   %2,8\n"
+                "       aghi    %0,8\n"
-                "4: ngr   %2,%1\n"
+                "       srl     %2,8\n"
-                "   ic    %2,0(%2,%5)\n"
+                "4:     ngr     %2,%1\n"
-                "   algr  %0,%2\n"
+                "       ic      %2,0(%2,%5)\n"
-                "5:"
+                "       algr    %0,%2\n"
-                : "=&a" (res), "=&d" (cmp), "=&a" (count)
+                "5:"
+                : "=&a" (res), "=&d" (cmp), "=&a" (count)
                : "a" (size), "a" (addr), "a" (&_zb_findmap),
-                  "m" (*(addrtype *) addr) : "cc" );
+                  "m" (*(addrtype *) addr) : "cc");
        return (res < size) ? res : size;
 }
@@ -684,39 +630,40 @@ find_first_bit(const unsigned long * addr, unsigned long size)
        if (!size)
                return 0;
-        __asm__("   slgr  %1,%1\n"
+        asm volatile(
-                "   lgr   %2,%3\n"
+                "       slgr    %1,%1\n"
-                "   slgr  %0,%0\n"
+                "       lgr     %2,%3\n"
-                "   aghi  %2,63\n"
+                "       slgr    %0,%0\n"
-                "   srlg  %2,%2,6\n"
+                "       aghi    %2,63\n"
-                "0: cg    %1,0(%0,%4)\n"
+                "       srlg    %2,%2,6\n"
-                "   jne   1f\n"
+                "0:     cg      %1,0(%0,%4)\n"
-                "   aghi  %0,8\n"
+                "       jne     1f\n"
-                "   brct  %2,0b\n"
+                "       aghi    %0,8\n"
-                "   lgr   %0,%3\n"
+                "       brct    %2,0b\n"
-                "   j     5f\n"
+                "       lgr     %0,%3\n"
-                "1: lg    %2,0(%0,%4)\n"
+                "       j       5f\n"
-                "   sllg  %0,%0,3\n"
+                "1:     lg      %2,0(%0,%4)\n"
-                "   clr   %2,%1\n"
+                "       sllg    %0,%0,3\n"
-                "   jne   2f\n"
+                "       clr     %2,%1\n"
-                "   aghi  %0,32\n"
+                "       jne     2f\n"
-                "   srlg  %2,%2,32\n"
+                "       aghi    %0,32\n"
-                "2: lghi  %1,0xff\n"
+                "       srlg    %2,%2,32\n"
-                "   tmll  %2,0xffff\n"
+                "2:     lghi    %1,0xff\n"
-                "   jnz   3f\n"
+                "       tmll    %2,0xffff\n"
-                "   aghi  %0,16\n"
+                "       jnz     3f\n"
-                "   srl   %2,16\n"
+                "       aghi    %0,16\n"
-                "3: tmll  %2,0x00ff\n"
+                "       srl     %2,16\n"
-                "   jnz   4f\n"
+                "3:     tmll    %2,0x00ff\n"
-                "   aghi  %0,8\n"
+                "       jnz     4f\n"
-                "   srl   %2,8\n"
+                "       aghi    %0,8\n"
-                "4: ngr   %2,%1\n"
+                "       srl     %2,8\n"
-                "   ic    %2,0(%2,%5)\n"
+                "4:     ngr     %2,%1\n"
-                "   algr  %0,%2\n"
+                "       ic      %2,0(%2,%5)\n"
-                "5:"
+                "       algr    %0,%2\n"
-                : "=&a" (res), "=&d" (cmp), "=&a" (count)
+                "5:"
+                : "=&a" (res), "=&d" (cmp), "=&a" (count)
                : "a" (size), "a" (addr), "a" (&_sb_findmap),
-                  "m" (*(addrtype *) addr) : "cc" );
+                  "m" (*(addrtype *) addr) : "cc");
        return (res < size) ? res : size;
 }
@@ -832,36 +779,37 @@ ext2_find_first_zero_bit(void *vaddr, unsigned int size)
        if (!size)
                return 0;
-        __asm__("   lhi  %1,-1\n"
+        asm volatile(
-                "   lr   %2,%3\n"
+                "       lhi     %1,-1\n"
-                "   ahi  %2,31\n"
+                "       lr      %2,%3\n"
-                "   srl  %2,5\n"
+                "       ahi     %2,31\n"
-                "   slr  %0,%0\n"
+                "       srl     %2,5\n"
-                "0: cl   %1,0(%0,%4)\n"
+                "       slr     %0,%0\n"
-                "   jne  1f\n"
+                "0:     cl      %1,0(%0,%4)\n"
-                "   ahi  %0,4\n"
+                "       jne     1f\n"
-                "   brct %2,0b\n"
+                "       ahi     %0,4\n"
-                "   lr   %0,%3\n"
+                "       brct    %2,0b\n"
-                "   j    4f\n"
+                "       lr      %0,%3\n"
-                "1: l    %2,0(%0,%4)\n"
+                "       j       4f\n"
-                "   sll  %0,3\n"
+                "1:     l       %2,0(%0,%4)\n"
-                "   ahi  %0,24\n"
+                "       sll     %0,3\n"
-                "   lhi  %1,0xff\n"
+                "       ahi     %0,24\n"
-                "   tmh  %2,0xffff\n"
+                "       lhi     %1,0xff\n"
-                "   jo   2f\n"
+                "       tmh     %2,0xffff\n"
-                "   ahi  %0,-16\n"
+                "       jo      2f\n"
-                "   srl  %2,16\n"
+                "       ahi     %0,-16\n"
-                "2: tml  %2,0xff00\n"
+                "       srl     %2,16\n"
-                "   jo   3f\n"
+                "2:     tml     %2,0xff00\n"
-                "   ahi  %0,-8\n"
+                "       jo      3f\n"
-                "   srl  %2,8\n"
+                "       ahi     %0,-8\n"
-                "3: nr   %2,%1\n"
+                "       srl     %2,8\n"
-                "   ic   %2,0(%2,%5)\n"
+                "3:     nr      %2,%1\n"
-                "   alr  %0,%2\n"
+                "       ic      %2,0(%2,%5)\n"
-                "4:"
+                "       alr     %0,%2\n"
-                : "=&a" (res), "=&d" (cmp), "=&a" (count)
+                "4:"
-                : "a" (size), "a" (vaddr), "a" (&_zb_findmap),
+                : "=&a" (res), "=&d" (cmp), "=&a" (count)
-                  "m" (*(addrtype *) vaddr) : "cc" );
+                : "a" (size), "a" (vaddr), "a" (&_zb_findmap),
+                  "m" (*(addrtype *) vaddr) : "cc");
        return (res < size) ? res : size;
 }
@@ -875,39 +823,40 @@ ext2_find_first_zero_bit(void *vaddr, unsigned long size)
        if (!size)
                return 0;
-        __asm__("   lghi  %1,-1\n"
+        asm volatile(
-                "   lgr   %2,%3\n"
+                "       lghi    %1,-1\n"
-                "   aghi  %2,63\n"
+                "       lgr     %2,%3\n"
-                "   srlg  %2,%2,6\n"
+                "       aghi    %2,63\n"
-                "   slgr  %0,%0\n"
+                "       srlg    %2,%2,6\n"
-                "0: clg   %1,0(%0,%4)\n"
+                "       slgr    %0,%0\n"
-                "   jne   1f\n"
+                "0:     clg     %1,0(%0,%4)\n"
-                "   aghi  %0,8\n"
+                "       jne     1f\n"
-                "   brct  %2,0b\n"
+                "       aghi    %0,8\n"
-                "   lgr   %0,%3\n"
+                "       brct    %2,0b\n"
-                "   j     5f\n"
+                "       lgr     %0,%3\n"
-                "1: cl    %1,0(%0,%4)\n"
+                "       j       5f\n"
-                "   jne   2f\n"
+                "1:     cl      %1,0(%0,%4)\n"
-                "   aghi  %0,4\n"
+                "       jne     2f\n"
-                "2: l     %2,0(%0,%4)\n"
+                "       aghi    %0,4\n"
-                "   sllg  %0,%0,3\n"
+                "2:     l       %2,0(%0,%4)\n"
-                "   aghi  %0,24\n"
+                "       sllg    %0,%0,3\n"
-                "   lghi  %1,0xff\n"
+                "       aghi    %0,24\n"
-                "   tmlh  %2,0xffff\n"
+                "       lghi    %1,0xff\n"
-                "   jo    3f\n"
+                "       tmlh    %2,0xffff\n"
-                "   aghi  %0,-16\n"
+                "       jo      3f\n"
-                "   srl   %2,16\n"
+                "       aghi    %0,-16\n"
-                "3: tmll  %2,0xff00\n"
+                "       srl     %2,16\n"
-                "   jo    4f\n"
+                "3:     tmll    %2,0xff00\n"
-                "   aghi  %0,-8\n"
+                "       jo      4f\n"
-                "   srl   %2,8\n"
+                "       aghi    %0,-8\n"
-                "4: ngr   %2,%1\n"
+                "       srl     %2,8\n"
-                "   ic    %2,0(%2,%5)\n"
+                "4:     ngr     %2,%1\n"
-                "   algr  %0,%2\n"
+                "       ic      %2,0(%2,%5)\n"
-                "5:"
+                "       algr    %0,%2\n"
-                : "=&a" (res), "=&d" (cmp), "=&a" (count)
+                "5:"
+                : "=&a" (res), "=&d" (cmp), "=&a" (count)
                : "a" (size), "a" (vaddr), "a" (&_zb_findmap),
-                  "m" (*(addrtype *) vaddr) : "cc" );
+                  "m" (*(addrtype *) vaddr) : "cc");
        return (res < size) ? res : size;
 }
@@ -927,13 +876,16 @@ ext2_find_next_zero_bit(void *vaddr, unsigned long size, unsigned long offset)
        p = addr + offset / __BITOPS_WORDSIZE;
        if (bit) {
 #ifndef __s390x__
-                asm("   ic   %0,0(%1)\n"
+                asm volatile(
-                    "   icm  %0,2,1(%1)\n"
+                        "       ic      %0,0(%1)\n"
-                    "   icm  %0,4,2(%1)\n"
+                        "       icm     %0,2,1(%1)\n"
-                    "   icm  %0,8,3(%1)"
+                        "       icm     %0,4,2(%1)\n"
-                    : "=&a" (word) : "a" (p), "m" (*p) : "cc" );
+                        "       icm     %0,8,3(%1)"
+                        : "=&a" (word) : "a" (p), "m" (*p) : "cc");
 #else
-                asm("   lrvg %0,%1" : "=a" (word) : "m" (*p) );
+                asm volatile(
+                        "       lrvg    %0,%1"
+                        : "=a" (word) : "m" (*p) );
 #endif
                /*
                 * s390 version of ffz returns __BITOPS_WORDSIZE
diff --git a/include/asm-s390/byteorder.h b/include/asm-s390/byteorder.h
index 2cc35a0e188e..1fe2492baa8d 100644
--- a/include/asm-s390/byteorder.h
+++ b/include/asm-s390/byteorder.h
@@ -14,60 +14,54 @@
 #ifdef __GNUC__
 #ifdef __s390x__
-static __inline__ __u64 ___arch__swab64p(const __u64 *x)
+static inline __u64 ___arch__swab64p(const __u64 *x)
 {
        __u64 result;
-        __asm__ __volatile__ (
+        asm volatile("lrvg %0,%1" : "=d" (result) : "m" (*x));
-                "   lrvg %0,%1"
-                : "=d" (result) : "m" (*x) );
        return result;
 }
-static __inline__ __u64 ___arch__swab64(__u64 x)
+static inline __u64 ___arch__swab64(__u64 x)
 {
        __u64 result;
-        __asm__ __volatile__ (
+        asm volatile("lrvgr %0,%1" : "=d" (result) : "d" (x));
-                "   lrvgr %0,%1"
-                : "=d" (result) : "d" (x) );
        return result;
 }
-static __inline__ void ___arch__swab64s(__u64 *x)
+static inline void ___arch__swab64s(__u64 *x)
 {
        *x = ___arch__swab64p(x);
 }
 #endif /* __s390x__ */
-static __inline__ __u32 ___arch__swab32p(const __u32 *x)
+static inline __u32 ___arch__swab32p(const __u32 *x)
 {
        __u32 result;
        
-        __asm__ __volatile__ (
+        asm volatile(
 #ifndef __s390x__
-                "        icm   %0,8,3(%1)\n"
+                "       icm     %0,8,3(%1)\n"
-                "        icm   %0,4,2(%1)\n"
+                "       icm     %0,4,2(%1)\n"
-                "        icm   %0,2,1(%1)\n"
+                "       icm     %0,2,1(%1)\n"
-                "        ic    %0,0(%1)"
+                "       ic      %0,0(%1)"
-                : "=&d" (result) : "a" (x), "m" (*x) : "cc" );
+                : "=&d" (result) : "a" (x), "m" (*x) : "cc");
 #else /* __s390x__ */
-                "   lrv  %0,%1"
+                "       lrv     %0,%1"
-                : "=d" (result) : "m" (*x) );
+                : "=d" (result) : "m" (*x));
 #endif /* __s390x__ */
        return result;
 }
-static __inline__ __u32 ___arch__swab32(__u32 x)
+static inline __u32 ___arch__swab32(__u32 x)
 {
 #ifndef __s390x__
        return ___arch__swab32p(&x);
 #else /* __s390x__ */
        __u32 result;
        
-        __asm__ __volatile__ (
+        asm volatile("lrvr  %0,%1" : "=d" (result) : "d" (x));
-                "   lrvr  %0,%1"
-                : "=d" (result) : "d" (x) );
        return result;
 #endif /* __s390x__ */
 }
@@ -81,14 +75,14 @@ static __inline__ __u16 ___arch__swab16p(const __u16 *x)
 {
        __u16 result;
        
-        __asm__ __volatile__ (
+        asm volatile(
 #ifndef __s390x__
-                "        icm   %0,2,1(%1)\n"
+                "       icm     %0,2,1(%1)\n"
-                "        ic    %0,0(%1)\n"
+                "       ic      %0,0(%1)\n"
-                : "=&d" (result) : "a" (x), "m" (*x) : "cc" );
+                : "=&d" (result) : "a" (x), "m" (*x) : "cc");
 #else /* __s390x__ */
-                "   lrvh %0,%1"
+                "       lrvh    %0,%1"
-                : "=d" (result) : "m" (*x) );
+                : "=d" (result) : "m" (*x));
 #endif /* __s390x__ */
        return result;
 }
diff --git a/include/asm-s390/checksum.h b/include/asm-s390/checksum.h
index 471f2af2b16a..37c362d89fad 100644
--- a/include/asm-s390/checksum.h
+++ b/include/asm-s390/checksum.h
@@ -30,57 +30,13 @@
 static inline unsigned int
 csum_partial(const unsigned char * buff, int len, unsigned int sum)
 {
-        /*
+        register unsigned long reg2 asm("2") = (unsigned long) buff;
-         * Experiments with ethernet and slip connections show that buf
+        register unsigned long reg3 asm("3") = (unsigned long) len;
-         * is aligned on either a 2-byte or 4-byte boundary.
-         */
-#ifndef __s390x__
-        register_pair rp;
-        rp.subreg.even = (unsigned long) buff;
-        rp.subreg.odd = (unsigned long) len;
-        __asm__ __volatile__ (
-                "0:  cksm %0,%1\n"      /* do checksum on longs */
-                "    jo   0b\n"
-                : "+&d" (sum), "+&a" (rp) : : "cc", "memory" );
-#else /* __s390x__ */
-        __asm__ __volatile__ (
-                "    lgr  2,%1\n"    /* address in gpr 2 */
-                "    lgfr 3,%2\n"    /* length in gpr 3 */
-                "0:  cksm %0,2\n"    /* do checksum on longs */
-                "    jo   0b\n"
-                : "+&d" (sum)
-                : "d" (buff), "d" (len)
-                : "cc", "memory", "2", "3" );
-#endif /* __s390x__ */
-        return sum;
-}
-/*
- * csum_partial as an inline function
- */
-static inline unsigned int 
-csum_partial_inline(const unsigned char * buff, int len, unsigned int sum)
-{
-#ifndef __s390x__
-        register_pair rp;
-        rp.subreg.even = (unsigned long) buff;
+        asm volatile(
-        rp.subreg.odd = (unsigned long) len;
+                "0:     cksm    %0,%1\n"        /* do checksum on longs */
-        __asm__ __volatile__ (
+                "       jo      0b\n"
-                "0:  cksm %0,%1\n"    /* do checksum on longs */
+                : "+d" (sum), "+d" (reg2), "+d" (reg3) : : "cc", "memory");
-                "    jo   0b\n"
-                : "+&d" (sum), "+&a" (rp) : : "cc", "memory" );
-#else /* __s390x__ */
-        __asm__ __volatile__ (
-                "    lgr  2,%1\n"    /* address in gpr 2 */
-                "    lgfr 3,%2\n"    /* length in gpr 3 */
-                "0:  cksm %0,2\n"    /* do checksum on longs */
-                "    jo   0b\n"
-                : "+&d" (sum)
-                : "d" (buff), "d" (len)
-                : "cc", "memory", "2", "3" );
-#endif /* __s390x__ */
        return sum;
 }
@@ -114,7 +70,7 @@ static inline unsigned int
 csum_partial_copy_nocheck (const char *src, char *dst, int len, unsigned int sum)
 {
        memcpy(dst,src,len);
-        return csum_partial_inline(dst, len, sum);
+        return csum_partial(dst, len, sum);
 }
 /*
@@ -126,22 +82,22 @@ csum_fold(unsigned int sum)
 #ifndef __s390x__
        register_pair rp;
-        __asm__ __volatile__ (
+        asm volatile(
-                "    slr  %N1,%N1\n" /* %0 = H L */
+                "       slr     %N1,%N1\n"      /* %0 = H L */
-                "    lr   %1,%0\n"   /* %0 = H L, %1 = H L 0 0 */
+                "       lr      %1,%0\n"        /* %0 = H L, %1 = H L 0 0 */
-                "    srdl %1,16\n"   /* %0 = H L, %1 = 0 H L 0 */
+                "       srdl    %1,16\n"        /* %0 = H L, %1 = 0 H L 0 */
-                "    alr  %1,%N1\n"  /* %0 = H L, %1 = L H L 0 */
+                "       alr     %1,%N1\n"       /* %0 = H L, %1 = L H L 0 */
-                "    alr  %0,%1\n"   /* %0 = H+L+C L+H */
+                "       alr     %0,%1\n"        /* %0 = H+L+C L+H */
-                "    srl  %0,16\n"   /* %0 = H+L+C */
+                "       srl     %0,16\n"        /* %0 = H+L+C */
-                : "+&d" (sum), "=d" (rp) : : "cc" );
+                : "+&d" (sum), "=d" (rp) : : "cc");
 #else /* __s390x__ */
-        __asm__ __volatile__ (
+        asm volatile(
-                "    sr   3,3\n"   /* %0 = H*65536 + L */
+                "       sr      3,3\n"          /* %0 = H*65536 + L */
-                "    lr   2,%0\n"  /* %0 = H L, R2/R3 = H L / 0 0 */
+                "       lr      2,%0\n"         /* %0 = H L, 2/3 = H L / 0 0 */
-                "    srdl 2,16\n"  /* %0 = H L, R2/R3 = 0 H / L 0 */
+                "       srdl    2,16\n"         /* %0 = H L, 2/3 = 0 H / L 0 */
-                "    alr  2,3\n"   /* %0 = H L, R2/R3 = L H / L 0 */
+                "       alr     2,3\n"          /* %0 = H L, 2/3 = L H / L 0 */
-                "    alr  %0,2\n"  /* %0 = H+L+C L+H */
+                "       alr     %0,2\n"         /* %0 = H+L+C L+H */
-                "    srl  %0,16\n" /* %0 = H+L+C */
+                "       srl     %0,16\n"        /* %0 = H+L+C */
                : "+&d" (sum) : : "cc", "2", "3");
 #endif /* __s390x__ */
        return ((unsigned short) ~sum);
@@ -155,29 +111,7 @@ csum_fold(unsigned int sum)
 static inline unsigned short
 ip_fast_csum(unsigned char *iph, unsigned int ihl)
 {
-        unsigned long sum;
+        return csum_fold(csum_partial(iph, ihl*4, 0));
-#ifndef __s390x__
-        register_pair rp;
-        rp.subreg.even = (unsigned long) iph;
-        rp.subreg.odd = (unsigned long) ihl*4;
-        __asm__ __volatile__ (
-                "    sr   %0,%0\n"   /* set sum to zero */
-                "0:  cksm %0,%1\n"   /* do checksum on longs */
-                "    jo   0b\n"
-                : "=&d" (sum), "+&a" (rp) : : "cc", "memory" );
-#else /* __s390x__ */
-        __asm__ __volatile__ (
-                "    slgr %0,%0\n"   /* set sum to zero */
-                "    lgr  2,%1\n"    /* address in gpr 2 */
-                "    lgfr 3,%2\n"    /* length in gpr 3 */
-                "0:  cksm %0,2\n"    /* do checksum on ints */
-                "    jo   0b\n"
-                : "=&d" (sum)
-                : "d" (iph), "d" (ihl*4)
-                : "cc", "memory", "2", "3" );
-#endif /* __s390x__ */
-        return csum_fold(sum);
 }
 /*
@@ -190,47 +124,47 @@ csum_tcpudp_nofold(unsigned long saddr, unsigned long daddr,
                   unsigned int sum)
 {
 #ifndef __s390x__
-        __asm__ __volatile__ (
+        asm volatile(
-                "    alr   %0,%1\n"  /* sum += saddr */
+                "       alr     %0,%1\n" /* sum += saddr */
-                "    brc   12,0f\n"
+                "       brc     12,0f\n"
-                "    ahi   %0,1\n"   /* add carry */
+                "       ahi     %0,1\n"  /* add carry */
                "0:"
-                : "+&d" (sum) : "d" (saddr) : "cc" );
+                : "+&d" (sum) : "d" (saddr) : "cc");
-        __asm__ __volatile__ (
+        asm volatile(
-                "    alr   %0,%1\n"  /* sum += daddr */
+                "       alr     %0,%1\n" /* sum += daddr */
-                "    brc   12,1f\n"
+                "       brc     12,1f\n"
-                "    ahi   %0,1\n"   /* add carry */
+                "       ahi     %0,1\n"  /* add carry */
                "1:"
-                : "+&d" (sum) : "d" (daddr) : "cc" );
+                : "+&d" (sum) : "d" (daddr) : "cc");
-        __asm__ __volatile__ (
+        asm volatile(
-                "    alr   %0,%1\n"  /* sum += (len<<16) + (proto<<8) */
+                "       alr     %0,%1\n" /* sum += (len<<16) + (proto<<8) */
-                "    brc   12,2f\n"
+                "       brc     12,2f\n"
-                "    ahi   %0,1\n"   /* add carry */
+                "       ahi     %0,1\n"  /* add carry */
                "2:"
                : "+&d" (sum)
                : "d" (((unsigned int) len<<16) + (unsigned int) proto)
-                : "cc" );
+                : "cc");
 #else /* __s390x__ */
-        __asm__ __volatile__ (
+        asm volatile(
-                "    lgfr  %0,%0\n"
+                "       lgfr    %0,%0\n"
-                "    algr  %0,%1\n"  /* sum += saddr */
+                "       algr    %0,%1\n"  /* sum += saddr */
-                "    brc   12,0f\n"
+                "       brc     12,0f\n"
-                "    aghi  %0,1\n"   /* add carry */
+                "       aghi    %0,1\n"   /* add carry */
-                "0:  algr  %0,%2\n"  /* sum += daddr */
+                "0:     algr    %0,%2\n"  /* sum += daddr */
-                "    brc   12,1f\n"
+                "       brc     12,1f\n"
-                "    aghi  %0,1\n"   /* add carry */
+                "       aghi    %0,1\n"   /* add carry */
-                "1:  algfr %0,%3\n"  /* sum += (len<<16) + proto */
+                "1:     algfr   %0,%3\n"  /* sum += (len<<16) + proto */
-                "    brc   12,2f\n"
+                "       brc     12,2f\n"
-                "    aghi  %0,1\n"   /* add carry */
+                "       aghi    %0,1\n"   /* add carry */
-                "2:  srlg  0,%0,32\n"
+                "2:     srlg    0,%0,32\n"
-                "    alr   %0,0\n"   /* fold to 32 bits */
+                "       alr     %0,0\n"   /* fold to 32 bits */
-                "    brc   12,3f\n"
+                "       brc     12,3f\n"
-                "    ahi   %0,1\n"   /* add carry */
+                "       ahi     %0,1\n"   /* add carry */
-                "3:  llgfr %0,%0"
+                "3:     llgfr   %0,%0"
                : "+&d" (sum)
                : "d" (saddr), "d" (daddr),
                  "d" (((unsigned int) len<<16) + (unsigned int) proto)
-                : "cc", "0" );
+                : "cc", "0");
 #endif /* __s390x__ */
        return sum;
 }
diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h
index 28fdd6e2b8ba..da063cd5f0a0 100644
--- a/include/asm-s390/cio.h
+++ b/include/asm-s390/cio.h
@@ -270,6 +270,11 @@ struct diag210 {
        __u32 vrdccrft : 8;    /* real device feature (output) */
 } __attribute__ ((packed,aligned(4)));
+struct ccw_dev_id {
+        u8 ssid;
+        u16 devno;
+};
 extern int diag210(struct diag210 *addr);
 extern void wait_cons_dev(void);
@@ -280,6 +285,8 @@ extern void cio_reset_channel_paths(void);
 extern void css_schedule_reprobe(void);
+extern void reipl_ccw_dev(struct ccw_dev_id *id);
 #endif
 #endif
diff --git a/include/asm-s390/div64.h b/include/asm-s390/div64.h
index af098dc3cf59..6cd978cefb28 100644
--- a/include/asm-s390/div64.h
+++ b/include/asm-s390/div64.h
@@ -1,49 +1 @@
-#ifndef __S390_DIV64
-#define __S390_DIV64
-#ifndef __s390x__
-/* for do_div "base" needs to be smaller than 2^31-1 */
-#define do_div(n, base) ({                                      \
-        unsigned long long __n = (n);                           \
-        unsigned long __r;                                      \
-                                                                \
-        asm ("   slr  0,0\n"                                    \
-             "   l    1,%1\n"                                   \
-             "   srdl 0,1\n"                                    \
-             "   dr   0,%2\n"                                   \
-             "   alr  1,1\n"                                    \
-             "   alr  0,0\n"                                    \
-             "   lhi  2,1\n"                                    \
-             "   n    2,%1\n"                                   \
-             "   alr  0,2\n"                                    \
-             "   clr  0,%2\n"                                   \
-             "   jl   0f\n"                                     \
-             "   slr  0,%2\n"                                   \
-             "   ahi  1,1\n"                                    \
-             "0: st   1,%1\n"                                   \
-             "   l    1,4+%1\n"                                 \
-             "   srdl 0,1\n"                                    \
-             "   dr   0,%2\n"                                   \
-             "   alr  1,1\n"                                    \
-             "   alr  0,0\n"                                    \
-             "   lhi  2,1\n"                                    \
-             "   n    2,4+%1\n"                                 \
-             "   alr  0,2\n"                                    \
-             "   clr  0,%2\n"                                   \
-             "   jl   1f\n"                                     \
-             "   slr  0,%2\n"                                   \
-             "   ahi  1,1\n"                                    \
-             "1: st   1,4+%1\n"                                 \
-             "   lr   %0,0"                                     \
-             : "=d" (__r), "=m" (__n)                           \
-             : "d" (base), "m" (__n) : "0", "1", "2", "cc" );   \
-        (n) = (__n);                                            \
-        __r;                                                    \
-})
-#else /* __s390x__ */
 #include <asm-generic/div64.h>
-#endif /* __s390x__ */
-#endif
diff --git a/include/asm-s390/dma.h b/include/asm-s390/dma.h
index 02720c449cd8..7425c6af6cd4 100644
--- a/include/asm-s390/dma.h
+++ b/include/asm-s390/dma.h
@@ -11,6 +11,6 @@
 #define MAX_DMA_ADDRESS         0x80000000
-#define free_dma(x)
+#define free_dma(x)     do { } while (0)
 #endif /* _ASM_DMA_H */
diff --git a/include/asm-s390/ebcdic.h b/include/asm-s390/ebcdic.h
index 15fd2eda6c90..7f6f641d32f4 100644
--- a/include/asm-s390/ebcdic.h
+++ b/include/asm-s390/ebcdic.h
@@ -26,16 +26,16 @@ codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr)
 {
        if (nr-- <= 0)
                return;
-        __asm__ __volatile__(
+        asm volatile(
-                "   bras 1,1f\n"
+                "       bras    1,1f\n"
-                "   tr   0(1,%0),0(%2)\n"
+                "       tr      0(1,%0),0(%2)\n"
-                "0: tr   0(256,%0),0(%2)\n"
+                "0:     tr      0(256,%0),0(%2)\n"
-                "   la   %0,256(%0)\n"
+                "       la      %0,256(%0)\n"
-                "1: ahi  %1,-256\n"
+                "1:     ahi     %1,-256\n"
-                "   jnm  0b\n"
+                "       jnm     0b\n"
-                "   ex   %1,0(1)"
+                "       ex      %1,0(1)"
-                : "+&a" (addr), "+&a" (nr)
+                : "+&a" (addr), "+&a" (nr)
-                : "a" (codepage) : "cc", "memory", "1" );
+                : "a" (codepage) : "cc", "memory", "1");
 }
 #define ASCEBC(addr,nr) codepage_convert(_ascebc, addr, nr)
diff --git a/include/asm-s390/futex.h b/include/asm-s390/futex.h
index ffedf14f89f6..5e261e1de671 100644
--- a/include/asm-s390/futex.h
+++ b/include/asm-s390/futex.h
@@ -7,75 +7,21 @@
 #include <asm/errno.h>
 #include <asm/uaccess.h>
-#ifndef __s390x__
-#define __futex_atomic_fixup \
-                     ".section __ex_table,\"a\"\n"                      \
-                     "   .align 4\n"                                    \
-                     "   .long  0b,4b,2b,4b,3b,4b\n"                    \
-                     ".previous"
-#else /* __s390x__ */
-#define __futex_atomic_fixup \
-                     ".section __ex_table,\"a\"\n"                      \
-                     "   .align 8\n"                                    \
-                     "   .quad  0b,4b,2b,4b,3b,4b\n"                    \
-                     ".previous"
-#endif /* __s390x__ */
-#define __futex_atomic_op(insn, ret, oldval, newval, uaddr, oparg)      \
-        asm volatile("   sacf 256\n"                                    \
-                     "0: l   %1,0(%6)\n"                                \
-                     "1: " insn                                         \
-                     "2: cs  %1,%2,0(%6)\n"                             \
-                     "3: jl  1b\n"                                      \
-                     "   lhi %0,0\n"                                    \
-                     "4: sacf 0\n"                                      \
-                     __futex_atomic_fixup                               \
-                     : "=d" (ret), "=&d" (oldval), "=&d" (newval),      \
-                       "=m" (*uaddr)                                    \
-                     : "0" (-EFAULT), "d" (oparg), "a" (uaddr),         \
-                       "m" (*uaddr) : "cc" );
 static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
 {
        int op = (encoded_op >> 28) & 7;
        int cmp = (encoded_op >> 24) & 15;
        int oparg = (encoded_op << 8) >> 20;
        int cmparg = (encoded_op << 20) >> 20;
-        int oldval = 0, newval, ret;
+        int oldval, ret;
        if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
                oparg = 1 << oparg;
        if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                return -EFAULT;
-        inc_preempt_count();
+        ret = uaccess.futex_atomic_op(op, uaddr, oparg, &oldval);
-        switch (op) {
-        case FUTEX_OP_SET:
-                __futex_atomic_op("lr %2,%5\n",
-                                  ret, oldval, newval, uaddr, oparg);
-                break;
-        case FUTEX_OP_ADD:
-                __futex_atomic_op("lr %2,%1\nar %2,%5\n",
-                                  ret, oldval, newval, uaddr, oparg);
-                break;
-        case FUTEX_OP_OR:
-                __futex_atomic_op("lr %2,%1\nor %2,%5\n",
-                                  ret, oldval, newval, uaddr, oparg);
-                break;
-        case FUTEX_OP_ANDN:
-                __futex_atomic_op("lr %2,%1\nnr %2,%5\n",
-                                  ret, oldval, newval, uaddr, oparg);
-                break;
-        case FUTEX_OP_XOR:
-                __futex_atomic_op("lr %2,%1\nxr %2,%5\n",
-                                  ret, oldval, newval, uaddr, oparg);
-                break;
-        default:
-                ret = -ENOSYS;
-        }
-        dec_preempt_count();
        if (!ret) {
                switch (cmp) {
@@ -91,32 +37,13 @@ static inline int futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
        return ret;
 }
-static inline int
+static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr,
-futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
+                                                int oldval, int newval)
 {
-        int ret;
        if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
                return -EFAULT;
-        asm volatile("   sacf 256\n"
-                     "   cs   %1,%4,0(%5)\n"
+        return uaccess.futex_atomic_cmpxchg(uaddr, oldval, newval);
-                     "0: lr   %0,%1\n"
-                     "1: sacf 0\n"
-#ifndef __s390x__
-                     ".section __ex_table,\"a\"\n"
-                     "   .align 4\n"
-                     "   .long  0b,1b\n"
-                     ".previous"
-#else /* __s390x__ */
-                     ".section __ex_table,\"a\"\n"
-                     "   .align 8\n"
-                     "   .quad  0b,1b\n"
-                     ".previous"
-#endif /* __s390x__ */
-                     : "=d" (ret), "+d" (oldval), "=m" (*uaddr)
-                     : "0" (-EFAULT), "d" (newval), "a" (uaddr), "m" (*uaddr)
-                     : "cc", "memory" );
-        return oldval;
 }
 #endif /* __KERNEL__ */
diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h
index d4614b35f423..63c78b9399c4 100644
--- a/include/asm-s390/io.h
+++ b/include/asm-s390/io.h
@@ -27,18 +27,16 @@
 static inline unsigned long virt_to_phys(volatile void * address)
 {
        unsigned long real_address;
-        __asm__ (
+        asm volatile(
 #ifndef __s390x__
-                 "   lra    %0,0(%1)\n"
+                 "      lra     %0,0(%1)\n"
-                 "   jz     0f\n"
-                 "   sr     %0,%0\n"
 #else /* __s390x__ */
-                 "   lrag   %0,0(%1)\n"
+                 "      lrag    %0,0(%1)\n"
-                 "   jz     0f\n"
-                 "   slgr   %0,%0\n"
 #endif /* __s390x__ */
+                 "      jz      0f\n"
+                 "      la      %0,0\n"
                 "0:"
-                 : "=a" (real_address) : "a" (address) : "cc" );
+                 : "=a" (real_address) : "a" (address) : "cc");
        return real_address;
 }
@@ -116,7 +114,7 @@ extern void iounmap(void *addr);
 #define outb(x,addr) ((void) writeb(x,addr))
 #define outb_p(x,addr) outb(x,addr)
-#define mmiowb()
+#define mmiowb()        do { } while (0)
 /*
 * Convert a physical pointer to a virtual kernel pointer for /dev/mem
diff --git a/include/asm-s390/irq.h b/include/asm-s390/irq.h
index bd1a721f7aa2..7da991a858f8 100644
--- a/include/asm-s390/irq.h
+++ b/include/asm-s390/irq.h
@@ -19,8 +19,5 @@ enum interruption_class {
        NR_IRQS,
 };
-#define touch_nmi_watchdog() do { } while(0)
 #endif /* __KERNEL__ */
 #endif
diff --git a/include/asm-s390/irqflags.h b/include/asm-s390/irqflags.h
index 3b566a5b3cc7..3f26131120b7 100644
--- a/include/asm-s390/irqflags.h
+++ b/include/asm-s390/irqflags.h
@@ -10,43 +10,93 @@
 #ifdef __KERNEL__
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
+/* store then or system mask. */
+#define __raw_local_irq_stosm(__or)                                     \
+({                                                                      \
+        unsigned long __mask;                                           \
+        asm volatile(                                                   \
+                "       stosm   %0,%1"                                  \
+                : "=Q" (__mask) : "i" (__or) : "memory");               \
+        __mask;                                                         \
+})
+/* store then and system mask. */
+#define __raw_local_irq_stnsm(__and)                                    \
+({                                                                      \
+        unsigned long __mask;                                           \
+        asm volatile(                                                   \
+                "       stnsm   %0,%1"                                  \
+                : "=Q" (__mask) : "i" (__and) : "memory");              \
+        __mask;                                                         \
+})
+/* set system mask. */
+#define __raw_local_irq_ssm(__mask)                                     \
+({                                                                      \
+        asm volatile("ssm   %0" : : "Q" (__mask) : "memory");           \
+})
+#else /* __GNUC__ */
+/* store then or system mask. */
+#define __raw_local_irq_stosm(__or)                                     \
+({                                                                      \
+        unsigned long __mask;                                           \
+        asm volatile(                                                   \
+                "       stosm   0(%1),%2"                               \
+                : "=m" (__mask)                                         \
+                : "a" (&__mask), "i" (__or) : "memory");                \
+        __mask;                                                         \
+})
+/* store then and system mask. */
+#define __raw_local_irq_stnsm(__and)                                    \
+({                                                                      \
+        unsigned long __mask;                                           \
+        asm volatile(                                                   \
+                "       stnsm   0(%1),%2"                               \
+                : "=m" (__mask)                                         \
+                : "a" (&__mask), "i" (__and) : "memory");               \
+        __mask;                                                         \
+})
+/* set system mask. */
+#define __raw_local_irq_ssm(__mask)                                     \
+({                                                                      \
+        asm volatile(                                                   \
+                "       ssm     0(%0)"                                  \
+                : : "a" (&__mask), "m" (__mask) : "memory");            \
+})
+#endif /* __GNUC__ */
 /* interrupt control.. */
-#define raw_local_irq_enable() ({ \
+static inline unsigned long raw_local_irq_enable(void)
-        unsigned long  __dummy; \
+{
-        __asm__ __volatile__ ( \
+        return __raw_local_irq_stosm(0x03);
-                "stosm 0(%1),0x03" \
+}
-                : "=m" (__dummy) : "a" (&__dummy) : "memory" ); \
-        })
-#define raw_local_irq_disable() ({ \
-        unsigned long __flags; \
-        __asm__ __volatile__ ( \
-                "stnsm 0(%1),0xfc" : "=m" (__flags) : "a" (&__flags) ); \
-        __flags; \
-        })
-#define raw_local_save_flags(x)                                                 \
-do {                                                                            \
-        typecheck(unsigned long, x);                                            \
-        __asm__ __volatile__("stosm 0(%1),0" : "=m" (x) : "a" (&x), "m" (x) );  \
-} while (0)
-#define raw_local_irq_restore(x)                                                \
+static inline unsigned long raw_local_irq_disable(void)
-do {                                                                            \
+{
-        typecheck(unsigned long, x);                                            \
+        return __raw_local_irq_stnsm(0xfc);
-        __asm__ __volatile__("ssm   0(%0)" : : "a" (&x), "m" (x) : "memory");   \
+}
+#define raw_local_save_flags(x)                                         \
+do {                                                                    \
+        typecheck(unsigned long, x);                                    \
+        (x) = __raw_local_irq_stosm(0x00);                              \
 } while (0)
-#define raw_irqs_disabled()             \
+static inline void raw_local_irq_restore(unsigned long flags)
-({                                      \
+{
-        unsigned long flags;            \
+        __raw_local_irq_ssm(flags);
-        raw_local_save_flags(flags);    \
+}
-        !((flags >> __FLAG_SHIFT) & 3); \
-})
 static inline int raw_irqs_disabled_flags(unsigned long flags)
 {
-        return !((flags >> __FLAG_SHIFT) & 3);
+        return !(flags & (3UL << (BITS_PER_LONG - 8)));
 }
 /* For spinlocks etc */
diff --git a/include/asm-s390/kdebug.h b/include/asm-s390/kdebug.h
new file mode 100644
index 000000000000..40cc68025e01
--- /dev/null
+++ b/include/asm-s390/kdebug.h
@@ -0,0 +1,59 @@
+#ifndef _S390_KDEBUG_H
+#define _S390_KDEBUG_H
+/*
+ * Feb 2006 Ported to s390 <grundym@us.ibm.com>
+ */
+#include <linux/notifier.h>
+struct pt_regs;
+struct die_args {
+        struct pt_regs *regs;
+        const char *str;
+        long err;
+        int trapnr;
+        int signr;
+};
+/* Note - you should never unregister because that can race with NMIs.
+ * If you really want to do it first unregister - then synchronize_sched
+ *  - then free.
+ */
+extern int register_die_notifier(struct notifier_block *);
+extern int unregister_die_notifier(struct notifier_block *);
+extern int register_page_fault_notifier(struct notifier_block *);
+extern int unregister_page_fault_notifier(struct notifier_block *);
+extern struct atomic_notifier_head s390die_chain;
+enum die_val {
+        DIE_OOPS = 1,
+        DIE_BPT,
+        DIE_SSTEP,
+        DIE_PANIC,
+        DIE_NMI,
+        DIE_DIE,
+        DIE_NMIWATCHDOG,
+        DIE_KERNELDEBUG,
+        DIE_TRAP,
+        DIE_GPF,
+        DIE_CALL,
+        DIE_NMI_IPI,
+        DIE_PAGE_FAULT,
+};
+static inline int notify_die(enum die_val val, const char *str,
+                        struct pt_regs *regs, long err, int trap, int sig)
+{
+        struct die_args args = {
+                .regs = regs,
+                .str = str,
+                .err = err,
+                .trapnr = trap,
+                .signr = sig
+        };
+        return atomic_notifier_call_chain(&s390die_chain, val, &args);
+}
+#endif
diff --git a/include/asm-s390/kprobes.h b/include/asm-s390/kprobes.h
new file mode 100644
index 000000000000..b847ff0ec3fa
--- /dev/null
+++ b/include/asm-s390/kprobes.h
@@ -0,0 +1,114 @@
+#ifndef _ASM_S390_KPROBES_H
+#define _ASM_S390_KPROBES_H
+/*
+ *  Kernel Probes (KProbes)
+ *
+ * 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.
+ *
+ * Copyright (C) IBM Corporation, 2002, 2006
+ *
+ * 2002-Oct     Created by Vamsi Krishna S <vamsi_krishna@in.ibm.com> Kernel
+ *              Probes initial implementation ( includes suggestions from
+ *              Rusty Russell).
+ * 2004-Nov     Modified for PPC64 by Ananth N Mavinakayanahalli
+ *              <ananth@in.ibm.com>
+ * 2005-Dec     Used as a template for s390 by Mike Grundy
+ *              <grundym@us.ibm.com>
+ */
+#include <linux/types.h>
+#include <linux/ptrace.h>
+#include <linux/percpu.h>
+#define  __ARCH_WANT_KPROBES_INSN_SLOT
+struct pt_regs;
+struct kprobe;
+typedef u16 kprobe_opcode_t;
+#define BREAKPOINT_INSTRUCTION  0x0002
+/* Maximum instruction size is 3 (16bit) halfwords: */
+#define MAX_INSN_SIZE           0x0003
+#define MAX_STACK_SIZE          64
+#define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \
+        (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR))) \
+        ? (MAX_STACK_SIZE) \
+        : (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)(pentry)
+#define ARCH_SUPPORTS_KRETPROBES
+#define ARCH_INACTIVE_KPROBE_COUNT 0
+#define KPROBE_SWAP_INST        0x10
+#define FIXUP_PSW_NORMAL        0x08
+#define FIXUP_BRANCH_NOT_TAKEN  0x04
+#define FIXUP_RETURN_REGISTER   0x02
+#define FIXUP_NOT_REQUIRED      0x01
+/* Architecture specific copy of original instruction */
+struct arch_specific_insn {
+        /* copy of original instruction */
+        kprobe_opcode_t *insn;
+        int fixup;
+        int ilen;
+        int reg;
+};
+struct ins_replace_args {
+        kprobe_opcode_t *ptr;
+        kprobe_opcode_t old;
+        kprobe_opcode_t new;
+};
+struct prev_kprobe {
+        struct kprobe *kp;
+        unsigned long status;
+        unsigned long saved_psw;
+        unsigned long kprobe_saved_imask;
+        unsigned long kprobe_saved_ctl[3];
+};
+/* per-cpu kprobe control block */
+struct kprobe_ctlblk {
+        unsigned long kprobe_status;
+        unsigned long kprobe_saved_imask;
+        unsigned long kprobe_saved_ctl[3];
+        struct pt_regs jprobe_saved_regs;
+        unsigned long jprobe_saved_r14;
+        unsigned long jprobe_saved_r15;
+        struct prev_kprobe prev_kprobe;
+        kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
+};
+void arch_remove_kprobe(struct kprobe *p);
+void kretprobe_trampoline(void);
+int  is_prohibited_opcode(kprobe_opcode_t *instruction);
+void get_instruction_type(struct arch_specific_insn *ainsn);
+#define flush_insn_slot(p)      do { } while (0)
+#endif  /* _ASM_S390_KPROBES_H */
+#ifdef CONFIG_KPROBES
+extern int kprobe_exceptions_notify(struct notifier_block *self,
+                                        unsigned long val, void *data);
+#else   /* !CONFIG_KPROBES */
+static inline int kprobe_exceptions_notify(struct notifier_block *self,
+                                                unsigned long val, void *data)
+{
+        return 0;
+}
+#endif
diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h
index 596c8b172104..06583ed0bde7 100644
--- a/include/asm-s390/lowcore.h
+++ b/include/asm-s390/lowcore.h
@@ -35,6 +35,7 @@
 #define __LC_IO_NEW_PSW                 0x01f0
 #endif /* !__s390x__ */
+#define __LC_IPL_PARMBLOCK_PTR          0x014
 #define __LC_EXT_PARAMS                 0x080
 #define __LC_CPU_ADDRESS                0x084
 #define __LC_EXT_INT_CODE               0x086
@@ -47,6 +48,7 @@
 #define __LC_PER_ATMID                  0x096
 #define __LC_PER_ADDRESS                0x098
 #define __LC_PER_ACCESS_ID              0x0A1
+#define __LC_AR_MODE_ID                 0x0A3
 #define __LC_SUBCHANNEL_ID              0x0B8
 #define __LC_SUBCHANNEL_NR              0x0BA
@@ -106,18 +108,28 @@
 #define __LC_INT_CLOCK                  0xDE8
 #endif /* __s390x__ */
-#define __LC_PANIC_MAGIC                0xE00
+#define __LC_PANIC_MAGIC                0xE00
 #ifndef __s390x__
 #define __LC_PFAULT_INTPARM             0x080
 #define __LC_CPU_TIMER_SAVE_AREA        0x0D8
+#define __LC_CLOCK_COMP_SAVE_AREA       0x0E0
+#define __LC_PSW_SAVE_AREA              0x100
+#define __LC_PREFIX_SAVE_AREA           0x108
 #define __LC_AREGS_SAVE_AREA            0x120
+#define __LC_FPREGS_SAVE_AREA           0x160
 #define __LC_GPREGS_SAVE_AREA           0x180
 #define __LC_CREGS_SAVE_AREA            0x1C0
 #else /* __s390x__ */
 #define __LC_PFAULT_INTPARM             0x11B8
+#define __LC_FPREGS_SAVE_AREA           0x1200
 #define __LC_GPREGS_SAVE_AREA           0x1280
+#define __LC_PSW_SAVE_AREA              0x1300
+#define __LC_PREFIX_SAVE_AREA           0x1318
+#define __LC_FP_CREG_SAVE_AREA          0x131C
+#define __LC_TODREG_SAVE_AREA           0x1324
 #define __LC_CPU_TIMER_SAVE_AREA        0x1328
+#define __LC_CLOCK_COMP_SAVE_AREA       0x1331
 #define __LC_AREGS_SAVE_AREA            0x1340
 #define __LC_CREGS_SAVE_AREA            0x1380
 #endif /* __s390x__ */
@@ -347,7 +359,7 @@ extern struct _lowcore *lowcore_ptr[];
 static inline void set_prefix(__u32 address)
 {
-        __asm__ __volatile__ ("spx %0" : : "m" (address) : "memory" );
+        asm volatile("spx %0" : : "m" (address) : "memory");
 }
 #define __PANIC_MAGIC           0xDEADC0DE
diff --git a/include/asm-s390/monwriter.h b/include/asm-s390/monwriter.h
new file mode 100644
index 000000000000..f0cbf96c52e6
--- /dev/null
+++ b/include/asm-s390/monwriter.h
@@ -0,0 +1,33 @@
+/*
+ * include/asm-s390/monwriter.h
+ *
+ * Copyright (C) IBM Corp. 2006
+ * Character device driver for writing z/VM APPLDATA monitor records
+ * Version 1.0
+ * Author(s): Melissa Howland <melissah@us.ibm.com>
+ *
+ */
+#ifndef _ASM_390_MONWRITER_H
+#define _ASM_390_MONWRITER_H
+/* mon_function values */
+#define MONWRITE_START_INTERVAL 0x00 /* start interval recording */
+#define MONWRITE_STOP_INTERVAL  0x01 /* stop interval or config recording */
+#define MONWRITE_GEN_EVENT      0x02 /* generate event record */
+#define MONWRITE_START_CONFIG   0x03 /* start configuration recording */
+/* the header the app uses in its write() data */
+struct monwrite_hdr {
+        unsigned char mon_function;
+        unsigned short applid;
+        unsigned char record_num;
+        unsigned short version;
+        unsigned short release;
+        unsigned short mod_level;
+        unsigned short datalen;
+        unsigned char hdrlen;
+} __attribute__((packed));
+#endif /* _ASM_390_MONWRITER_H */
diff --git a/include/asm-s390/page.h b/include/asm-s390/page.h
index b2628dc5c490..796c400f2b79 100644
--- a/include/asm-s390/page.h
+++ b/include/asm-s390/page.h
@@ -22,89 +22,45 @@
 #include <asm/setup.h>
 #ifndef __ASSEMBLY__
-#ifndef __s390x__
-static inline void clear_page(void *page)
-{
-        register_pair rp;
-        rp.subreg.even = (unsigned long) page;
-        rp.subreg.odd = (unsigned long) 4096;
-        asm volatile ("   slr  1,1\n"
-                      "   mvcl %0,0"
-                      : "+&a" (rp) : : "memory", "cc", "1" );
-}
-static inline void copy_page(void *to, void *from)
-{
-        if (MACHINE_HAS_MVPG)
-                asm volatile ("   sr   0,0\n"
-                              "   mvpg %0,%1"
-                              : : "a" ((void *)(to)), "a" ((void *)(from))
-                              : "memory", "cc", "0" );
-        else
-                asm volatile ("   mvc  0(256,%0),0(%1)\n"
-                              "   mvc  256(256,%0),256(%1)\n"
-                              "   mvc  512(256,%0),512(%1)\n"
-                              "   mvc  768(256,%0),768(%1)\n"
-                              "   mvc  1024(256,%0),1024(%1)\n"
-                              "   mvc  1280(256,%0),1280(%1)\n"
-                              "   mvc  1536(256,%0),1536(%1)\n"
-                              "   mvc  1792(256,%0),1792(%1)\n"
-                              "   mvc  2048(256,%0),2048(%1)\n"
-                              "   mvc  2304(256,%0),2304(%1)\n"
-                              "   mvc  2560(256,%0),2560(%1)\n"
-                              "   mvc  2816(256,%0),2816(%1)\n"
-                              "   mvc  3072(256,%0),3072(%1)\n"
-                              "   mvc  3328(256,%0),3328(%1)\n"
-                              "   mvc  3584(256,%0),3584(%1)\n"
-                              "   mvc  3840(256,%0),3840(%1)\n"
-                              : : "a"((void *)(to)),"a"((void *)(from)) 
-                              : "memory" );
-}
-#else /* __s390x__ */
 static inline void clear_page(void *page)
 {
-        asm volatile ("   lgr  2,%0\n"
+        register unsigned long reg1 asm ("1") = 0;
-                      "   lghi 3,4096\n"
+        register void *reg2 asm ("2") = page;
-                      "   slgr 1,1\n"
+        register unsigned long reg3 asm ("3") = 4096;
-                      "   mvcl 2,0"
+        asm volatile(
-                      : : "a" ((void *) (page))
+                "       mvcl    2,0"
-                      : "memory", "cc", "1", "2", "3" );
+                : "+d" (reg2), "+d" (reg3) : "d" (reg1) : "memory", "cc");
 }
 static inline void copy_page(void *to, void *from)
 {
-        if (MACHINE_HAS_MVPG)
+        if (MACHINE_HAS_MVPG) {
-                asm volatile ("   sgr  0,0\n"
+                register unsigned long reg0 asm ("0") = 0;
-                              "   mvpg %0,%1"
+                asm volatile(
-                              : : "a" ((void *)(to)), "a" ((void *)(from))
+                        "       mvpg    %0,%1"
-                              : "memory", "cc", "0" );
+                        : : "a" (to), "a" (from), "d" (reg0)
-        else
+                        : "memory", "cc");
-                asm volatile ("   mvc  0(256,%0),0(%1)\n"
+        } else
-                              "   mvc  256(256,%0),256(%1)\n"
+                asm volatile(
-                              "   mvc  512(256,%0),512(%1)\n"
+                        "       mvc     0(256,%0),0(%1)\n"
-                              "   mvc  768(256,%0),768(%1)\n"
+                        "       mvc     256(256,%0),256(%1)\n"
-                              "   mvc  1024(256,%0),1024(%1)\n"
+                        "       mvc     512(256,%0),512(%1)\n"
-                              "   mvc  1280(256,%0),1280(%1)\n"
+                        "       mvc     768(256,%0),768(%1)\n"
-                              "   mvc  1536(256,%0),1536(%1)\n"
+                        "       mvc     1024(256,%0),1024(%1)\n"
-                              "   mvc  1792(256,%0),1792(%1)\n"
+                        "       mvc     1280(256,%0),1280(%1)\n"
-                              "   mvc  2048(256,%0),2048(%1)\n"
+                        "       mvc     1536(256,%0),1536(%1)\n"
-                              "   mvc  2304(256,%0),2304(%1)\n"
+                        "       mvc     1792(256,%0),1792(%1)\n"
-                              "   mvc  2560(256,%0),2560(%1)\n"
+                        "       mvc     2048(256,%0),2048(%1)\n"
-                              "   mvc  2816(256,%0),2816(%1)\n"
+                        "       mvc     2304(256,%0),2304(%1)\n"
-                              "   mvc  3072(256,%0),3072(%1)\n"
+                        "       mvc     2560(256,%0),2560(%1)\n"
-                              "   mvc  3328(256,%0),3328(%1)\n"
+                        "       mvc     2816(256,%0),2816(%1)\n"
-                              "   mvc  3584(256,%0),3584(%1)\n"
+                        "       mvc     3072(256,%0),3072(%1)\n"
-                              "   mvc  3840(256,%0),3840(%1)\n"
+                        "       mvc     3328(256,%0),3328(%1)\n"
-                              : : "a"((void *)(to)),"a"((void *)(from)) 
+                        "       mvc     3584(256,%0),3584(%1)\n"
-                              : "memory" );
+                        "       mvc     3840(256,%0),3840(%1)\n"
+                        : : "a" (to), "a" (from) : "memory");
 }
-#endif /* __s390x__ */
 #define clear_user_page(page, vaddr, pg)        clear_page(page)
 #define copy_user_page(to, from, vaddr, pg)     copy_page(to, from)
@@ -159,7 +115,7 @@ extern unsigned int default_storage_key;
 static inline void
 page_set_storage_key(unsigned long addr, unsigned int skey)
 {
-        asm volatile ( "sske %0,%1" : : "d" (skey), "a" (addr) );
+        asm volatile("sske %0,%1" : : "d" (skey), "a" (addr));
 }
 static inline unsigned int
@@ -167,8 +123,7 @@ page_get_storage_key(unsigned long addr)
 {
        unsigned int skey;
-        asm volatile ( "iske %0,%1" : "=d" (skey) : "a" (addr), "0" (0) );
+        asm volatile("iske %0,%1" : "=d" (skey) : "a" (addr), "0" (0));
        return skey;
 }
diff --git a/include/asm-s390/percpu.h b/include/asm-s390/percpu.h
index 28b3517e787c..495ad99c7635 100644
--- a/include/asm-s390/percpu.h
+++ b/include/asm-s390/percpu.h
@@ -15,18 +15,20 @@
 */
 #if defined(__s390x__) && defined(MODULE)
-#define __reloc_hide(var,offset) \
+#define __reloc_hide(var,offset) (*({                   \
-  (*({ unsigned long *__ptr; \
+        extern int simple_indentifier_##var(void);      \
-       asm ( "larl %0,per_cpu__"#var"@GOTENT" \
+        unsigned long *__ptr;                           \
-             : "=a" (__ptr) : "X" (per_cpu__##var) ); \
+        asm ( "larl %0,per_cpu__"#var"@GOTENT"          \
-       (typeof(&per_cpu__##var))((*__ptr) + (offset)); }))
+            : "=a" (__ptr) : "X" (per_cpu__##var) );    \
+        (typeof(&per_cpu__##var))((*__ptr) + (offset)); }))
 #else
-#define __reloc_hide(var, offset) \
+#define __reloc_hide(var, offset) (*({                          \
-  (*({ unsigned long __ptr; \
+        extern int simple_indentifier_##var(void);              \
-       asm ( "" : "=a" (__ptr) : "0" (&per_cpu__##var) ); \
+        unsigned long __ptr;                                    \
-       (typeof(&per_cpu__##var)) (__ptr + (offset)); }))
+        asm ( "" : "=a" (__ptr) : "0" (&per_cpu__##var) );      \
+        (typeof(&per_cpu__##var)) (__ptr + (offset)); }))
 #endif
diff --git a/include/asm-s390/pgalloc.h b/include/asm-s390/pgalloc.h
index a78e853e0dd5..803bc7064418 100644
--- a/include/asm-s390/pgalloc.h
+++ b/include/asm-s390/pgalloc.h
@@ -22,6 +22,16 @@
 extern void diag10(unsigned long addr);
 /*
+ * Page allocation orders.
+ */
+#ifndef __s390x__
+# define PGD_ALLOC_ORDER        1
+#else /* __s390x__ */
+# define PMD_ALLOC_ORDER        2
+# define PGD_ALLOC_ORDER        2
+#endif /* __s390x__ */
+/*
 * Allocate and free page tables. The xxx_kernel() versions are
 * used to allocate a kernel page table - this turns on ASN bits
 * if any.
@@ -29,30 +39,23 @@ extern void diag10(unsigned long addr);
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
-        pgd_t *pgd;
+        pgd_t *pgd = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_ALLOC_ORDER);
        int i;
+        if (!pgd)
+                return NULL;
+        for (i = 0; i < PTRS_PER_PGD; i++)
 #ifndef __s390x__
-        pgd = (pgd_t *) __get_free_pages(GFP_KERNEL,1);
+                pmd_clear(pmd_offset(pgd + i, i*PGDIR_SIZE));
-        if (pgd != NULL)
+#else
-                for (i = 0; i < USER_PTRS_PER_PGD; i++)
+                pgd_clear(pgd + i);
-                        pmd_clear(pmd_offset(pgd + i, i*PGDIR_SIZE));
+#endif
-#else /* __s390x__ */
-        pgd = (pgd_t *) __get_free_pages(GFP_KERNEL,2);
-        if (pgd != NULL)
-                for (i = 0; i < PTRS_PER_PGD; i++)
-                        pgd_clear(pgd + i);
-#endif /* __s390x__ */
        return pgd;
 }
 static inline void pgd_free(pgd_t *pgd)
 {
-#ifndef __s390x__
+        free_pages((unsigned long) pgd, PGD_ALLOC_ORDER);
-        free_pages((unsigned long) pgd, 1);
-#else /* __s390x__ */
-        free_pages((unsigned long) pgd, 2);
-#endif /* __s390x__ */
 }
 #ifndef __s390x__
@@ -68,20 +71,19 @@ static inline void pgd_free(pgd_t *pgd)
 #else /* __s390x__ */
 static inline pmd_t * pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)
 {
-        pmd_t *pmd;
+        pmd_t *pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ALLOC_ORDER);
-        int i;
+        int i;
-        pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, 2);
+        if (!pmd)
-        if (pmd != NULL) {
+                return NULL;
-                for (i=0; i < PTRS_PER_PMD; i++)
+        for (i=0; i < PTRS_PER_PMD; i++)
-                        pmd_clear(pmd+i);
+                pmd_clear(pmd + i);
-        }
        return pmd;
 }
 static inline void pmd_free (pmd_t *pmd)
 {
-        free_pages((unsigned long) pmd, 2);
+        free_pages((unsigned long) pmd, PMD_ALLOC_ORDER);
 }
 #define __pmd_free_tlb(tlb,pmd)                 \
@@ -123,15 +125,14 @@ pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *page)
 static inline pte_t *
 pte_alloc_one_kernel(struct mm_struct *mm, unsigned long vmaddr)
 {
-        pte_t *pte;
+        pte_t *pte = (pte_t *) __get_free_page(GFP_KERNEL|__GFP_REPEAT);
-        int i;
+        int i;
-        pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+        if (!pte)
-        if (pte != NULL) {
+                return NULL;
-                for (i=0; i < PTRS_PER_PTE; i++) {
+        for (i=0; i < PTRS_PER_PTE; i++) {
-                        pte_clear(mm, vmaddr, pte+i);
+                pte_clear(mm, vmaddr, pte + i);
-                        vmaddr += PAGE_SIZE;
+                vmaddr += PAGE_SIZE;
-                }
        }
        return pte;
 }
diff --git a/include/asm-s390/pgtable.h b/include/asm-s390/pgtable.h
index 24312387fa24..ecdff13b2505 100644
--- a/include/asm-s390/pgtable.h
+++ b/include/asm-s390/pgtable.h
@@ -31,9 +31,9 @@
 * the S390 page table tree.
 */
 #ifndef __ASSEMBLY__
+#include <linux/mm_types.h>
 #include <asm/bug.h>
 #include <asm/processor.h>
-#include <linux/threads.h>
 struct vm_area_struct; /* forward declaration (include/linux/mm.h) */
 struct mm_struct;
@@ -89,19 +89,6 @@ extern char empty_zero_page[PAGE_SIZE];
 # define PTRS_PER_PGD    2048
 #endif /* __s390x__ */
-/*
- * pgd entries used up by user/kernel:
- */
-#ifndef __s390x__
-# define USER_PTRS_PER_PGD  512
-# define USER_PGD_PTRS      512
-# define KERNEL_PGD_PTRS    512
-#else /* __s390x__ */
-# define USER_PTRS_PER_PGD  2048
-# define USER_PGD_PTRS      2048
-# define KERNEL_PGD_PTRS    2048
-#endif /* __s390x__ */
 #define FIRST_USER_ADDRESS  0
 #define pte_ERROR(e) \
@@ -216,12 +203,14 @@ extern char empty_zero_page[PAGE_SIZE];
 #define _PAGE_RO        0x200          /* HW read-only                     */
 #define _PAGE_INVALID   0x400          /* HW invalid                       */
-/* Mask and four different kinds of invalid pages. */
+/* Mask and six different types of pages. */
-#define _PAGE_INVALID_MASK      0x601
+#define _PAGE_TYPE_MASK         0x601
-#define _PAGE_INVALID_EMPTY     0x400
+#define _PAGE_TYPE_EMPTY        0x400
-#define _PAGE_INVALID_NONE      0x401
+#define _PAGE_TYPE_NONE         0x401
-#define _PAGE_INVALID_SWAP      0x600
+#define _PAGE_TYPE_SWAP         0x600
-#define _PAGE_INVALID_FILE      0x601
+#define _PAGE_TYPE_FILE         0x601
+#define _PAGE_TYPE_RO           0x200
+#define _PAGE_TYPE_RW           0x000
 #ifndef __s390x__
@@ -280,15 +269,14 @@ extern char empty_zero_page[PAGE_SIZE];
 #endif /* __s390x__ */
 /*
- * No mapping available
+ * Page protection definitions.
 */
-#define PAGE_NONE_SHARED  __pgprot(_PAGE_INVALID_NONE)
+#define PAGE_NONE       __pgprot(_PAGE_TYPE_NONE)
-#define PAGE_NONE_PRIVATE __pgprot(_PAGE_INVALID_NONE)
+#define PAGE_RO         __pgprot(_PAGE_TYPE_RO)
-#define PAGE_RO_SHARED    __pgprot(_PAGE_RO)
+#define PAGE_RW         __pgprot(_PAGE_TYPE_RW)
-#define PAGE_RO_PRIVATE   __pgprot(_PAGE_RO)
-#define PAGE_COPY         __pgprot(_PAGE_RO)
+#define PAGE_KERNEL     PAGE_RW
-#define PAGE_SHARED       __pgprot(0)
+#define PAGE_COPY       PAGE_RO
-#define PAGE_KERNEL       __pgprot(0)
 /*
 * The S390 can't do page protection for execute, and considers that the
@@ -296,23 +284,23 @@ extern char empty_zero_page[PAGE_SIZE];
 * the closest we can get..
 */
         /*xwr*/
-#define __P000  PAGE_NONE_PRIVATE
+#define __P000  PAGE_NONE
-#define __P001  PAGE_RO_PRIVATE
+#define __P001  PAGE_RO
-#define __P010  PAGE_COPY
+#define __P010  PAGE_RO
-#define __P011  PAGE_COPY
+#define __P011  PAGE_RO
-#define __P100  PAGE_RO_PRIVATE
+#define __P100  PAGE_RO
-#define __P101  PAGE_RO_PRIVATE
+#define __P101  PAGE_RO
-#define __P110  PAGE_COPY
+#define __P110  PAGE_RO
-#define __P111  PAGE_COPY
+#define __P111  PAGE_RO
-#define __S000  PAGE_NONE_SHARED
+#define __S000  PAGE_NONE
-#define __S001  PAGE_RO_SHARED
+#define __S001  PAGE_RO
-#define __S010  PAGE_SHARED
+#define __S010  PAGE_RW
-#define __S011  PAGE_SHARED
+#define __S011  PAGE_RW
-#define __S100  PAGE_RO_SHARED
+#define __S100  PAGE_RO
-#define __S101  PAGE_RO_SHARED
+#define __S101  PAGE_RO
-#define __S110  PAGE_SHARED
+#define __S110  PAGE_RW
-#define __S111  PAGE_SHARED
+#define __S111  PAGE_RW
 /*
 * Certain architectures need to do special things when PTEs
@@ -377,18 +365,18 @@ static inline int pmd_bad(pmd_t pmd)
 static inline int pte_none(pte_t pte)
 {
-        return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_EMPTY;
+        return (pte_val(pte) & _PAGE_TYPE_MASK) == _PAGE_TYPE_EMPTY;
 }
 static inline int pte_present(pte_t pte)
 {
        return !(pte_val(pte) & _PAGE_INVALID) ||
-                (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_NONE;
+                (pte_val(pte) & _PAGE_TYPE_MASK) == _PAGE_TYPE_NONE;
 }
 static inline int pte_file(pte_t pte)
 {
-        return (pte_val(pte) & _PAGE_INVALID_MASK) == _PAGE_INVALID_FILE;
+        return (pte_val(pte) & _PAGE_TYPE_MASK) == _PAGE_TYPE_FILE;
 }
 #define pte_same(a,b)   (pte_val(a) == pte_val(b))
@@ -461,7 +449,7 @@ static inline void pmd_clear(pmd_t * pmdp)
 static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
-        pte_val(*ptep) = _PAGE_INVALID_EMPTY;
+        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
 }
 /*
@@ -477,7 +465,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 static inline pte_t pte_wrprotect(pte_t pte)
 {
-        /* Do not clobber _PAGE_INVALID_NONE pages!  */
+        /* Do not clobber _PAGE_TYPE_NONE pages!  */
        if (!(pte_val(pte) & _PAGE_INVALID))
                pte_val(pte) |= _PAGE_RO;
        return pte;
@@ -556,26 +544,31 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
        return pte;
 }
-static inline pte_t
+static inline void __ptep_ipte(unsigned long address, pte_t *ptep)
-ptep_clear_flush(struct vm_area_struct *vma,
-                 unsigned long address, pte_t *ptep)
 {
-        pte_t pte = *ptep;
+        if (!(pte_val(*ptep) & _PAGE_INVALID)) {
 #ifndef __s390x__
-        if (!(pte_val(pte) & _PAGE_INVALID)) {
                /* S390 has 1mb segments, we are emulating 4MB segments */
                pte_t *pto = (pte_t *) (((unsigned long) ptep) & 0x7ffffc00);
-                __asm__ __volatile__ ("ipte %2,%3"
+#else
-                                      : "=m" (*ptep) : "m" (*ptep),
+                /* ipte in zarch mode can do the math */
-                                        "a" (pto), "a" (address) );
+                pte_t *pto = ptep;
+#endif
+                asm volatile(
+                        "       ipte    %2,%3"
+                        : "=m" (*ptep) : "m" (*ptep),
+                          "a" (pto), "a" (address));
        }
-#else /* __s390x__ */
+        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
-        if (!(pte_val(pte) & _PAGE_INVALID)) 
+}
-                __asm__ __volatile__ ("ipte %2,%3"
-                                      : "=m" (*ptep) : "m" (*ptep),
+static inline pte_t
-                                        "a" (ptep), "a" (address) );
+ptep_clear_flush(struct vm_area_struct *vma,
-#endif /* __s390x__ */
+                 unsigned long address, pte_t *ptep)
-        pte_val(*ptep) = _PAGE_INVALID_EMPTY;
+{
+        pte_t pte = *ptep;
+        __ptep_ipte(address, ptep);
        return pte;
 }
@@ -604,30 +597,31 @@ ptep_establish(struct vm_area_struct *vma,
 * should therefore only be called if it is not mapped in any
 * address space.
 */
-#define page_test_and_clear_dirty(_page)                                  \
+static inline int page_test_and_clear_dirty(struct page *page)
-({                                                                        \
+{
-        struct page *__page = (_page);                                    \
+        unsigned long physpage = __pa((page - mem_map) << PAGE_SHIFT);
-        unsigned long __physpage = __pa((__page-mem_map) << PAGE_SHIFT);  \
+        int skey = page_get_storage_key(physpage);
-        int __skey = page_get_storage_key(__physpage);                    \
-        if (__skey & _PAGE_CHANGED)                                       \
+        if (skey & _PAGE_CHANGED)
-                page_set_storage_key(__physpage, __skey & ~_PAGE_CHANGED);\
+                page_set_storage_key(physpage, skey & ~_PAGE_CHANGED);
-        (__skey & _PAGE_CHANGED);                                         \
+        return skey & _PAGE_CHANGED;
-})
+}
 /*
 * Test and clear referenced bit in storage key.
 */
-#define page_test_and_clear_young(page)                                   \
+static inline int page_test_and_clear_young(struct page *page)
-({                                                                        \
+{
-        struct page *__page = (page);                                     \
+        unsigned long physpage = __pa((page - mem_map) << PAGE_SHIFT);
-        unsigned long __physpage = __pa((__page-mem_map) << PAGE_SHIFT);  \
+        int ccode;
-        int __ccode;                                                      \
-        asm volatile ("rrbe 0,%1\n\t"                                     \
+        asm volatile (
-                      "ipm  %0\n\t"                                       \
+                "rrbe 0,%1\n"
-                      "srl  %0,28\n\t"                                    \
+                "ipm  %0\n"
-                      : "=d" (__ccode) : "a" (__physpage) : "cc" );       \
+                "srl  %0,28\n"
-        (__ccode & 2);                                                    \
+                : "=d" (ccode) : "a" (physpage) : "cc" );
-})
+        return ccode & 2;
+}
 /*
 * Conversion functions: convert a page and protection to a page entry,
@@ -640,43 +634,41 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
        return __pte;
 }
-#define mk_pte(pg, pgprot)                                                \
+static inline pte_t mk_pte(struct page *page, pgprot_t pgprot)
-({                                                                        \
+{
-        struct page *__page = (pg);                                       \
+        unsigned long physpage = __pa((page - mem_map) << PAGE_SHIFT);
-        pgprot_t __pgprot = (pgprot);                                     \
-        unsigned long __physpage = __pa((__page-mem_map) << PAGE_SHIFT);  \
-        pte_t __pte = mk_pte_phys(__physpage, __pgprot);                  \
-        __pte;                                                            \
-})
-#define pfn_pte(pfn, pgprot)                                              \
+        return mk_pte_phys(physpage, pgprot);
-({                                                                        \
+}
-        pgprot_t __pgprot = (pgprot);                                     \
-        unsigned long __physpage = __pa((pfn) << PAGE_SHIFT);             \
+static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
-        pte_t __pte = mk_pte_phys(__physpage, __pgprot);                  \
+{
-        __pte;                                                            \
+        unsigned long physpage = __pa((pfn) << PAGE_SHIFT);
-})
+        return mk_pte_phys(physpage, pgprot);
+}
 #ifdef __s390x__
-#define pfn_pmd(pfn, pgprot)                                              \
+static inline pmd_t pfn_pmd(unsigned long pfn, pgprot_t pgprot)
-({                                                                        \
+{
-        pgprot_t __pgprot = (pgprot);                                     \
+        unsigned long physpage = __pa((pfn) << PAGE_SHIFT);
-        unsigned long __physpage = __pa((pfn) << PAGE_SHIFT);             \
-        pmd_t __pmd = __pmd(__physpage + pgprot_val(__pgprot));           \
+        return __pmd(physpage + pgprot_val(pgprot));
-        __pmd;                                                            \
+}
-})
 #endif /* __s390x__ */
 #define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT)
 #define pte_page(x) pfn_to_page(pte_pfn(x))
-#define pmd_page_kernel(pmd) (pmd_val(pmd) & PAGE_MASK)
+#define pmd_page_vaddr(pmd) (pmd_val(pmd) & PAGE_MASK)
 #define pmd_page(pmd) (mem_map+(pmd_val(pmd) >> PAGE_SHIFT))
-#define pgd_page_kernel(pgd) (pgd_val(pgd) & PAGE_MASK)
+#define pgd_page_vaddr(pgd) (pgd_val(pgd) & PAGE_MASK)
+#define pgd_page(pgd) (mem_map+(pgd_val(pgd) >> PAGE_SHIFT))
 /* to find an entry in a page-table-directory */
 #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
@@ -698,14 +690,14 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 /* Find an entry in the second-level page table.. */
 #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
 #define pmd_offset(dir,addr) \
-        ((pmd_t *) pgd_page_kernel(*(dir)) + pmd_index(addr))
+        ((pmd_t *) pgd_page_vaddr(*(dir)) + pmd_index(addr))
 #endif /* __s390x__ */
 /* Find an entry in the third-level page table.. */
 #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
 #define pte_offset_kernel(pmd, address) \
-        ((pte_t *) pmd_page_kernel(*(pmd)) + pte_index(address))
+        ((pte_t *) pmd_page_vaddr(*(pmd)) + pte_index(address))
 #define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_unmap(pte) do { } while (0)
@@ -755,7 +747,7 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
 {
        pte_t pte;
        offset &= __SWP_OFFSET_MASK;
-        pte_val(pte) = _PAGE_INVALID_SWAP | ((type & 0x1f) << 2) |
+        pte_val(pte) = _PAGE_TYPE_SWAP | ((type & 0x1f) << 2) |
                ((offset & 1UL) << 7) | ((offset & ~1UL) << 11);
        return pte;
 }
@@ -778,7 +770,7 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
 #define pgoff_to_pte(__off) \
        ((pte_t) { ((((__off) & 0x7f) << 1) + (((__off) >> 7) << 12)) \
-                   | _PAGE_INVALID_FILE })
+                   | _PAGE_TYPE_FILE })
 #endif /* !__ASSEMBLY__ */
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
index 5b71d3731723..cbbedc63ba25 100644
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
@@ -13,7 +13,6 @@
 #ifndef __ASM_S390_PROCESSOR_H
 #define __ASM_S390_PROCESSOR_H
-#include <asm/page.h>
 #include <asm/ptrace.h>
 #ifdef __KERNEL__
@@ -21,7 +20,7 @@
 * Default implementation of macro that returns current
 * instruction pointer ("program counter").
 */
-#define current_text_addr() ({ void *pc; __asm__("basr %0,0":"=a"(pc)); pc; })
+#define current_text_addr() ({ void *pc; asm("basr %0,0" : "=a" (pc)); pc; })
 /*
 *  CPU type and hardware bug flags. Kept separately for each CPU.
@@ -202,7 +201,7 @@ unsigned long get_wchan(struct task_struct *p);
 static inline void cpu_relax(void)
 {
        if (MACHINE_HAS_DIAG44)
-                asm volatile ("diag 0,0,68" : : : "memory");
+                asm volatile("diag 0,0,68" : : : "memory");
        else
                barrier();
 }
@@ -213,9 +212,9 @@ static inline void cpu_relax(void)
 static inline void __load_psw(psw_t psw)
 {
 #ifndef __s390x__
-        asm volatile ("lpsw  0(%0)" : : "a" (&psw), "m" (psw) : "cc" );
+        asm volatile("lpsw  0(%0)" : : "a" (&psw), "m" (psw) : "cc");
 #else
-        asm volatile ("lpswe 0(%0)" : : "a" (&psw), "m" (psw) : "cc" );
+        asm volatile("lpswe 0(%0)" : : "a" (&psw), "m" (psw) : "cc");
 #endif
 }
@@ -232,20 +231,20 @@ static inline void __load_psw_mask (unsigned long mask)
        psw.mask = mask;
 #ifndef __s390x__
-        asm volatile (
+        asm volatile(
-                "    basr %0,0\n"
+                "       basr    %0,0\n"
-                "0:  ahi  %0,1f-0b\n"
+                "0:     ahi     %0,1f-0b\n"
-                "    st   %0,4(%1)\n"
+                "       st      %0,4(%1)\n"
-                "    lpsw 0(%1)\n"
+                "       lpsw    0(%1)\n"
                "1:"
-                : "=&d" (addr) : "a" (&psw), "m" (psw) : "memory", "cc" );
+                : "=&d" (addr) : "a" (&psw), "m" (psw) : "memory", "cc");
 #else /* __s390x__ */
-        asm volatile (
+        asm volatile(
-                "    larl  %0,1f\n"
+                "       larl    %0,1f\n"
-                "    stg   %0,8(%1)\n"
+                "       stg     %0,8(%1)\n"
-                "    lpswe 0(%1)\n"
+                "       lpswe   0(%1)\n"
                "1:"
-                : "=&d" (addr) : "a" (&psw), "m" (psw) : "memory", "cc" );
+                : "=&d" (addr) : "a" (&psw), "m" (psw) : "memory", "cc");
 #endif /* __s390x__ */
 }
 
@@ -274,56 +273,57 @@ static inline void disabled_wait(unsigned long code)
         * the processor is dead afterwards
         */
 #ifndef __s390x__
-        asm volatile ("    stctl 0,0,0(%2)\n"
+        asm volatile(
-                      "    ni    0(%2),0xef\n" /* switch off protection */
+                "       stctl   0,0,0(%2)\n"
-                      "    lctl  0,0,0(%2)\n"
+                "       ni      0(%2),0xef\n"   /* switch off protection */
-                      "    stpt  0xd8\n"       /* store timer */
+                "       lctl    0,0,0(%2)\n"
-                      "    stckc 0xe0\n"       /* store clock comparator */
+                "       stpt    0xd8\n"         /* store timer */
-                      "    stpx  0x108\n"      /* store prefix register */
+                "       stckc   0xe0\n"         /* store clock comparator */
-                      "    stam  0,15,0x120\n" /* store access registers */
+                "       stpx    0x108\n"        /* store prefix register */
-                      "    std   0,0x160\n"    /* store f0 */
+                "       stam    0,15,0x120\n"   /* store access registers */
-                      "    std   2,0x168\n"    /* store f2 */
+                "       std     0,0x160\n"      /* store f0 */
-                      "    std   4,0x170\n"    /* store f4 */
+                "       std     2,0x168\n"      /* store f2 */
-                      "    std   6,0x178\n"    /* store f6 */
+                "       std     4,0x170\n"      /* store f4 */
-                      "    stm   0,15,0x180\n" /* store general registers */
+                "       std     6,0x178\n"      /* store f6 */
-                      "    stctl 0,15,0x1c0\n" /* store control registers */
+                "       stm     0,15,0x180\n"   /* store general registers */
-                      "    oi    0x1c0,0x10\n" /* fake protection bit */
+                "       stctl   0,15,0x1c0\n"   /* store control registers */
-                      "    lpsw 0(%1)"
+                "       oi      0x1c0,0x10\n"   /* fake protection bit */
-                      : "=m" (ctl_buf)
+                "       lpsw    0(%1)"
-                      : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc" );
+                : "=m" (ctl_buf)
+                : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc");
 #else /* __s390x__ */
-        asm volatile ("    stctg 0,0,0(%2)\n"
+        asm volatile(
-                      "    ni    4(%2),0xef\n" /* switch off protection */
+                "       stctg   0,0,0(%2)\n"
-                      "    lctlg 0,0,0(%2)\n"
+                "       ni      4(%2),0xef\n"   /* switch off protection */
-                      "    lghi  1,0x1000\n"
+                "       lctlg   0,0,0(%2)\n"
-                      "    stpt  0x328(1)\n"      /* store timer */
+                "       lghi    1,0x1000\n"
-                      "    stckc 0x330(1)\n"      /* store clock comparator */
+                "       stpt    0x328(1)\n"     /* store timer */
-                      "    stpx  0x318(1)\n"      /* store prefix register */
+                "       stckc   0x330(1)\n"     /* store clock comparator */
-                      "    stam  0,15,0x340(1)\n" /* store access registers */
+                "       stpx    0x318(1)\n"     /* store prefix register */
-                      "    stfpc 0x31c(1)\n"      /* store fpu control */
+                "       stam    0,15,0x340(1)\n"/* store access registers */
-                      "    std   0,0x200(1)\n"    /* store f0 */
+                "       stfpc   0x31c(1)\n"     /* store fpu control */
-                      "    std   1,0x208(1)\n"    /* store f1 */
+                "       std     0,0x200(1)\n"   /* store f0 */
-                      "    std   2,0x210(1)\n"    /* store f2 */
+                "       std     1,0x208(1)\n"   /* store f1 */
-                      "    std   3,0x218(1)\n"    /* store f3 */
+                "       std     2,0x210(1)\n"   /* store f2 */
-                      "    std   4,0x220(1)\n"    /* store f4 */
+                "       std     3,0x218(1)\n"   /* store f3 */
-                      "    std   5,0x228(1)\n"    /* store f5 */
+                "       std     4,0x220(1)\n"   /* store f4 */
-                      "    std   6,0x230(1)\n"    /* store f6 */
+                "       std     5,0x228(1)\n"   /* store f5 */
-                      "    std   7,0x238(1)\n"    /* store f7 */
+                "       std     6,0x230(1)\n"   /* store f6 */
-                      "    std   8,0x240(1)\n"    /* store f8 */
+                "       std     7,0x238(1)\n"   /* store f7 */
-                      "    std   9,0x248(1)\n"    /* store f9 */
+                "       std     8,0x240(1)\n"   /* store f8 */
-                      "    std   10,0x250(1)\n"   /* store f10 */
+                "       std     9,0x248(1)\n"   /* store f9 */
-                      "    std   11,0x258(1)\n"   /* store f11 */
+                "       std     10,0x250(1)\n"  /* store f10 */
-                      "    std   12,0x260(1)\n"   /* store f12 */
+                "       std     11,0x258(1)\n"  /* store f11 */
-                      "    std   13,0x268(1)\n"   /* store f13 */
+                "       std     12,0x260(1)\n"  /* store f12 */
-                      "    std   14,0x270(1)\n"   /* store f14 */
+                "       std     13,0x268(1)\n"  /* store f13 */
-                      "    std   15,0x278(1)\n"   /* store f15 */
+                "       std     14,0x270(1)\n"  /* store f14 */
-                      "    stmg  0,15,0x280(1)\n" /* store general registers */
+                "       std     15,0x278(1)\n"  /* store f15 */
-                      "    stctg 0,15,0x380(1)\n" /* store control registers */
+                "       stmg    0,15,0x280(1)\n"/* store general registers */
-                      "    oi    0x384(1),0x10\n" /* fake protection bit */
+                "       stctg   0,15,0x380(1)\n"/* store control registers */
-                      "    lpswe 0(%1)"
+                "       oi      0x384(1),0x10\n"/* fake protection bit */
-                      : "=m" (ctl_buf)
+                "       lpswe   0(%1)"
-                      : "a" (&dw_psw), "a" (&ctl_buf),
+                : "=m" (ctl_buf)
-                        "m" (dw_psw) : "cc", "0", "1");
+                : "a" (&dw_psw), "a" (&ctl_buf), "m" (dw_psw) : "cc", "0");
 #endif /* __s390x__ */
 }
@@ -337,6 +337,25 @@ struct notifier_block;
 int register_idle_notifier(struct notifier_block *nb);
 int unregister_idle_notifier(struct notifier_block *nb);
+#define ARCH_LOW_ADDRESS_LIMIT  0x7fffffffUL
+#endif
+/*
+ * Helper macro for exception table entries
+ */
+#ifndef __s390x__
+#define EX_TABLE(_fault,_target)                        \
+        ".section __ex_table,\"a\"\n"                   \
+        "       .align 4\n"                             \
+        "       .long  " #_fault "," #_target "\n"      \
+        ".previous\n"
+#else
+#define EX_TABLE(_fault,_target)                        \
+        ".section __ex_table,\"a\"\n"                   \
+        "       .align 8\n"                             \
+        "       .quad  " #_fault "," #_target "\n"      \
+        ".previous\n"
 #endif
 #endif                                 /* __ASM_S390_PROCESSOR_H           */
diff --git a/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h
index 4d75d77b0f99..8d2bf65b0b64 100644
--- a/include/asm-s390/ptrace.h
+++ b/include/asm-s390/ptrace.h
@@ -479,7 +479,7 @@ extern void show_regs(struct pt_regs * regs);
 static inline void
 psw_set_key(unsigned int key)
 {
-        asm volatile ( "spka 0(%0)" : : "d" (key) );
+        asm volatile("spka 0(%0)" : : "d" (key));
 }
 #endif /* __ASSEMBLY__ */
diff --git a/include/asm-s390/rwsem.h b/include/asm-s390/rwsem.h
index 13ec16965150..90f4eccaa290 100644
--- a/include/asm-s390/rwsem.h
+++ b/include/asm-s390/rwsem.h
@@ -122,23 +122,23 @@ static inline void __down_read(struct rw_semaphore *sem)
 {
        signed long old, new;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: lr   %1,%0\n"
+                "0:     lr      %1,%0\n"
-                "   ahi  %1,%5\n"
+                "       ahi     %1,%5\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #else /* __s390x__ */
-                "   lg   %0,0(%3)\n"
+                "       lg      %0,0(%3)\n"
-                "0: lgr  %1,%0\n"
+                "0:     lgr     %1,%0\n"
-                "   aghi %1,%5\n"
+                "       aghi    %1,%5\n"
-                "   csg  %0,%1,0(%3)\n"
+                "       csg     %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
+                : "=&d" (old), "=&d" (new), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count),
-                  "i" (RWSEM_ACTIVE_READ_BIAS) : "cc", "memory" );
+                  "i" (RWSEM_ACTIVE_READ_BIAS) : "cc", "memory");
        if (old < 0)
                rwsem_down_read_failed(sem);
 }
@@ -150,27 +150,27 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
 {
        signed long old, new;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: ltr  %1,%0\n"
+                "0:     ltr     %1,%0\n"
-                "   jm   1f\n"
+                "       jm      1f\n"
-                "   ahi  %1,%5\n"
+                "       ahi     %1,%5\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b\n"
+                "       jl      0b\n"
                "1:"
 #else /* __s390x__ */
-                "   lg   %0,0(%3)\n"
+                "       lg      %0,0(%3)\n"
-                "0: ltgr %1,%0\n"
+                "0:     ltgr    %1,%0\n"
-                "   jm   1f\n"
+                "       jm      1f\n"
-                "   aghi %1,%5\n"
+                "       aghi    %1,%5\n"
-                "   csg  %0,%1,0(%3)\n"
+                "       csg     %0,%1,0(%3)\n"
-                "   jl   0b\n"
+                "       jl      0b\n"
                "1:"
 #endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
+                : "=&d" (old), "=&d" (new), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count),
-                  "i" (RWSEM_ACTIVE_READ_BIAS) : "cc", "memory" );
+                  "i" (RWSEM_ACTIVE_READ_BIAS) : "cc", "memory");
        return old >= 0 ? 1 : 0;
 }
@@ -182,23 +182,23 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
        signed long old, new, tmp;
        tmp = RWSEM_ACTIVE_WRITE_BIAS;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: lr   %1,%0\n"
+                "0:     lr      %1,%0\n"
-                "   a    %1,%5\n"
+                "       a       %1,%5\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #else /* __s390x__ */
-                "   lg   %0,0(%3)\n"
+                "       lg      %0,0(%3)\n"
-                "0: lgr  %1,%0\n"
+                "0:     lgr     %1,%0\n"
-                "   ag   %1,%5\n"
+                "       ag      %1,%5\n"
-                "   csg  %0,%1,0(%3)\n"
+                "       csg     %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
+                : "=&d" (old), "=&d" (new), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count), "m" (tmp)
-                : "cc", "memory" );
+                : "cc", "memory");
        if (old != 0)
                rwsem_down_write_failed(sem);
 }
@@ -215,24 +215,24 @@ static inline int __down_write_trylock(struct rw_semaphore *sem)
 {
        signed long old;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%2)\n"
+                "       l       %0,0(%2)\n"
-                "0: ltr  %0,%0\n"
+                "0:     ltr     %0,%0\n"
-                "   jnz  1f\n"
+                "       jnz     1f\n"
-                "   cs   %0,%4,0(%2)\n"
+                "       cs      %0,%4,0(%2)\n"
-                "   jl   0b\n"
+                "       jl      0b\n"
 #else /* __s390x__ */
-                "   lg   %0,0(%2)\n"
+                "       lg      %0,0(%2)\n"
-                "0: ltgr %0,%0\n"
+                "0:     ltgr    %0,%0\n"
-                "   jnz  1f\n"
+                "       jnz     1f\n"
-                "   csg  %0,%4,0(%2)\n"
+                "       csg     %0,%4,0(%2)\n"
-                "   jl   0b\n"
+                "       jl      0b\n"
 #endif /* __s390x__ */
                "1:"
-                : "=&d" (old), "=m" (sem->count)
+                : "=&d" (old), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count),
-                  "d" (RWSEM_ACTIVE_WRITE_BIAS) : "cc", "memory" );
+                  "d" (RWSEM_ACTIVE_WRITE_BIAS) : "cc", "memory");
        return (old == RWSEM_UNLOCKED_VALUE) ? 1 : 0;
 }
@@ -243,24 +243,24 @@ static inline void __up_read(struct rw_semaphore *sem)
 {
        signed long old, new;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: lr   %1,%0\n"
+                "0:     lr      %1,%0\n"
-                "   ahi  %1,%5\n"
+                "       ahi     %1,%5\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #else /* __s390x__ */
-                "   lg   %0,0(%3)\n"
+                "       lg      %0,0(%3)\n"
-                "0: lgr  %1,%0\n"
+                "0:     lgr     %1,%0\n"
-                "   aghi %1,%5\n"
+                "       aghi    %1,%5\n"
-                "   csg  %0,%1,0(%3)\n"
+                "       csg     %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
+                : "=&d" (old), "=&d" (new), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count),
                  "i" (-RWSEM_ACTIVE_READ_BIAS)
-                : "cc", "memory" );
+                : "cc", "memory");
        if (new < 0)
                if ((new & RWSEM_ACTIVE_MASK) == 0)
                        rwsem_wake(sem);
@@ -274,23 +274,23 @@ static inline void __up_write(struct rw_semaphore *sem)
        signed long old, new, tmp;
        tmp = -RWSEM_ACTIVE_WRITE_BIAS;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: lr   %1,%0\n"
+                "0:     lr      %1,%0\n"
-                "   a    %1,%5\n"
+                "       a       %1,%5\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #else /* __s390x__ */
-                "   lg   %0,0(%3)\n"
+                "       lg      %0,0(%3)\n"
-                "0: lgr  %1,%0\n"
+                "0:     lgr     %1,%0\n"
-                "   ag   %1,%5\n"
+                "       ag      %1,%5\n"
-                "   csg  %0,%1,0(%3)\n"
+                "       csg     %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
+                : "=&d" (old), "=&d" (new), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count), "m" (tmp)
-                : "cc", "memory" );
+                : "cc", "memory");
        if (new < 0)
                if ((new & RWSEM_ACTIVE_MASK) == 0)
                        rwsem_wake(sem);
@@ -304,23 +304,23 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
        signed long old, new, tmp;
        tmp = -RWSEM_WAITING_BIAS;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: lr   %1,%0\n"
+                "0:     lr      %1,%0\n"
-                "   a    %1,%5\n"
+                "       a       %1,%5\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #else /* __s390x__ */
-                "   lg   %0,0(%3)\n"
+                "       lg      %0,0(%3)\n"
-                "0: lgr  %1,%0\n"
+                "0:     lgr     %1,%0\n"
-                "   ag   %1,%5\n"
+                "       ag      %1,%5\n"
-                "   csg  %0,%1,0(%3)\n"
+                "       csg     %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
+                : "=&d" (old), "=&d" (new), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count), "m" (tmp)
-                : "cc", "memory" );
+                : "cc", "memory");
        if (new > 1)
                rwsem_downgrade_wake(sem);
 }
@@ -332,23 +332,23 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
 {
        signed long old, new;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: lr   %1,%0\n"
+                "0:     lr      %1,%0\n"
-                "   ar   %1,%5\n"
+                "       ar      %1,%5\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #else /* __s390x__ */
-                "   lg   %0,0(%3)\n"
+                "       lg      %0,0(%3)\n"
-                "0: lgr  %1,%0\n"
+                "0:     lgr     %1,%0\n"
-                "   agr  %1,%5\n"
+                "       agr     %1,%5\n"
-                "   csg  %0,%1,0(%3)\n"
+                "       csg     %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
+                : "=&d" (old), "=&d" (new), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count), "d" (delta)
-                : "cc", "memory" );
+                : "cc", "memory");
 }
 /*
@@ -358,23 +358,23 @@ static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
 {
        signed long old, new;
-        __asm__ __volatile__(
+        asm volatile(
 #ifndef __s390x__
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: lr   %1,%0\n"
+                "0:     lr      %1,%0\n"
-                "   ar   %1,%5\n"
+                "       ar      %1,%5\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #else /* __s390x__ */
-                "   lg   %0,0(%3)\n"
+                "       lg      %0,0(%3)\n"
-                "0: lgr  %1,%0\n"
+                "0:     lgr     %1,%0\n"
-                "   agr  %1,%5\n"
+                "       agr     %1,%5\n"
-                "   csg  %0,%1,0(%3)\n"
+                "       csg     %0,%1,0(%3)\n"
-                "   jl   0b"
+                "       jl      0b"
 #endif /* __s390x__ */
-                : "=&d" (old), "=&d" (new), "=m" (sem->count)
+                : "=&d" (old), "=&d" (new), "=m" (sem->count)
                : "a" (&sem->count), "m" (sem->count), "d" (delta)
-                : "cc", "memory" );
+                : "cc", "memory");
        return new;
 }
diff --git a/include/asm-s390/semaphore.h b/include/asm-s390/semaphore.h
index 32cdc69f39f4..dbce058aefa9 100644
--- a/include/asm-s390/semaphore.h
+++ b/include/asm-s390/semaphore.h
@@ -85,17 +85,17 @@ static inline int down_trylock(struct semaphore * sem)
         *       sem->count.counter = --new_val;
         * In the ppc code this is called atomic_dec_if_positive.
         */
-        __asm__ __volatile__ (
+        asm volatile(
-                "   l    %0,0(%3)\n"
+                "       l       %0,0(%3)\n"
-                "0: ltr  %1,%0\n"
+                "0:     ltr     %1,%0\n"
-                "   jle  1f\n"
+                "       jle     1f\n"
-                "   ahi  %1,-1\n"
+                "       ahi     %1,-1\n"
-                "   cs   %0,%1,0(%3)\n"
+                "       cs      %0,%1,0(%3)\n"
-                "   jl   0b\n"
+                "       jl      0b\n"
                "1:"
                : "=&d" (old_val), "=&d" (new_val), "=m" (sem->count.counter)
                : "a" (&sem->count.counter), "m" (sem->count.counter)
-                : "cc", "memory" );
+                : "cc", "memory");
        return old_val <= 0;
 }
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 19e31979309a..5d72eda8a11b 100644
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -14,8 +14,6 @@
 #define PARMAREA                0x10400
 #define COMMAND_LINE_SIZE       896
-#define RAMDISK_ORIGIN          0x800000
-#define RAMDISK_SIZE            0x800000
 #define MEMORY_CHUNKS           16      /* max 0x7fff */
 #define IPL_PARMBLOCK_ORIGIN    0x2000
@@ -41,15 +39,18 @@ extern unsigned long machine_flags;
 #define MACHINE_IS_P390         (machine_flags & 4)
 #define MACHINE_HAS_MVPG        (machine_flags & 16)
 #define MACHINE_HAS_IDTE        (machine_flags & 128)
+#define MACHINE_HAS_DIAG9C      (machine_flags & 256)
 #ifndef __s390x__
 #define MACHINE_HAS_IEEE        (machine_flags & 2)
 #define MACHINE_HAS_CSP         (machine_flags & 8)
 #define MACHINE_HAS_DIAG44      (1)
+#define MACHINE_HAS_MVCOS       (0)
 #else /* __s390x__ */
 #define MACHINE_HAS_IEEE        (1)
 #define MACHINE_HAS_CSP         (1)
 #define MACHINE_HAS_DIAG44      (machine_flags & 32)
+#define MACHINE_HAS_MVCOS       (machine_flags & 512)
 #endif /* __s390x__ */
@@ -70,52 +71,76 @@ extern unsigned int console_irq;
 #define SET_CONSOLE_3215        do { console_mode = 2; } while (0)
 #define SET_CONSOLE_3270        do { console_mode = 3; } while (0)
-struct ipl_list_header {
-        u32 length;
+struct ipl_list_hdr {
-        u8  reserved[3];
+        u32 len;
+        u8  reserved1[3];
        u8  version;
+        u32 blk0_len;
+        u8  pbt;
+        u8  flags;
+        u16 reserved2;
 } __attribute__((packed));
 struct ipl_block_fcp {
-        u32 length;
+        u8  reserved1[313-1];
-        u8  pbt;
+        u8  opt;
-        u8  reserved1[322-1];
+        u8  reserved2[3];
+        u16 reserved3;
        u16 devno;
-        u8  reserved2[4];
+        u8  reserved4[4];
        u64 wwpn;
        u64 lun;
        u32 bootprog;
-        u8  reserved3[12];
+        u8  reserved5[12];
        u64 br_lba;
        u32 scp_data_len;
-        u8  reserved4[260];
+        u8  reserved6[260];
        u8  scp_data[];
 } __attribute__((packed));
+struct ipl_block_ccw {
+        u8  load_param[8];
+        u8  reserved1[84];
+        u8  reserved2[2];
+        u16 devno;
+        u8  vm_flags;
+        u8  reserved3[3];
+        u32 vm_parm_len;
+} __attribute__((packed));
 struct ipl_parameter_block {
+        struct ipl_list_hdr hdr;
        union {
-                u32 length;
+                struct ipl_block_fcp fcp;
-                struct ipl_list_header header;
+                struct ipl_block_ccw ccw;
-        } hdr;
+        } ipl_info;
-        struct ipl_block_fcp fcp;
 } __attribute__((packed));
-#define IPL_MAX_SUPPORTED_VERSION (0)
+#define IPL_PARM_BLK_FCP_LEN (sizeof(struct ipl_list_hdr) + \
+                              sizeof(struct ipl_block_fcp))
-#define IPL_TYPE_FCP (0)
+#define IPL_PARM_BLK_CCW_LEN (sizeof(struct ipl_list_hdr) + \
+                              sizeof(struct ipl_block_ccw))
+#define IPL_MAX_SUPPORTED_VERSION (0)
 /*
 * IPL validity flags and parameters as detected in head.S
 */
-extern u32 ipl_parameter_flags;
+extern u32 ipl_flags;
 extern u16 ipl_devno;
-#define IPL_DEVNO_VALID         (ipl_parameter_flags & 1)
+void do_reipl(void);
-#define IPL_PARMBLOCK_VALID     (ipl_parameter_flags & 2)
+enum {
+        IPL_DEVNO_VALID = 1,
+        IPL_PARMBLOCK_VALID = 2,
+};
 #define IPL_PARMBLOCK_START     ((struct ipl_parameter_block *) \
                                 IPL_PARMBLOCK_ORIGIN)
-#define IPL_PARMBLOCK_SIZE      (IPL_PARMBLOCK_START->hdr.length)
+#define IPL_PARMBLOCK_SIZE      (IPL_PARMBLOCK_START->hdr.len)
 #else /* __ASSEMBLY__ */
diff --git a/include/asm-s390/sfp-machine.h b/include/asm-s390/sfp-machine.h
index de69dfa46fbb..8ca8c77b2d04 100644
--- a/include/asm-s390/sfp-machine.h
+++ b/include/asm-s390/sfp-machine.h
@@ -76,21 +76,23 @@
        unsigned int __r2 = (x2) + (y2);                        \
        unsigned int __r1 = (x1);                               \
        unsigned int __r0 = (x0);                               \
-        __asm__ ("   alr %2,%3\n"                               \
+        asm volatile(                                           \
-                 "   brc 12,0f\n"                               \
+                "       alr     %2,%3\n"                        \
-                 "   lhi 0,1\n"                                 \
+                "       brc     12,0f\n"                        \
-                 "   alr %1,0\n"                                \
+                "       lhi     0,1\n"                          \
-                 "   brc 12,0f\n"                               \
+                "       alr     %1,0\n"                         \
-                 "   alr %0,0\n"                                \
+                "       brc     12,0f\n"                        \
-                 "0:"                                           \
+                "       alr     %0,0\n"                         \
-                 : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)     \
+                "0:"                                            \
-                 : "d" (y0), "i" (1) : "cc", "0" );             \
+                : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)      \
-        __asm__ ("   alr %1,%2\n"                               \
+                : "d" (y0), "i" (1) : "cc", "0" );              \
-                 "   brc 12,0f\n"                               \
+        asm volatile(                                           \
-                 "   ahi %0,1\n"                                \
+                "       alr     %1,%2\n"                        \
-                 "0:"                                           \
+                "       brc     12,0f\n"                        \
-                 : "+&d" (__r2), "+&d" (__r1)                   \
+                "       ahi     %0,1\n"                         \
-                 : "d" (y1) : "cc" );                           \
+                "0:"                                            \
+                : "+&d" (__r2), "+&d" (__r1)                    \
+                : "d" (y1) : "cc");                             \
        (r2) = __r2;                                            \
        (r1) = __r1;                                            \
        (r0) = __r0;                                            \
@@ -100,21 +102,23 @@
        unsigned int __r2 = (x2) - (y2);                        \
        unsigned int __r1 = (x1);                               \
        unsigned int __r0 = (x0);                               \
-        __asm__ ("   slr %2,%3\n"                               \
+        asm volatile(                                           \
-                 "   brc 3,0f\n"                                \
+                "       slr   %2,%3\n"                          \
-                 "   lhi 0,1\n"                                 \
+                "       brc     3,0f\n"                         \
-                 "   slr %1,0\n"                                \
+                "       lhi     0,1\n"                          \
-                 "   brc 3,0f\n"                                \
+                "       slr     %1,0\n"                         \
-                 "   slr %0,0\n"                                \
+                "       brc     3,0f\n"                         \
-                 "0:"                                           \
+                "       slr     %0,0\n"                         \
-                 : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)     \
+                "0:"                                            \
-                 : "d" (y0) : "cc", "0" );                      \
+                : "+&d" (__r2), "+&d" (__r1), "+&d" (__r0)      \
-        __asm__ ("   slr %1,%2\n"                               \
+                : "d" (y0) : "cc", "0");                        \
-                 "   brc 3,0f\n"                                \
+        asm volatile(                                           \
-                 "   ahi %0,-1\n"                               \
+                "       slr     %1,%2\n"                        \
-                 "0:"                                           \
+                "       brc     3,0f\n"                         \
-                 : "+&d" (__r2), "+&d" (__r1)                   \
+                "       ahi     %0,-1\n"                        \
-                 : "d" (y1) : "cc" );                           \
+                "0:"                                            \
+                : "+&d" (__r2), "+&d" (__r1)                    \
+                : "d" (y1) : "cc");                             \
        (r2) = __r2;                                            \
        (r1) = __r1;                                            \
        (r0) = __r0;                                            \
diff --git a/include/asm-s390/sigp.h b/include/asm-s390/sigp.h
index fc56458aff66..e16d56f8dfe1 100644
--- a/include/asm-s390/sigp.h
+++ b/include/asm-s390/sigp.h
@@ -70,16 +70,16 @@ typedef enum
 static inline sigp_ccode
 signal_processor(__u16 cpu_addr, sigp_order_code order_code)
 {
+        register unsigned long reg1 asm ("1") = 0;
        sigp_ccode ccode;
-        __asm__ __volatile__(
+        asm volatile(
-                "    sr     1,1\n"        /* parameter=0 in gpr 1 */
+                "       sigp    %1,%2,0(%3)\n"
-                "    sigp   1,%1,0(%2)\n"
+                "       ipm     %0\n"
-                "    ipm    %0\n"
+                "       srl     %0,28\n"
-                "    srl    %0,28\n"
+                :       "=d"    (ccode)
-                : "=d" (ccode)
+                : "d" (reg1), "d" (__cpu_logical_map[cpu_addr]),
-                : "d" (__cpu_logical_map[cpu_addr]), "a" (order_code)
+                  "a" (order_code) : "cc" , "memory");
-                : "cc" , "memory", "1" );
        return ccode;
 }
@@ -87,20 +87,18 @@ signal_processor(__u16 cpu_addr, sigp_order_code order_code)
 * Signal processor with parameter
 */
 static inline sigp_ccode
-signal_processor_p(__u32 parameter, __u16 cpu_addr,
+signal_processor_p(__u32 parameter, __u16 cpu_addr, sigp_order_code order_code)
-                   sigp_order_code order_code)
 {
+        register unsigned int reg1 asm ("1") = parameter;
        sigp_ccode ccode;
-        
-        __asm__ __volatile__(
+        asm volatile(
-                "    lr     1,%1\n"       /* parameter in gpr 1 */
+                "       sigp    %1,%2,0(%3)\n"
-                "    sigp   1,%2,0(%3)\n"
+                "       ipm     %0\n"
-                "    ipm    %0\n"
+                "       srl     %0,28\n"
-                "    srl    %0,28\n"
                : "=d" (ccode)
-                : "d" (parameter), "d" (__cpu_logical_map[cpu_addr]),
+                : "d" (reg1), "d" (__cpu_logical_map[cpu_addr]),
-                  "a" (order_code)
+                  "a" (order_code) : "cc" , "memory");
-                : "cc" , "memory", "1" );
        return ccode;
 }
@@ -108,24 +106,21 @@ signal_processor_p(__u32 parameter, __u16 cpu_addr,
 * Signal processor with parameter and return status
 */
 static inline sigp_ccode
-signal_processor_ps(__u32 *statusptr, __u32 parameter,
+signal_processor_ps(__u32 *statusptr, __u32 parameter, __u16 cpu_addr,
-                    __u16 cpu_addr, sigp_order_code order_code)
+                    sigp_order_code order_code)
 {
+        register unsigned int reg1 asm ("1") = parameter;
        sigp_ccode ccode;
-        
-        __asm__ __volatile__(
+        asm volatile(
-                "    sr     2,2\n"        /* clear status */
+                "       sigp    %1,%2,0(%3)\n"
-                "    lr     3,%2\n"       /* parameter in gpr 3 */
+                "       ipm     %0\n"
-                "    sigp   2,%3,0(%4)\n"
+                "       srl     %0,28\n"
-                "    st     2,%1\n"
+                : "=d" (ccode), "+d" (reg1)
-                "    ipm    %0\n"
+                : "d" (__cpu_logical_map[cpu_addr]), "a" (order_code)
-                "    srl    %0,28\n"
+                : "cc" , "memory");
-                : "=d" (ccode), "=m" (*statusptr)
+        *statusptr = reg1;
-                : "d" (parameter), "d" (__cpu_logical_map[cpu_addr]),
+        return ccode;
-                  "a" (order_code)
-                : "cc" , "memory", "2" , "3"
-                );
-   return ccode;
 }
 #endif /* __SIGP__ */
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
index 657646054c5e..c3cf030ada4d 100644
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
@@ -56,7 +56,7 @@ static inline __u16 hard_smp_processor_id(void)
 {
        __u16 cpu_address;
 
-        __asm__ ("stap %0\n" : "=m" (cpu_address));
+        asm volatile("stap %0" : "=m" (cpu_address));
        return cpu_address;
 }
@@ -104,7 +104,7 @@ smp_call_function_on(void (*func) (void *info), void *info,
 #define smp_cpu_not_running(cpu)        1
 #define smp_get_cpu(cpu) ({ 0; })
 #define smp_put_cpu(cpu) ({ 0; })
-#define smp_setup_cpu_possible_map()
+#define smp_setup_cpu_possible_map()    do { } while (0)
 #endif
 #endif
diff --git a/include/asm-s390/spinlock.h b/include/asm-s390/spinlock.h
index 273dbecf8ace..6b78af16999b 100644
--- a/include/asm-s390/spinlock.h
+++ b/include/asm-s390/spinlock.h
@@ -11,17 +11,38 @@
 #ifndef __ASM_SPINLOCK_H
 #define __ASM_SPINLOCK_H
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
+#include <linux/smp.h>
 static inline int
 _raw_compare_and_swap(volatile unsigned int *lock,
                      unsigned int old, unsigned int new)
 {
-        asm volatile ("cs %0,%3,0(%4)"
+        asm volatile(
-                      : "=d" (old), "=m" (*lock)
+                "       cs      %0,%3,%1"
-                      : "0" (old), "d" (new), "a" (lock), "m" (*lock)
+                : "=d" (old), "=Q" (*lock)
-                      : "cc", "memory" );
+                : "0" (old), "d" (new), "Q" (*lock)
+                : "cc", "memory" );
        return old;
 }
+#else /* __GNUC__ */
+static inline int
+_raw_compare_and_swap(volatile unsigned int *lock,
+                      unsigned int old, unsigned int new)
+{
+        asm volatile(
+                "       cs      %0,%3,0(%4)"
+                : "=d" (old), "=m" (*lock)
+                : "0" (old), "d" (new), "a" (lock), "m" (*lock)
+                : "cc", "memory" );
+        return old;
+}
+#endif /* __GNUC__ */
 /*
 * Simple spin lock operations.  There are two variants, one clears IRQ's
 * on the local processor, one does not.
@@ -31,34 +52,46 @@ _raw_compare_and_swap(volatile unsigned int *lock,
 * (the type definitions are in asm/spinlock_types.h)
 */
-#define __raw_spin_is_locked(x) ((x)->lock != 0)
+#define __raw_spin_is_locked(x) ((x)->owner_cpu != 0)
 #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
 #define __raw_spin_unlock_wait(lock) \
-        do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
+        do { while (__raw_spin_is_locked(lock)) \
+                 _raw_spin_relax(lock); } while (0)
-extern void _raw_spin_lock_wait(raw_spinlock_t *lp, unsigned int pc);
+extern void _raw_spin_lock_wait(raw_spinlock_t *, unsigned int pc);
-extern int _raw_spin_trylock_retry(raw_spinlock_t *lp, unsigned int pc);
+extern int _raw_spin_trylock_retry(raw_spinlock_t *, unsigned int pc);
+extern void _raw_spin_relax(raw_spinlock_t *lock);
 static inline void __raw_spin_lock(raw_spinlock_t *lp)
 {
        unsigned long pc = 1 | (unsigned long) __builtin_return_address(0);
+        int old;
-        if (unlikely(_raw_compare_and_swap(&lp->lock, 0, pc) != 0))
-                _raw_spin_lock_wait(lp, pc);
+        old = _raw_compare_and_swap(&lp->owner_cpu, 0, ~smp_processor_id());
+        if (likely(old == 0)) {
+                lp->owner_pc = pc;
+                return;
+        }
+        _raw_spin_lock_wait(lp, pc);
 }
 static inline int __raw_spin_trylock(raw_spinlock_t *lp)
 {
        unsigned long pc = 1 | (unsigned long) __builtin_return_address(0);
+        int old;
-        if (likely(_raw_compare_and_swap(&lp->lock, 0, pc) == 0))
+        old = _raw_compare_and_swap(&lp->owner_cpu, 0, ~smp_processor_id());
+        if (likely(old == 0)) {
+                lp->owner_pc = pc;
                return 1;
+        }
        return _raw_spin_trylock_retry(lp, pc);
 }
 static inline void __raw_spin_unlock(raw_spinlock_t *lp)
 {
-        _raw_compare_and_swap(&lp->lock, lp->lock, 0);
+        lp->owner_pc = 0;
+        _raw_compare_and_swap(&lp->owner_cpu, lp->owner_cpu, 0);
 }
                
 /*
@@ -135,4 +168,7 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
        return _raw_write_trylock_retry(rw);
 }
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-s390/spinlock_types.h b/include/asm-s390/spinlock_types.h
index f79a2216204f..b7ac13f7aa37 100644
--- a/include/asm-s390/spinlock_types.h
+++ b/include/asm-s390/spinlock_types.h
@@ -6,16 +6,16 @@
 #endif
 typedef struct {
-        volatile unsigned int lock;
+        volatile unsigned int owner_cpu;
+        volatile unsigned int owner_pc;
 } __attribute__ ((aligned (4))) raw_spinlock_t;
 #define __RAW_SPIN_LOCK_UNLOCKED        { 0 }
 typedef struct {
        volatile unsigned int lock;
-        volatile unsigned int owner_pc;
 } raw_rwlock_t;
-#define __RAW_RW_LOCK_UNLOCKED          { 0, 0 }
+#define __RAW_RW_LOCK_UNLOCKED          { 0 }
 #endif
diff --git a/include/asm-s390/string.h b/include/asm-s390/string.h
index 23a4c390489f..d074673a6d9b 100644
--- a/include/asm-s390/string.h
+++ b/include/asm-s390/string.h
@@ -60,12 +60,13 @@ static inline void *memchr(const void * s, int c, size_t n)
        register int r0 asm("0") = (char) c;
        const void *ret = s + n;
-        asm volatile ("0: srst  %0,%1\n"
+        asm volatile(
-                      "   jo    0b\n"
+                "0:     srst    %0,%1\n"
-                      "   jl    1f\n"
+                "       jo      0b\n"
-                      "   la    %0,0\n"
+                "       jl      1f\n"
-                      "1:"
+                "       la      %0,0\n"
-                      : "+a" (ret), "+&a" (s) : "d" (r0) : "cc" );
+                "1:"
+                : "+a" (ret), "+&a" (s) : "d" (r0) : "cc");
        return (void *) ret;
 }
@@ -74,9 +75,10 @@ static inline void *memscan(void *s, int c, size_t n)
        register int r0 asm("0") = (char) c;
        const void *ret = s + n;
-        asm volatile ("0: srst  %0,%1\n"
+        asm volatile(
-                      "   jo    0b\n"
+                "0:     srst    %0,%1\n"
-                      : "+a" (ret), "+&a" (s) : "d" (r0) : "cc" );
+                "       jo      0b\n"
+                : "+a" (ret), "+&a" (s) : "d" (r0) : "cc");
        return (void *) ret;
 }
@@ -86,12 +88,13 @@ static inline char *strcat(char *dst, const char *src)
        unsigned long dummy;
        char *ret = dst;
-        asm volatile ("0: srst  %0,%1\n"
+        asm volatile(
-                      "   jo    0b\n"
+                "0:     srst    %0,%1\n"
-                      "1: mvst  %0,%2\n"
+                "       jo      0b\n"
-                      "   jo    1b"
+                "1:     mvst    %0,%2\n"
-                      : "=&a" (dummy), "+a" (dst), "+a" (src)
+                "       jo      1b"
-                      : "d" (r0), "0" (0) : "cc", "memory" );
+                : "=&a" (dummy), "+a" (dst), "+a" (src)
+                : "d" (r0), "0" (0) : "cc", "memory" );
        return ret;
 }
@@ -100,10 +103,11 @@ static inline char *strcpy(char *dst, const char *src)
        register int r0 asm("0") = 0;
        char *ret = dst;
-        asm volatile ("0: mvst  %0,%1\n"
+        asm volatile(
-                      "   jo    0b"
+                "0:     mvst    %0,%1\n"
-                      : "+&a" (dst), "+&a" (src) : "d" (r0)
+                "       jo      0b"
-                      : "cc", "memory" );
+                : "+&a" (dst), "+&a" (src) : "d" (r0)
+                : "cc", "memory");
        return ret;
 }
@@ -112,9 +116,10 @@ static inline size_t strlen(const char *s)
        register unsigned long r0 asm("0") = 0;
        const char *tmp = s;
-        asm volatile ("0: srst  %0,%1\n"
+        asm volatile(
-                      "   jo    0b"
+                "0:     srst    %0,%1\n"
-                      : "+d" (r0), "+a" (tmp) :  : "cc" );
+                "       jo      0b"
+                : "+d" (r0), "+a" (tmp) :  : "cc");
        return r0 - (unsigned long) s;
 }
@@ -124,9 +129,10 @@ static inline size_t strnlen(const char * s, size_t n)
        const char *tmp = s;
        const char *end = s + n;
-        asm volatile ("0: srst  %0,%1\n"
+        asm volatile(
-                      "   jo    0b"
+                "0:     srst    %0,%1\n"
-                      : "+a" (end), "+a" (tmp) : "d" (r0)  : "cc" );
+                "       jo      0b"
+                : "+a" (end), "+a" (tmp) : "d" (r0)  : "cc");
        return end - s;
 }
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index 16040048cd1b..ccbafe4bf2cb 100644
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
@@ -23,74 +23,68 @@ struct task_struct;
 extern struct task_struct *__switch_to(void *, void *);
-#ifdef __s390x__
-#define __FLAG_SHIFT 56
-#else /* ! __s390x__ */
-#define __FLAG_SHIFT 24
-#endif /* ! __s390x__ */
 static inline void save_fp_regs(s390_fp_regs *fpregs)
 {
-        asm volatile (
+        asm volatile(
-                "   std   0,8(%1)\n"
+                "       std     0,8(%1)\n"
-                "   std   2,24(%1)\n"
+                "       std     2,24(%1)\n"
-                "   std   4,40(%1)\n"
+                "       std     4,40(%1)\n"
-                "   std   6,56(%1)"
+                "       std     6,56(%1)"
-                : "=m" (*fpregs) : "a" (fpregs), "m" (*fpregs) : "memory" );
+                : "=m" (*fpregs) : "a" (fpregs), "m" (*fpregs) : "memory");
        if (!MACHINE_HAS_IEEE)
                return;
        asm volatile(
-                "   stfpc 0(%1)\n"
+                "       stfpc   0(%1)\n"
-                "   std   1,16(%1)\n"
+                "       std     1,16(%1)\n"
-                "   std   3,32(%1)\n"
+                "       std     3,32(%1)\n"
-                "   std   5,48(%1)\n"
+                "       std     5,48(%1)\n"
-                "   std   7,64(%1)\n"
+                "       std     7,64(%1)\n"
-                "   std   8,72(%1)\n"
+                "       std     8,72(%1)\n"
-                "   std   9,80(%1)\n"
+                "       std     9,80(%1)\n"
-                "   std   10,88(%1)\n"
+                "       std     10,88(%1)\n"
-                "   std   11,96(%1)\n"
+                "       std     11,96(%1)\n"
-                "   std   12,104(%1)\n"
+                "       std     12,104(%1)\n"
-                "   std   13,112(%1)\n"
+                "       std     13,112(%1)\n"
-                "   std   14,120(%1)\n"
+                "       std     14,120(%1)\n"
-                "   std   15,128(%1)\n"
+                "       std     15,128(%1)\n"
-                : "=m" (*fpregs) : "a" (fpregs), "m" (*fpregs) : "memory" );
+                : "=m" (*fpregs) : "a" (fpregs), "m" (*fpregs) : "memory");
 }
 static inline void restore_fp_regs(s390_fp_regs *fpregs)
 {
-        asm volatile (
+        asm volatile(
-                "   ld    0,8(%0)\n"
+                "       ld      0,8(%0)\n"
-                "   ld    2,24(%0)\n"
+                "       ld      2,24(%0)\n"
-                "   ld    4,40(%0)\n"
+                "       ld      4,40(%0)\n"
-                "   ld    6,56(%0)"
+                "       ld      6,56(%0)"
-                : : "a" (fpregs), "m" (*fpregs) );
+                : : "a" (fpregs), "m" (*fpregs));
        if (!MACHINE_HAS_IEEE)
                return;
        asm volatile(
-                "   lfpc  0(%0)\n"
+                "       lfpc    0(%0)\n"
-                "   ld    1,16(%0)\n"
+                "       ld      1,16(%0)\n"
-                "   ld    3,32(%0)\n"
+                "       ld      3,32(%0)\n"
-                "   ld    5,48(%0)\n"
+                "       ld      5,48(%0)\n"
-                "   ld    7,64(%0)\n"
+                "       ld      7,64(%0)\n"
-                "   ld    8,72(%0)\n"
+                "       ld      8,72(%0)\n"
-                "   ld    9,80(%0)\n"
+                "       ld      9,80(%0)\n"
-                "   ld    10,88(%0)\n"
+                "       ld      10,88(%0)\n"
-                "   ld    11,96(%0)\n"
+                "       ld      11,96(%0)\n"
-                "   ld    12,104(%0)\n"
+                "       ld      12,104(%0)\n"
-                "   ld    13,112(%0)\n"
+                "       ld      13,112(%0)\n"
-                "   ld    14,120(%0)\n"
+                "       ld      14,120(%0)\n"
-                "   ld    15,128(%0)\n"
+                "       ld      15,128(%0)\n"
-                : : "a" (fpregs), "m" (*fpregs) );
+                : : "a" (fpregs), "m" (*fpregs));
 }
 static inline void save_access_regs(unsigned int *acrs)
 {
-        asm volatile ("stam 0,15,0(%0)" : : "a" (acrs) : "memory" );
+        asm volatile("stam 0,15,0(%0)" : : "a" (acrs) : "memory");
 }
 static inline void restore_access_regs(unsigned int *acrs)
 {
-        asm volatile ("lam 0,15,0(%0)" : : "a" (acrs) );
+        asm volatile("lam 0,15,0(%0)" : : "a" (acrs));
 }
 #define switch_to(prev,next,last) do {                                       \
@@ -126,7 +120,7 @@ extern void account_system_vtime(struct task_struct *);
        account_vtime(prev);                                                 \
 } while (0)
-#define nop() __asm__ __volatile__ ("nop")
+#define nop() asm volatile("nop")
 #define xchg(ptr,x)                                                       \
 ({                                                                        \
@@ -147,15 +141,15 @@ static inline unsigned long __xchg(unsigned long x, void * ptr, int size)
                shift = (3 ^ (addr & 3)) << 3;
                addr ^= addr & 3;
                asm volatile(
-                        "    l   %0,0(%4)\n"
+                        "       l       %0,0(%4)\n"
-                        "0:  lr  0,%0\n"
+                        "0:     lr      0,%0\n"
-                        "    nr  0,%3\n"
+                        "       nr      0,%3\n"
-                        "    or  0,%2\n"
+                        "       or      0,%2\n"
-                        "    cs  %0,0,0(%4)\n"
+                        "       cs      %0,0,0(%4)\n"
-                        "    jl  0b\n"
+                        "       jl      0b\n"
                        : "=&d" (old), "=m" (*(int *) addr)
                        : "d" (x << shift), "d" (~(255 << shift)), "a" (addr),
-                          "m" (*(int *) addr) : "memory", "cc", "0" );
+                          "m" (*(int *) addr) : "memory", "cc", "0");
                x = old >> shift;
                break;
        case 2:
@@ -163,36 +157,36 @@ static inline unsigned long __xchg(unsigned long x, void * ptr, int size)
                shift = (2 ^ (addr & 2)) << 3;
                addr ^= addr & 2;
                asm volatile(
-                        "    l   %0,0(%4)\n"
+                        "       l       %0,0(%4)\n"
-                        "0:  lr  0,%0\n"
+                        "0:     lr      0,%0\n"
-                        "    nr  0,%3\n"
+                        "       nr      0,%3\n"
-                        "    or  0,%2\n"
+                        "       or      0,%2\n"
-                        "    cs  %0,0,0(%4)\n"
+                        "       cs      %0,0,0(%4)\n"
-                        "    jl  0b\n"
+                        "       jl      0b\n"
                        : "=&d" (old), "=m" (*(int *) addr)
                        : "d" (x << shift), "d" (~(65535 << shift)), "a" (addr),
-                          "m" (*(int *) addr) : "memory", "cc", "0" );
+                          "m" (*(int *) addr) : "memory", "cc", "0");
                x = old >> shift;
                break;
        case 4:
-                asm volatile (
+                asm volatile(
-                        "    l   %0,0(%3)\n"
+                        "       l       %0,0(%3)\n"
-                        "0:  cs  %0,%2,0(%3)\n"
+                        "0:     cs      %0,%2,0(%3)\n"
-                        "    jl  0b\n"
+                        "       jl      0b\n"
                        : "=&d" (old), "=m" (*(int *) ptr)
                        : "d" (x), "a" (ptr), "m" (*(int *) ptr)
-                        : "memory", "cc" );
+                        : "memory", "cc");
                x = old;
                break;
 #ifdef __s390x__
        case 8:
-                asm volatile (
+                asm volatile(
-                        "    lg  %0,0(%3)\n"
+                        "       lg      %0,0(%3)\n"
-                        "0:  csg %0,%2,0(%3)\n"
+                        "0:     csg     %0,%2,0(%3)\n"
-                        "    jl  0b\n"
+                        "       jl      0b\n"
                        : "=&d" (old), "=m" (*(long *) ptr)
                        : "d" (x), "a" (ptr), "m" (*(long *) ptr)
-                        : "memory", "cc" );
+                        : "memory", "cc");
                x = old;
                break;
 #endif /* __s390x__ */
@@ -224,55 +218,55 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
                shift = (3 ^ (addr & 3)) << 3;
                addr ^= addr & 3;
                asm volatile(
-                        "    l   %0,0(%4)\n"
+                        "       l       %0,0(%4)\n"
-                        "0:  nr  %0,%5\n"
+                        "0:     nr      %0,%5\n"
-                        "    lr  %1,%0\n"
+                        "       lr      %1,%0\n"
-                        "    or  %0,%2\n"
+                        "       or      %0,%2\n"
-                        "    or  %1,%3\n"
+                        "       or      %1,%3\n"
-                        "    cs  %0,%1,0(%4)\n"
+                        "       cs      %0,%1,0(%4)\n"
-                        "    jnl 1f\n"
+                        "       jnl     1f\n"
-                        "    xr  %1,%0\n"
+                        "       xr      %1,%0\n"
-                        "    nr  %1,%5\n"
+                        "       nr      %1,%5\n"
-                        "    jnz 0b\n"
+                        "       jnz     0b\n"
                        "1:"
                        : "=&d" (prev), "=&d" (tmp)
                        : "d" (old << shift), "d" (new << shift), "a" (ptr),
                          "d" (~(255 << shift))
-                        : "memory", "cc" );
+                        : "memory", "cc");
                return prev >> shift;
        case 2:
                addr = (unsigned long) ptr;
                shift = (2 ^ (addr & 2)) << 3;
                addr ^= addr & 2;
                asm volatile(
-                        "    l   %0,0(%4)\n"
+                        "       l       %0,0(%4)\n"
-                        "0:  nr  %0,%5\n"
+                        "0:     nr      %0,%5\n"
-                        "    lr  %1,%0\n"
+                        "       lr      %1,%0\n"
-                        "    or  %0,%2\n"
+                        "       or      %0,%2\n"
-                        "    or  %1,%3\n"
+                        "       or      %1,%3\n"
-                        "    cs  %0,%1,0(%4)\n"
+                        "       cs      %0,%1,0(%4)\n"
-                        "    jnl 1f\n"
+                        "       jnl     1f\n"
-                        "    xr  %1,%0\n"
+                        "       xr      %1,%0\n"
-                        "    nr  %1,%5\n"
+                        "       nr      %1,%5\n"
-                        "    jnz 0b\n"
+                        "       jnz     0b\n"
                        "1:"
                        : "=&d" (prev), "=&d" (tmp)
                        : "d" (old << shift), "d" (new << shift), "a" (ptr),
                          "d" (~(65535 << shift))
-                        : "memory", "cc" );
+                        : "memory", "cc");
                return prev >> shift;
        case 4:
-                asm volatile (
+                asm volatile(
-                        "    cs  %0,%2,0(%3)\n"
+                        "       cs      %0,%2,0(%3)\n"
                        : "=&d" (prev) : "0" (old), "d" (new), "a" (ptr)
-                        : "memory", "cc" );
+                        : "memory", "cc");
                return prev;
 #ifdef __s390x__
        case 8:
-                asm volatile (
+                asm volatile(
-                        "    csg %0,%2,0(%3)\n"
+                        "       csg     %0,%2,0(%3)\n"
                        : "=&d" (prev) : "0" (old), "d" (new), "a" (ptr)
-                        : "memory", "cc" );
+                        : "memory", "cc");
                return prev;
 #endif /* __s390x__ */
        }
@@ -289,8 +283,8 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 * all memory ops have completed wrt other CPU's ( see 7-15 POP  DJB ).
 */
-#define eieio()  __asm__ __volatile__ ( "bcr 15,0" : : : "memory" ) 
+#define eieio() asm volatile("bcr 15,0" : : : "memory")
-# define SYNC_OTHER_CORES(x)   eieio() 
+#define SYNC_OTHER_CORES(x)   eieio()
 #define mb()    eieio()
 #define rmb()   eieio()
 #define wmb()   eieio()
@@ -307,117 +301,56 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 #ifdef __s390x__
-#define __ctl_load(array, low, high) ({ \
+#define __ctl_load(array, low, high) ({                         \
-        typedef struct { char _[sizeof(array)]; } addrtype; \
+        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        __asm__ __volatile__ ( \
+        asm volatile(                                           \
-                "   bras  1,0f\n" \
+                "       lctlg   %1,%2,0(%0)\n"                  \
-                "   lctlg 0,0,0(%0)\n" \
+                : : "a" (&array), "i" (low), "i" (high),        \
-                "0: ex    %1,0(1)" \
+                    "m" (*(addrtype *)(array)));                \
-                : : "a" (&array), "a" (((low)<<4)+(high)), \
-                    "m" (*(addrtype *)(array)) : "1" ); \
        })
-#define __ctl_store(array, low, high) ({ \
+#define __ctl_store(array, low, high) ({                        \
-        typedef struct { char _[sizeof(array)]; } addrtype; \
+        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        __asm__ __volatile__ ( \
+        asm volatile(                                           \
-                "   bras  1,0f\n" \
+                "       stctg   %2,%3,0(%1)\n"                  \
-                "   stctg 0,0,0(%1)\n" \
+                : "=m" (*(addrtype *)(array))                   \
-                "0: ex    %2,0(1)" \
+                : "a" (&array), "i" (low), "i" (high));         \
-                : "=m" (*(addrtype *)(array)) \
-                : "a" (&array), "a" (((low)<<4)+(high)) : "1" ); \
        })
-#define __ctl_set_bit(cr, bit) ({ \
-        __u8 __dummy[24]; \
-        __asm__ __volatile__ ( \
-                "    bras  1,0f\n"       /* skip indirect insns */ \
-                "    stctg 0,0,0(%1)\n" \
-                "    lctlg 0,0,0(%1)\n" \
-                "0:  ex    %2,0(1)\n"    /* execute stctl */ \
-                "    lg    0,0(%1)\n" \
-                "    ogr   0,%3\n"       /* set the bit */ \
-                "    stg   0,0(%1)\n" \
-                "1:  ex    %2,6(1)"      /* execute lctl */ \
-                : "=m" (__dummy) \
-                : "a" ((((unsigned long) &__dummy) + 7) & ~7UL), \
-                  "a" (cr*17), "a" (1L<<(bit)) \
-                : "cc", "0", "1" ); \
-        })
-#define __ctl_clear_bit(cr, bit) ({ \
-        __u8 __dummy[16]; \
-        __asm__ __volatile__ ( \
-                "    bras  1,0f\n"       /* skip indirect insns */ \
-                "    stctg 0,0,0(%1)\n" \
-                "    lctlg 0,0,0(%1)\n" \
-                "0:  ex    %2,0(1)\n"    /* execute stctl */ \
-                "    lg    0,0(%1)\n" \
-                "    ngr   0,%3\n"       /* set the bit */ \
-                "    stg   0,0(%1)\n" \
-                "1:  ex    %2,6(1)"      /* execute lctl */ \
-                : "=m" (__dummy) \
-                : "a" ((((unsigned long) &__dummy) + 7) & ~7UL), \
-                  "a" (cr*17), "a" (~(1L<<(bit))) \
-                : "cc", "0", "1" ); \
-        })
 #else /* __s390x__ */
-#define __ctl_load(array, low, high) ({ \
+#define __ctl_load(array, low, high) ({                         \
-        typedef struct { char _[sizeof(array)]; } addrtype; \
+        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        __asm__ __volatile__ ( \
+        asm volatile(                                           \
-                "   bras  1,0f\n" \
+                "       lctl    %1,%2,0(%0)\n"                  \
-                "   lctl 0,0,0(%0)\n" \
+                : : "a" (&array), "i" (low), "i" (high),        \
-                "0: ex    %1,0(1)" \
+                    "m" (*(addrtype *)(array)));                \
-                : : "a" (&array), "a" (((low)<<4)+(high)), \
+})
-                    "m" (*(addrtype *)(array)) : "1" ); \
-        })
-#define __ctl_store(array, low, high) ({ \
+#define __ctl_store(array, low, high) ({                        \
-        typedef struct { char _[sizeof(array)]; } addrtype; \
+        typedef struct { char _[sizeof(array)]; } addrtype;     \
-        __asm__ __volatile__ ( \
+        asm volatile(                                           \
-                "   bras  1,0f\n" \
+                "       stctl   %2,%3,0(%1)\n"                  \
-                "   stctl 0,0,0(%1)\n" \
+                : "=m" (*(addrtype *)(array))                   \
-                "0: ex    %2,0(1)" \
+                : "a" (&array), "i" (low), "i" (high));         \
-                : "=m" (*(addrtype *)(array)) \
-                : "a" (&array), "a" (((low)<<4)+(high)): "1" ); \
        })
-#define __ctl_set_bit(cr, bit) ({ \
-        __u8 __dummy[16]; \
-        __asm__ __volatile__ ( \
-                "    bras  1,0f\n"       /* skip indirect insns */ \
-                "    stctl 0,0,0(%1)\n" \
-                "    lctl  0,0,0(%1)\n" \
-                "0:  ex    %2,0(1)\n"    /* execute stctl */ \
-                "    l     0,0(%1)\n" \
-                "    or    0,%3\n"       /* set the bit */ \
-                "    st    0,0(%1)\n" \
-                "1:  ex    %2,4(1)"      /* execute lctl */ \
-                : "=m" (__dummy) \
-                : "a" ((((unsigned long) &__dummy) + 7) & ~7UL), \
-                  "a" (cr*17), "a" (1<<(bit)) \
-                : "cc", "0", "1" ); \
-        })
-#define __ctl_clear_bit(cr, bit) ({ \
-        __u8 __dummy[16]; \
-        __asm__ __volatile__ ( \
-                "    bras  1,0f\n"       /* skip indirect insns */ \
-                "    stctl 0,0,0(%1)\n" \
-                "    lctl  0,0,0(%1)\n" \
-                "0:  ex    %2,0(1)\n"    /* execute stctl */ \
-                "    l     0,0(%1)\n" \
-                "    nr    0,%3\n"       /* set the bit */ \
-                "    st    0,0(%1)\n" \
-                "1:  ex    %2,4(1)"      /* execute lctl */ \
-                : "=m" (__dummy) \
-                : "a" ((((unsigned long) &__dummy) + 7) & ~7UL), \
-                  "a" (cr*17), "a" (~(1<<(bit))) \
-                : "cc", "0", "1" ); \
-        })
 #endif /* __s390x__ */
+#define __ctl_set_bit(cr, bit) ({       \
+        unsigned long __dummy;          \
+        __ctl_store(__dummy, cr, cr);   \
+        __dummy |= 1UL << (bit);        \
+        __ctl_load(__dummy, cr, cr);    \
+})
+#define __ctl_clear_bit(cr, bit) ({     \
+        unsigned long __dummy;          \
+        __ctl_store(__dummy, cr, cr);   \
+        __dummy &= ~(1UL << (bit));     \
+        __ctl_load(__dummy, cr, cr);    \
+})
 #include <linux/irqflags.h>
 /*
@@ -427,8 +360,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 static inline void
 __set_psw_mask(unsigned long mask)
 {
-        local_save_flags(mask);
+        __load_psw_mask(mask | (__raw_local_irq_stosm(0x00) & ~(-1UL >> 8)));
-        __load_psw_mask(mask);
 }
 #define local_mcck_enable()  __set_psw_mask(PSW_KERNEL_BITS)
diff --git a/include/asm-s390/timex.h b/include/asm-s390/timex.h
index 5d0332a4c2bd..4df4a41029a3 100644
--- a/include/asm-s390/timex.h
+++ b/include/asm-s390/timex.h
@@ -15,20 +15,21 @@
 typedef unsigned long long cycles_t;
-static inline cycles_t get_cycles(void)
-{
-        cycles_t cycles;
-        __asm__ __volatile__ ("stck 0(%1)" : "=m" (cycles) : "a" (&cycles) : "cc");
-        return cycles >> 2;
-}
 static inline unsigned long long get_clock (void)
 {
        unsigned long long clk;
-        __asm__ __volatile__ ("stck 0(%1)" : "=m" (clk) : "a" (&clk) : "cc");
+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
+        asm volatile("stck %0" : "=Q" (clk) : : "cc");
+#else /* __GNUC__ */
+        asm volatile("stck 0(%1)" : "=m" (clk) : "a" (&clk) : "cc");
+#endif /* __GNUC__ */
        return clk;
 }
+static inline cycles_t get_cycles(void)
+{
+        return (cycles_t) get_clock() >> 2;
+}
 #endif
diff --git a/include/asm-s390/tlbflush.h b/include/asm-s390/tlbflush.h
index 73cd85bebfb2..fa4dc916a9bf 100644
--- a/include/asm-s390/tlbflush.h
+++ b/include/asm-s390/tlbflush.h
@@ -25,7 +25,7 @@
 */
 #define local_flush_tlb() \
-do {  __asm__ __volatile__("ptlb": : :"memory"); } while (0)
+do {  asm volatile("ptlb": : :"memory"); } while (0)
 #ifndef CONFIG_SMP
@@ -68,24 +68,24 @@ extern void smp_ptlb_all(void);
 static inline void global_flush_tlb(void)
 {
+        register unsigned long reg2 asm("2");
+        register unsigned long reg3 asm("3");
+        register unsigned long reg4 asm("4");
+        long dummy;
 #ifndef __s390x__
        if (!MACHINE_HAS_CSP) {
                smp_ptlb_all();
                return;
        }
 #endif /* __s390x__ */
-        {
-                register unsigned long addr asm("4");
+        dummy = 0;
-                long dummy;
+        reg2 = reg3 = 0;
+        reg4 = ((unsigned long) &dummy) + 1;
-                dummy = 0;
+        asm volatile(
-                addr = ((unsigned long) &dummy) + 1;
+                "       csp     %0,%2"
-                __asm__ __volatile__ (
+                : : "d" (reg2), "d" (reg3), "d" (reg4), "m" (dummy) : "cc" );
-                        "    slr  2,2\n"
-                        "    slr  3,3\n"
-                        "    csp  2,%0"
-                        : : "a" (addr), "m" (dummy) : "cc", "2", "3" );
-        }
 }
 /*
@@ -102,9 +102,9 @@ static inline void __flush_tlb_mm(struct mm_struct * mm)
        if (unlikely(cpus_empty(mm->cpu_vm_mask)))
                return;
        if (MACHINE_HAS_IDTE) {
-                asm volatile (".insn rrf,0xb98e0000,0,%0,%1,0"
+                asm volatile(
-                              : : "a" (2048),
+                        "       .insn   rrf,0xb98e0000,0,%0,%1,0"
-                              "a" (__pa(mm->pgd)&PAGE_MASK) : "cc" );
+                        : : "a" (2048), "a" (__pa(mm->pgd)&PAGE_MASK) : "cc");
                return;
        }
        preempt_disable();
diff --git a/include/asm-s390/uaccess.h b/include/asm-s390/uaccess.h
index 0b7c0ca4c3d7..72ae4efddb49 100644
--- a/include/asm-s390/uaccess.h
+++ b/include/asm-s390/uaccess.h
@@ -38,25 +38,14 @@
 #define get_ds()        (KERNEL_DS)
 #define get_fs()        (current->thread.mm_segment)
-#ifdef __s390x__
 #define set_fs(x) \
 ({                                                                      \
        unsigned long __pto;                                            \
        current->thread.mm_segment = (x);                               \
        __pto = current->thread.mm_segment.ar4 ?                        \
                S390_lowcore.user_asce : S390_lowcore.kernel_asce;      \
-        asm volatile ("lctlg 7,7,%0" : : "m" (__pto) );                 \
+        __ctl_load(__pto, 7, 7);                                        \
 })
-#else
-#define set_fs(x) \
-({                                                                      \
-        unsigned long __pto;                                            \
-        current->thread.mm_segment = (x);                               \
-        __pto = current->thread.mm_segment.ar4 ?                        \
-                S390_lowcore.user_asce : S390_lowcore.kernel_asce;      \
-        asm volatile ("lctl  7,7,%0" : : "m" (__pto) );                 \
-})
-#endif
 #define segment_eq(a,b) ((a).ar4 == (b).ar4)
@@ -85,76 +74,51 @@ struct exception_table_entry
        unsigned long insn, fixup;
 };
-#ifndef __s390x__
+struct uaccess_ops {
-#define __uaccess_fixup \
+        size_t (*copy_from_user)(size_t, const void __user *, void *);
-        ".section .fixup,\"ax\"\n"      \
+        size_t (*copy_from_user_small)(size_t, const void __user *, void *);
-        "2: lhi    %0,%4\n"             \
+        size_t (*copy_to_user)(size_t, void __user *, const void *);
-        "   bras   1,3f\n"              \
+        size_t (*copy_to_user_small)(size_t, void __user *, const void *);
-        "   .long  1b\n"                \
+        size_t (*copy_in_user)(size_t, void __user *, const void __user *);
-        "3: l      1,0(1)\n"            \
+        size_t (*clear_user)(size_t, void __user *);
-        "   br     1\n"                 \
+        size_t (*strnlen_user)(size_t, const char __user *);
-        ".previous\n"                   \
+        size_t (*strncpy_from_user)(size_t, const char __user *, char *);
-        ".section __ex_table,\"a\"\n"   \
+        int (*futex_atomic_op)(int op, int __user *, int oparg, int *old);
-        "   .align 4\n"                 \
+        int (*futex_atomic_cmpxchg)(int __user *, int old, int new);
-        "   .long  0b,2b\n"             \
+};
-        ".previous"
-#define __uaccess_clobber "cc", "1"
+extern struct uaccess_ops uaccess;
-#else /* __s390x__ */
+extern struct uaccess_ops uaccess_std;
-#define __uaccess_fixup \
+extern struct uaccess_ops uaccess_mvcos;
-        ".section .fixup,\"ax\"\n"      \
-        "2: lghi   %0,%4\n"             \
+static inline int __put_user_fn(size_t size, void __user *ptr, void *x)
-        "   jg     1b\n"                \
+{
-        ".previous\n"                   \
+        size = uaccess.copy_to_user_small(size, ptr, x);
-        ".section __ex_table,\"a\"\n"   \
+        return size ? -EFAULT : size;
-        "   .align 8\n"                 \
+}
-        "   .quad  0b,2b\n"             \
-        ".previous"
+static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
-#define __uaccess_clobber "cc"
+{
-#endif /* __s390x__ */
+        size = uaccess.copy_from_user_small(size, ptr, x);
+        return size ? -EFAULT : size;
+}
 /*
 * These are the main single-value transfer routines.  They automatically
 * use the right size if we just have the right pointer type.
 */
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-#define __put_user_asm(x, ptr, err) \
-({                                                              \
-        err = 0;                                                \
-        asm volatile(                                           \
-                "0: mvcs  0(%1,%2),%3,%0\n"                     \
-                "1:\n"                                          \
-                __uaccess_fixup                                 \
-                : "+&d" (err)                                   \
-                : "d" (sizeof(*(ptr))), "a" (ptr), "Q" (x),     \
-                  "K" (-EFAULT)                                 \
-                : __uaccess_clobber );                          \
-})
-#else
-#define __put_user_asm(x, ptr, err) \
-({                                                              \
-        err = 0;                                                \
-        asm volatile(                                           \
-                "0: mvcs  0(%1,%2),0(%3),%0\n"                  \
-                "1:\n"                                          \
-                __uaccess_fixup                                 \
-                : "+&d" (err)                                   \
-                : "d" (sizeof(*(ptr))), "a" (ptr), "a" (&(x)),  \
-                  "K" (-EFAULT), "m" (x)                        \
-                : __uaccess_clobber );                          \
-})
-#endif
 #define __put_user(x, ptr) \
 ({                                                              \
        __typeof__(*(ptr)) __x = (x);                           \
-        int __pu_err;                                           \
+        int __pu_err = -EFAULT;                                 \
        __chk_user_ptr(ptr);                                    \
        switch (sizeof (*(ptr))) {                              \
        case 1:                                                 \
        case 2:                                                 \
        case 4:                                                 \
        case 8:                                                 \
-                __put_user_asm(__x, ptr, __pu_err);             \
+                __pu_err = __put_user_fn(sizeof (*(ptr)),       \
+                                         ptr, &__x);            \
                break;                                          \
        default:                                                \
                __put_user_bad();                               \
@@ -172,60 +136,36 @@ struct exception_table_entry
 extern int __put_user_bad(void) __attribute__((noreturn));
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
-#define __get_user_asm(x, ptr, err) \
-({                                                              \
-        err = 0;                                                \
-        asm volatile (                                          \
-                "0: mvcp  %O1(%2,%R1),0(%3),%0\n"               \
-                "1:\n"                                          \
-                __uaccess_fixup                                 \
-                : "+&d" (err), "=Q" (x)                         \
-                : "d" (sizeof(*(ptr))), "a" (ptr),              \
-                  "K" (-EFAULT)                                 \
-                : __uaccess_clobber );                          \
-})
-#else
-#define __get_user_asm(x, ptr, err) \
-({                                                              \
-        err = 0;                                                \
-        asm volatile (                                          \
-                "0: mvcp  0(%2,%5),0(%3),%0\n"                  \
-                "1:\n"                                          \
-                __uaccess_fixup                                 \
-                : "+&d" (err), "=m" (x)                         \
-                : "d" (sizeof(*(ptr))), "a" (ptr),              \
-                  "K" (-EFAULT), "a" (&(x))                     \
-                : __uaccess_clobber );                          \
-})
-#endif
 #define __get_user(x, ptr)                                      \
 ({                                                              \
-        int __gu_err;                                           \
+        int __gu_err = -EFAULT;                                 \
-        __chk_user_ptr(ptr);                                    \
+        __chk_user_ptr(ptr);                                    \
        switch (sizeof(*(ptr))) {                               \
        case 1: {                                               \
                unsigned char __x;                              \
-                __get_user_asm(__x, ptr, __gu_err);             \
+                __gu_err = __get_user_fn(sizeof (*(ptr)),       \
+                                         ptr, &__x);            \
                (x) = *(__force __typeof__(*(ptr)) *) &__x;     \
                break;                                          \
        };                                                      \
        case 2: {                                               \
                unsigned short __x;                             \
-                __get_user_asm(__x, ptr, __gu_err);             \
+                __gu_err = __get_user_fn(sizeof (*(ptr)),       \
+                                         ptr, &__x);            \
                (x) = *(__force __typeof__(*(ptr)) *) &__x;     \
                break;                                          \
        };                                                      \
        case 4: {                                               \
                unsigned int __x;                               \
-                __get_user_asm(__x, ptr, __gu_err);             \
+                __gu_err = __get_user_fn(sizeof (*(ptr)),       \
+                                         ptr, &__x);            \
                (x) = *(__force __typeof__(*(ptr)) *) &__x;     \
                break;                                          \
        };                                                      \
        case 8: {                                               \
                unsigned long long __x;                         \
-                __get_user_asm(__x, ptr, __gu_err);             \
+                __gu_err = __get_user_fn(sizeof (*(ptr)),       \
+                                         ptr, &__x);            \
                (x) = *(__force __typeof__(*(ptr)) *) &__x;     \
                break;                                          \
        };                                                      \
@@ -247,8 +187,6 @@ extern int __get_user_bad(void) __attribute__((noreturn));
 #define __put_user_unaligned __put_user
 #define __get_user_unaligned __get_user
-extern long __copy_to_user_asm(const void *from, long n, void __user *to);
 /**
 * __copy_to_user: - Copy a block of data into user space, with less checking.
 * @to:   Destination address, in user space.
@@ -266,7 +204,10 @@ extern long __copy_to_user_asm(const void *from, long n, void __user *to);
 static inline unsigned long
 __copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-        return __copy_to_user_asm(from, n, to);
+        if (__builtin_constant_p(n) && (n <= 256))
+                return uaccess.copy_to_user_small(n, to, from);
+        else
+                return uaccess.copy_to_user(n, to, from);
 }
 #define __copy_to_user_inatomic __copy_to_user
@@ -294,8 +235,6 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
        return n;
 }
-extern long __copy_from_user_asm(void *to, long n, const void __user *from);
 /**
 * __copy_from_user: - Copy a block of data from user space, with less checking.
 * @to:   Destination address, in kernel space.
@@ -316,7 +255,10 @@ extern long __copy_from_user_asm(void *to, long n, const void __user *from);
 static inline unsigned long
 __copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-        return __copy_from_user_asm(to, n, from);
+        if (__builtin_constant_p(n) && (n <= 256))
+                return uaccess.copy_from_user_small(n, from, to);
+        else
+                return uaccess.copy_from_user(n, from, to);
 }
 /**
@@ -346,13 +288,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
        return n;
 }
-extern unsigned long __copy_in_user_asm(const void __user *from, long n,
-                                                        void __user *to);
 static inline unsigned long
 __copy_in_user(void __user *to, const void __user *from, unsigned long n)
 {
-        return __copy_in_user_asm(from, n, to);
+        return uaccess.copy_in_user(n, to, from);
 }
 static inline unsigned long
@@ -360,34 +299,28 @@ copy_in_user(void __user *to, const void __user *from, unsigned long n)
 {
        might_sleep();
        if (__access_ok(from,n) && __access_ok(to,n))
-                n = __copy_in_user_asm(from, n, to);
+                n = __copy_in_user(to, from, n);
        return n;
 }
 /*
 * Copy a null terminated string from userspace.
 */
-extern long __strncpy_from_user_asm(long count, char *dst,
-                                        const char __user *src);
 static inline long
 strncpy_from_user(char *dst, const char __user *src, long count)
 {
        long res = -EFAULT;
        might_sleep();
        if (access_ok(VERIFY_READ, src, 1))
-                res = __strncpy_from_user_asm(count, dst, src);
+                res = uaccess.strncpy_from_user(count, src, dst);
        return res;
 }
-extern long __strnlen_user_asm(long count, const char __user *src);
 static inline unsigned long
 strnlen_user(const char __user * src, unsigned long n)
 {
        might_sleep();
-        return __strnlen_user_asm(n, src);
+        return uaccess.strnlen_user(n, src);
 }
 /**
@@ -410,12 +343,10 @@ strnlen_user(const char __user * src, unsigned long n)
 * Zero Userspace
 */
-extern long __clear_user_asm(void __user *to, long n);
 static inline unsigned long
 __clear_user(void __user *to, unsigned long n)
 {
-        return __clear_user_asm(to, n);
+        return uaccess.clear_user(n, to);
 }
 static inline unsigned long
@@ -423,7 +354,7 @@ clear_user(void __user *to, unsigned long n)
 {
        might_sleep();
        if (access_ok(VERIFY_WRITE, to, n))
-                n = __clear_user_asm(to, n);
+                n = uaccess.clear_user(n, to);
        return n;
 }
diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
index aa7a243862e1..0361ac5dcde3 100644
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
@@ -25,17 +25,12 @@
 #define __NR_unlink              10
 #define __NR_execve              11
 #define __NR_chdir               12
-#define __NR_time                13
 #define __NR_mknod               14
 #define __NR_chmod               15
-#define __NR_lchown              16
 #define __NR_lseek               19
 #define __NR_getpid              20
 #define __NR_mount               21
 #define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
 #define __NR_ptrace              26
 #define __NR_alarm               27
 #define __NR_pause               29
@@ -51,11 +46,7 @@
 #define __NR_pipe                42
 #define __NR_times               43
 #define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
 #define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
 #define __NR_acct                51
 #define __NR_umount2             52
 #define __NR_ioctl               54
@@ -69,18 +60,13 @@
 #define __NR_getpgrp             65
 #define __NR_setsid              66
 #define __NR_sigaction           67
-#define __NR_setreuid            70
-#define __NR_setregid            71
 #define __NR_sigsuspend          72
 #define __NR_sigpending          73
 #define __NR_sethostname         74
 #define __NR_setrlimit           75
-#define __NR_getrlimit           76
 #define __NR_getrusage           77
 #define __NR_gettimeofday        78
 #define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
 #define __NR_symlink             83
 #define __NR_readlink            85
 #define __NR_uselib              86
@@ -92,12 +78,10 @@
 #define __NR_truncate            92
 #define __NR_ftruncate           93
 #define __NR_fchmod              94
-#define __NR_fchown              95
 #define __NR_getpriority         96
 #define __NR_setpriority         97
 #define __NR_statfs              99
 #define __NR_fstatfs            100
-#define __NR_ioperm             101
 #define __NR_socketcall         102
 #define __NR_syslog             103
 #define __NR_setitimer          104
@@ -131,11 +115,7 @@
 #define __NR_sysfs              135
 #define __NR_personality        136
 #define __NR_afs_syscall        137 /* Syscall for Andrew File System */
-#define __NR_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
 #define __NR_getdents           141
-#define __NR__newselect         142
 #define __NR_flock              143
 #define __NR_msync              144
 #define __NR_readv              145
@@ -157,13 +137,9 @@
 #define __NR_sched_rr_get_interval      161
 #define __NR_nanosleep          162
 #define __NR_mremap             163
-#define __NR_setresuid          164
-#define __NR_getresuid          165
 #define __NR_query_module       167
 #define __NR_poll               168
 #define __NR_nfsservctl         169
-#define __NR_setresgid          170
-#define __NR_getresgid          171
 #define __NR_prctl              172
 #define __NR_rt_sigreturn       173
 #define __NR_rt_sigaction       174
@@ -174,7 +150,6 @@
 #define __NR_rt_sigsuspend      179
 #define __NR_pread64            180
 #define __NR_pwrite64           181
-#define __NR_chown              182
 #define __NR_getcwd             183
 #define __NR_capget             184
 #define __NR_capset             185
@@ -183,39 +158,11 @@
 #define __NR_getpmsg            188
 #define __NR_putpmsg            189
 #define __NR_vfork              190
-#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#define __NR_lchown32           198
-#define __NR_getuid32           199
-#define __NR_getgid32           200
-#define __NR_geteuid32          201
-#define __NR_getegid32          202
-#define __NR_setreuid32         203
-#define __NR_setregid32         204
-#define __NR_getgroups32        205
-#define __NR_setgroups32        206
-#define __NR_fchown32           207
-#define __NR_setresuid32        208
-#define __NR_getresuid32        209
-#define __NR_setresgid32        210
-#define __NR_getresgid32        211
-#define __NR_chown32            212
-#define __NR_setuid32           213
-#define __NR_setgid32           214
-#define __NR_setfsuid32         215
-#define __NR_setfsgid32         216
 #define __NR_pivot_root         217
 #define __NR_mincore            218
 #define __NR_madvise            219
 #define __NR_getdents64         220
-#define __NR_fcntl64            221
 #define __NR_readahead          222
-#define __NR_sendfile64         223
 #define __NR_setxattr           224
 #define __NR_lsetxattr          225
 #define __NR_fsetxattr          226
@@ -256,7 +203,6 @@
 #define __NR_clock_getres       (__NR_timer_create+7)
 #define __NR_clock_nanosleep    (__NR_timer_create+8)
 /* Number 263 is reserved for vserver */
-#define __NR_fadvise64_64       264
 #define __NR_statfs64           265
 #define __NR_fstatfs64          266
 #define __NR_remap_file_pages   267
@@ -285,7 +231,6 @@
 #define __NR_mknodat            290
 #define __NR_fchownat           291
 #define __NR_futimesat          292
-#define __NR_fstatat64          293
 #define __NR_unlinkat           294
 #define __NR_renameat           295
 #define __NR_linkat             296
@@ -310,62 +255,65 @@
 * have a different name although they do the same (e.g. __NR_chown32
 * is __NR_chown on 64 bit).
 */
-#ifdef __s390x__
+#ifndef __s390x__
-#undef  __NR_time
-#undef  __NR_lchown
+#define __NR_time                13
-#undef  __NR_setuid
+#define __NR_lchown              16
-#undef  __NR_getuid
+#define __NR_setuid              23
-#undef  __NR_stime
+#define __NR_getuid              24
-#undef  __NR_setgid
+#define __NR_stime               25
-#undef  __NR_getgid
+#define __NR_setgid              46
-#undef  __NR_geteuid
+#define __NR_getgid              47
-#undef  __NR_getegid
+#define __NR_geteuid             49
-#undef  __NR_setreuid
+#define __NR_getegid             50
-#undef  __NR_setregid
+#define __NR_setreuid            70
-#undef  __NR_getrlimit
+#define __NR_setregid            71
-#undef  __NR_getgroups
+#define __NR_getrlimit           76
-#undef  __NR_setgroups
+#define __NR_getgroups           80
-#undef  __NR_fchown
+#define __NR_setgroups           81
-#undef  __NR_ioperm
+#define __NR_fchown              95
-#undef  __NR_setfsuid
+#define __NR_ioperm             101
-#undef  __NR_setfsgid
+#define __NR_setfsuid           138
-#undef  __NR__llseek
+#define __NR_setfsgid           139
-#undef  __NR__newselect
+#define __NR__llseek            140
-#undef  __NR_setresuid
+#define __NR__newselect         142
-#undef  __NR_getresuid
+#define __NR_setresuid          164
-#undef  __NR_setresgid
+#define __NR_getresuid          165
-#undef  __NR_getresgid
+#define __NR_setresgid          170
-#undef  __NR_chown
+#define __NR_getresgid          171
-#undef  __NR_ugetrlimit
+#define __NR_chown              182
-#undef  __NR_mmap2
+#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#undef  __NR_truncate64
+#define __NR_mmap2              192
-#undef  __NR_ftruncate64
+#define __NR_truncate64         193
-#undef  __NR_stat64
+#define __NR_ftruncate64        194
-#undef  __NR_lstat64
+#define __NR_stat64             195
-#undef  __NR_fstat64
+#define __NR_lstat64            196
-#undef  __NR_lchown32
+#define __NR_fstat64            197
-#undef  __NR_getuid32
+#define __NR_lchown32           198
-#undef  __NR_getgid32
+#define __NR_getuid32           199
-#undef  __NR_geteuid32
+#define __NR_getgid32           200
-#undef  __NR_getegid32
+#define __NR_geteuid32          201
-#undef  __NR_setreuid32
+#define __NR_getegid32          202
-#undef  __NR_setregid32
+#define __NR_setreuid32         203
-#undef  __NR_getgroups32
+#define __NR_setregid32         204
-#undef  __NR_setgroups32
+#define __NR_getgroups32        205
-#undef  __NR_fchown32
+#define __NR_setgroups32        206
-#undef  __NR_setresuid32
+#define __NR_fchown32           207
-#undef  __NR_getresuid32
+#define __NR_setresuid32        208
-#undef  __NR_setresgid32
+#define __NR_getresuid32        209
-#undef  __NR_getresgid32
+#define __NR_setresgid32        210
-#undef  __NR_chown32
+#define __NR_getresgid32        211
-#undef  __NR_setuid32
+#define __NR_chown32            212
-#undef  __NR_setgid32
+#define __NR_setuid32           213
-#undef  __NR_setfsuid32
+#define __NR_setgid32           214
-#undef  __NR_setfsgid32
+#define __NR_setfsuid32         215
-#undef  __NR_fcntl64
+#define __NR_setfsgid32         216
-#undef  __NR_sendfile64
+#define __NR_fcntl64            221
-#undef  __NR_fadvise64_64
+#define __NR_sendfile64         223
-#undef  __NR_fstatat64
+#define __NR_fadvise64_64       264
+#define __NR_fstatat64          293
+#else
 #define __NR_select             142
 #define __NR_getrlimit          191     /* SuS compliant getrlimit */
@@ -394,9 +342,11 @@
 #ifdef __KERNEL__
+#include <linux/err.h>
 #define __syscall_return(type, res)                          \
 do {                                                         \
-        if ((unsigned long)(res) >= (unsigned long)(-4095)) {\
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
                errno = -(res);                              \
                res = -1;                                    \
        }                                                    \
@@ -405,145 +355,145 @@ do {							     \
 #define _svc_clobber "1", "cc", "memory"
-#define _syscall0(type,name)                                 \
+#define _syscall0(type,name)                                    \
-type name(void) {                                            \
+type name(void) {                                               \
-        register long __svcres asm("2");                     \
+        register long __svcres asm("2");                        \
-        long __res;                                          \
+        long __res;                                             \
-        __asm__ __volatile__ (                               \
+        asm volatile(                                           \
-                "    .if %1 < 256\n"                         \
+                "       .if     %1 < 256\n"                     \
-                "    svc %b1\n"                              \
+                "       svc     %b1\n"                          \
-                "    .else\n"                                \
+                "       .else\n"                                \
-                "    la  %%r1,%1\n"                          \
+                "       la      %%r1,%1\n"                      \
-                "    svc 0\n"                                \
+                "       svc     0\n"                            \
-                "    .endif"                                 \
+                "       .endif"                                 \
-                : "=d" (__svcres)                            \
+                : "=d" (__svcres)                               \
-                : "i" (__NR_##name)                          \
+                : "i" (__NR_##name)                             \
-                : _svc_clobber );                            \
+                : _svc_clobber);                                \
-        __res = __svcres;                                    \
+        __res = __svcres;                                       \
-        __syscall_return(type,__res);                        \
+        __syscall_return(type,__res);                           \
 }
-#define _syscall1(type,name,type1,arg1)                      \
+#define _syscall1(type,name,type1,arg1)                         \
-type name(type1 arg1) {                                      \
+type name(type1 arg1) {                                         \
-        register type1 __arg1 asm("2") = arg1;               \
+        register type1 __arg1 asm("2") = arg1;                  \
-        register long __svcres asm("2");                     \
+        register long __svcres asm("2");                        \
-        long __res;                                          \
+        long __res;                                             \
-        __asm__ __volatile__ (                               \
+        asm volatile(                                           \
-                "    .if %1 < 256\n"                         \
+                "       .if     %1 < 256\n"                     \
-                "    svc %b1\n"                              \
+                "       svc     %b1\n"                          \
-                "    .else\n"                                \
+                "       .else\n"                                \
-                "    la  %%r1,%1\n"                          \
+                "       la      %%r1,%1\n"                      \
-                "    svc 0\n"                                \
+                "       svc     0\n"                            \
-                "    .endif"                                 \
+                "       .endif"                                 \
-                : "=d" (__svcres)                            \
+                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                         \
+                : "i" (__NR_##name),                            \
-                  "0" (__arg1)                               \
+                  "0" (__arg1)                                  \
-                : _svc_clobber );                            \
+                : _svc_clobber);                                \
-        __res = __svcres;                                    \
+        __res = __svcres;                                       \
-        __syscall_return(type,__res);                        \
+        __syscall_return(type,__res);                           \
 }
-#define _syscall2(type,name,type1,arg1,type2,arg2)           \
+#define _syscall2(type,name,type1,arg1,type2,arg2)              \
-type name(type1 arg1, type2 arg2) {                          \
+type name(type1 arg1, type2 arg2) {                             \
-        register type1 __arg1 asm("2") = arg1;               \
+        register type1 __arg1 asm("2") = arg1;                  \
-        register type2 __arg2 asm("3") = arg2;               \
+        register type2 __arg2 asm("3") = arg2;                  \
-        register long __svcres asm("2");                     \
+        register long __svcres asm("2");                        \
-        long __res;                                          \
+        long __res;                                             \
-        __asm__ __volatile__ (                               \
+        asm volatile(                                           \
-                "    .if %1 < 256\n"                         \
+                "       .if     %1 < 256\n"                     \
-                "    svc %b1\n"                              \
+                "       svc     %b1\n"                          \
-                "    .else\n"                                \
+                "       .else\n"                                \
-                "    la %%r1,%1\n"                           \
+                "       la      %%r1,%1\n"                      \
-                "    svc 0\n"                                \
+                "       svc     0\n"                            \
-                "    .endif"                                 \
+                "       .endif"                                 \
-                : "=d" (__svcres)                            \
+                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                         \
+                : "i" (__NR_##name),                            \
-                  "0" (__arg1),                              \
+                  "0" (__arg1),                                 \
-                  "d" (__arg2)                               \
+                  "d" (__arg2)                                  \
-                : _svc_clobber );                            \
+                : _svc_clobber );                               \
-        __res = __svcres;                                    \
+        __res = __svcres;                                       \
-        __syscall_return(type,__res);                        \
+        __syscall_return(type,__res);                           \
 }
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)\
+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)   \
-type name(type1 arg1, type2 arg2, type3 arg3) {              \
+type name(type1 arg1, type2 arg2, type3 arg3) {                 \
-        register type1 __arg1 asm("2") = arg1;               \
+        register type1 __arg1 asm("2") = arg1;                  \
-        register type2 __arg2 asm("3") = arg2;               \
+        register type2 __arg2 asm("3") = arg2;                  \
-        register type3 __arg3 asm("4") = arg3;               \
+        register type3 __arg3 asm("4") = arg3;                  \
-        register long __svcres asm("2");                     \
+        register long __svcres asm("2");                        \
-        long __res;                                          \
+        long __res;                                             \
-        __asm__ __volatile__ (                               \
+        asm volatile(                                           \
-                "    .if %1 < 256\n"                         \
+                "       .if     %1 < 256\n"                     \
-                "    svc %b1\n"                              \
+                "       svc     %b1\n"                          \
-                "    .else\n"                                \
+                "       .else\n"                                \
-                "    la  %%r1,%1\n"                          \
+                "       la      %%r1,%1\n"                      \
-                "    svc 0\n"                                \
+                "       svc     0\n"                            \
-                "    .endif"                                 \
+                "       .endif"                                 \
-                : "=d" (__svcres)                            \
+                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                         \
+                : "i" (__NR_##name),                            \
-                  "0" (__arg1),                              \
+                  "0" (__arg1),                                 \
-                  "d" (__arg2),                              \
+                  "d" (__arg2),                                 \
-                  "d" (__arg3)                               \
+                  "d" (__arg3)                                  \
-                : _svc_clobber );                            \
+                : _svc_clobber);                                \
-        __res = __svcres;                                    \
+        __res = __svcres;                                       \
-        __syscall_return(type,__res);                        \
+        __syscall_return(type,__res);                           \
 }
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,\
+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,   \
-                  type4,name4)                               \
+                  type4,name4)                                  \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {  \
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {     \
-        register type1 __arg1 asm("2") = arg1;               \
+        register type1 __arg1 asm("2") = arg1;                  \
-        register type2 __arg2 asm("3") = arg2;               \
+        register type2 __arg2 asm("3") = arg2;                  \
-        register type3 __arg3 asm("4") = arg3;               \
+        register type3 __arg3 asm("4") = arg3;                  \
-        register type4 __arg4 asm("5") = arg4;               \
+        register type4 __arg4 asm("5") = arg4;                  \
-        register long __svcres asm("2");                     \
+        register long __svcres asm("2");                        \
-        long __res;                                          \
+        long __res;                                             \
-        __asm__ __volatile__ (                               \
+        asm volatile(                                           \
-                "    .if %1 < 256\n"                         \
+                "       .if     %1 < 256\n"                     \
-                "    svc %b1\n"                              \
+                "       svc     %b1\n"                          \
-                "    .else\n"                                \
+                "       .else\n"                                \
-                "    la  %%r1,%1\n"                          \
+                "       la      %%r1,%1\n"                      \
-                "    svc 0\n"                                \
+                "       svc     0\n"                            \
-                "    .endif"                                 \
+                "       .endif"                                 \
-                : "=d" (__svcres)                            \
+                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                         \
+                : "i" (__NR_##name),                            \
-                  "0" (__arg1),                              \
+                  "0" (__arg1),                                 \
-                  "d" (__arg2),                              \
+                  "d" (__arg2),                                 \
-                  "d" (__arg3),                              \
+                  "d" (__arg3),                                 \
-                  "d" (__arg4)                               \
+                  "d" (__arg4)                                  \
-                : _svc_clobber );                            \
+                : _svc_clobber);                                \
-        __res = __svcres;                                    \
+        __res = __svcres;                                       \
-        __syscall_return(type,__res);                        \
+        __syscall_return(type,__res);                           \
 }
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,\
+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,   \
-                  type4,name4,type5,name5)                   \
+                  type4,name4,type5,name5)                      \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4,    \
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4,       \
-          type5 arg5) {                                      \
+          type5 arg5) {                                         \
-        register type1 __arg1 asm("2") = arg1;               \
+        register type1 __arg1 asm("2") = arg1;                  \
-        register type2 __arg2 asm("3") = arg2;               \
+        register type2 __arg2 asm("3") = arg2;                  \
-        register type3 __arg3 asm("4") = arg3;               \
+        register type3 __arg3 asm("4") = arg3;                  \
-        register type4 __arg4 asm("5") = arg4;               \
+        register type4 __arg4 asm("5") = arg4;                  \
-        register type5 __arg5 asm("6") = arg5;               \
+        register type5 __arg5 asm("6") = arg5;                  \
-        register long __svcres asm("2");                     \
+        register long __svcres asm("2");                        \
-        long __res;                                          \
+        long __res;                                             \
-        __asm__ __volatile__ (                               \
+        asm volatile(                                           \
-                "    .if %1 < 256\n"                         \
+                "       .if     %1 < 256\n"                     \
-                "    svc %b1\n"                              \
+                "       svc     %b1\n"                          \
-                "    .else\n"                                \
+                "       .else\n"                                \
-                "    la  %%r1,%1\n"                          \
+                "       la      %%r1,%1\n"                      \
-                "    svc 0\n"                                \
+                "       svc     0\n"                            \
-                "    .endif"                                 \
+                "       .endif"                                 \
-                : "=d" (__svcres)                            \
+                : "=d" (__svcres)                               \
-                : "i" (__NR_##name),                         \
+                : "i" (__NR_##name),                            \
-                  "0" (__arg1),                              \
+                  "0" (__arg1),                                 \
-                  "d" (__arg2),                              \
+                  "d" (__arg2),                                 \
-                  "d" (__arg3),                              \
+                  "d" (__arg3),                                 \
-                  "d" (__arg4),                              \
+                  "d" (__arg4),                                 \
-                  "d" (__arg5)                               \
+                  "d" (__arg5)                                  \
-                : _svc_clobber );                            \
+                : _svc_clobber);                                \
-        __res = __svcres;                                    \
+        __res = __svcres;                                       \
-        __syscall_return(type,__res);                        \
+        __syscall_return(type,__res);                           \
 }
 #define __ARCH_WANT_IPC_PARSE_VERSION
diff --git a/include/asm-s390/z90crypt.h b/include/asm-s390/z90crypt.h
deleted file mode 100644
index 31a2439b07bd..000000000000
--- a/include/asm-s390/z90crypt.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- *  include/asm-s390/z90crypt.h
- *
- *  z90crypt 1.3.3 (user-visible header)
- *
- *  Copyright (C)  2001, 2005 IBM Corporation
- *  Author(s): Robert Burroughs
- *             Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *
- * 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#ifndef __ASM_S390_Z90CRYPT_H
-#define __ASM_S390_Z90CRYPT_H
-#include <linux/ioctl.h>
-#define z90crypt_VERSION 1
-#define z90crypt_RELEASE 3      // 2 = PCIXCC, 3 = rewrite for coding standards
-#define z90crypt_VARIANT 3      // 3 = CEX2A support
-/**
- * struct ica_rsa_modexpo
- *
- * Requirements:
- * - outputdatalength is at least as large as inputdatalength.
- * - All key parts are right justified in their fields, padded on
- *   the left with zeroes.
- * - length(b_key) = inputdatalength
- * - length(n_modulus) = inputdatalength
- */
-struct ica_rsa_modexpo {
-        char __user *   inputdata;
-        unsigned int    inputdatalength;
-        char __user *   outputdata;
-        unsigned int    outputdatalength;
-        char __user *   b_key;
-        char __user *   n_modulus;
-};
-/**
- * struct ica_rsa_modexpo_crt
- *
- * Requirements:
- * - inputdatalength is even.
- * - outputdatalength is at least as large as inputdatalength.
- * - All key parts are right justified in their fields, padded on
- *   the left with zeroes.
- * - length(bp_key)     = inputdatalength/2 + 8
- * - length(bq_key)     = inputdatalength/2
- * - length(np_key)     = inputdatalength/2 + 8
- * - length(nq_key)     = inputdatalength/2
- * - length(u_mult_inv) = inputdatalength/2 + 8
- */
-struct ica_rsa_modexpo_crt {
-        char __user *   inputdata;
-        unsigned int    inputdatalength;
-        char __user *   outputdata;
-        unsigned int    outputdatalength;
-        char __user *   bp_key;
-        char __user *   bq_key;
-        char __user *   np_prime;
-        char __user *   nq_prime;
-        char __user *   u_mult_inv;
-};
-#define Z90_IOCTL_MAGIC 'z'  // NOTE:  Need to allocate from linux folks
-/**
- * Interface notes:
- *
- * The ioctl()s which are implemented (along with relevant details)
- * are:
- *
- *   ICARSAMODEXPO
- *     Perform an RSA operation using a Modulus-Exponent pair
- *     This takes an ica_rsa_modexpo struct as its arg.
- *
- *     NOTE: please refer to the comments preceding this structure
- *           for the implementation details for the contents of the
- *           block
- *
- *   ICARSACRT
- *     Perform an RSA operation using a Chinese-Remainder Theorem key
- *     This takes an ica_rsa_modexpo_crt struct as its arg.
- *
- *     NOTE: please refer to the comments preceding this structure
- *           for the implementation details for the contents of the
- *           block
- *
- *   Z90STAT_TOTALCOUNT
- *     Return an integer count of all device types together.
- *
- *   Z90STAT_PCICACOUNT
- *     Return an integer count of all PCICAs.
- *
- *   Z90STAT_PCICCCOUNT
- *     Return an integer count of all PCICCs.
- *
- *   Z90STAT_PCIXCCMCL2COUNT
- *     Return an integer count of all MCL2 PCIXCCs.
- *
- *   Z90STAT_PCIXCCMCL3COUNT
- *     Return an integer count of all MCL3 PCIXCCs.
- *
- *   Z90STAT_CEX2CCOUNT
- *     Return an integer count of all CEX2Cs.
- *
- *   Z90STAT_CEX2ACOUNT
- *     Return an integer count of all CEX2As.
- *
- *   Z90STAT_REQUESTQ_COUNT
- *     Return an integer count of the number of entries waiting to be
- *     sent to a device.
- *
- *   Z90STAT_PENDINGQ_COUNT
- *     Return an integer count of the number of entries sent to a
- *     device awaiting the reply.
- *
- *   Z90STAT_TOTALOPEN_COUNT
- *     Return an integer count of the number of open file handles.
- *
- *   Z90STAT_DOMAIN_INDEX
- *     Return the integer value of the Cryptographic Domain.
- *
- *   Z90STAT_STATUS_MASK
- *     Return an 64 element array of unsigned chars for the status of
- *     all devices.
- *       0x01: PCICA
- *       0x02: PCICC
- *       0x03: PCIXCC_MCL2
- *       0x04: PCIXCC_MCL3
- *       0x05: CEX2C
- *       0x06: CEX2A
- *       0x0d: device is disabled via the proc filesystem
- *
- *   Z90STAT_QDEPTH_MASK
- *     Return an 64 element array of unsigned chars for the queue
- *     depth of all devices.
- *
- *   Z90STAT_PERDEV_REQCNT
- *     Return an 64 element array of unsigned integers for the number
- *     of successfully completed requests per device since the device
- *     was detected and made available.
- *
- *   ICAZ90STATUS (deprecated)
- *     Return some device driver status in a ica_z90_status struct
- *     This takes an ica_z90_status struct as its arg.
- *
- *     NOTE: this ioctl() is deprecated, and has been replaced with
- *           single ioctl()s for each type of status being requested
- *
- *   Z90STAT_PCIXCCCOUNT (deprecated)
- *     Return an integer count of all PCIXCCs (MCL2 + MCL3).
- *     This is DEPRECATED now that MCL3 PCIXCCs are treated differently from
- *     MCL2 PCIXCCs.
- *
- *   Z90QUIESCE (not recommended)
- *     Quiesce the driver.  This is intended to stop all new
- *     requests from being processed.  Its use is NOT recommended,
- *     except in circumstances where there is no other way to stop
- *     callers from accessing the driver.  Its original use was to
- *     allow the driver to be "drained" of work in preparation for
- *     a system shutdown.
- *
- *     NOTE: once issued, this ban on new work cannot be undone
- *           except by unloading and reloading the driver.
- */
-/**
- * Supported ioctl calls
- */
-#define ICARSAMODEXPO   _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x05, 0)
-#define ICARSACRT       _IOC(_IOC_READ|_IOC_WRITE, Z90_IOCTL_MAGIC, 0x06, 0)
-/* DEPRECATED status calls (bound for removal at some point) */
-#define ICAZ90STATUS    _IOR(Z90_IOCTL_MAGIC, 0x10, struct ica_z90_status)
-#define Z90STAT_PCIXCCCOUNT     _IOR(Z90_IOCTL_MAGIC, 0x43, int)
-/* unrelated to ICA callers */
-#define Z90QUIESCE      _IO(Z90_IOCTL_MAGIC, 0x11)
-/* New status calls */
-#define Z90STAT_TOTALCOUNT      _IOR(Z90_IOCTL_MAGIC, 0x40, int)
-#define Z90STAT_PCICACOUNT      _IOR(Z90_IOCTL_MAGIC, 0x41, int)
-#define Z90STAT_PCICCCOUNT      _IOR(Z90_IOCTL_MAGIC, 0x42, int)
-#define Z90STAT_PCIXCCMCL2COUNT _IOR(Z90_IOCTL_MAGIC, 0x4b, int)
-#define Z90STAT_PCIXCCMCL3COUNT _IOR(Z90_IOCTL_MAGIC, 0x4c, int)
-#define Z90STAT_CEX2CCOUNT      _IOR(Z90_IOCTL_MAGIC, 0x4d, int)
-#define Z90STAT_CEX2ACOUNT      _IOR(Z90_IOCTL_MAGIC, 0x4e, int)
-#define Z90STAT_REQUESTQ_COUNT  _IOR(Z90_IOCTL_MAGIC, 0x44, int)
-#define Z90STAT_PENDINGQ_COUNT  _IOR(Z90_IOCTL_MAGIC, 0x45, int)
-#define Z90STAT_TOTALOPEN_COUNT _IOR(Z90_IOCTL_MAGIC, 0x46, int)
-#define Z90STAT_DOMAIN_INDEX    _IOR(Z90_IOCTL_MAGIC, 0x47, int)
-#define Z90STAT_STATUS_MASK     _IOR(Z90_IOCTL_MAGIC, 0x48, char[64])
-#define Z90STAT_QDEPTH_MASK     _IOR(Z90_IOCTL_MAGIC, 0x49, char[64])
-#define Z90STAT_PERDEV_REQCNT   _IOR(Z90_IOCTL_MAGIC, 0x4a, int[64])
-#endif /* __ASM_S390_Z90CRYPT_H */
diff --git a/include/asm-s390/zcrypt.h b/include/asm-s390/zcrypt.h
new file mode 100644
index 000000000000..7244c68464f2
--- /dev/null
+++ b/include/asm-s390/zcrypt.h
@@ -0,0 +1,285 @@
+/*
+ *  include/asm-s390/zcrypt.h
+ *
+ *  zcrypt 2.1.0 (user-visible header)
+ *
+ *  Copyright (C)  2001, 2006 IBM Corporation
+ *  Author(s): Robert Burroughs
+ *             Eric Rossman (edrossma@us.ibm.com)
+ *
+ *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
+ *
+ * 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __ASM_S390_ZCRYPT_H
+#define __ASM_S390_ZCRYPT_H
+#define ZCRYPT_VERSION 2
+#define ZCRYPT_RELEASE 1
+#define ZCRYPT_VARIANT 0
+#include <linux/ioctl.h>
+#include <linux/compiler.h>
+/**
+ * struct ica_rsa_modexpo
+ *
+ * Requirements:
+ * - outputdatalength is at least as large as inputdatalength.
+ * - All key parts are right justified in their fields, padded on
+ *   the left with zeroes.
+ * - length(b_key) = inputdatalength
+ * - length(n_modulus) = inputdatalength
+ */
+struct ica_rsa_modexpo {
+        char __user *   inputdata;
+        unsigned int    inputdatalength;
+        char __user *   outputdata;
+        unsigned int    outputdatalength;
+        char __user *   b_key;
+        char __user *   n_modulus;
+};
+/**
+ * struct ica_rsa_modexpo_crt
+ *
+ * Requirements:
+ * - inputdatalength is even.
+ * - outputdatalength is at least as large as inputdatalength.
+ * - All key parts are right justified in their fields, padded on
+ *   the left with zeroes.
+ * - length(bp_key)     = inputdatalength/2 + 8
+ * - length(bq_key)     = inputdatalength/2
+ * - length(np_key)     = inputdatalength/2 + 8
+ * - length(nq_key)     = inputdatalength/2
+ * - length(u_mult_inv) = inputdatalength/2 + 8
+ */
+struct ica_rsa_modexpo_crt {
+        char __user *   inputdata;
+        unsigned int    inputdatalength;
+        char __user *   outputdata;
+        unsigned int    outputdatalength;
+        char __user *   bp_key;
+        char __user *   bq_key;
+        char __user *   np_prime;
+        char __user *   nq_prime;
+        char __user *   u_mult_inv;
+};
+/**
+ * CPRBX
+ *        Note that all shorts and ints are big-endian.
+ *        All pointer fields are 16 bytes long, and mean nothing.
+ *
+ *        A request CPRB is followed by a request_parameter_block.
+ *
+ *        The request (or reply) parameter block is organized thus:
+ *          function code
+ *          VUD block
+ *          key block
+ */
+struct ica_CPRBX {
+        unsigned short  cprb_len;       /* CPRB length        220        */
+        unsigned char   cprb_ver_id;    /* CPRB version id.   0x02       */
+        unsigned char   pad_000[3];     /* Alignment pad bytes           */
+        unsigned char   func_id[2];     /* function id        0x5432     */
+        unsigned char   cprb_flags[4];  /* Flags                         */
+        unsigned int    req_parml;      /* request parameter buffer len  */
+        unsigned int    req_datal;      /* request data buffer           */
+        unsigned int    rpl_msgbl;      /* reply  message block length   */
+        unsigned int    rpld_parml;     /* replied parameter block len   */
+        unsigned int    rpl_datal;      /* reply data block len          */
+        unsigned int    rpld_datal;     /* replied data block len        */
+        unsigned int    req_extbl;      /* request extension block len   */
+        unsigned char   pad_001[4];     /* reserved                      */
+        unsigned int    rpld_extbl;     /* replied extension block len   */
+        unsigned char   padx000[16 - sizeof (char *)];
+        unsigned char * req_parmb;      /* request parm block 'address'  */
+        unsigned char   padx001[16 - sizeof (char *)];
+        unsigned char * req_datab;      /* request data block 'address'  */
+        unsigned char   padx002[16 - sizeof (char *)];
+        unsigned char * rpl_parmb;      /* reply parm block 'address'    */
+        unsigned char   padx003[16 - sizeof (char *)];
+        unsigned char * rpl_datab;      /* reply data block 'address'    */
+        unsigned char   padx004[16 - sizeof (char *)];
+        unsigned char * req_extb;       /* request extension block 'addr'*/
+        unsigned char   padx005[16 - sizeof (char *)];
+        unsigned char * rpl_extb;       /* reply extension block 'addres'*/
+        unsigned short  ccp_rtcode;     /* server return code            */
+        unsigned short  ccp_rscode;     /* server reason code            */
+        unsigned int    mac_data_len;   /* Mac Data Length               */
+        unsigned char   logon_id[8];    /* Logon Identifier              */
+        unsigned char   mac_value[8];   /* Mac Value                     */
+        unsigned char   mac_content_flgs;/* Mac content flag byte        */
+        unsigned char   pad_002;        /* Alignment                     */
+        unsigned short  domain;         /* Domain                        */
+        unsigned char   usage_domain[4];/* Usage domain                  */
+        unsigned char   cntrl_domain[4];/* Control domain                */
+        unsigned char   S390enf_mask[4];/* S/390 enforcement mask        */
+        unsigned char   pad_004[36];    /* reserved                      */
+};
+/**
+ * xcRB
+ */
+struct ica_xcRB {
+        unsigned short  agent_ID;
+        unsigned int    user_defined;
+        unsigned short  request_ID;
+        unsigned int    request_control_blk_length;
+        unsigned char   padding1[16 - sizeof (char *)];
+        char __user *   request_control_blk_addr;
+        unsigned int    request_data_length;
+        char            padding2[16 - sizeof (char *)];
+        char __user *   request_data_address;
+        unsigned int    reply_control_blk_length;
+        char            padding3[16 - sizeof (char *)];
+        char __user *   reply_control_blk_addr;
+        unsigned int    reply_data_length;
+        char            padding4[16 - sizeof (char *)];
+        char __user *   reply_data_addr;
+        unsigned short  priority_window;
+        unsigned int    status;
+} __attribute__((packed));
+#define AUTOSELECT ((unsigned int)0xFFFFFFFF)
+#define ZCRYPT_IOCTL_MAGIC 'z'
+/**
+ * Interface notes:
+ *
+ * The ioctl()s which are implemented (along with relevant details)
+ * are:
+ *
+ *   ICARSAMODEXPO
+ *     Perform an RSA operation using a Modulus-Exponent pair
+ *     This takes an ica_rsa_modexpo struct as its arg.
+ *
+ *     NOTE: please refer to the comments preceding this structure
+ *           for the implementation details for the contents of the
+ *           block
+ *
+ *   ICARSACRT
+ *     Perform an RSA operation using a Chinese-Remainder Theorem key
+ *     This takes an ica_rsa_modexpo_crt struct as its arg.
+ *
+ *     NOTE: please refer to the comments preceding this structure
+ *           for the implementation details for the contents of the
+ *           block
+ *
+ *   Z90STAT_TOTALCOUNT
+ *     Return an integer count of all device types together.
+ *
+ *   Z90STAT_PCICACOUNT
+ *     Return an integer count of all PCICAs.
+ *
+ *   Z90STAT_PCICCCOUNT
+ *     Return an integer count of all PCICCs.
+ *
+ *   Z90STAT_PCIXCCMCL2COUNT
+ *     Return an integer count of all MCL2 PCIXCCs.
+ *
+ *   Z90STAT_PCIXCCMCL3COUNT
+ *     Return an integer count of all MCL3 PCIXCCs.
+ *
+ *   Z90STAT_CEX2CCOUNT
+ *     Return an integer count of all CEX2Cs.
+ *
+ *   Z90STAT_CEX2ACOUNT
+ *     Return an integer count of all CEX2As.
+ *
+ *   Z90STAT_REQUESTQ_COUNT
+ *     Return an integer count of the number of entries waiting to be
+ *     sent to a device.
+ *
+ *   Z90STAT_PENDINGQ_COUNT
+ *     Return an integer count of the number of entries sent to a
+ *     device awaiting the reply.
+ *
+ *   Z90STAT_TOTALOPEN_COUNT
+ *     Return an integer count of the number of open file handles.
+ *
+ *   Z90STAT_DOMAIN_INDEX
+ *     Return the integer value of the Cryptographic Domain.
+ *
+ *   Z90STAT_STATUS_MASK
+ *     Return an 64 element array of unsigned chars for the status of
+ *     all devices.
+ *       0x01: PCICA
+ *       0x02: PCICC
+ *       0x03: PCIXCC_MCL2
+ *       0x04: PCIXCC_MCL3
+ *       0x05: CEX2C
+ *       0x06: CEX2A
+ *       0x0d: device is disabled via the proc filesystem
+ *
+ *   Z90STAT_QDEPTH_MASK
+ *     Return an 64 element array of unsigned chars for the queue
+ *     depth of all devices.
+ *
+ *   Z90STAT_PERDEV_REQCNT
+ *     Return an 64 element array of unsigned integers for the number
+ *     of successfully completed requests per device since the device
+ *     was detected and made available.
+ *
+ *   ICAZ90STATUS (deprecated)
+ *     Return some device driver status in a ica_z90_status struct
+ *     This takes an ica_z90_status struct as its arg.
+ *
+ *     NOTE: this ioctl() is deprecated, and has been replaced with
+ *           single ioctl()s for each type of status being requested
+ *
+ *   Z90STAT_PCIXCCCOUNT (deprecated)
+ *     Return an integer count of all PCIXCCs (MCL2 + MCL3).
+ *     This is DEPRECATED now that MCL3 PCIXCCs are treated differently from
+ *     MCL2 PCIXCCs.
+ *
+ *   Z90QUIESCE (not recommended)
+ *     Quiesce the driver.  This is intended to stop all new
+ *     requests from being processed.  Its use is NOT recommended,
+ *     except in circumstances where there is no other way to stop
+ *     callers from accessing the driver.  Its original use was to
+ *     allow the driver to be "drained" of work in preparation for
+ *     a system shutdown.
+ *
+ *     NOTE: once issued, this ban on new work cannot be undone
+ *           except by unloading and reloading the driver.
+ */
+/**
+ * Supported ioctl calls
+ */
+#define ICARSAMODEXPO   _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x05, 0)
+#define ICARSACRT       _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x06, 0)
+#define ZSECSENDCPRB    _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x81, 0)
+/* New status calls */
+#define Z90STAT_TOTALCOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x40, int)
+#define Z90STAT_PCICACOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x41, int)
+#define Z90STAT_PCICCCOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x42, int)
+#define Z90STAT_PCIXCCMCL2COUNT _IOR(ZCRYPT_IOCTL_MAGIC, 0x4b, int)
+#define Z90STAT_PCIXCCMCL3COUNT _IOR(ZCRYPT_IOCTL_MAGIC, 0x4c, int)
+#define Z90STAT_CEX2CCOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x4d, int)
+#define Z90STAT_CEX2ACOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x4e, int)
+#define Z90STAT_REQUESTQ_COUNT  _IOR(ZCRYPT_IOCTL_MAGIC, 0x44, int)
+#define Z90STAT_PENDINGQ_COUNT  _IOR(ZCRYPT_IOCTL_MAGIC, 0x45, int)
+#define Z90STAT_TOTALOPEN_COUNT _IOR(ZCRYPT_IOCTL_MAGIC, 0x46, int)
+#define Z90STAT_DOMAIN_INDEX    _IOR(ZCRYPT_IOCTL_MAGIC, 0x47, int)
+#define Z90STAT_STATUS_MASK     _IOR(ZCRYPT_IOCTL_MAGIC, 0x48, char[64])
+#define Z90STAT_QDEPTH_MASK     _IOR(ZCRYPT_IOCTL_MAGIC, 0x49, char[64])
+#define Z90STAT_PERDEV_REQCNT   _IOR(ZCRYPT_IOCTL_MAGIC, 0x4a, int[64])
+#endif /* __ASM_S390_ZCRYPT_H */
diff --git a/include/asm-sh/addrspace.h b/include/asm-sh/addrspace.h
index 720afc11c2ca..b860218e402e 100644
--- a/include/asm-sh/addrspace.h
+++ b/include/asm-sh/addrspace.h
@@ -14,11 +14,19 @@
 #include <asm/cpu/addrspace.h>
 /* Memory segments (32bit Privileged mode addresses)  */
+#ifndef CONFIG_CPU_SH2A
 #define P0SEG           0x00000000
 #define P1SEG           0x80000000
 #define P2SEG           0xa0000000
 #define P3SEG           0xc0000000
 #define P4SEG           0xe0000000
+#else
+#define P0SEG           0x00000000
+#define P1SEG           0x00000000
+#define P2SEG           0x20000000
+#define P3SEG           0x00000000
+#define P4SEG           0x80000000
+#endif
 /* Returns the privileged segment base of a given address  */
 #define PXSEG(a)        (((unsigned long)(a)) & 0xe0000000)
diff --git a/include/asm-sh/adx/io.h b/include/asm-sh/adx/io.h
deleted file mode 100644
index ab1225f1d557..000000000000
--- a/include/asm-sh/adx/io.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * include/asm-sh/io_adx.h
- *
- * Copyright (C) 2001 A&D Co., Ltd.
- *
- * This file may be copied or modified under the terms of the GNU
- * General Public License.  See linux/COPYING for more information.
- *
- * IO functions for an A&D ADX Board
- */
-#ifndef _ASM_SH_IO_ADX_H
-#define _ASM_SH_IO_ADX_H
-#include <asm/io_generic.h>
-extern unsigned char adx_inb(unsigned long port);
-extern unsigned short adx_inw(unsigned long port);
-extern unsigned int adx_inl(unsigned long port);
-extern void adx_outb(unsigned char value, unsigned long port);
-extern void adx_outw(unsigned short value, unsigned long port);
-extern void adx_outl(unsigned int value, unsigned long port);
-extern unsigned char adx_inb_p(unsigned long port);
-extern void adx_outb_p(unsigned char value, unsigned long port);
-extern void adx_insb(unsigned long port, void *addr, unsigned long count);
-extern void adx_insw(unsigned long port, void *addr, unsigned long count);
-extern void adx_insl(unsigned long port, void *addr, unsigned long count);
-extern void adx_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void adx_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void adx_outsl(unsigned long port, const void *addr, unsigned long count);
-extern unsigned char adx_readb(unsigned long addr);
-extern unsigned short adx_readw(unsigned long addr);
-extern unsigned int adx_readl(unsigned long addr);
-extern void adx_writeb(unsigned char b, unsigned long addr);
-extern void adx_writew(unsigned short b, unsigned long addr);
-extern void adx_writel(unsigned int b, unsigned long addr);
-extern void * adx_ioremap(unsigned long offset, unsigned long size);
-extern void adx_iounmap(void *addr);
-extern unsigned long adx_isa_port2addr(unsigned long offset);
-extern void setup_adx(void);
-extern void init_adx_IRQ(void);
-#ifdef __WANT_IO_DEF
-#define __inb           adx_inb
-#define __inw           adx_inw
-#define __inl           adx_inl
-#define __outb          adx_outb
-#define __outw          adx_outw
-#define __outl          adx_outl
-#define __inb_p         adx_inb_p
-#define __inw_p         adx_inw
-#define __inl_p         adx_inl
-#define __outb_p        adx_outb_p
-#define __outw_p        adx_outw
-#define __outl_p        adx_outl
-#define __insb          adx_insb
-#define __insw          adx_insw
-#define __insl          adx_insl
-#define __outsb         adx_outsb
-#define __outsw         adx_outsw
-#define __outsl         adx_outsl
-#define __readb         adx_readb
-#define __readw         adx_readw
-#define __readl         adx_readl
-#define __writeb        adx_writeb
-#define __writew        adx_writew
-#define __writel        adx_writel
-#define __isa_port2addr adx_isa_port2addr
-#define __ioremap       adx_ioremap
-#define __iounmap       adx_iounmap
-#endif
-#endif /* _ASM_SH_IO_AANDD_H */
diff --git a/include/asm-sh/apm.h b/include/asm-sh/apm.h
new file mode 100644
index 000000000000..8b091e93651f
--- /dev/null
+++ b/include/asm-sh/apm.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2006 (c) Andriy Skulysh <askulysh@gmail.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ */
+#ifndef __ASM_SH_APM_H
+#define __ASM_SH_APM_H
+#define APM_AC_OFFLINE                  0
+#define APM_AC_ONLINE                   1
+#define APM_AC_BACKUP                   2
+#define APM_AC_UNKNOWN                  0xff
+#define APM_BATTERY_STATUS_HIGH         0
+#define APM_BATTERY_STATUS_LOW          1
+#define APM_BATTERY_STATUS_CRITICAL     2
+#define APM_BATTERY_STATUS_CHARGING     3
+#define APM_BATTERY_STATUS_NOT_PRESENT  4
+#define APM_BATTERY_STATUS_UNKNOWN      0xff
+#define APM_BATTERY_LIFE_UNKNOWN        0xFFFF
+#define APM_BATTERY_LIFE_MINUTES        0x8000
+#define APM_BATTERY_LIFE_VALUE_MASK     0x7FFF
+#define APM_BATTERY_FLAG_HIGH           (1 << 0)
+#define APM_BATTERY_FLAG_LOW            (1 << 1)
+#define APM_BATTERY_FLAG_CRITICAL       (1 << 2)
+#define APM_BATTERY_FLAG_CHARGING       (1 << 3)
+#define APM_BATTERY_FLAG_NOT_PRESENT    (1 << 7)
+#define APM_BATTERY_FLAG_UNKNOWN        0xff
+#define APM_UNITS_MINS                  0
+#define APM_UNITS_SECS                  1
+#define APM_UNITS_UNKNOWN               -1
+extern int (*apm_get_info)(char *buf, char **start, off_t fpos, int length);
+extern int apm_suspended;
+void apm_queue_event(apm_event_t event);
+#endif
diff --git a/include/asm-sh/atomic.h b/include/asm-sh/atomic.h
index fb627de217f2..8bdc1ba56f73 100644
--- a/include/asm-sh/atomic.h
+++ b/include/asm-sh/atomic.h
@@ -14,6 +14,7 @@ typedef struct { volatile int counter; } atomic_t;
 #define atomic_read(v)          ((v)->counter)
 #define atomic_set(v,i)         ((v)->counter = (i))
+#include <linux/compiler.h>
 #include <asm/system.h>
 /*
@@ -21,49 +22,110 @@ typedef struct { volatile int counter; } atomic_t;
 * forward to code at the end of this object's .text section, then
 * branch back to restart the operation.
 */
+static inline void atomic_add(int i, atomic_t *v)
-static __inline__ void atomic_add(int i, atomic_t * v)
 {
+#ifdef CONFIG_CPU_SH4A
+        unsigned long tmp;
+        __asm__ __volatile__ (
+"1:     movli.l @%3, %0         ! atomic_add    \n"
+"       add     %2, %0                          \n"
+"       movco.l %0, @%3                         \n"
+"       bf      1b                              \n"
+        : "=&z" (tmp), "=r" (&v->counter)
+        : "r" (i), "r" (&v->counter)
+        : "t");
+#else
        unsigned long flags;
        local_irq_save(flags);
        *(long *)v += i;
        local_irq_restore(flags);
+#endif
 }
-static __inline__ void atomic_sub(int i, atomic_t *v)
+static inline void atomic_sub(int i, atomic_t *v)
 {
+#ifdef CONFIG_CPU_SH4A
+        unsigned long tmp;
+        __asm__ __volatile__ (
+"1:     movli.l @%3, %0         ! atomic_sub    \n"
+"       sub     %2, %0                          \n"
+"       movco.l %0, @%3                         \n"
+"       bf      1b                              \n"
+        : "=&z" (tmp), "=r" (&v->counter)
+        : "r" (i), "r" (&v->counter)
+        : "t");
+#else
        unsigned long flags;
        local_irq_save(flags);
        *(long *)v -= i;
        local_irq_restore(flags);
+#endif
 }
-static __inline__ int atomic_add_return(int i, atomic_t * v)
+/*
+ * SH-4A note:
+ *
+ * We basically get atomic_xxx_return() for free compared with
+ * atomic_xxx(). movli.l/movco.l require r0 due to the instruction
+ * encoding, so the retval is automatically set without having to
+ * do any special work.
+ */
+static inline int atomic_add_return(int i, atomic_t *v)
 {
-        unsigned long temp, flags;
+        unsigned long temp;
+#ifdef CONFIG_CPU_SH4A
+        __asm__ __volatile__ (
+"1:     movli.l @%3, %0         ! atomic_add_return     \n"
+"       add     %2, %0                                  \n"
+"       movco.l %0, @%3                                 \n"
+"       bf      1b                                      \n"
+"       synco                                           \n"
+        : "=&z" (temp), "=r" (&v->counter)
+        : "r" (i), "r" (&v->counter)
+        : "t");
+#else
+        unsigned long flags;
        local_irq_save(flags);
        temp = *(long *)v;
        temp += i;
        *(long *)v = temp;
        local_irq_restore(flags);
+#endif
        return temp;
 }
 #define atomic_add_negative(a, v)       (atomic_add_return((a), (v)) < 0)
-static __inline__ int atomic_sub_return(int i, atomic_t * v)
+static inline int atomic_sub_return(int i, atomic_t *v)
 {
-        unsigned long temp, flags;
+        unsigned long temp;
+#ifdef CONFIG_CPU_SH4A
+        __asm__ __volatile__ (
+"1:     movli.l @%3, %0         ! atomic_sub_return     \n"
+"       sub     %2, %0                                  \n"
+"       movco.l %0, @%3                                 \n"
+"       bf      1b                                      \n"
+"       synco                                           \n"
+        : "=&z" (temp), "=r" (&v->counter)
+        : "r" (i), "r" (&v->counter)
+        : "t");
+#else
+        unsigned long flags;
        local_irq_save(flags);
        temp = *(long *)v;
        temp -= i;
        *(long *)v = temp;
        local_irq_restore(flags);
+#endif
        return temp;
 }
@@ -118,22 +180,48 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 }
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-static __inline__ void atomic_clear_mask(unsigned int mask, atomic_t *v)
+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
 {
+#ifdef CONFIG_CPU_SH4A
+        unsigned long tmp;
+        __asm__ __volatile__ (
+"1:     movli.l @%3, %0         ! atomic_clear_mask     \n"
+"       and     %2, %0                                  \n"
+"       movco.l %0, @%3                                 \n"
+"       bf      1b                                      \n"
+        : "=&z" (tmp), "=r" (&v->counter)
+        : "r" (~mask), "r" (&v->counter)
+        : "t");
+#else
        unsigned long flags;
        local_irq_save(flags);
        *(long *)v &= ~mask;
        local_irq_restore(flags);
+#endif
 }
-static __inline__ void atomic_set_mask(unsigned int mask, atomic_t *v)
+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
 {
+#ifdef CONFIG_CPU_SH4A
+        unsigned long tmp;
+        __asm__ __volatile__ (
+"1:     movli.l @%3, %0         ! atomic_set_mask       \n"
+"       or      %2, %0                                  \n"
+"       movco.l %0, @%3                                 \n"
+"       bf      1b                                      \n"
+        : "=&z" (tmp), "=r" (&v->counter)
+        : "r" (mask), "r" (&v->counter)
+        : "t");
+#else
        unsigned long flags;
        local_irq_save(flags);
        *(long *)v |= mask;
        local_irq_restore(flags);
+#endif
 }
 /* Atomic operations are already serializing on SH */
diff --git a/include/asm-sh/auxvec.h b/include/asm-sh/auxvec.h
index fc21e4db5881..1b6916e63e90 100644
--- a/include/asm-sh/auxvec.h
+++ b/include/asm-sh/auxvec.h
@@ -1,4 +1,18 @@
 #ifndef __ASM_SH_AUXVEC_H
 #define __ASM_SH_AUXVEC_H
+/*
+ * Architecture-neutral AT_ values in 0-17, leave some room
+ * for more of them.
+ */
+#ifdef CONFIG_VSYSCALL
+/*
+ * Only define this in the vsyscall case, the entry point to
+ * the vsyscall page gets placed here. The kernel will attempt
+ * to build a gate VMA we don't care about otherwise..
+ */
+#define AT_SYSINFO_EHDR         33
+#endif
 #endif /* __ASM_SH_AUXVEC_H */
diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h
index e34f82508568..1c16792cee1d 100644
--- a/include/asm-sh/bitops.h
+++ b/include/asm-sh/bitops.h
@@ -6,7 +6,7 @@
 /* For __swab32 */
 #include <asm/byteorder.h>
-static __inline__ void set_bit(int nr, volatile void * addr)
+static inline void set_bit(int nr, volatile void * addr)
 {
        int     mask;
        volatile unsigned int *a = addr;
@@ -24,7 +24,7 @@ static __inline__ void set_bit(int nr, volatile void * addr)
 */
 #define smp_mb__before_clear_bit()      barrier()
 #define smp_mb__after_clear_bit()       barrier()
-static __inline__ void clear_bit(int nr, volatile void * addr)
+static inline void clear_bit(int nr, volatile void * addr)
 {
        int     mask;
        volatile unsigned int *a = addr;
@@ -37,7 +37,7 @@ static __inline__ void clear_bit(int nr, volatile void * addr)
        local_irq_restore(flags);
 }
-static __inline__ void change_bit(int nr, volatile void * addr)
+static inline void change_bit(int nr, volatile void * addr)
 {
        int     mask;
        volatile unsigned int *a = addr;
@@ -50,7 +50,7 @@ static __inline__ void change_bit(int nr, volatile void * addr)
        local_irq_restore(flags);
 }
-static __inline__ int test_and_set_bit(int nr, volatile void * addr)
+static inline int test_and_set_bit(int nr, volatile void * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = addr;
@@ -66,7 +66,7 @@ static __inline__ int test_and_set_bit(int nr, volatile void * addr)
        return retval;
 }
-static __inline__ int test_and_clear_bit(int nr, volatile void * addr)
+static inline int test_and_clear_bit(int nr, volatile void * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = addr;
@@ -82,7 +82,7 @@ static __inline__ int test_and_clear_bit(int nr, volatile void * addr)
        return retval;
 }
-static __inline__ int test_and_change_bit(int nr, volatile void * addr)
+static inline int test_and_change_bit(int nr, volatile void * addr)
 {
        int     mask, retval;
        volatile unsigned int *a = addr;
@@ -100,7 +100,7 @@ static __inline__ int test_and_change_bit(int nr, volatile void * addr)
 #include <asm-generic/bitops/non-atomic.h>
-static __inline__ unsigned long ffz(unsigned long word)
+static inline unsigned long ffz(unsigned long word)
 {
        unsigned long result;
@@ -120,7 +120,7 @@ static __inline__ unsigned long ffz(unsigned long word)
 *
 * Undefined if no bit exists, so code should check against 0 first.
 */
-static __inline__ unsigned long __ffs(unsigned long word)
+static inline unsigned long __ffs(unsigned long word)
 {
        unsigned long result;
diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index a6de3d06a3d9..b4000c8bf31b 100644
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -32,6 +32,10 @@ static void __init check_bugs(void)
        case CPU_SH7750 ... CPU_SH4_501:
                *p++ = '4';
                break;
+        case CPU_SH7770 ... CPU_SH7781:
+                *p++ = '4';
+                *p++ = 'a';
+                break;
        default:
                *p++ = '?';
                *p++ = '!';
diff --git a/include/asm-sh/cache.h b/include/asm-sh/cache.h
index 656fdfe9e8b4..e3a180cf5062 100644
--- a/include/asm-sh/cache.h
+++ b/include/asm-sh/cache.h
@@ -10,7 +10,6 @@
 #ifdef __KERNEL__
 #include <asm/cpu/cache.h>
-#include <asm/cpu/cacheflush.h>
 #define SH_CACHE_VALID          1
 #define SH_CACHE_UPDATED        2
@@ -23,24 +22,31 @@
 #define L1_CACHE_ALIGN(x)       (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))
 struct cache_info {
-        unsigned int ways;
+        unsigned int ways;              /* Number of cache ways */
-        unsigned int sets;
+        unsigned int sets;              /* Number of cache sets */
-        unsigned int linesz;
+        unsigned int linesz;            /* Cache line size (bytes) */
-        unsigned int way_incr;
+        unsigned int way_size;          /* sets * line size */
+        /*
+         * way_incr is the address offset for accessing the next way
+         * in memory mapped cache array ops.
+         */
+        unsigned int way_incr;
        unsigned int entry_shift;
        unsigned int entry_mask;
+        /*
+         * Compute a mask which selects the address bits which overlap between
+         * 1. those used to select the cache set during indexing
+         * 2. those in the physical page number.
+         */
+        unsigned int alias_mask;
+        unsigned int n_aliases;         /* Number of aliases */
        unsigned long flags;
 };
-/* Flush (write-back only) a region (smaller than a page) */
-extern void __flush_wback_region(void *start, int size);
-/* Flush (write-back & invalidate) a region (smaller than a page) */
-extern void __flush_purge_region(void *start, int size);
-/* Flush (invalidate only) a region (smaller than a page) */
-extern void __flush_invalidate_region(void *start, int size);
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_CACHE_H */
diff --git a/include/asm-sh/cacheflush.h b/include/asm-sh/cacheflush.h
index 9dfb33edb008..07f62ec9ff0c 100644
--- a/include/asm-sh/cacheflush.h
+++ b/include/asm-sh/cacheflush.h
@@ -2,6 +2,7 @@
 #define __ASM_SH_CACHEFLUSH_H
 #ifdef __KERNEL__
+#include <linux/mm.h>
 #include <asm/cpu/cacheflush.h>
 /* Flush (write-back only) a region (smaller than a page) */
@@ -27,5 +28,7 @@ extern void __flush_invalidate_region(void *start, int size);
                memcpy(dst, src, len);                          \
        } while (0)
+#define HAVE_ARCH_UNMAPPED_AREA
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_CACHEFLUSH_H */
diff --git a/include/asm-sh/cat68701/io.h b/include/asm-sh/cat68701/io.h
deleted file mode 100644
index 753b8466ad11..000000000000
--- a/include/asm-sh/cat68701/io.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * include/asm-sh/io_cat68701.h
- *
- * Copyright 2000 Stuart Menefy (stuart.menefy@st.com)
- *           2001 Yutarou Ebihar (ebihara@si-linux.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * IO functions for an AONE Corp. CAT-68701 SH7708 Borad
- */
-#ifndef _ASM_SH_IO_CAT68701_H
-#define _ASM_SH_IO_CAT68701_H
-extern unsigned long cat68701_isa_port2addr(unsigned long offset);
-extern int cat68701_irq_demux(int irq);
-extern void init_cat68701_IRQ(void);
-extern void heartbeat_cat68701(void);
-#endif /* _ASM_SH_IO_CAT68701_H */
diff --git a/include/asm-sh/checksum.h b/include/asm-sh/checksum.h
index fa03b30c4269..08168afe6746 100644
--- a/include/asm-sh/checksum.h
+++ b/include/asm-sh/checksum.h
@@ -159,6 +159,7 @@ static __inline__ unsigned short ip_compute_csum(unsigned char * buff, int len)
 }
 #define _HAVE_ARCH_IPV6_CSUM
+#ifdef CONFIG_IPV6
 static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
                                                     struct in6_addr *daddr,
                                                     __u32 len,
@@ -194,6 +195,7 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
        return csum_fold(sum);
 }
+#endif
 /* 
 *      Copy and checksum to user
diff --git a/include/asm-sh/cpu-features.h b/include/asm-sh/cpu-features.h
new file mode 100644
index 000000000000..4bccd7c032f9
--- /dev/null
+++ b/include/asm-sh/cpu-features.h
@@ -0,0 +1,24 @@
+#ifndef __ASM_SH_CPU_FEATURES_H
+#define __ASM_SH_CPU_FEATURES_H
+/*
+ * Processor flags
+ *
+ * Note: When adding a new flag, keep cpu_flags[] in
+ * arch/sh/kernel/setup.c in sync so symbolic name
+ * mapping of the processor flags has a chance of being
+ * reasonably accurate.
+ *
+ * These flags are also available through the ELF
+ * auxiliary vector as AT_HWCAP.
+ */
+#define CPU_HAS_FPU             0x0001  /* Hardware FPU support */
+#define CPU_HAS_P2_FLUSH_BUG    0x0002  /* Need to flush the cache in P2 area */
+#define CPU_HAS_MMU_PAGE_ASSOC  0x0004  /* SH3: TLB way selection bit support */
+#define CPU_HAS_DSP             0x0008  /* SH-DSP: DSP support */
+#define CPU_HAS_PERF_COUNTER    0x0010  /* Hardware performance counters */
+#define CPU_HAS_PTEA            0x0020  /* PTEA register */
+#define CPU_HAS_LLSC            0x0040  /* movli.l/movco.l */
+#define CPU_HAS_L2_CACHE        0x0080  /* Secondary cache / URAM */
+#endif /* __ASM_SH_CPU_FEATURES_H */
diff --git a/include/asm-sh/cpu-sh2/shmparam.h b/include/asm-sh/cpu-sh2/shmparam.h
deleted file mode 100644
index 817c1821ee4b..000000000000
--- a/include/asm-sh/cpu-sh2/shmparam.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-sh/cpu-sh2/shmparam.h
- *
- * Copyright (C) 2003  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#ifndef __ASM_CPU_SH2_SHMPARAM_H
-#define __ASM_CPU_SH2_SHMPARAM_H
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-#endif /* __ASM_CPU_SH2_SHMPARAM_H */
diff --git a/include/asm-sh/cpu-sh3/cache.h b/include/asm-sh/cpu-sh3/cache.h
index 406aa8d9b947..ffe08d2813f9 100644
--- a/include/asm-sh/cpu-sh3/cache.h
+++ b/include/asm-sh/cpu-sh3/cache.h
@@ -26,12 +26,10 @@
 #define CCR_CACHE_ENABLE        CCR_CACHE_CE
 #define CCR_CACHE_INVALIDATE    CCR_CACHE_CF
-#if defined(CONFIG_CPU_SUBTYPE_SH7705)
+#if defined(CONFIG_CPU_SUBTYPE_SH7705) || defined(CONFIG_CPU_SUBTYPE_SH7710)
 #define CCR3    0xa40000b4
 #define CCR_CACHE_16KB  0x00010000
 #define CCR_CACHE_32KB  0x00020000
 #endif
 #endif /* __ASM_CPU_SH3_CACHE_H */
diff --git a/include/asm-sh/cpu-sh3/cacheflush.h b/include/asm-sh/cpu-sh3/cacheflush.h
index f51aed00c68f..03fde97a7fd0 100644
--- a/include/asm-sh/cpu-sh3/cacheflush.h
+++ b/include/asm-sh/cpu-sh3/cacheflush.h
@@ -10,7 +10,7 @@
 #ifndef __ASM_CPU_SH3_CACHEFLUSH_H
 #define __ASM_CPU_SH3_CACHEFLUSH_H
-/* 
+/*
 * Cache flushing:
 *
 *  - flush_cache_all() flushes entire cache
@@ -35,53 +35,33 @@
 /* 32KB cache, 4kb PAGE sizes need to check bit 12 */
 #define CACHE_ALIAS 0x00001000
-struct page;
-struct mm_struct;
-struct vm_area_struct;
-extern void flush_cache_all(void);
-extern void flush_cache_mm(struct mm_struct *mm);
-extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
-                              unsigned long end);
-extern void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn);
-extern void flush_dcache_page(struct page *pg);
-extern void flush_icache_range(unsigned long start, unsigned long end);
-extern void flush_icache_page(struct vm_area_struct *vma, struct page *page);
-#define flush_dcache_mmap_lock(mapping)         do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-/* SH3 has unified cache so no special action needed here */
-#define flush_cache_sigtramp(vaddr)             do { } while (0)
-#define flush_page_to_ram(page)                 do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
-#define p3_cache_init()                         do { } while (0)
 #define PG_mapped       PG_arch_1
-/* We provide our own get_unmapped_area to avoid cache alias issue */
+void flush_cache_all(void);
-#define HAVE_ARCH_UNMAPPED_AREA
+void flush_cache_mm(struct mm_struct *mm);
+void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
+                              unsigned long end);
+void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn);
+void flush_dcache_page(struct page *pg);
+void flush_icache_range(unsigned long start, unsigned long end);
+void flush_icache_page(struct vm_area_struct *vma, struct page *page);
 #else
 #define flush_cache_all()                       do { } while (0)
 #define flush_cache_mm(mm)                      do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
-#define flush_dcache_mmap_lock(mapping)         do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
 #define flush_icache_range(start, end)          do { } while (0)
 #define flush_icache_page(vma,pg)               do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
+#endif
-#define flush_cache_sigtramp(vaddr)             do { } while (0)
-#define p3_cache_init()                         do { } while (0)
+#define flush_dcache_mmap_lock(mapping)         do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-#define HAVE_ARCH_UNMAPPED_AREA
+/* SH3 has unified cache so no special action needed here */
+#define flush_cache_sigtramp(vaddr)             do { } while (0)
+#define flush_icache_user_range(vma,pg,adr,len) do { } while (0)
-#endif
+#define p3_cache_init()                         do { } while (0)
 #endif /* __ASM_CPU_SH3_CACHEFLUSH_H */
diff --git a/include/asm-sh/cpu-sh3/freq.h b/include/asm-sh/cpu-sh3/freq.h
index b61b6e331df0..273f3229785c 100644
--- a/include/asm-sh/cpu-sh3/freq.h
+++ b/include/asm-sh/cpu-sh3/freq.h
@@ -18,5 +18,9 @@
 #define MIN_DIVISOR_NR          0
 #define MAX_DIVISOR_NR          4
+#define FRQCR_CKOEN     0x0100
+#define FRQCR_PLLEN     0x0080
+#define FRQCR_PSTBY     0x0040
 #endif /* __ASM_CPU_SH3_FREQ_H */
diff --git a/include/asm-sh/cpu-sh3/mmu_context.h b/include/asm-sh/cpu-sh3/mmu_context.h
index a844ea0965b6..bccb7ddb438b 100644
--- a/include/asm-sh/cpu-sh3/mmu_context.h
+++ b/include/asm-sh/cpu-sh3/mmu_context.h
@@ -27,8 +27,12 @@
 #define TRA     0xffffffd0
 #define EXPEVT  0xffffffd4
-#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+#if defined(CONFIG_CPU_SUBTYPE_SH7707) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+    defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7706) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7300) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7705) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7710)
 #define INTEVT  0xa4000000      /* INTEVTE2(0xa4000000) */
 #else
 #define INTEVT  0xffffffd8
diff --git a/include/asm-sh/cpu-sh3/shmparam.h b/include/asm-sh/cpu-sh3/shmparam.h
deleted file mode 100644
index da5b5eec81ee..000000000000
--- a/include/asm-sh/cpu-sh3/shmparam.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * include/asm-sh/cpu-sh3/shmparam.h
- *
- * Copyright (C) 1999 Niibe Yutaka
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#ifndef __ASM_CPU_SH3_SHMPARAM_H
-#define __ASM_CPU_SH3_SHMPARAM_H
-#define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-#endif /* __ASM_CPU_SH3_SHMPARAM_H */
diff --git a/include/asm-sh/cpu-sh3/timer.h b/include/asm-sh/cpu-sh3/timer.h
index 3d8e95e8d10c..b2394cf76f49 100644
--- a/include/asm-sh/cpu-sh3/timer.h
+++ b/include/asm-sh/cpu-sh3/timer.h
@@ -20,9 +20,14 @@
 *      SH7710
 *      SH7720
 *      SH7300
+ *      SH7710
 * ---------------------------------------------------------------------------
 */
+#if !defined(CONFIG_CPU_SUBTYPE_SH7727)
+#define TMU_TOCR        0xfffffe90      /* Byte access */
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7710)
 #define TMU_TSTR        0xa412fe92      /* Byte access */
@@ -39,9 +44,6 @@
 #define TMU2_TCR        0xa412feb4      /* Word access */
 #else
-#if !defined(CONFIG_CPU_SUBTYPE_SH7727)
-#define TMU_TOCR        0xfffffe90      /* Byte access */
-#endif
 #define TMU_TSTR        0xfffffe92      /* Byte access */
 #define TMU0_TCOR       0xfffffe94      /* Long access */
diff --git a/include/asm-sh/cpu-sh3/ubc.h b/include/asm-sh/cpu-sh3/ubc.h
index 0f809dec4e17..9d308cbe9b29 100644
--- a/include/asm-sh/cpu-sh3/ubc.h
+++ b/include/asm-sh/cpu-sh3/ubc.h
@@ -11,6 +11,19 @@
 #ifndef __ASM_CPU_SH3_UBC_H
 #define __ASM_CPU_SH3_UBC_H
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+#define UBC_BARA                0xa4ffffb0
+#define UBC_BAMRA               0xa4ffffb4
+#define UBC_BBRA                0xa4ffffb8
+#define UBC_BASRA               0xffffffe4
+#define UBC_BARB                0xa4ffffa0
+#define UBC_BAMRB               0xa4ffffa4
+#define UBC_BBRB                0xa4ffffa8
+#define UBC_BASRB               0xffffffe8
+#define UBC_BDRB                0xa4ffff90
+#define UBC_BDMRB               0xa4ffff94
+#define UBC_BRCR                0xa4ffff98
+#else
 #define UBC_BARA                0xffffffb0
 #define UBC_BAMRA               0xffffffb4
 #define UBC_BBRA                0xffffffb8
@@ -22,6 +35,6 @@
 #define UBC_BDRB                0xffffff90
 #define UBC_BDMRB               0xffffff94
 #define UBC_BRCR                0xffffff98
+#endif
 #endif /* __ASM_CPU_SH3_UBC_H */
diff --git a/include/asm-sh/cpu-sh4/addrspace.h b/include/asm-sh/cpu-sh4/addrspace.h
index 727634d886ce..bb2e1b03060c 100644
--- a/include/asm-sh/cpu-sh4/addrspace.h
+++ b/include/asm-sh/cpu-sh4/addrspace.h
@@ -22,5 +22,8 @@
 #define P4SEG_TLB_DATA  0xf7000000
 #define P4SEG_REG_BASE  0xff000000
+#define PA_AREA5_IO     0xb4000000      /* Area 5 IO Memory */
+#define PA_AREA6_IO     0xb8000000      /* Area 6 IO Memory */
 #endif /* __ASM_CPU_SH4_ADDRSPACE_H */
diff --git a/include/asm-sh/cpu-sh4/cache.h b/include/asm-sh/cpu-sh4/cache.h
index 1fe20359312c..6e9c7e6ee8e4 100644
--- a/include/asm-sh/cpu-sh4/cache.h
+++ b/include/asm-sh/cpu-sh4/cache.h
@@ -22,7 +22,9 @@
 #define CCR_CACHE_ICE   0x0100  /* Instruction Cache Enable */
 #define CCR_CACHE_ICI   0x0800  /* IC Invalidate */
 #define CCR_CACHE_IIX   0x8000  /* IC Index Enable */
+#ifndef CONFIG_CPU_SUBTYPE_SH7780
 #define CCR_CACHE_EMODE 0x80000000      /* EMODE Enable */
+#endif
 /* Default CCR setup: 8k+16k-byte cache,P1-wb,enable */
 #define CCR_CACHE_ENABLE        (CCR_CACHE_OCE|CCR_CACHE_ICE)
diff --git a/include/asm-sh/cpu-sh4/cacheflush.h b/include/asm-sh/cpu-sh4/cacheflush.h
index f323567e085f..515fd574267c 100644
--- a/include/asm-sh/cpu-sh4/cacheflush.h
+++ b/include/asm-sh/cpu-sh4/cacheflush.h
@@ -16,40 +16,29 @@
 *  caching; in which case they're only semi-broken),
 *  so we need them.
 */
+void flush_cache_all(void);
-/* Page is 4K, OC size is 16K, there are four lines. */
+void flush_cache_mm(struct mm_struct *mm);
-#define CACHE_ALIAS 0x00003000
+void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
+                       unsigned long end);
-struct page;
+void flush_cache_page(struct vm_area_struct *vma, unsigned long addr,
-struct mm_struct;
+                      unsigned long pfn);
-struct vm_area_struct;
+void flush_dcache_page(struct page *pg);
-extern void flush_cache_all(void);
-extern void flush_cache_mm(struct mm_struct *mm);
-extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
-                              unsigned long end);
-extern void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn);
-extern void flush_dcache_page(struct page *pg);
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
-extern void flush_icache_range(unsigned long start, unsigned long end);
+void flush_icache_range(unsigned long start, unsigned long end);
-extern void flush_cache_sigtramp(unsigned long addr);
+void flush_cache_sigtramp(unsigned long addr);
-extern void flush_icache_user_range(struct vm_area_struct *vma,
+void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-                                    struct page *page, unsigned long addr,
+                             unsigned long addr, int len);
-                                    int len);
 #define flush_icache_page(vma,pg)               do { } while (0)
 /* Initialization of P3 area for copy_user_page */
-extern void p3_cache_init(void);
+void p3_cache_init(void);
 #define PG_mapped       PG_arch_1
-/* We provide our own get_unmapped_area to avoid cache alias issue */
-#define HAVE_ARCH_UNMAPPED_AREA
 #ifdef CONFIG_MMU
 extern int remap_area_pages(unsigned long addr, unsigned long phys_addr,
                            unsigned long size, unsigned long flags);
@@ -61,4 +50,3 @@ static inline int remap_area_pages(unsigned long addr, unsigned long phys_addr,
 }
 #endif /* CONFIG_MMU */
 #endif /* __ASM_CPU_SH4_CACHEFLUSH_H */
diff --git a/include/asm-sh/cpu-sh4/dma-sh7780.h b/include/asm-sh/cpu-sh4/dma-sh7780.h
new file mode 100644
index 000000000000..6c90d28331b2
--- /dev/null
+++ b/include/asm-sh/cpu-sh4/dma-sh7780.h
@@ -0,0 +1,39 @@
+#ifndef __ASM_SH_CPU_SH4_DMA_SH7780_H
+#define __ASM_SH_CPU_SH4_DMA_SH7780_H
+#define REQ_HE  0x000000C0
+#define REQ_H   0x00000080
+#define REQ_LE  0x00000040
+#define TM_BURST 0x0000020
+#define TS_8    0x00000000
+#define TS_16   0x00000008
+#define TS_32   0x00000010
+#define TS_16BLK        0x00000018
+#define TS_32BLK        0x00100000
+/*
+ * The SuperH DMAC supports a number of transmit sizes, we list them here,
+ * with their respective values as they appear in the CHCR registers.
+ *
+ * Defaults to a 64-bit transfer size.
+ */
+enum {
+        XMIT_SZ_8BIT,
+        XMIT_SZ_16BIT,
+        XMIT_SZ_32BIT,
+        XMIT_SZ_128BIT,
+        XMIT_SZ_256BIT,
+};
+/*
+ * The DMA count is defined as the number of bytes to transfer.
+ */
+static unsigned int __attribute__ ((used)) ts_shift[] = {
+        [XMIT_SZ_8BIT]          = 0,
+        [XMIT_SZ_16BIT]         = 1,
+        [XMIT_SZ_32BIT]         = 2,
+        [XMIT_SZ_128BIT]        = 4,
+        [XMIT_SZ_256BIT]        = 5,
+};
+#endif /* __ASM_SH_CPU_SH4_DMA_SH7780_H */
diff --git a/include/asm-sh/cpu-sh4/dma.h b/include/asm-sh/cpu-sh4/dma.h
index 0dfe61f14802..3e4b3e6d80c0 100644
--- a/include/asm-sh/cpu-sh4/dma.h
+++ b/include/asm-sh/cpu-sh4/dma.h
@@ -1,11 +1,17 @@
 #ifndef __ASM_CPU_SH4_DMA_H
 #define __ASM_CPU_SH4_DMA_H
+#define DMAOR_INIT      ( 0x8000 | DMAOR_DME )
 #ifdef CONFIG_CPU_SH4A
 #define SH_DMAC_BASE    0xfc808020
+#define CHCR_TS_MASK    0x18
+#define CHCR_TS_SHIFT   3
+#include <asm/cpu/dma-sh7780.h>
 #else
 #define SH_DMAC_BASE    0xffa00000
-#endif
 /* Definitions for the SuperH DMAC */
 #define TM_BURST        0x0000080
@@ -19,8 +25,6 @@
 #define DMAOR_COD       0x00000008
-#define DMAOR_INIT      ( 0x8000 | DMAOR_DME )
 /*
 * The SuperH DMAC supports a number of transmit sizes, we list them here,
 * with their respective values as they appear in the CHCR registers.
@@ -45,5 +49,6 @@ static unsigned int ts_shift[] __attribute__ ((used)) = {
        [XMIT_SZ_32BIT]         = 2,
        [XMIT_SZ_256BIT]        = 5,
 };
+#endif
 #endif /* __ASM_CPU_SH4_DMA_H */
diff --git a/include/asm-sh/cpu-sh4/shmparam.h b/include/asm-sh/cpu-sh4/shmparam.h
deleted file mode 100644
index a5a0aa9425fe..000000000000
--- a/include/asm-sh/cpu-sh4/shmparam.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * include/asm-sh/cpu-sh4/shmparam.h
- *
- * Copyright (C) 1999 Niibe Yutaka
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#ifndef __ASM_CPU_SH4_SHMPARAM_H
-#define __ASM_CPU_SH4_SHMPARAM_H
-/*
- * SH-4 has D-cache alias issue
- */
-#define SHMLBA (PAGE_SIZE*4)             /* attach addr a multiple of this */
-#endif /* __ASM_CPU_SH4_SHMPARAM_H */
diff --git a/include/asm-sh/cpu-sh4/sq.h b/include/asm-sh/cpu-sh4/sq.h
index 366b09166d3b..586d6491816a 100644
--- a/include/asm-sh/cpu-sh4/sq.h
+++ b/include/asm-sh/cpu-sh4/sq.h
@@ -17,7 +17,7 @@
 * Store queues range from e0000000-e3fffffc, allowing approx. 64MB to be
 * mapped to any physical address space. Since data is written (and aligned)
 * to 32-byte boundaries, we need to be sure that all allocations are aligned.
- */ 
+ */
 #define SQ_SIZE                 32
 #define SQ_ALIGN_MASK           (~(SQ_SIZE - 1))
 #define SQ_ALIGN(addr)          (((addr)+SQ_SIZE-1) & SQ_ALIGN_MASK)
@@ -26,23 +26,10 @@
 #define SQ_QACR1                (P4SEG_REG_BASE  + 0x3c)
 #define SQ_ADDRMAX              (P4SEG_STORE_QUE + 0x04000000)
-struct sq_mapping {
-        const char *name;
-        unsigned long sq_addr;
-        unsigned long addr;
-        unsigned int size;
-        struct list_head list;
-};
 /* arch/sh/kernel/cpu/sh4/sq.c */
-extern struct sq_mapping *sq_remap(unsigned long phys, unsigned int size, const char *name);
+unsigned long sq_remap(unsigned long phys, unsigned int size,
-extern void sq_unmap(struct sq_mapping *map);
+                       const char *name, unsigned long flags);
+void sq_unmap(unsigned long vaddr);
-extern void sq_clear(unsigned long addr, unsigned int len);
+void sq_flush_range(unsigned long start, unsigned int len);
-extern void sq_flush(void *addr);
-extern void sq_flush_range(unsigned long start, unsigned int len);
 #endif /* __ASM_CPU_SH4_SQ_H */
diff --git a/include/asm-sh/cqreek/cqreek.h b/include/asm-sh/cqreek/cqreek.h
deleted file mode 100644
index 09aecc06693e..000000000000
--- a/include/asm-sh/cqreek/cqreek.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __ASM_SH_CQREEK_CQREEK_H
-#define __ASM_SH_CQREEK_CQREEK_H
-#define BRIDGE_FEATURE          0x0002
-#define BRIDGE_IDE_CTRL         0x0018
-#define BRIDGE_IDE_INTR_LVL     0x001A
-#define BRIDGE_IDE_INTR_MASK    0x001C
-#define BRIDGE_IDE_INTR_STAT    0x001E
-#define BRIDGE_ISA_CTRL         0x0028
-#define BRIDGE_ISA_INTR_LVL     0x002A
-#define BRIDGE_ISA_INTR_MASK    0x002C
-#define BRIDGE_ISA_INTR_STAT    0x002E
-/* arch/sh/boards/cqreek/setup.c */
-extern void setup_cqreek(void);
-/* arch/sh/boards/cqreek/irq.c */
-extern int cqreek_has_ide, cqreek_has_isa;
-extern void init_cqreek_IRQ(void);
-/* arch/sh/boards/cqreek/io.c */
-extern unsigned long cqreek_port2addr(unsigned long port);
-#endif /* __ASM_SH_CQREEK_CQREEK_H */
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index 124968f9866e..56cd4b977232 100644
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -141,25 +141,35 @@ static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
        }
 }
-static void dma_sync_single_for_cpu(struct device *dev,
+static inline void dma_sync_single_for_cpu(struct device *dev,
-                                    dma_addr_t dma_handle, size_t size,
+                                           dma_addr_t dma_handle, size_t size,
-                                    enum dma_data_direction dir)
+                                           enum dma_data_direction dir)
-        __attribute__ ((alias("dma_sync_single")));
+{
+        dma_sync_single(dev, dma_handle, size, dir);
+}
+static inline void dma_sync_single_for_device(struct device *dev,
+                                              dma_addr_t dma_handle,
+                                              size_t size,
+                                              enum dma_data_direction dir)
+{
+        dma_sync_single(dev, dma_handle, size, dir);
+}
-static void dma_sync_single_for_device(struct device *dev,
+static inline void dma_sync_sg_for_cpu(struct device *dev,
-                                       dma_addr_t dma_handle, size_t size,
+                                       struct scatterlist *sg, int nelems,
                                       enum dma_data_direction dir)
-        __attribute__ ((alias("dma_sync_single")));
+{
+        dma_sync_sg(dev, sg, nelems, dir);
+}
-static void dma_sync_sg_for_cpu(struct device *dev,
+static inline void dma_sync_sg_for_device(struct device *dev,
-                                struct scatterlist *sg, int nelems,
+                                          struct scatterlist *sg, int nelems,
-                                enum dma_data_direction dir)
+                                          enum dma_data_direction dir)
-        __attribute__ ((alias("dma_sync_sg")));
+{
+        dma_sync_sg(dev, sg, nelems, dir);
+}
-static void dma_sync_sg_for_device(struct device *dev,
-                                   struct scatterlist *sg, int nelems,
-                                   enum dma_data_direction dir)
-        __attribute__ ((alias("dma_sync_sg")));
 static inline int dma_get_cache_alignment(void)
 {
@@ -174,6 +184,4 @@ static inline int dma_mapping_error(dma_addr_t dma_addr)
 {
        return dma_addr == 0;
 }
 #endif /* __ASM_SH_DMA_MAPPING_H */
diff --git a/include/asm-sh/dma.h b/include/asm-sh/dma.h
index e62a6d0ed932..d9daa028689f 100644
--- a/include/asm-sh/dma.h
+++ b/include/asm-sh/dma.h
@@ -89,6 +89,7 @@ struct dma_channel {
        wait_queue_head_t wait_queue;
        struct sys_device dev;
+        char *name;
 };
 struct dma_info {
diff --git a/include/asm-sh/dmida/io.h b/include/asm-sh/dmida/io.h
deleted file mode 100644
index 21bd416c01c3..000000000000
--- a/include/asm-sh/dmida/io.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_SH_DMIDA_IO_H
-#define __ASM_SH_DMIDA_IO_H
-/*
- * Nothing special here.. just use the generic cchip io routines.
- */
-#include <asm/hd64465/io.h>
-#endif /* __ASM_SH_DMIDA_IO_H */
diff --git a/include/asm-sh/ec3104/keyboard.h b/include/asm-sh/ec3104/keyboard.h
index 0dee7b05b49d..c1253a683197 100644
--- a/include/asm-sh/ec3104/keyboard.h
+++ b/include/asm-sh/ec3104/keyboard.h
@@ -6,8 +6,6 @@ extern char ec3104_kbd_unexpected_up(unsigned char);
 extern void ec3104_kbd_leds(unsigned char);
 extern void ec3104_kbd_init_hw(void);
-#define SYSRQ_KEY 0x54
 #define kbd_sysrq_xlate ec3104_kbd_sysrq_xlate
 #define kbd_setkeycode ec3104_kbd_setkeycode
 #define kbd_getkeycode ec3104_kbd_getkeycode
diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h
index 1b63dfeea4f2..3a07ab40ac4d 100644
--- a/include/asm-sh/elf.h
+++ b/include/asm-sh/elf.h
@@ -1,6 +1,11 @@
 #ifndef __ASM_SH_ELF_H
 #define __ASM_SH_ELF_H
+#include <asm/processor.h>
+#include <asm/auxvec.h>
+#include <asm/ptrace.h>
+#include <asm/user.h>
 /* SH relocation types  */
 #define R_SH_NONE               0
 #define R_SH_DIR32              1
@@ -46,9 +51,6 @@
 * ELF register definitions..
 */
-#include <asm/ptrace.h>
-#include <asm/user.h>
 typedef unsigned long elf_greg_t;
 #define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
@@ -91,7 +93,7 @@ typedef struct user_fpu_struct elf_fpregset_t;
   instruction set this CPU supports.  This could be done in user space,
   but it's not easy, and we've already done it here.  */
-#define ELF_HWCAP       (0)
+#define ELF_HWCAP       (boot_cpu_data.flags)
 /* This yields a string that ld.so will use to load implementation
   specific libraries for optimization.  This is more specific in
@@ -119,4 +121,24 @@ extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);
 #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
 #endif
+#ifdef CONFIG_VSYSCALL
+/* vDSO has arch_setup_additional_pages */
+#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
+struct linux_binprm;
+extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+                                       int executable_stack);
+extern unsigned int vdso_enabled;
+extern void __kernel_vsyscall;
+#define VDSO_BASE               ((unsigned long)current->mm->context.vdso)
+#define VDSO_SYM(x)             (VDSO_BASE + (unsigned long)(x))
+#define ARCH_DLINFO                                             \
+do {                                                            \
+        if (vdso_enabled)                                       \
+                NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);        \
+} while (0)
+#endif /* CONFIG_VSYSCALL */
 #endif /* __ASM_SH_ELF_H */
diff --git a/include/asm-sh/fixmap.h b/include/asm-sh/fixmap.h
index 412bccaa07e6..458e9fa59545 100644
--- a/include/asm-sh/fixmap.h
+++ b/include/asm-sh/fixmap.h
@@ -25,7 +25,7 @@
 * addresses. The point is to have a constant address at
 * compile time, but to set the physical address only
 * in the boot process. We allocate these special  addresses
- * from the end of virtual memory (0xfffff000) backwards.
+ * from the end of P3 backwards.
 * Also this lets us do fail-safe vmalloc(), we
 * can guarantee that these special addresses and
 * vmalloc()-ed addresses never overlap.
diff --git a/include/asm-sh/flat.h b/include/asm-sh/flat.h
index f29072e1c87e..0d5cc04ab005 100644
--- a/include/asm-sh/flat.h
+++ b/include/asm-sh/flat.h
@@ -13,7 +13,7 @@
 #define __ASM_SH_FLAT_H
 #define flat_stack_align(sp)                    /* nothing needed */
-#define flat_argvp_envp_on_stack()              1
+#define flat_argvp_envp_on_stack()              0
 #define flat_old_ram_flag(flags)                (flags)
 #define flat_reloc_valid(reloc, size)           ((reloc) <= (size))
 #define flat_get_addr_from_rp(rp, relval, flags)        get_unaligned(rp)
diff --git a/include/asm-sh/harp/harp.h b/include/asm-sh/harp/harp.h
deleted file mode 100644
index b2fbcfae9940..000000000000
--- a/include/asm-sh/harp/harp.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* 
- * Copyright (C) 2001 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- * Defintions applicable to the STMicroelectronics ST40STB1 HARP and
- * compatible boards.
- */
-#if defined(CONFIG_SH_STB1_HARP)
-#define EPLD_BASE     0xa0800000
-#define EPLD_LED      (EPLD_BASE+0x000c0000)
-#define EPLD_INTSTAT0 (EPLD_BASE+0x00200000)
-#define EPLD_INTSTAT1 (EPLD_BASE+0x00240000)
-#define EPLD_INTMASK0 (EPLD_BASE+0x00280000)
-#define EPLD_INTMASK1 (EPLD_BASE+0x002c0000)
-#define EPLD_PAGEADDR (EPLD_BASE+0x00300000)
-#define EPLD_REVID1   (EPLD_BASE+0x00380000)
-#define EPLD_REVID2   (EPLD_BASE+0x003c0000)
-#define EPLD_LED_ON  1
-#define EPLD_LED_OFF 0
-#elif defined(CONFIG_SH_STB1_OVERDRIVE)
-#define EPLD_BASE     0xa7000000
-#define EPLD_REVID    (EPLD_BASE+0x00000000)
-#define EPLD_LED      (EPLD_BASE+0x00040000)
-#define EPLD_INTMASK0 (EPLD_BASE+0x001c0000)
-#define EPLD_INTMASK1 (EPLD_BASE+0x00200000)
-#define EPLD_INTSTAT0 (EPLD_BASE+0x00240000)
-#define EPLD_INTSTAT1 (EPLD_BASE+0x00280000)
-#define EPLD_LED_ON  0
-#define EPLD_LED_OFF 1
-#else
-#error Unknown board
-#endif
diff --git a/include/asm-sh/harp/io.h b/include/asm-sh/harp/io.h
deleted file mode 100644
index 68f39e0b39de..000000000000
--- a/include/asm-sh/harp/io.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_SH_HARP_IO_H
-#define __ASM_SH_HARP_IO_H
-/*
- * Nothing special here.. just use the generic cchip io routines.
- */
-#include <asm/hd64465/io.h>
-#endif /* __ASM_SH_HARP_IO_H */
diff --git a/include/asm-sh/hd64461/hd64461.h b/include/asm-sh/hd64461.h
index 87f13d24c630..27e5c34e2659 100644
--- a/include/asm-sh/hd64461/hd64461.h
+++ b/include/asm-sh/hd64461.h
@@ -40,7 +40,12 @@
 #define HD64461_LCDCBAR         0x11000
 #define HD64461_LCDCLOR         0x11002
 #define HD64461_LCDCCR          0x11004
-#define HD64461_LCDCCR_MOFF     0x80
+#define HD64461_LCDCCR_STBACK   0x0400
+#define HD64461_LCDCCR_STREQ    0x0100
+#define HD64461_LCDCCR_MOFF     0x0080
+#define HD64461_LCDCCR_REFSEL   0x0040
+#define HD64461_LCDCCR_EPON     0x0020
+#define HD64461_LCDCCR_SPON     0x0010
 #define HD64461_LDR1            0x11010
 #define HD64461_LDR1_DON        0x01
@@ -54,9 +59,9 @@
 #define HD64461_LDVSPR          0x1101c
 #define HD64461_LDR3            0x1101e
-#define HD64461_CPTWAR          0x11030 
+#define HD64461_CPTWAR          0x11030
 #define HD64461_CPTWDR          0x11032
-#define HD64461_CPTRAR          0x11034 
+#define HD64461_CPTRAR          0x11034
 #define HD64461_CPTRDR          0x11036
 #define HD64461_GRDOR           0x11040
@@ -111,7 +116,7 @@
 #define HD64461_PCCISR_BVD1             0x01    /* battery 1 */
 #define HD64461_PCCISR_PCD_MASK         0x0c    /* card detect */
-#define HD64461_PCCISR_BVD_MASK 0x03    /* battery voltage */
+#define HD64461_PCCISR_BVD_MASK         0x03    /* battery voltage */
 #define HD64461_PCCISR_BVD_BATGOOD      0x03    /* battery good */
 #define HD64461_PCCISR_BVD_BATWARN      0x01    /* battery low warning */
 #define HD64461_PCCISR_BVD_BATDEAD1     0x02    /* battery dead */
@@ -139,11 +144,11 @@
 /* PCC Card Status Change Interrupt Enable Register */
 #define HD64461_PCCCSCIER_CRE           0x80    /* change reset enable */
-#define HD64461_PCCCSCIER_IREQE_MASK    0x60   /* IREQ enable */
+#define HD64461_PCCCSCIER_IREQE_MASK    0x60   /* IREQ enable */
 #define HD64461_PCCCSCIER_IREQE_DISABLED        0x00   /* IREQ disabled */
-#define HD64461_PCCCSCIER_IREQE_LEVEL   0x20   /* IREQ level-triggered */
+#define HD64461_PCCCSCIER_IREQE_LEVEL   0x20   /* IREQ level-triggered */
 #define HD64461_PCCCSCIER_IREQE_FALLING 0x40   /* IREQ falling-edge-trig */
-#define HD64461_PCCCSCIER_IREQE_RISING  0x60   /* IREQ rising-edge-trig */
+#define HD64461_PCCCSCIER_IREQE_RISING  0x60   /* IREQ rising-edge-trig */
 #define HD64461_PCCCSCIER_SCE           0x10    /* status change enable */
 #define HD64461_PCCCSCIER_CDE           0x08    /* card detect change enable */
@@ -155,7 +160,6 @@
 #define HD64461_PCCSCR_VCC1             0x02    /* voltage control pin 1 */
 #define HD64461_PCCSCR_SWP              0x01    /* write protect */
 #define HD64461_P0OCR           0x1202a
 #define HD64461_P1OCR           0x1202c
 #define HD64461_PGCR            0x1202e
@@ -180,23 +184,25 @@
 #define HD64461_NIRR            0x15000
 #define HD64461_NIMR            0x15002
-#ifndef CONFIG_HD64461_IOBASE
-#define CONFIG_HD64461_IOBASE   0xb0000000
-#endif
-#ifndef CONFIG_HD64461_IRQ
-#define CONFIG_HD64461_IRQ      36
-#endif
 #define HD64461_IRQBASE         OFFCHIP_IRQ_BASE
-#define HD64461_IRQ_NUM         16
+#define HD64461_IRQ_NUM         16
-#define HD64461_IRQ_UART        (HD64461_IRQBASE+5)
+#define HD64461_IRQ_UART        (HD64461_IRQBASE+5)
-#define HD64461_IRQ_IRDA        (HD64461_IRQBASE+6)
+#define HD64461_IRQ_IRDA        (HD64461_IRQBASE+6)
-#define HD64461_IRQ_TMU1        (HD64461_IRQBASE+9)
+#define HD64461_IRQ_TMU1        (HD64461_IRQBASE+9)
-#define HD64461_IRQ_TMU0        (HD64461_IRQBASE+10)
+#define HD64461_IRQ_TMU0        (HD64461_IRQBASE+10)
-#define HD64461_IRQ_GPIO        (HD64461_IRQBASE+11)
+#define HD64461_IRQ_GPIO        (HD64461_IRQBASE+11)
-#define HD64461_IRQ_AFE         (HD64461_IRQBASE+12)
+#define HD64461_IRQ_AFE         (HD64461_IRQBASE+12)
-#define HD64461_IRQ_PCC1        (HD64461_IRQBASE+13)
+#define HD64461_IRQ_PCC1        (HD64461_IRQBASE+13)
-#define HD64461_IRQ_PCC0        (HD64461_IRQBASE+14)
+#define HD64461_IRQ_PCC0        (HD64461_IRQBASE+14)
+#define __IO_PREFIX     hd64461
+#include <asm/io_generic.h>
+/* arch/sh/cchips/hd6446x/hd64461/setup.c */
+int hd64461_irq_demux(int irq);
+void hd64461_register_irq_demux(int irq,
+                                int (*demux) (int irq, void *dev), void *dev);
+void hd64461_unregister_irq_demux(int irq);
 #endif
diff --git a/include/asm-sh/hd64461/io.h b/include/asm-sh/hd64461/io.h
deleted file mode 100644
index 67f2489088d9..000000000000
--- a/include/asm-sh/hd64461/io.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * include/asm-sh/io_hd64461.h
- *
- * Copyright 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * IO functions for an HD64461
- */
-#ifndef _ASM_SH_IO_HD64461_H
-#define _ASM_SH_IO_HD64461_H
-extern unsigned char hd64461_inb(unsigned long port);
-extern unsigned short hd64461_inw(unsigned long port);
-extern unsigned int hd64461_inl(unsigned long port);
-extern void hd64461_outb(unsigned char value, unsigned long port);
-extern void hd64461_outw(unsigned short value, unsigned long port);
-extern void hd64461_outl(unsigned int value, unsigned long port);
-extern unsigned char hd64461_inb_p(unsigned long port);
-extern void hd64461_outb_p(unsigned char value, unsigned long port);
-extern void hd64461_insb(unsigned long port, void *addr, unsigned long count);
-extern void hd64461_insw(unsigned long port, void *addr, unsigned long count);
-extern void hd64461_insl(unsigned long port, void *addr, unsigned long count);
-extern void hd64461_outsb(unsigned long port, const void *buffer, unsigned long count);
-extern void hd64461_outsw(unsigned long port, const void *buffer, unsigned long count);
-extern void hd64461_outsl(unsigned long port, const void *buffer, unsigned long count);
-extern unsigned short hd64461_readw(unsigned long addr);
-extern void hd64461_writew(unsigned short b, unsigned long addr);
-extern int hd64461_irq_demux(int irq);
-extern void hd64461_register_irq_demux(int irq,
-                int (*demux)(int irq, void *dev), void *dev);
-extern void hd64461_unregister_irq_demux(int irq);
-#endif /* _ASM_SH_IO_HD64461_H */
diff --git a/include/asm-sh/hp6xx/hp6xx.h b/include/asm-sh/hp6xx/hp6xx.h
index a26247fd3d87..f35134c159dd 100644
--- a/include/asm-sh/hp6xx/hp6xx.h
+++ b/include/asm-sh/hp6xx/hp6xx.h
@@ -2,16 +2,33 @@
 #define __ASM_SH_HP6XX_H
 /*
- * Copyright (C) 2003  Andriy Skulysh
+ * Copyright (C) 2003, 2004, 2005  Andriy Skulysh
+ *
+ * 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.
+ *
 */
-#define HP680_TS_IRQ IRQ3_IRQ
+#define HP680_BTN_IRQ           IRQ0_IRQ
+#define HP680_TS_IRQ            IRQ3_IRQ
+#define HP680_HD64461_IRQ       IRQ4_IRQ
 #define DAC_LCD_BRIGHTNESS      0
 #define DAC_SPEAKER_VOLUME      1
+#define PGDR_OPENED             0x01
+#define PGDR_MAIN_BATTERY_OUT   0x04
+#define PGDR_PLAY_BUTTON        0x08
+#define PGDR_REWIND_BUTTON      0x10
+#define PGDR_RECORD_BUTTON      0x20
 #define PHDR_TS_PEN_DOWN        0x08
+#define PJDR_LED_BLINK          0x02
+#define PKDR_LED_GREEN          0x10
 #define SCPDR_TS_SCAN_ENABLE    0x20
 #define SCPDR_TS_SCAN_Y         0x02
 #define SCPDR_TS_SCAN_X         0x01
@@ -21,11 +38,43 @@
 #define ADC_CHANNEL_TS_Y        1
 #define ADC_CHANNEL_TS_X        2
+#define ADC_CHANNEL_BATTERY     3
+#define ADC_CHANNEL_BACKUP      4
+#define ADC_CHANNEL_CHARGE      5
 #define HD64461_GPADR_SPEAKER   0x01
 #define HD64461_GPADR_PCMCIA0   (0x02|0x08)
 #define HD64461_GPBDR_LCDOFF    0x01
+#define HD64461_GPBDR_LCD_CONTRAST_MASK 0x78
 #define HD64461_GPBDR_LED_RED   0x80
+#include <asm/hd64461.h>
+#include <asm/io.h>
+#define PJDR    0xa4000130
+#define PKDR    0xa4000132
+static inline void hp6xx_led_red(int on)
+{
+        u16 v16;
+        v16 = ctrl_inw(CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
+        if (on)
+            ctrl_outw(v16 & (~HD64461_GPBDR_LED_RED), CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
+        else
+            ctrl_outw(v16 | HD64461_GPBDR_LED_RED, CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
+}
+static inline void hp6xx_led_green(int on)
+{
+        u8 v8;
+        v8 = ctrl_inb(PKDR);
+        if (on)
+            ctrl_outb(v8 & (~PKDR_LED_GREEN), PKDR);
+        else
+            ctrl_outb(v8 | PKDR_LED_GREEN, PKDR);
+}
 #endif /* __ASM_SH_HP6XX_H */
diff --git a/include/asm-sh/hp6xx/io.h b/include/asm-sh/hp6xx/io.h
index 731798003550..2044476ab199 100644
--- a/include/asm-sh/hp6xx/io.h
+++ b/include/asm-sh/hp6xx/io.h
@@ -4,7 +4,7 @@
 /*
 * Nothing special here.. just use the generic cchip io routines.
 */
-#include <asm/hd64461/io.h>
+#include <asm/hd64461.h>
 #endif /* __ASM_SH_HP6XX_IO_H */
diff --git a/include/asm-sh/hs7751rvoip/hs7751rvoip.h b/include/asm-sh/hs7751rvoip/hs7751rvoip.h
index 5f995f937a44..c4cff9d33927 100644
--- a/include/asm-sh/hs7751rvoip/hs7751rvoip.h
+++ b/include/asm-sh/hs7751rvoip/hs7751rvoip.h
@@ -19,8 +19,6 @@
 #define PA_OUTPORTR     0xa400000e      /* Output Port Reguster */
 #define PA_VERREG       0xa4000014      /* FPGA Version Register */
-#define PA_AREA5_IO     0xb4000000      /* Area 5 IO Memory */
-#define PA_AREA6_IO     0xb8000000      /* Area 6 IO Memory */
 #define PA_IDE_OFFSET   0x1f0           /* CF IDE Offset */
 #define IRLCNTR1        (PA_BCR + 0)    /* Interrupt Control Register1 */
@@ -44,4 +42,13 @@
 #define IRQ_RINGING     4               /* Ringing IRQ */
 #define IRQ_CODEC       5               /* CODEC IRQ */
+#define __IO_PREFIX     hs7751rvoip
+#include <asm/io_generic.h>
+/* arch/sh/boards/renesas/hs7751rvoip/irq.c */
+void init_hs7751rvoip_IRQ(void);
+/* arch/sh/boards/renesas/hs7751rvoip/io.c */
+void *hs7751rvoip_ioremap(unsigned long, unsigned long);
 #endif  /* __ASM_SH_RENESAS_HS7751RVOIP */
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index 894e64b2d5f0..ed12d38e8c00 100644
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -107,6 +107,9 @@
 #define __raw_writew(v, a)      __writew(v, (void __iomem *)(a))
 #define __raw_writel(v, a)      __writel(v, (void __iomem *)(a))
+void __raw_writesl(unsigned long addr, const void *data, int longlen);
+void __raw_readsl(unsigned long addr, void *data, int longlen);
 /*
 * The platform header files may define some of these macros to use
 * the inlined versions where appropriate.  These macros may also be
@@ -132,6 +135,9 @@
 # define writel(v,a)    ({ __raw_writel((v),(a)); mb(); })
 #endif
+#define writesl __raw_writesl
+#define readsl  __raw_readsl
 #define readb_relaxed(a) readb(a)
 #define readw_relaxed(a) readw(a)
 #define readl_relaxed(a) readl(a)
@@ -209,8 +215,14 @@ static inline void ctrl_outl(unsigned int b, unsigned long addr)
        *(volatile unsigned long*)addr = b;
 }
+static inline void ctrl_delay(void)
+{
+        ctrl_inw(P2SEG);
+}
 #define IO_SPACE_LIMIT 0xffffffff
+#ifdef CONFIG_MMU
 /*
 * Change virtual addresses to physical addresses and vv.
 * These are trivial on the 1:1 Linux/SuperH mapping
@@ -224,6 +236,10 @@ static inline void *phys_to_virt(unsigned long address)
 {
        return (void *)P1SEGADDR(address);
 }
+#else
+#define phys_to_virt(address)   ((void *)(address))
+#define virt_to_phys(address)   ((unsigned long)(address))
+#endif
 #define virt_to_bus virt_to_phys
 #define bus_to_virt phys_to_virt
diff --git a/include/asm-sh/irq-sh73180.h b/include/asm-sh/irq-sh73180.h
index d705252be260..b28af9a69d72 100644
--- a/include/asm-sh/irq-sh73180.h
+++ b/include/asm-sh/irq-sh73180.h
@@ -311,6 +311,4 @@
 #define IRQ6_PRIORITY   1
 #define IRQ7_PRIORITY   1
-int shmse_irq_demux(int irq);
 #endif /* __ASM_SH_IRQ_SH73180_H */
diff --git a/include/asm-sh/irq-sh7343.h b/include/asm-sh/irq-sh7343.h
new file mode 100644
index 000000000000..5d15419b53b0
--- /dev/null
+++ b/include/asm-sh/irq-sh7343.h
@@ -0,0 +1,317 @@
+#ifndef __ASM_SH_IRQ_SH7343_H
+#define __ASM_SH_IRQ_SH7343_H
+/*
+ * linux/include/asm-sh/irq-sh7343.h
+ *
+ * Copyright (C) 2006 Kenati Technologies Inc.
+ * Andre Mccurdy <andre@kenati.com>
+ * Ranjit Deshpande <ranjit@kenati.com>
+ */
+#undef INTC_IPRA
+#undef INTC_IPRB
+#undef INTC_IPRC
+#undef INTC_IPRD
+#undef DMTE0_IRQ
+#undef DMTE1_IRQ
+#undef DMTE2_IRQ
+#undef DMTE3_IRQ
+#undef DMTE4_IRQ
+#undef DMTE5_IRQ
+#undef DMTE6_IRQ
+#undef DMTE7_IRQ
+#undef DMAE_IRQ
+#undef DMA_IPR_ADDR
+#undef DMA_IPR_POS
+#undef DMA_PRIORITY
+#undef INTC_IMCR0
+#undef INTC_IMCR1
+#undef INTC_IMCR2
+#undef INTC_IMCR3
+#undef INTC_IMCR4
+#undef INTC_IMCR5
+#undef INTC_IMCR6
+#undef INTC_IMCR7
+#undef INTC_IMCR8
+#undef INTC_IMCR9
+#undef INTC_IMCR10
+#define INTC_IPRA       0xA4080000UL
+#define INTC_IPRB       0xA4080004UL
+#define INTC_IPRC       0xA4080008UL
+#define INTC_IPRD       0xA408000CUL
+#define INTC_IPRE       0xA4080010UL
+#define INTC_IPRF       0xA4080014UL
+#define INTC_IPRG       0xA4080018UL
+#define INTC_IPRH       0xA408001CUL
+#define INTC_IPRI       0xA4080020UL
+#define INTC_IPRJ       0xA4080024UL
+#define INTC_IPRK       0xA4080028UL
+#define INTC_IPRL       0xA408002CUL
+#define INTC_IMR0       0xA4080080UL
+#define INTC_IMR1       0xA4080084UL
+#define INTC_IMR2       0xA4080088UL
+#define INTC_IMR3       0xA408008CUL
+#define INTC_IMR4       0xA4080090UL
+#define INTC_IMR5       0xA4080094UL
+#define INTC_IMR6       0xA4080098UL
+#define INTC_IMR7       0xA408009CUL
+#define INTC_IMR8       0xA40800A0UL
+#define INTC_IMR9       0xA40800A4UL
+#define INTC_IMR10      0xA40800A8UL
+#define INTC_IMR11      0xA40800ACUL
+#define INTC_IMCR0      0xA40800C0UL
+#define INTC_IMCR1      0xA40800C4UL
+#define INTC_IMCR2      0xA40800C8UL
+#define INTC_IMCR3      0xA40800CCUL
+#define INTC_IMCR4      0xA40800D0UL
+#define INTC_IMCR5      0xA40800D4UL
+#define INTC_IMCR6      0xA40800D8UL
+#define INTC_IMCR7      0xA40800DCUL
+#define INTC_IMCR8      0xA40800E0UL
+#define INTC_IMCR9      0xA40800E4UL
+#define INTC_IMCR10     0xA40800E8UL
+#define INTC_IMCR11     0xA40800ECUL
+#define INTC_ICR0       0xA4140000UL
+#define INTC_ICR1       0xA414001CUL
+#define INTMSK0         0xa4140044
+#define INTMSKCLR0      0xa4140064
+#define INTC_INTPRI0    0xa4140010
+/*
+  NOTE:
+  *_IRQ = (INTEVT2 - 0x200)/0x20
+*/
+/* TMU0 */
+#define TMU0_IRQ        16
+#define TMU0_IPR_ADDR   INTC_IPRA
+#define TMU0_IPR_POS     3
+#define TMU0_PRIORITY    2
+#define TIMER_IRQ       16
+#define TIMER_IPR_ADDR  INTC_IPRA
+#define TIMER_IPR_POS    3
+#define TIMER_PRIORITY   2
+/* TMU1 */
+#define TMU1_IRQ        17
+#define TMU1_IPR_ADDR   INTC_IPRA
+#define TMU1_IPR_POS     2
+#define TMU1_PRIORITY    2
+/* TMU2 */
+#define TMU2_IRQ        18
+#define TMU2_IPR_ADDR   INTC_IPRA
+#define TMU2_IPR_POS     1
+#define TMU2_PRIORITY    2
+/* LCDC */
+#define LCDC_IRQ        28
+#define LCDC_IPR_ADDR   INTC_IPRB
+#define LCDC_IPR_POS     2
+#define LCDC_PRIORITY    2
+/* VIO (Video I/O) */
+#define CEU_IRQ         52
+#define BEU_IRQ         53
+#define VEU_IRQ         54
+#define VOU_IRQ         55
+#define VIO_IPR_ADDR    INTC_IPRE
+#define VIO_IPR_POS      2
+#define VIO_PRIORITY     2
+/* MFI (Multi Functional Interface) */
+#define MFI_IRQ         56
+#define MFI_IPR_ADDR    INTC_IPRE
+#define MFI_IPR_POS      1
+#define MFI_PRIORITY     2
+/* VPU (Video Processing Unit) */
+#define VPU_IRQ         60
+#define VPU_IPR_ADDR    INTC_IPRE
+#define VPU_IPR_POS      0
+#define VPU_PRIORITY     2
+/* 3DG */
+#define TDG_IRQ         63
+#define TDG_IPR_ADDR    INTC_IPRJ
+#define TDG_IPR_POS      2
+#define TDG_PRIORITY     2
+/* DMAC(1) */
+#define DMTE0_IRQ       48
+#define DMTE1_IRQ       49
+#define DMTE2_IRQ       50
+#define DMTE3_IRQ       51
+#define DMA1_IPR_ADDR   INTC_IPRE
+#define DMA1_IPR_POS    3
+#define DMA1_PRIORITY   7
+/* DMAC(2) */
+#define DMTE4_IRQ       76
+#define DMTE5_IRQ       77
+#define DMA2_IPR_ADDR   INTC_IPRF
+#define DMA2_IPR_POS    2
+#define DMA2_PRIORITY   7
+/* SCIF0 */
+#define SCIF_ERI_IRQ    80
+#define SCIF_RXI_IRQ    81
+#define SCIF_BRI_IRQ    82
+#define SCIF_TXI_IRQ    83
+#define SCIF_IPR_ADDR   INTC_IPRG
+#define SCIF_IPR_POS    3
+#define SCIF_PRIORITY   3
+/* SIOF0 */
+#define SIOF0_IRQ       84
+#define SIOF0_IPR_ADDR  INTC_IPRH
+#define SIOF0_IPR_POS   3
+#define SIOF0_PRIORITY  3
+/* FLCTL (Flash Memory Controller) */
+#define FLSTE_IRQ       92
+#define FLTEND_IRQ      93
+#define FLTRQ0_IRQ      94
+#define FLTRQ1_IRQ      95
+#define FLCTL_IPR_ADDR  INTC_IPRH
+#define FLCTL_IPR_POS   1
+#define FLCTL_PRIORITY  3
+/* IIC(0) (IIC Bus Interface) */
+#define IIC0_ALI_IRQ    96
+#define IIC0_TACKI_IRQ  97
+#define IIC0_WAITI_IRQ  98
+#define IIC0_DTEI_IRQ   99
+#define IIC0_IPR_ADDR   INTC_IPRH
+#define IIC0_IPR_POS    0
+#define IIC0_PRIORITY   3
+/* IIC(1) (IIC Bus Interface) */
+#define IIC1_ALI_IRQ    44
+#define IIC1_TACKI_IRQ  45
+#define IIC1_WAITI_IRQ  46
+#define IIC1_DTEI_IRQ   47
+#define IIC1_IPR_ADDR   INTC_IPRI
+#define IIC1_IPR_POS    0
+#define IIC1_PRIORITY   3
+/* SIO0 */
+#define SIO0_IRQ        88
+#define SIO0_IPR_ADDR   INTC_IPRI
+#define SIO0_IPR_POS    3
+#define SIO0_PRIORITY   3
+/* SDHI */
+#define SDHI_SDHII0_IRQ 100
+#define SDHI_SDHII1_IRQ 101
+#define SDHI_SDHII2_IRQ 102
+#define SDHI_SDHII3_IRQ 103
+#define SDHI_IPR_ADDR   INTC_IPRK
+#define SDHI_IPR_POS    0
+#define SDHI_PRIORITY   3
+/* SIU (Sound Interface Unit) */
+#define SIU_IRQ         108
+#define SIU_IPR_ADDR    INTC_IPRJ
+#define SIU_IPR_POS     1
+#define SIU_PRIORITY    3
+#define PORT_PACR       0xA4050100UL
+#define PORT_PBCR       0xA4050102UL
+#define PORT_PCCR       0xA4050104UL
+#define PORT_PDCR       0xA4050106UL
+#define PORT_PECR       0xA4050108UL
+#define PORT_PFCR       0xA405010AUL
+#define PORT_PGCR       0xA405010CUL
+#define PORT_PHCR       0xA405010EUL
+#define PORT_PJCR       0xA4050110UL
+#define PORT_PKCR       0xA4050112UL
+#define PORT_PLCR       0xA4050114UL
+#define PORT_SCPCR      0xA4050116UL
+#define PORT_PMCR       0xA4050118UL
+#define PORT_PNCR       0xA405011AUL
+#define PORT_PQCR       0xA405011CUL
+#define PORT_PRCR       0xA405011EUL
+#define PORT_PTCR       0xA405014CUL
+#define PORT_PUCR       0xA405014EUL
+#define PORT_PVCR       0xA4050150UL
+#define PORT_PSELA      0xA4050140UL
+#define PORT_PSELB      0xA4050142UL
+#define PORT_PSELC      0xA4050144UL
+#define PORT_PSELE      0xA4050158UL
+#define PORT_HIZCRA     0xA4050146UL
+#define PORT_HIZCRB     0xA4050148UL
+#define PORT_DRVCR      0xA405014AUL
+#define PORT_PADR       0xA4050120UL
+#define PORT_PBDR       0xA4050122UL
+#define PORT_PCDR       0xA4050124UL
+#define PORT_PDDR       0xA4050126UL
+#define PORT_PEDR       0xA4050128UL
+#define PORT_PFDR       0xA405012AUL
+#define PORT_PGDR       0xA405012CUL
+#define PORT_PHDR       0xA405012EUL
+#define PORT_PJDR       0xA4050130UL
+#define PORT_PKDR       0xA4050132UL
+#define PORT_PLDR       0xA4050134UL
+#define PORT_SCPDR      0xA4050136UL
+#define PORT_PMDR       0xA4050138UL
+#define PORT_PNDR       0xA405013AUL
+#define PORT_PQDR       0xA405013CUL
+#define PORT_PRDR       0xA405013EUL
+#define PORT_PTDR       0xA405016CUL
+#define PORT_PUDR       0xA405016EUL
+#define PORT_PVDR       0xA4050170UL
+#define IRQ0_IRQ        32
+#define IRQ1_IRQ        33
+#define IRQ2_IRQ        34
+#define IRQ3_IRQ        35
+#define IRQ4_IRQ        36
+#define IRQ5_IRQ        37
+#define IRQ6_IRQ        38
+#define IRQ7_IRQ        39
+#define INTPRI00        0xA4140010UL
+#define IRQ0_IPR_ADDR   INTPRI00
+#define IRQ1_IPR_ADDR   INTPRI00
+#define IRQ2_IPR_ADDR   INTPRI00
+#define IRQ3_IPR_ADDR   INTPRI00
+#define IRQ4_IPR_ADDR   INTPRI00
+#define IRQ5_IPR_ADDR   INTPRI00
+#define IRQ6_IPR_ADDR   INTPRI00
+#define IRQ7_IPR_ADDR   INTPRI00
+#define IRQ0_IPR_POS    7
+#define IRQ1_IPR_POS    6
+#define IRQ2_IPR_POS    5
+#define IRQ3_IPR_POS    4
+#define IRQ4_IPR_POS    3
+#define IRQ5_IPR_POS    2
+#define IRQ6_IPR_POS    1
+#define IRQ7_IPR_POS    0
+#define IRQ0_PRIORITY   1
+#define IRQ1_PRIORITY   1
+#define IRQ2_PRIORITY   1
+#define IRQ3_PRIORITY   1
+#define IRQ4_PRIORITY   1
+#define IRQ5_PRIORITY   1
+#define IRQ6_PRIORITY   1
+#define IRQ7_PRIORITY   1
+#endif /* __ASM_SH_IRQ_SH7343_H */
diff --git a/include/asm-sh/irq-sh7780.h b/include/asm-sh/irq-sh7780.h
index 7f90315cd830..895c5780e454 100644
--- a/include/asm-sh/irq-sh7780.h
+++ b/include/asm-sh/irq-sh7780.h
@@ -145,11 +145,6 @@
 #define TMU_CH5_IPR_POS         1
 #define TMU_CH5_PRIORITY        2
-#define RTC_IRQ         22
-#define RTC_IPR_ADDR    INTC_INT2PRI1
-#define RTC_IPR_POS     0
-#define RTC_PRIORITY    TIMER_PRIORITY
 /* SCIF0 */
 #define SCIF0_ERI_IRQ   40
 #define SCIF0_RXI_IRQ   41
diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h
index 611e67cd0627..0e5f365aff70 100644
--- a/include/asm-sh/irq.h
+++ b/include/asm-sh/irq.h
@@ -192,7 +192,7 @@
 #if defined (CONFIG_CPU_SUBTYPE_SH7707) || defined (CONFIG_CPU_SUBTYPE_SH7708) || \
    defined (CONFIG_CPU_SUBTYPE_SH7709) || defined (CONFIG_CPU_SUBTYPE_SH7750) || \
-    defined (CONFIG_CPU_SUBTYPE_SH7751)
+    defined (CONFIG_CPU_SUBTYPE_SH7751) || defined (CONFIG_CPU_SUBTYPE_SH7706)
 #define SCI_ERI_IRQ     23
 #define SCI_RXI_IRQ     24
 #define SCI_TXI_IRQ     25
@@ -207,6 +207,7 @@
 #define SCIF0_IPR_POS   3
 #define SCIF0_PRIORITY  3
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7706) || \
      defined(CONFIG_CPU_SUBTYPE_SH7707) || \
      defined(CONFIG_CPU_SUBTYPE_SH7709)
 #define SCIF_ERI_IRQ    56
@@ -261,9 +262,12 @@
 #elif defined(CONFIG_CPU_SUBTYPE_SH7708)
 # define ONCHIP_NR_IRQS 32
 #elif defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7706) || \
      defined(CONFIG_CPU_SUBTYPE_SH7705)
 # define ONCHIP_NR_IRQS 64      // Actually 61
 # define PINT_NR_IRQS   16
+#elif defined(CONFIG_CPU_SUBTYPE_SH7710)
+# define ONCHIP_NR_IRQS 104
 #elif defined(CONFIG_CPU_SUBTYPE_SH7750)
 # define ONCHIP_NR_IRQS 48      // Actually 44
 #elif defined(CONFIG_CPU_SUBTYPE_SH7751)
@@ -275,7 +279,8 @@
 #elif defined(CONFIG_CPU_SUBTYPE_ST40STB1)
 # define ONCHIP_NR_IRQS 144
 #elif defined(CONFIG_CPU_SUBTYPE_SH7300) || \
-      defined(CONFIG_CPU_SUBTYPE_SH73180)
+      defined(CONFIG_CPU_SUBTYPE_SH73180) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7343)
 # define ONCHIP_NR_IRQS 109
 #elif defined(CONFIG_CPU_SUBTYPE_SH7780)
 # define ONCHIP_NR_IRQS 111
@@ -311,6 +316,8 @@
 # define OFFCHIP_NR_IRQS 4
 #elif defined(CONFIG_SH_R7780RP)
 # define OFFCHIP_NR_IRQS 16
+#elif defined(CONFIG_SH_7343_SOLUTION_ENGINE)
+# define OFFCHIP_NR_IRQS 12
 #elif defined(CONFIG_SH_UNKNOWN)
 # define OFFCHIP_NR_IRQS 16     /* Must also be last */
 #else
@@ -335,6 +342,11 @@ extern void make_maskreg_irq(unsigned int irq);
 extern unsigned short *irq_mask_register;
 /*
+ * PINT IRQs
+ */
+void init_IRQ_pint(void);
+/*
 * Function for "on chip support modules".
 */
 extern void make_ipr_irq(unsigned int irq, unsigned int addr,
@@ -471,8 +483,10 @@ extern int ipr_irq_demux(int irq);
 #define INTC_ICR        0xfffffee0UL
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7706) || \
      defined(CONFIG_CPU_SUBTYPE_SH7707) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7709)
+      defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7710)
 #define INTC_IRR0       0xa4000004UL
 #define INTC_IRR1       0xa4000006UL
 #define INTC_IRR2       0xa4000008UL
@@ -491,8 +505,105 @@ extern int ipr_irq_demux(int irq);
 #define INTC_IPRF       0xa4080000UL
 #define INTC_IPRG       0xa4080002UL
 #define INTC_IPRH       0xa4080004UL
-#endif
+#elif defined(CONFIG_CPU_SUBTYPE_SH7710)
+/* Interrupt Controller Registers */
+#undef INTC_IPRA
+#undef INTC_IPRB
+#define INTC_IPRA       0xA414FEE2UL
+#define INTC_IPRB       0xA414FEE4UL
+#define INTC_IPRF       0xA4080000UL
+#define INTC_IPRG       0xA4080002UL
+#define INTC_IPRH       0xA4080004UL
+#define INTC_IPRI       0xA4080006UL
+#undef INTC_ICR0
+#undef INTC_ICR1
+#define INTC_ICR0       0xA414FEE0UL
+#define INTC_ICR1       0xA4140010UL
+#define INTC_IRR0       0xa4000004UL
+#define INTC_IRR1       0xa4000006UL
+#define INTC_IRR2       0xa4000008UL
+#define INTC_IRR3       0xa400000AUL
+#define INTC_IRR4       0xa400000CUL
+#define INTC_IRR5       0xa4080020UL
+#define INTC_IRR7       0xa4080024UL
+#define INTC_IRR8       0xa4080026UL
+/* Interrupt numbers */
+#define TIMER2_IRQ      18
+#define TIMER2_IPR_ADDR INTC_IPRA
+#define TIMER2_IPR_POS   1
+#define TIMER2_PRIORITY  2
+/* WDT */
+#define WDT_IRQ         27
+#define WDT_IPR_ADDR    INTC_IPRB
+#define WDT_IPR_POS      3
+#define WDT_PRIORITY     2
+#define SCIF0_ERI_IRQ   52
+#define SCIF0_RXI_IRQ   53
+#define SCIF0_BRI_IRQ   54
+#define SCIF0_TXI_IRQ   55
+#define SCIF0_IPR_ADDR  INTC_IPRE
+#define SCIF0_IPR_POS   2
+#define SCIF0_PRIORITY  3
+#define DMTE4_IRQ       76
+#define DMTE5_IRQ       77
+#define DMA2_IPR_ADDR   INTC_IPRF
+#define DMA2_IPR_POS    2
+#define DMA2_PRIORITY   7
+#define IPSEC_IRQ       79
+#define IPSEC_IPR_ADDR  INTC_IPRF
+#define IPSEC_IPR_POS   3
+#define IPSEC_PRIORITY  3
+/* EDMAC */
+#define EDMAC0_IRQ      80
+#define EDMAC0_IPR_ADDR INTC_IPRG
+#define EDMAC0_IPR_POS  3
+#define EDMAC0_PRIORITY 3
+#define EDMAC1_IRQ      81
+#define EDMAC1_IPR_ADDR INTC_IPRG
+#define EDMAC1_IPR_POS  2
+#define EDMAC1_PRIORITY 3
+#define EDMAC2_IRQ      82
+#define EDMAC2_IPR_ADDR INTC_IPRG
+#define EDMAC2_IPR_POS  1
+#define EDMAC2_PRIORITY 3
+/* SIOF */
+#define SIOF0_ERI_IRQ   96
+#define SIOF0_TXI_IRQ   97
+#define SIOF0_RXI_IRQ   98
+#define SIOF0_CCI_IRQ   99
+#define SIOF0_IPR_ADDR  INTC_IPRH
+#define SIOF0_IPR_POS   0
+#define SIOF0_PRIORITY  7
+#define SIOF1_ERI_IRQ   100
+#define SIOF1_TXI_IRQ   101
+#define SIOF1_RXI_IRQ   102
+#define SIOF1_CCI_IRQ   103
+#define SIOF1_IPR_ADDR  INTC_IPRI
+#define SIOF1_IPR_POS   1
+#define SIOF1_PRIORITY  7
+#endif /* CONFIG_CPU_SUBTYPE_SH7710 */
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+#define PORT_PACR       0xa4050100UL
+#define PORT_PBCR       0xa4050102UL
+#define PORT_PCCR       0xa4050104UL
+#define PORT_PETCR      0xa4050106UL
+#define PORT_PADR       0xa4050120UL
+#define PORT_PBDR       0xa4050122UL
+#define PORT_PCDR       0xa4050124UL
+#else
 #define PORT_PACR       0xa4000100UL
 #define PORT_PBCR       0xa4000102UL
 #define PORT_PCCR       0xa4000104UL
@@ -501,6 +612,7 @@ extern int ipr_irq_demux(int irq);
 #define PORT_PBDR       0xa4000122UL
 #define PORT_PCDR       0xa4000124UL
 #define PORT_PFDR       0xa400012aUL
+#endif
 #define IRQ0_IRQ        32
 #define IRQ1_IRQ        33
@@ -577,7 +689,7 @@ extern int ipr_irq_demux(int irq);
 #define NR_INTC2_IRQS   64
 #elif defined(CONFIG_CPU_SUBTYPE_SH7780)
 #define INTC2_BASE      0xffd40000
-#define INTC2_FIRST_IRQ 22
+#define INTC2_FIRST_IRQ 21
 #define INTC2_INTMSK_OFFSET     (0x38)
 #define INTC2_INTMSKCLR_OFFSET  (0x3c)
 #define NR_INTC2_IRQS   60
@@ -594,6 +706,8 @@ void intc2_add_clear_irq(int irq, int (*fn)(int));
 #endif
+extern int shmse_irq_demux(int irq);
 static inline int generic_irq_demux(int irq)
 {
        return irq;
@@ -605,8 +719,21 @@ static inline int generic_irq_demux(int irq)
 #define irq_canonicalize(irq)   (irq)
 #define irq_demux(irq)          __irq_demux(sh_mv.mv_irq_demux(irq))
+#ifdef CONFIG_4KSTACKS
+extern void irq_ctx_init(int cpu);
+extern void irq_ctx_exit(int cpu);
+# define __ARCH_HAS_DO_SOFTIRQ
+#else
+# define irq_ctx_init(cpu) do { } while (0)
+# define irq_ctx_exit(cpu) do { } while (0)
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH73180)
 #include <asm/irq-sh73180.h>
 #endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7343)
+#include <asm/irq-sh7343.h>
+#endif
 #endif /* __ASM_SH_IRQ_H */
diff --git a/include/asm-sh/kexec.h b/include/asm-sh/kexec.h
index 9dfe59f6fcb5..9d235af20cdd 100644
--- a/include/asm-sh/kexec.h
+++ b/include/asm-sh/kexec.h
@@ -23,11 +23,10 @@
 /* The native architecture */
 #define KEXEC_ARCH KEXEC_ARCH_SH
-#ifndef __ASSEMBLY__
+#define MAX_NOTE_BYTES 1024
-extern void machine_shutdown(void);
+/* Provide a dummy definition to avoid build failures. */
-extern void *crash_notes;
+static inline void crash_setup_regs(struct pt_regs *newregs,
+                                        struct pt_regs *oldregs) { }
-#endif /* __ASSEMBLY__ */
 #endif /* _SH_KEXEC_H */
diff --git a/include/asm-sh/kgdb.h b/include/asm-sh/kgdb.h
index 1653ffb75fbe..7b26f53fe343 100644
--- a/include/asm-sh/kgdb.h
+++ b/include/asm-sh/kgdb.h
@@ -128,4 +128,19 @@ extern int     setjmp(jmp_buf __jmpb);
 #define KGDB_ASSERT(condition, message)
 #endif
+/* Taken from sh-stub.c of GDB 4.18 */
+static const char hexchars[] = "0123456789abcdef";
+/* Get high hex bits */
+static inline char highhex(const int x)
+{
+        return hexchars[(x >> 4) & 0xf];
+}
+/* Get low hex bits */
+static inline char lowhex(const int x)
+{
+        return hexchars[x & 0xf];
+}
 #endif
diff --git a/include/asm-sh/landisk/gio.h b/include/asm-sh/landisk/gio.h
new file mode 100644
index 000000000000..3fce4c451a46
--- /dev/null
+++ b/include/asm-sh/landisk/gio.h
@@ -0,0 +1,45 @@
+#ifndef __ASM_SH_LANDISK_GIO_H
+#define __ASM_SH_LANDISK_GIO_H
+#include <linux/ioctl.h>
+/* version */
+#define VERSION_STR     "1.00"
+/* Driver name */
+#define GIO_DRIVER_NAME         "/dev/giodrv"
+/* Use 'k' as magic number */
+#define GIODRV_IOC_MAGIC  'k'
+#define GIODRV_IOCRESET    _IO(GIODRV_IOC_MAGIC, 0)
+/*
+ * S means "Set" through a ptr,
+ * T means "Tell" directly
+ * G means "Get" (to a pointed var)
+ * Q means "Query", response is on the return value
+ * X means "eXchange": G and S atomically
+ * H means "sHift": T and Q atomically
+ */
+#define GIODRV_IOCSGIODATA1   _IOW(GIODRV_IOC_MAGIC,  1, unsigned char *)
+#define GIODRV_IOCGGIODATA1   _IOR(GIODRV_IOC_MAGIC,  2, unsigned char *)
+#define GIODRV_IOCSGIODATA2   _IOW(GIODRV_IOC_MAGIC,  3, unsigned short *)
+#define GIODRV_IOCGGIODATA2   _IOR(GIODRV_IOC_MAGIC,  4, unsigned short *)
+#define GIODRV_IOCSGIODATA4   _IOW(GIODRV_IOC_MAGIC,  5, unsigned long *)
+#define GIODRV_IOCGGIODATA4   _IOR(GIODRV_IOC_MAGIC,  6, unsigned long *)
+#define GIODRV_IOCSGIOSETADDR _IOW(GIODRV_IOC_MAGIC,  7, unsigned long *)
+#define GIODRV_IOCHARDRESET   _IO(GIODRV_IOC_MAGIC, 8) /* debugging tool */
+#define GIODRV_IOCSGIO_LED    _IOW(GIODRV_IOC_MAGIC,  9, unsigned long *)
+#define GIODRV_IOCGGIO_LED    _IOR(GIODRV_IOC_MAGIC,  10, unsigned long *)
+#define GIODRV_IOCSGIO_BUZZER _IOW(GIODRV_IOC_MAGIC,  11, unsigned long *)
+#define GIODRV_IOCGGIO_LANDISK _IOR(GIODRV_IOC_MAGIC,  14, unsigned long *)
+#define GIODRV_IOCGGIO_BTN _IOR(GIODRV_IOC_MAGIC,  22, unsigned long *)
+#define GIODRV_IOCSGIO_BTNPID _IOW(GIODRV_IOC_MAGIC,  23, unsigned long *)
+#define GIODRV_IOCGGIO_BTNPID _IOR(GIODRV_IOC_MAGIC,  24, unsigned long *)
+#define GIODRV_IOC_MAXNR 8
+#define GIO_READ 0x00000000
+#define GIO_WRITE 0x00000001
+#endif /* __ASM_SH_LANDISK_GIO_H  */
diff --git a/include/asm-sh/landisk/ide.h b/include/asm-sh/landisk/ide.h
new file mode 100644
index 000000000000..6490e28415ed
--- /dev/null
+++ b/include/asm-sh/landisk/ide.h
@@ -0,0 +1,14 @@
+/*
+ * modifed by kogiidena
+ * 2005.03.03
+ */
+#ifndef __ASM_SH_LANDISK_IDE_H
+#define __ASM_SH_LANDISK_IDE_H
+/* Nothing to see here.. */
+#include <asm/landisk/iodata_landisk.h>
+#define IRQ_CFCARD      IRQ_FATA        /* CF Card IRQ */
+#define IRQ_PCMCIA      IRQ_ATA         /* PCMCIA IRQ */
+#endif /* __ASM_SH_LANDISK_IDE_H  */
diff --git a/include/asm-sh/landisk/iodata_landisk.h b/include/asm-sh/landisk/iodata_landisk.h
new file mode 100644
index 000000000000..c74d3c73f377
--- /dev/null
+++ b/include/asm-sh/landisk/iodata_landisk.h
@@ -0,0 +1,79 @@
+#ifndef __ASM_SH_IODATA_LANDISK_H
+#define __ASM_SH_IODATA_LANDISK_H
+/*
+ * linux/include/asm-sh/landisk/iodata_landisk.h
+ *
+ * Copyright (C) 2000  Atom Create Engineering Co., Ltd.
+ *
+ * IO-DATA LANDISK support
+ */
+/* Box specific addresses.  */
+#define PA_USB          0xa4000000      /* USB Controller M66590 */
+#define PA_ATARST       0xb0000000      /* ATA/FATA Access Control Register */
+#define PA_LED          0xb0000001      /* LED Control Register */
+#define PA_STATUS       0xb0000002      /* Switch Status Register */
+#define PA_SHUTDOWN     0xb0000003      /* Shutdown Control Register */
+#define PA_PCIPME       0xb0000004      /* PCI PME Status Register */
+#define PA_IMASK        0xb0000005      /* Interrupt Mask Register */
+/* 2003.10.31 I-O DATA NSD NWG  add.    for shutdown port clear */
+#define PA_PWRINT_CLR   0xb0000006      /* Shutdown Interrupt clear Register */
+#define PA_LCD_CLRDSP   0x00            /* LCD Clear Display Offset */
+#define PA_LCD_RTNHOME  0x00            /* LCD Return Home Offset */
+#define PA_LCD_ENTMODE  0x00            /* LCD Entry Mode Offset */
+#define PA_LCD_DSPCTL   0x00            /* LCD Display ON/OFF Control Offset */
+#define PA_LCD_FUNC     0x00            /* LCD Function Set Offset */
+#define PA_LCD_CGRAM    0x00            /* LCD Set CGRAM Address Offset */
+#define PA_LCD_DDRAM    0x00            /* LCD Set DDRAM Address Offset */
+#define PA_LCD_RDFLAG   0x01            /* LCD Read Busy Flag Offset */
+#define PA_LCD_WTDATA   0x02            /* LCD Write Datat to RAM Offset */
+#define PA_LCD_RDDATA   0x03            /* LCD Read Data from RAM Offset */
+#define PA_PIDE_OFFSET  0x40            /* CF IDE Offset */
+#define PA_SIDE_OFFSET  0x40            /* HDD IDE Offset */
+#define IRQ_PCIINTA     5               /* PCI INTA IRQ */
+#define IRQ_PCIINTB     6               /* PCI INTB IRQ */
+#define IRQ_PCIINDC     7               /* PCI INTC IRQ */
+#define IRQ_PCIINTD     8               /* PCI INTD IRQ */
+#define IRQ_ATA         9               /* ATA IRQ */
+#define IRQ_FATA        10              /* FATA IRQ */
+#define IRQ_POWER       11              /* Power Switch IRQ */
+#define IRQ_BUTTON      12              /* USL-5P Button IRQ */
+#define IRQ_FAULT       13              /* USL-5P Fault  IRQ */
+#define SHUTDOWN_BTN_MAJOR      99      /* Shutdown button device major no. */
+#define SHUTDOWN_LOOP_CNT       5       /* Shutdown button Detection loop */
+#define SHUTDOWN_DELAY          200     /* Shutdown button delay value(ms) */
+/* added by kogiidena */
+/*
+ *  landisk_ledparam
+ *
+ * led  ------10 -6543210 -6543210 -6543210
+ *     |000000..|0.......|0.......|U.......|
+ *     |  HARD  |fastblik| blink  |   on   |
+ *
+ *   led0: power       U:update flag
+ *   led1: error
+ *   led2: usb1
+ *   led3: usb2
+ *   led4: usb3
+ *   led5: usb4
+ *   led6: usb5
+ *
+ */
+extern int landisk_ledparam;    /* from setup.c */
+extern int landisk_buzzerparam; /* from setup.c */
+extern int landisk_arch;        /* from setup.c */
+#define __IO_PREFIX landisk
+#include <asm/io_generic.h>
+#endif  /* __ASM_SH_IODATA_LANDISK_H */
diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 550501fa4fed..70389b72ffef 100644
--- a/include/asm-sh/machvec.h
+++ b/include/asm-sh/machvec.h
@@ -8,17 +8,18 @@
 */
 #ifndef _ASM_SH_MACHVEC_H
-#define _ASM_SH_MACHVEC_H 1
+#define _ASM_SH_MACHVEC_H
 #include <linux/types.h>
 #include <linux/time.h>
 #include <asm/machtypes.h>
 #include <asm/machvec_init.h>
 struct device;
 struct sh_machine_vector {
+        void (*mv_setup)(char **cmdline_p);
+        const char *mv_name;
        int mv_nr_irqs;
        u8 (*mv_inb)(unsigned long);
@@ -65,4 +66,6 @@ struct sh_machine_vector {
 extern struct sh_machine_vector sh_mv;
+#define get_system_type()       sh_mv.mv_name
 #endif /* _ASM_SH_MACHVEC_H */
diff --git a/include/asm-sh/mc146818rtc.h b/include/asm-sh/mc146818rtc.h
index 1707cfb2915d..0aee96a97330 100644
--- a/include/asm-sh/mc146818rtc.h
+++ b/include/asm-sh/mc146818rtc.h
@@ -4,173 +4,4 @@
 #ifndef _ASM_MC146818RTC_H
 #define _ASM_MC146818RTC_H
-#ifdef CONFIG_SH_MPC1211
-#undef  _ASM_MC146818RTC_H
-#undef  RTC_IRQ
-#include <asm/mpc1211/mc146818rtc.h>
-#else
-#include <asm/rtc.h>
-#define RTC_ALWAYS_BCD  1
-/* FIXME:RTC Interrupt feature is not implemented yet. */
-#undef  RTC_IRQ
-#define RTC_IRQ         0
-#if defined(CONFIG_CPU_SH3)
-#define RTC_PORT(n)             (R64CNT+(n)*2)
-#define CMOS_READ(addr)         __CMOS_READ(addr,b)
-#define CMOS_WRITE(val,addr)    __CMOS_WRITE(val,addr,b)
-#elif defined(CONFIG_SH_SECUREEDGE5410)
-#include <asm/snapgear/io.h>
-#define RTC_PORT(n)             SECUREEDGE_IOPORT_ADDR
-#define CMOS_READ(addr)         secureedge5410_cmos_read(addr)
-#define CMOS_WRITE(val,addr)    secureedge5410_cmos_write(val,addr)
-extern unsigned char secureedge5410_cmos_read(int addr);
-extern void secureedge5410_cmos_write(unsigned char val, int addr);
-#elif defined(CONFIG_CPU_SH4)
-#define RTC_PORT(n)             (R64CNT+(n)*4)
-#define CMOS_READ(addr)         __CMOS_READ(addr,w)
-#define CMOS_WRITE(val,addr)    __CMOS_WRITE(val,addr,w)
-#endif
-#define __CMOS_READ(addr, s) ({                                         \
-        unsigned char val=0, rcr1, rcr2, r64cnt, retry;                 \
-        switch(addr) {                                                  \
-                case RTC_SECONDS:                                       \
-                        val = ctrl_inb(RSECCNT);                        \
-                        break;                                          \
-                case RTC_SECONDS_ALARM:                                 \
-                        val = ctrl_inb(RSECAR);                         \
-                        break;                                          \
-                case RTC_MINUTES:                                       \
-                        val = ctrl_inb(RMINCNT);                        \
-                        break;                                          \
-                case RTC_MINUTES_ALARM:                                 \
-                        val = ctrl_inb(RMINAR);                         \
-                        break;                                          \
-                case RTC_HOURS:                                         \
-                        val = ctrl_inb(RHRCNT);                         \
-                        break;                                          \
-                case RTC_HOURS_ALARM:                                   \
-                        val = ctrl_inb(RHRAR);                          \
-                        break;                                          \
-                case RTC_DAY_OF_WEEK:                                   \
-                        val = ctrl_inb(RWKCNT);                         \
-                        break;                                          \
-                case RTC_DAY_OF_MONTH:                                  \
-                        val = ctrl_inb(RDAYCNT);                        \
-                        break;                                          \
-                case RTC_MONTH:                                         \
-                        val = ctrl_inb(RMONCNT);                        \
-                        break;                                          \
-                case RTC_YEAR:                                          \
-                        val = ctrl_in##s(RYRCNT);                       \
-                        break;                                          \
-                case RTC_REG_A: /* RTC_FREQ_SELECT */                   \
-                        rcr2 = ctrl_inb(RCR2);                          \
-                        val = (rcr2 & RCR2_PESMASK) >> 4;               \
-                        rcr1 = ctrl_inb(RCR1);                          \
-                        rcr1 = (rcr1 & (RCR1_CIE | RCR1_AIE)) | RCR1_AF;\
-                        retry = 0;                                      \
-                        do {                                            \
-                                ctrl_outb(rcr1, RCR1); /* clear CF */   \
-                                r64cnt = ctrl_inb(R64CNT);              \
-                        } while((ctrl_inb(RCR1) & RCR1_CF) && retry++ < 1000);\
-                        r64cnt ^= RTC_BIT_INVERTED;                     \
-                        if(r64cnt == 0x7f || r64cnt == 0)               \
-                                val |= RTC_UIP;                         \
-                        break;                                          \
-                case RTC_REG_B: /* RTC_CONTROL */                       \
-                        rcr1 = ctrl_inb(RCR1);                          \
-                        rcr2 = ctrl_inb(RCR2);                          \
-                        if(rcr1 & RCR1_CIE)     val |= RTC_UIE;         \
-                        if(rcr1 & RCR1_AIE)     val |= RTC_AIE;         \
-                        if(rcr2 & RCR2_PESMASK) val |= RTC_PIE;         \
-                        if(!(rcr2 & RCR2_START))val |= RTC_SET;         \
-                        val |= RTC_24H;                                 \
-                        break;                                          \
-                case RTC_REG_C: /* RTC_INTR_FLAGS */                    \
-                        rcr1 = ctrl_inb(RCR1);                          \
-                        rcr1 &= ~(RCR1_CF | RCR1_AF);                   \
-                        ctrl_outb(rcr1, RCR1);                          \
-                        rcr2 = ctrl_inb(RCR2);                          \
-                        rcr2 &= ~RCR2_PEF;                              \
-                        ctrl_outb(rcr2, RCR2);                          \
-                        break;                                          \
-                case RTC_REG_D: /* RTC_VALID */                         \
-                        /* Always valid ... */                          \
-                        val = RTC_VRT;                                  \
-                        break;                                          \
-                default:                                                \
-                        break;                                          \
-        }                                                               \
-        val;                                                            \
-})
-#define __CMOS_WRITE(val, addr, s) ({                                   \
-        unsigned char rcr1,rcr2;                                        \
-        switch(addr) {                                                  \
-                case RTC_SECONDS:                                       \
-                        ctrl_outb(val, RSECCNT);                        \
-                        break;                                          \
-                case RTC_SECONDS_ALARM:                                 \
-                        ctrl_outb(val, RSECAR);                         \
-                        break;                                          \
-                case RTC_MINUTES:                                       \
-                        ctrl_outb(val, RMINCNT);                        \
-                        break;                                          \
-                case RTC_MINUTES_ALARM:                                 \
-                        ctrl_outb(val, RMINAR);                         \
-                        break;                                          \
-                case RTC_HOURS:                                         \
-                        ctrl_outb(val, RHRCNT);                         \
-                        break;                                          \
-                case RTC_HOURS_ALARM:                                   \
-                        ctrl_outb(val, RHRAR);                          \
-                        break;                                          \
-                case RTC_DAY_OF_WEEK:                                   \
-                        ctrl_outb(val, RWKCNT);                         \
-                        break;                                          \
-                case RTC_DAY_OF_MONTH:                                  \
-                        ctrl_outb(val, RDAYCNT);                        \
-                        break;                                          \
-                case RTC_MONTH:                                         \
-                        ctrl_outb(val, RMONCNT);                        \
-                        break;                                          \
-                case RTC_YEAR:                                          \
-                        ctrl_out##s((ctrl_in##s(RYRCNT) & 0xff00) | (val & 0xff), RYRCNT);\
-                        break;                                          \
-                case RTC_REG_A: /* RTC_FREQ_SELECT */                   \
-                        rcr2 = ctrl_inb(RCR2);                          \
-                        if((val & RTC_DIV_CTL) == RTC_DIV_RESET2)       \
-                                rcr2 |= RCR2_RESET;                     \
-                        ctrl_outb(rcr2, RCR2);                          \
-                        break;                                          \
-                case RTC_REG_B: /* RTC_CONTROL */                       \
-                        rcr1 = (ctrl_inb(RCR1) & 0x99) | RCR1_AF;       \
-                        if(val & RTC_AIE) rcr1 |= RCR1_AIE;             \
-                        else              rcr1 &= ~RCR1_AIE;            \
-                        if(val & RTC_UIE) rcr1 |= RCR1_CIE;             \
-                        else              rcr1 &= ~RCR1_CIE;            \
-                        ctrl_outb(rcr1, RCR1);                          \
-                        rcr2 = ctrl_inb(RCR2);                          \
-                        if(val & RTC_SET) rcr2 &= ~RCR2_START;          \
-                        else              rcr2 |= RCR2_START;           \
-                        ctrl_outb(rcr2, RCR2);                          \
-                        break;                                          \
-                case RTC_REG_C: /* RTC_INTR_FLAGS */                    \
-                        break;                                          \
-                case RTC_REG_D: /* RTC_VALID */                         \
-                        break;                                          \
-                default:                                                \
-                        break;                                          \
-        }                                                               \
-})
-#endif /* CONFIG_SH_MPC1211 */
 #endif /* _ASM_MC146818RTC_H */
diff --git a/include/asm-sh/mmu.h b/include/asm-sh/mmu.h
index 72f07be6117f..cf47df79bb94 100644
--- a/include/asm-sh/mmu.h
+++ b/include/asm-sh/mmu.h
@@ -3,27 +3,76 @@
 #if !defined(CONFIG_MMU)
-struct mm_rblock_struct {
-        int     size;
-        int     refcount;
-        void    *kblock;
-};
-struct mm_tblock_struct {
-        struct mm_rblock_struct *rblock;
-        struct mm_tblock_struct *next;
-};
 typedef struct {
-        struct mm_tblock_struct tblock;
+        struct vm_list_struct   *vmlist;
        unsigned long           end_brk;
 } mm_context_t;
 #else
 /* Default "unsigned long" context */
-typedef unsigned long mm_context_t;
+typedef unsigned long mm_context_id_t;
+typedef struct {
+        mm_context_id_t id;
+        void *vdso;
+} mm_context_t;
 #endif /* CONFIG_MMU */
-#endif /* __MMH_H */
+/*
+ * Privileged Space Mapping Buffer (PMB) definitions
+ */
+#define PMB_PASCR               0xff000070
+#define PMB_IRMCR               0xff000078
+#define PMB_ADDR                0xf6100000
+#define PMB_DATA                0xf7100000
+#define PMB_ENTRY_MAX           16
+#define PMB_E_MASK              0x0000000f
+#define PMB_E_SHIFT             8
+#define PMB_SZ_16M              0x00000000
+#define PMB_SZ_64M              0x00000010
+#define PMB_SZ_128M             0x00000080
+#define PMB_SZ_512M             0x00000090
+#define PMB_SZ_MASK             PMB_SZ_512M
+#define PMB_C                   0x00000008
+#define PMB_WT                  0x00000001
+#define PMB_UB                  0x00000200
+#define PMB_V                   0x00000100
+#define PMB_NO_ENTRY            (-1)
+struct pmb_entry;
+struct pmb_entry {
+        unsigned long vpn;
+        unsigned long ppn;
+        unsigned long flags;
+        /*
+         * 0 .. NR_PMB_ENTRIES for specific entry selection, or
+         * PMB_NO_ENTRY to search for a free one
+         */
+        int entry;
+        struct pmb_entry *next;
+        /* Adjacent entry link for contiguous multi-entry mappings */
+        struct pmb_entry *link;
+};
+/* arch/sh/mm/pmb.c */
+int __set_pmb_entry(unsigned long vpn, unsigned long ppn,
+                    unsigned long flags, int *entry);
+int set_pmb_entry(struct pmb_entry *pmbe);
+void clear_pmb_entry(struct pmb_entry *pmbe);
+struct pmb_entry *pmb_alloc(unsigned long vpn, unsigned long ppn,
+                            unsigned long flags);
+void pmb_free(struct pmb_entry *pmbe);
+long pmb_remap(unsigned long virt, unsigned long phys,
+               unsigned long size, unsigned long flags);
+void pmb_unmap(unsigned long addr);
+#endif /* __MMU_H */
diff --git a/include/asm-sh/mmu_context.h b/include/asm-sh/mmu_context.h
index 6760d064bd02..c7088efe579a 100644
--- a/include/asm-sh/mmu_context.h
+++ b/include/asm-sh/mmu_context.h
@@ -49,7 +49,7 @@ get_mmu_context(struct mm_struct *mm)
        unsigned long mc = mmu_context_cache;
        /* Check if we have old version of context. */
-        if (((mm->context ^ mc) & MMU_CONTEXT_VERSION_MASK) == 0)
+        if (((mm->context.id ^ mc) & MMU_CONTEXT_VERSION_MASK) == 0)
                /* It's up to date, do nothing */
                return;
@@ -68,7 +68,7 @@ get_mmu_context(struct mm_struct *mm)
                if (!mc)
                        mmu_context_cache = mc = MMU_CONTEXT_FIRST_VERSION;
        }
-        mm->context = mc;
+        mm->context.id = mc;
 }
 /*
@@ -78,7 +78,7 @@ get_mmu_context(struct mm_struct *mm)
 static __inline__ int init_new_context(struct task_struct *tsk,
                                       struct mm_struct *mm)
 {
-        mm->context = NO_CONTEXT;
+        mm->context.id = NO_CONTEXT;
        return 0;
 }
@@ -123,7 +123,7 @@ static __inline__ unsigned long get_asid(void)
 static __inline__ void activate_context(struct mm_struct *mm)
 {
        get_mmu_context(mm);
-        set_asid(mm->context & MMU_CONTEXT_ASID_MASK);
+        set_asid(mm->context.id & MMU_CONTEXT_ASID_MASK);
 }
 /* MMU_TTB can be used for optimizing the fault handling.
@@ -174,9 +174,7 @@ static inline void enable_mmu(void)
 {
        /* Enable MMU */
        ctrl_outl(MMU_CONTROL_INIT, MMUCR);
+        ctrl_barrier();
-        /* The manual suggests doing some nops after turning on the MMU */
-        __asm__ __volatile__ ("nop;nop;nop;nop;nop;nop;nop;nop\n\t");
        if (mmu_context_cache == NO_CONTEXT)
                mmu_context_cache = MMU_CONTEXT_FIRST_VERSION;
@@ -191,7 +189,8 @@ static inline void disable_mmu(void)
        cr = ctrl_inl(MMUCR);
        cr &= ~MMU_CONTROL_INIT;
        ctrl_outl(cr, MMUCR);
-        __asm__ __volatile__ ("nop;nop;nop;nop;nop;nop;nop;nop\n\t");
+        ctrl_barrier();
 }
 #else
 /*
diff --git a/include/asm-sh/mpc1211/keyboard.h b/include/asm-sh/mpc1211/keyboard.h
index 71ef4cf4242d..9020feee7b4c 100644
--- a/include/asm-sh/mpc1211/keyboard.h
+++ b/include/asm-sh/mpc1211/keyboard.h
@@ -24,7 +24,6 @@ extern void pckbd_leds(unsigned char leds);
 extern void pckbd_init_hw(void);
 extern int pckbd_pm_resume(struct pm_dev *, pm_request_t, void *);
 extern pm_callback pm_kbd_request_override;
-extern unsigned char pckbd_sysrq_xlate[128];
 #define kbd_setkeycode          pckbd_setkeycode
 #define kbd_getkeycode          pckbd_getkeycode
@@ -32,9 +31,6 @@ extern unsigned char pckbd_sysrq_xlate[128];
 #define kbd_unexpected_up       pckbd_unexpected_up
 #define kbd_leds                pckbd_leds
 #define kbd_init_hw             pckbd_init_hw
-#define kbd_sysrq_xlate         pckbd_sysrq_xlate
-#define SYSRQ_KEY 0x54
 /* resource allocation */
 #define kbd_request_region()
diff --git a/include/asm-sh/overdrive/fpga.h b/include/asm-sh/overdrive/fpga.h
deleted file mode 100644
index 1cd87992c124..000000000000
--- a/include/asm-sh/overdrive/fpga.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- */
-#ifndef __FPGA_OD_H__
-#define __FPGA_OD_H__
-/* This routine will program up the fpga which interfaces to the galileo */
-int init_overdrive_fpga(void);
-#endif
diff --git a/include/asm-sh/overdrive/gt64111.h b/include/asm-sh/overdrive/gt64111.h
deleted file mode 100644
index 01d58bc13a44..000000000000
--- a/include/asm-sh/overdrive/gt64111.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef _GT64111_H_
-#define _GT64111_H_
-#define MASTER_INTERFACE         0x0
-#define RAS10_LO_DEC_ADR         0x8        
-#define RAS10_HI_DEC_ADR         0x10
-#define RAS32_LO_DEC_ADR         0x18
-#define RAS32_HI_DEC_ADR         0x20
-#define CS20_LO_DEC_ADR          0x28
-#define CS20_HI_DEC_ADR          0x30
-#define CS3_LO_DEC_ADR           0x38
-#define CS3_HI_DEC_ADR           0x40
-#define PCI_IO_LO_DEC_ADR        0x48
-#define PCI_IO_HI_DEC_ADR        0x50
-#define PCI_MEM0_LO_DEC_ADR      0x58
-#define PCI_MEM0_HI_DEC_ADR      0x60
-#define INTERNAL_SPACE_DEC       0x68
-#define BUS_ERR_ADR_LO_CPU       0x70
-#define READONLY0                0x78
-#define PCI_MEM1_LO_DEC_ADR      0x80
-#define PCI_MEM1_HI_DEC_ADR      0x88
-#define RAS0_LO_DEC_ADR          0x400   
-#define RAS0_HI_DEC_ADR          0x404
-#define RAS1_LO_DEC_ADR          0x408
-#define RAS1_HI_DEC_ADR          0x40c
-#define RAS2_LO_DEC_ADR          0x410
-#define RAS2_HI_DEC_ADR          0x414
-#define RAS3_LO_DEC_ADR          0x418
-#define RAS3_HI_DEC_ADR          0x41c
-#define DEV_CS0_LO_DEC_ADR       0x420
-#define DEV_CS0_HI_DEC_ADR       0x424
-#define DEV_CS1_LO_DEC_ADR       0x428
-#define DEV_CS1_HI_DEC_ADR       0x42c
-#define DEV_CS2_LO_DEC_ADR       0x430
-#define DEV_CS2_HI_DEC_ADR       0x434
-#define DEV_CS3_LO_DEC_ADR       0x438
-#define DEV_CS3_HI_DEC_ADR       0x43c
-#define DEV_BOOTCS_LO_DEC_ADR    0x440
-#define DEV_BOOTCS_HI_DEC_ADR    0x444
-#define DEV_ADR_DEC_ERR          0x470
-#define DRAM_CFG                 0x448   
-#define DRAM_BANK0_PARMS         0x44c   
-#define DRAM_BANK1_PARMS         0x450
-#define DRAM_BANK2_PARMS         0x454
-#define DRAM_BANK3_PARMS         0x458
-#define DEV_BANK0_PARMS          0x45c
-#define DEV_BANK1_PARMS          0x460
-#define DEV_BANK2_PARMS          0x464
-#define DEV_BANK3_PARMS          0x468
-#define DEV_BOOT_BANK_PARMS      0x46c
-#define CH0_DMA_BYTECOUNT        0x800
-#define CH1_DMA_BYTECOUNT        0x804
-#define CH2_DMA_BYTECOUNT        0x808
-#define CH3_DMA_BYTECOUNT        0x80c
-#define CH0_DMA_SRC_ADR          0x810
-#define CH1_DMA_SRC_ADR          0x814
-#define CH2_DMA_SRC_ADR          0x818
-#define CH3_DMA_SRC_ADR          0x81c
-#define CH0_DMA_DST_ADR          0x820
-#define CH1_DMA_DST_ADR          0x824
-#define CH2_DMA_DST_ADR          0x828
-#define CH3_DMA_DST_ADR          0x82c
-#define CH0_NEXT_REC_PTR         0x830
-#define CH1_NEXT_REC_PTR         0x834
-#define CH2_NEXT_REC_PTR         0x838
-#define CH3_NEXT_REC_PTR         0x83c
-#define CH0_CTRL                 0x840
-#define CH1_CTRL                 0x844
-#define CH2_CTRL                 0x848
-#define CH3_CTRL                 0x84c
-#define DMA_ARBITER              0x860
-#define TIMER0                   0x850
-#define TIMER1                   0x854
-#define TIMER2                   0x858
-#define TIMER3                   0x85c
-#define TIMER_CTRL               0x864
-#define PCI_CMD                  0xc00
-#define PCI_TIMEOUT              0xc04
-#define PCI_RAS10_BANK_SIZE      0xc08
-#define PCI_RAS32_BANK_SIZE      0xc0c
-#define PCI_CS20_BANK_SIZE       0xc10
-#define PCI_CS3_BANK_SIZE        0xc14
-#define PCI_SERRMASK             0xc28
-#define PCI_INTACK               0xc34
-#define PCI_BAR_EN               0xc3c
-#define PCI_CFG_ADR              0xcf8
-#define PCI_CFG_DATA             0xcfc
-#define PCI_INTCAUSE             0xc18
-#define PCI_MAST_MASK            0xc1c
-#define PCI_PCIMASK              0xc24
-#define BAR_ENABLE_ADR           0xc3c
-/* These are config registers, accessible via PCI space */
-#define PCI_CONFIG_RAS10_BASE_ADR   0x010
-#define PCI_CONFIG_RAS32_BASE_ADR   0x014
-#define PCI_CONFIG_CS20_BASE_ADR    0x018
-#define PCI_CONFIG_CS3_BASE_ADR     0x01c
-#define PCI_CONFIG_INT_REG_MM_ADR   0x020
-#define PCI_CONFIG_INT_REG_IO_ADR   0x024
-#define PCI_CONFIG_BOARD_VENDOR     0x02c
-#define PCI_CONFIG_ROM_ADR          0x030
-#define PCI_CONFIG_INT_PIN_LINE     0x03c
-#endif
diff --git a/include/asm-sh/overdrive/io.h b/include/asm-sh/overdrive/io.h
deleted file mode 100644
index 0dba700e9643..000000000000
--- a/include/asm-sh/overdrive/io.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * include/asm-sh/io_od.h
- *
- * Copyright 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * IO functions for an STMicroelectronics Overdrive
- */
-#ifndef _ASM_SH_IO_OD_H
-#define _ASM_SH_IO_OD_H
-extern unsigned char od_inb(unsigned long port);
-extern unsigned short od_inw(unsigned long port);
-extern unsigned int od_inl(unsigned long port);
-extern void od_outb(unsigned char value, unsigned long port);
-extern void od_outw(unsigned short value, unsigned long port);
-extern void od_outl(unsigned int value, unsigned long port);
-extern unsigned char od_inb_p(unsigned long port);
-extern unsigned short od_inw_p(unsigned long port);
-extern unsigned int od_inl_p(unsigned long port);
-extern void od_outb_p(unsigned char value, unsigned long port);
-extern void od_outw_p(unsigned short value, unsigned long port);
-extern void od_outl_p(unsigned int value, unsigned long port);
-extern void od_insb(unsigned long port, void *addr, unsigned long count);
-extern void od_insw(unsigned long port, void *addr, unsigned long count);
-extern void od_insl(unsigned long port, void *addr, unsigned long count);
-extern void od_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void od_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void od_outsl(unsigned long port, const void *addr, unsigned long count);
-extern unsigned long od_isa_port2addr(unsigned long offset);
-#endif /* _ASM_SH_IO_OD_H */
diff --git a/include/asm-sh/overdrive/overdrive.h b/include/asm-sh/overdrive/overdrive.h
deleted file mode 100644
index fc746c244f83..000000000000
--- a/include/asm-sh/overdrive/overdrive.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* 
- * Copyright (C) 2000 David J. Mckay (david.mckay@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.                            
- *
- */
-#ifndef __OVERDRIVE_H__
-#define __OVERDRIVE_H__
-#define OVERDRIVE_INT_CT 0xa3a00000
-#define OVERDRIVE_INT_DT 0xa3b00000
-#define OVERDRIVE_CTRL    0xa3000000
-/* Shoving all these bits into the same register is not a good idea. 
- * As soon as I get a spare moment, I'll change the FPGA and put each 
- * bit in a separate register
- */
-#define VALID_CTRL_BITS                   0x1f
-#define ENABLE_RS232_MASK                 0x1e
-#define DISABLE_RS232_BIT                 0x01
-#define ENABLE_NMI_MASK                   0x1d
-#define DISABLE_NMI_BIT                   0x02
-#define RESET_PCI_MASK                    0x1b
-#define ENABLE_PCI_BIT                    0x04
-#define ENABLE_LED_MASK                   0x17
-#define DISABLE_LED_BIT                   0x08
-#define RESET_FPGA_MASK                   0x0f
-#define ENABLE_FPGA_BIT                   0x10
-#define FPGA_DCLK_ADDRESS           0xA3C00000
-#define FPGA_DATA        0x01   /*   W */
-#define FPGA_CONFDONE    0x02   /* R   */
-#define FPGA_NOT_STATUS  0x04   /* R   */
-#define FPGA_INITDONE    0x08   /* R   */
-#define FPGA_TIMEOUT     100000
-/* Interrupts for the overdrive. Note that these numbers have 
- * nothing to do with the actual IRQ numbers they appear on, 
- * this is all programmable. This is simply the position in the 
- * INT_CT register.
- */
-#define OVERDRIVE_PCI_INTA              0
-#define OVERDRIVE_PCI_INTB              1
-#define OVERDRIVE_PCI_INTC              2
-#define OVERDRIVE_PCI_INTD              3
-#define OVERDRIVE_GALILEO_INT           4
-#define OVERDRIVE_GALILEO_LOCAL_INT     5
-#define OVERDRIVE_AUDIO_INT             6
-#define OVERDRIVE_KEYBOARD_INT          7
-/* Which Linux IRQ should we assign to each interrupt source? */
-#define OVERDRIVE_PCI_IRQ1              2
-#ifdef CONFIG_HACKED_NE2K
-#define OVERDRIVE_PCI_IRQ2              7
-#else
-#define OVERDRIVE_PCI_IRQ2              2
-#undef OVERDRIVE_PCI_INTB 
-#define OVERDRIVE_PCI_INTB OVERDRIVE_PCI_INTA
-#endif
-/* Put the ESS solo audio chip on IRQ 4 */
-#define OVERDRIVE_ESS_IRQ               4
-/* Where the memory behind the PCI bus appears */
-#define PCI_DRAM_BASE   0xb7000000
-#define PCI_DRAM_SIZE (16*1024*1024)
-#define PCI_DRAM_FINISH (PCI_DRAM_BASE+PCI_DRAM_SIZE-1)
-/* Where the IO region appears in the memory */
-#define PCI_GTIO_BASE   0xb8000000
-#endif
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h
index 5a057b00f19a..ca8b26d90475 100644
--- a/include/asm-sh/page.h
+++ b/include/asm-sh/page.h
@@ -16,7 +16,13 @@
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT      12
+#ifdef __ASSEMBLY__
+#define PAGE_SIZE       (1 << PAGE_SHIFT)
+#else
 #define PAGE_SIZE       (1UL << PAGE_SHIFT)
+#endif
 #define PAGE_MASK       (~(PAGE_SIZE-1))
 #define PTE_MASK        PAGE_MASK
@@ -30,7 +36,6 @@
 #define HPAGE_SIZE              (1UL << HPAGE_SHIFT)
 #define HPAGE_MASK              (~(HPAGE_SIZE-1))
 #define HUGETLB_PAGE_ORDER      (HPAGE_SHIFT-PAGE_SHIFT)
-#define ARCH_HAS_SETCLEAR_HUGE_PTE
 #endif
 #ifdef __KERNEL__
@@ -39,10 +44,18 @@
 extern void (*clear_page)(void *to);
 extern void (*copy_page)(void *to, void *from);
+extern unsigned long shm_align_mask;
+#ifdef CONFIG_MMU
 extern void clear_page_slow(void *to);
 extern void copy_page_slow(void *to, void *from);
+#else
+extern void clear_page_nommu(void *to);
+extern void copy_page_nommu(void *to, void *from);
+#endif
-#if defined(CONFIG_SH7705_CACHE_32KB) && defined(CONFIG_MMU)
+#if defined(CONFIG_MMU) && (defined(CONFIG_CPU_SH4) || \
+        defined(CONFIG_SH7705_CACHE_32KB))
 struct page;
 extern void clear_user_page(void *to, unsigned long address, struct page *pg);
 extern void copy_user_page(void *to, void *from, unsigned long address, struct page *pg);
@@ -51,29 +64,20 @@ extern void __copy_user_page(void *to, void *from, void *orig_to);
 #elif defined(CONFIG_CPU_SH2) || defined(CONFIG_CPU_SH3) || !defined(CONFIG_MMU)
 #define clear_user_page(page, vaddr, pg)        clear_page(page)
 #define copy_user_page(to, from, vaddr, pg)     copy_page(to, from)
-#elif defined(CONFIG_CPU_SH4)
-struct page;
-extern void clear_user_page(void *to, unsigned long address, struct page *pg);
-extern void copy_user_page(void *to, void *from, unsigned long address, struct page *pg);
-extern void __clear_user_page(void *to, void *orig_to);
-extern void __copy_user_page(void *to, void *from, void *orig_to);
 #endif
 /*
 * These are used to make use of C type-checking..
 */
 typedef struct { unsigned long pte; } pte_t;
-typedef struct { unsigned long pmd; } pmd_t;
 typedef struct { unsigned long pgd; } pgd_t;
 typedef struct { unsigned long pgprot; } pgprot_t;
 #define pte_val(x)      ((x).pte)
-#define pmd_val(x)      ((x).pmd)
 #define pgd_val(x)      ((x).pgd)
 #define pgprot_val(x)   ((x).pgprot)
 #define __pte(x) ((pte_t) { (x) } )
-#define __pmd(x) ((pmd_t) { (x) } )
 #define __pgd(x) ((pgd_t) { (x) } )
 #define __pgprot(x)     ((pgprot_t) { (x) } )
@@ -93,7 +97,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define __MEMORY_START          CONFIG_MEMORY_START
 #define __MEMORY_SIZE           CONFIG_MEMORY_SIZE
-#define PAGE_OFFSET             (0x80000000UL)
+#define PAGE_OFFSET             CONFIG_PAGE_OFFSET
 #define __pa(x)                 ((unsigned long)(x)-PAGE_OFFSET)
 #define __va(x)                 ((void *)((unsigned long)(x)+PAGE_OFFSET))
@@ -112,9 +116,13 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* __KERNEL__ */
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
+/* vDSO support */
+#ifdef CONFIG_VSYSCALL
+#define __HAVE_ARCH_GATE_AREA
+#endif
+#endif /* __KERNEL__ */
 #endif /* __ASM_SH_PAGE_H */
diff --git a/include/asm-sh/pci.h b/include/asm-sh/pci.h
index 0a523c85b11c..6ccc948fe216 100644
--- a/include/asm-sh/pci.h
+++ b/include/asm-sh/pci.h
@@ -32,6 +32,34 @@ extern struct pci_channel board_pci_channels[];
 #define PCIBIOS_MIN_IO          board_pci_channels->io_resource->start
 #define PCIBIOS_MIN_MEM         board_pci_channels->mem_resource->start
+/*
+ * I/O routine helpers
+ */
+#ifdef CONFIG_CPU_SUBTYPE_SH7780
+#define PCI_IO_AREA             0xFE400000
+#define PCI_IO_SIZE             0x00400000
+#else
+#define PCI_IO_AREA             0xFE240000
+#define PCI_IO_SIZE             0X00040000
+#endif
+#define PCI_MEM_SIZE            0x01000000
+#define SH4_PCIIOBR_MASK        0xFFFC0000
+#define pci_ioaddr(addr)        (PCI_IO_AREA + (addr & ~SH4_PCIIOBR_MASK))
+#if defined(CONFIG_PCI)
+#define is_pci_ioaddr(port)             \
+        (((port) >= PCIBIOS_MIN_IO) &&  \
+         ((port) < (PCIBIOS_MIN_IO + PCI_IO_SIZE)))
+#define is_pci_memaddr(port)            \
+        (((port) >= PCIBIOS_MIN_MEM) && \
+         ((port) < (PCIBIOS_MIN_MEM + PCI_MEM_SIZE)))
+#else
+#define is_pci_ioaddr(port)     (0)
+#define is_pci_memaddr(port)    (0)
+#endif
 struct pci_dev;
 extern void pcibios_set_master(struct pci_dev *dev);
@@ -87,15 +115,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
 */
 #define pci_dac_dma_supported(pci_dev, mask) (0)
-/* These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)      (virt_to_bus((sg)->dma_address))
-#define sg_dma_len(sg)          ((sg)->length)
 #ifdef CONFIG_PCI
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
                                        enum pci_dma_burst_strategy *strat,
@@ -107,11 +126,12 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 #endif
 /* Board-specific fixup routines. */
-extern void pcibios_fixup(void);
+void pcibios_fixup(void);
-extern void pcibios_fixup_irqs(void);
+int pcibios_init_platform(void);
+int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin);
 #ifdef CONFIG_PCI_AUTO
-extern int pciauto_assign_resources(int busno, struct pci_channel *hose);
+int pciauto_assign_resources(int busno, struct pci_channel *hose);
 #endif
 static inline void pcibios_add_platform_entries(struct pci_dev *dev)
diff --git a/include/asm-sh/pgalloc.h b/include/asm-sh/pgalloc.h
index f4f233f7a4f5..e841465ab4d2 100644
--- a/include/asm-sh/pgalloc.h
+++ b/include/asm-sh/pgalloc.h
@@ -1,15 +1,6 @@
 #ifndef __ASM_SH_PGALLOC_H
 #define __ASM_SH_PGALLOC_H
-#include <linux/threads.h>
-#include <linux/slab.h>
-#include <linux/mm.h>
-#define pgd_quicklist ((unsigned long *)0)
-#define pmd_quicklist ((unsigned long *)0)
-#define pte_quicklist ((unsigned long *)0)
-#define pgtable_cache_size 0L
 #define pmd_populate_kernel(mm, pmd, pte) \
                set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
@@ -24,38 +15,24 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 */
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
-        unsigned int pgd_size = (USER_PTRS_PER_PGD * sizeof(pgd_t));
+        return (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
-        pgd_t *pgd = (pgd_t *)kmalloc(pgd_size, GFP_KERNEL);
-        if (pgd)
-                memset(pgd, 0, pgd_size);
-        return pgd;
 }
 static inline void pgd_free(pgd_t *pgd)
 {
-        kfree(pgd);
+        free_page((unsigned long)pgd);
 }
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                          unsigned long address)
 {
-        pte_t *pte;
+        return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
-        pte = (pte_t *) __get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
-        return pte;
 }
 static inline struct page *pte_alloc_one(struct mm_struct *mm,
                                         unsigned long address)
 {
-        struct page *pte;
+        return alloc_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
-        pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
-        return pte;
 }
 static inline void pte_free_kernel(pte_t *pte)
@@ -75,14 +52,8 @@ static inline void pte_free(struct page *pte)
 * inside the pgd, so has no extra memory associated with it.
 */
-#define pmd_alloc_one(mm, addr)         ({ BUG(); ((pmd_t *)2); })
 #define pmd_free(x)                     do { } while (0)
 #define __pmd_free_tlb(tlb,x)           do { } while (0)
-#define pgd_populate(mm, pmd, pte)      BUG()
 #define check_pgt_cache()               do { } while (0)
-#ifdef CONFIG_CPU_SH4
-#define PG_mapped                       PG_arch_1
-#endif
 #endif /* __ASM_SH_PGALLOC_H */
diff --git a/include/asm-sh/pgtable-2level.h b/include/asm-sh/pgtable-2level.h
index b0528aa3cb1f..b525db6f61c6 100644
--- a/include/asm-sh/pgtable-2level.h
+++ b/include/asm-sh/pgtable-2level.h
@@ -50,9 +50,12 @@ static inline void pgd_clear (pgd_t * pgdp) 	{ }
 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
 #define set_pgd(pgdptr, pgdval) (*(pgdptr) = pgdval)
-#define pgd_page(pgd) \
+#define pgd_page_vaddr(pgd) \
 ((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))
+#define pgd_page(pgd) \
+        (phys_to_page(pgd_val(pgd)))
 static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 {
        return (pmd_t *) dir;
diff --git a/include/asm-sh/pgtable.h b/include/asm-sh/pgtable.h
index dcd23a03683d..2c8682ad1012 100644
--- a/include/asm-sh/pgtable.h
+++ b/include/asm-sh/pgtable.h
@@ -1,42 +1,42 @@
-#ifndef __ASM_SH_PGTABLE_H
-#define __ASM_SH_PGTABLE_H
-#include <asm-generic/4level-fixup.h>
 /*
+ * This file contains the functions and defines necessary to modify and
+ * use the SuperH page table tree.
+ *
 * Copyright (C) 1999 Niibe Yutaka
- * Copyright (C) 2002, 2003, 2004 Paul Mundt
+ * Copyright (C) 2002 - 2005 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file "COPYING" in the main directory of this
+ * archive for more details.
 */
+#ifndef __ASM_SH_PGTABLE_H
+#define __ASM_SH_PGTABLE_H
-#include <asm/pgtable-2level.h>
+#include <asm-generic/pgtable-nopmd.h>
+#include <asm/page.h>
+#define PTRS_PER_PGD            1024
-/*
- * This file contains the functions and defines necessary to modify and use
- * the SuperH page table tree.
- */
 #ifndef __ASSEMBLY__
-#include <asm/processor.h>
 #include <asm/addrspace.h>
 #include <asm/fixmap.h>
-#include <linux/threads.h>
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
 extern void paging_init(void);
 /*
- * Basically we have the same two-level (which is the logical three level
- * Linux page table layout folded) page tables as the i386.
- */
-/*
 * ZERO_PAGE is a global shared page that is always zero: used
 * for zero-mapped memory areas etc..
 */
-extern unsigned long empty_zero_page[1024];
+extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
 #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
 #endif /* !__ASSEMBLY__ */
+/* traditional two-level paging structure */
+#define PGDIR_SHIFT     22
+#define PTRS_PER_PMD    1
+#define PTRS_PER_PTE    1024
 #define PMD_SIZE        (1UL << PMD_SHIFT)
 #define PMD_MASK        (~(PMD_SIZE-1))
 #define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
@@ -47,7 +47,6 @@ extern unsigned long empty_zero_page[1024];
 #define PTE_PHYS_MASK   0x1ffff000
-#ifndef __ASSEMBLY__
 /*
 * First 1MB map is used by fixed purpose.
 * Currently only 4-enty (16kB) is used (see arch/sh/mm/cache.c)
@@ -55,20 +54,41 @@ extern unsigned long empty_zero_page[1024];
 #define VMALLOC_START   (P3SEG+0x00100000)
 #define VMALLOC_END     (FIXADDR_START-2*PAGE_SIZE)
-#define _PAGE_WT        0x001  /* WT-bit on SH-4, 0 on SH-3 */
+/*
-#define _PAGE_HW_SHARED 0x002  /* SH-bit  : page is shared among processes */
+ * Linux PTEL encoding.
-#define _PAGE_DIRTY     0x004  /* D-bit   : page changed */
+ *
-#define _PAGE_CACHABLE  0x008  /* C-bit   : cachable */
+ * Hardware and software bit definitions for the PTEL value:
-#define _PAGE_SZ0       0x010  /* SZ0-bit : Size of page */
+ *
-#define _PAGE_RW        0x020  /* PR0-bit : write access allowed */
+ * - Bits 0 and 7 are reserved on SH-3 (_PAGE_WT and _PAGE_SZ1 on SH-4).
-#define _PAGE_USER      0x040  /* PR1-bit : user space access allowed */
+ *
-#define _PAGE_SZ1       0x080  /* SZ1-bit : Size of page (on SH-4) */
+ * - Bit 1 is the SH-bit, but is unused on SH-3 due to an MMU bug (the
-#define _PAGE_PRESENT   0x100  /* V-bit   : page is valid */
+ *   hardware PTEL value can't have the SH-bit set when MMUCR.IX is set,
-#define _PAGE_PROTNONE  0x200  /* software: if not present  */
+ *   which is the default in cpu-sh3/mmu_context.h:MMU_CONTROL_INIT).
-#define _PAGE_ACCESSED  0x400  /* software: page referenced */
+ *
-#define _PAGE_U0_SHARED 0x800  /* software: page is shared in user space */
+ *   In order to keep this relatively clean, do not use these for defining
+ *   SH-3 specific flags until all of the other unused bits have been
-#define _PAGE_FILE      _PAGE_WT  /* software: pagecache or swap? */
+ *   exhausted.
+ *
+ * - Bit 9 is reserved by everyone and used by _PAGE_PROTNONE.
+ *
+ * - Bits 10 and 11 are low bits of the PPN that are reserved on >= 4K pages.
+ *   Bit 10 is used for _PAGE_ACCESSED, bit 11 remains unused.
+ *
+ * - Bits 31, 30, and 29 remain unused by everyone and can be used for future
+ *   software flags, although care must be taken to update _PAGE_CLEAR_FLAGS.
+ */
+#define _PAGE_WT        0x001           /* WT-bit on SH-4, 0 on SH-3 */
+#define _PAGE_HW_SHARED 0x002           /* SH-bit  : shared among processes */
+#define _PAGE_DIRTY     0x004           /* D-bit   : page changed */
+#define _PAGE_CACHABLE  0x008           /* C-bit   : cachable */
+#define _PAGE_SZ0       0x010           /* SZ0-bit : Size of page */
+#define _PAGE_RW        0x020           /* PR0-bit : write access allowed */
+#define _PAGE_USER      0x040           /* PR1-bit : user space access allowed */
+#define _PAGE_SZ1       0x080           /* SZ1-bit : Size of page (on SH-4) */
+#define _PAGE_PRESENT   0x100           /* V-bit   : page is valid */
+#define _PAGE_PROTNONE  0x200           /* software: if not present  */
+#define _PAGE_ACCESSED  0x400           /* software: page referenced */
+#define _PAGE_FILE      _PAGE_WT        /* software: pagecache or swap? */
 /* software: moves to PTEA.TC (Timing Control) */
 #define _PAGE_PCC_AREA5 0x00000000      /* use BSC registers for area5 */
@@ -83,23 +103,17 @@ extern unsigned long empty_zero_page[1024];
 #define _PAGE_PCC_ATR8  0x60000000      /* Attribute Memory space, 8 bit bus */
 #define _PAGE_PCC_ATR16 0x60000001      /* Attribute Memory space, 6 bit bus */
+/* Mask which drops unused bits from the PTEL value */
-/* Mask which drop software flags
+#ifdef CONFIG_CPU_SH3
- * We also drop WT bit since it is used for _PAGE_FILE
+#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED| \
- * bit in this implementation.
+                                 _PAGE_FILE     | _PAGE_SZ1     | \
- */
+                                 _PAGE_HW_SHARED)
-#define _PAGE_CLEAR_FLAGS       (_PAGE_WT | _PAGE_PROTNONE | _PAGE_ACCESSED | _PAGE_U0_SHARED)
-#if defined(CONFIG_CPU_SH3)
-/*
- * MMU on SH-3 has bug on SH-bit: We can't use it if MMUCR.IX=1.
- * Work around: Just drop SH-bit.
- */
-#define _PAGE_FLAGS_HARDWARE_MASK       (0x1fffffff & ~(_PAGE_CLEAR_FLAGS | _PAGE_HW_SHARED))
 #else
-#define _PAGE_FLAGS_HARDWARE_MASK       (0x1fffffff & ~(_PAGE_CLEAR_FLAGS))
+#define _PAGE_CLEAR_FLAGS       (_PAGE_PROTNONE | _PAGE_ACCESSED | _PAGE_FILE)
 #endif
+#define _PAGE_FLAGS_HARDWARE_MASK       (0x1fffffff & ~(_PAGE_CLEAR_FLAGS))
 /* Hardware flags: SZ0=1 (4k-byte) */
 #define _PAGE_FLAGS_HARD        _PAGE_SZ0
@@ -109,15 +123,15 @@ extern unsigned long empty_zero_page[1024];
 #define _PAGE_SZHUGE    (_PAGE_SZ0 | _PAGE_SZ1)
 #endif
-#define _PAGE_SHARED    _PAGE_U0_SHARED
 #define _PAGE_TABLE     (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)
 #define _KERNPG_TABLE   (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)
-#define _PAGE_CHG_MASK  (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | _PAGE_DIRTY | _PAGE_SHARED)
+#define _PAGE_CHG_MASK  (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | _PAGE_DIRTY)
+#ifndef __ASSEMBLY__
 #ifdef CONFIG_MMU
 #define PAGE_NONE       __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE |_PAGE_ACCESSED | _PAGE_FLAGS_HARD)
-#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_CACHABLE |_PAGE_ACCESSED | _PAGE_SHARED | _PAGE_FLAGS_HARD)
+#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_CACHABLE |_PAGE_ACCESSED | _PAGE_FLAGS_HARD)
 #define PAGE_COPY       __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
 #define PAGE_READONLY   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_CACHABLE | _PAGE_ACCESSED | _PAGE_FLAGS_HARD)
 #define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_CACHABLE | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_HW_SHARED | _PAGE_FLAGS_HARD)
@@ -137,12 +151,13 @@ extern unsigned long empty_zero_page[1024];
 #define PAGE_KERNEL_PCC         __pgprot(0)
 #endif
+#endif /* __ASSEMBLY__ */
 /*
 * As i386 and MIPS, SuperH can't do page protection for execute, and
 * considers that the same as a read.  Also, write permissions imply
- * read permissions. This is the closest we can get..  
+ * read permissions. This is the closest we can get..
 */
 #define __P000  PAGE_NONE
 #define __P001  PAGE_READONLY
 #define __P010  PAGE_COPY
@@ -161,6 +176,26 @@ extern unsigned long empty_zero_page[1024];
 #define __S110  PAGE_SHARED
 #define __S111  PAGE_SHARED
+#ifndef __ASSEMBLY__
+/*
+ * Certain architectures need to do special things when PTEs
+ * within a page table are directly modified.  Thus, the following
+ * hook is made available.
+ */
+#define set_pte(pteptr, pteval) (*(pteptr) = pteval)
+#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
+/*
+ * (pmds are folded into pgds so this doesn't get actually called,
+ * but the define is needed for a generic inline function.)
+ */
+#define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
+#define pte_pfn(x)              ((unsigned long)(((x).pte >> PAGE_SHIFT)))
+#define pfn_pte(pfn, prot)      __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
+#define pfn_pmd(pfn, prot)      __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
 #define pte_none(x)     (!pte_val(x))
 #define pte_present(x)  (pte_val(x) & (_PAGE_PRESENT | _PAGE_PROTNONE))
 #define pte_clear(mm,addr,xp)   do { set_pte_at(mm, addr, xp, __pte(0)); } while (0)
@@ -171,7 +206,7 @@ extern unsigned long empty_zero_page[1024];
 #define pmd_bad(x)      ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
 #define pages_to_mb(x)  ((x) >> (20-PAGE_SHIFT))
-#define pte_page(x)     phys_to_page(pte_val(x)&PTE_PHYS_MASK)
+#define pte_page(x)     phys_to_page(pte_val(x)&PTE_PHYS_MASK)
 /*
 * The following only work if pte_present() is true.
@@ -225,7 +260,7 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 { set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot))); return pte; }
-#define pmd_page_kernel(pmd) \
+#define pmd_page_vaddr(pmd) \
 ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 #define pmd_page(pmd) \
@@ -242,12 +277,17 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define pte_index(address) \
                ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address))
 #define pte_offset_map(dir, address) pte_offset_kernel(dir, address)
 #define pte_offset_map_nested(dir, address) pte_offset_kernel(dir, address)
 #define pte_unmap(pte)          do { } while (0)
 #define pte_unmap_nested(pte)   do { } while (0)
+#define pte_ERROR(e) \
+        printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
+#define pgd_ERROR(e) \
+        printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
 struct vm_area_struct;
 extern void update_mmu_cache(struct vm_area_struct * vma,
                             unsigned long address, pte_t pte);
@@ -272,8 +312,6 @@ extern void update_mmu_cache(struct vm_area_struct * vma,
 typedef pte_t *pte_addr_t;
-#endif /* !__ASSEMBLY__ */
 #define kern_addr_valid(addr)   (1)
 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot)         \
@@ -301,5 +339,5 @@ extern pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t
 #include <asm-generic/pgtable.h>
+#endif /* !__ASSEMBLY__ */
 #endif /* __ASM_SH_PAGE_H */
diff --git a/include/asm-sh/pm.h b/include/asm-sh/pm.h
new file mode 100644
index 000000000000..56fdbd6b1c94
--- /dev/null
+++ b/include/asm-sh/pm.h
@@ -0,0 +1,17 @@
+/*
+ * 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 2006 (c) Andriy Skulysh <askulysh@gmail.com>
+ *
+ */
+#ifndef __ASM_SH_PM_H
+#define __ASM_SH_PM_H
+extern u8 wakeup_start;
+extern u8 wakeup_end;
+void pm_enter(void);
+#endif
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index eeb0f48bb99e..474773853cd1 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -14,6 +14,7 @@
 #include <asm/types.h>
 #include <asm/cache.h>
 #include <asm/ptrace.h>
+#include <asm/cpu-features.h>
 /*
 * Default implementation of macro that returns current
@@ -38,27 +39,30 @@ enum cpu_type {
        CPU_SH7604,
        /* SH-3 types */
-        CPU_SH7705, CPU_SH7707,  CPU_SH7708, CPU_SH7708S, CPU_SH7708R,
+        CPU_SH7705, CPU_SH7706, CPU_SH7707,
-        CPU_SH7709, CPU_SH7709A, CPU_SH7729, CPU_SH7300,
+        CPU_SH7708, CPU_SH7708S, CPU_SH7708R,
+        CPU_SH7709, CPU_SH7709A, CPU_SH7710,
+        CPU_SH7729, CPU_SH7300,
        /* SH-4 types */
        CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R,
        CPU_SH7760, CPU_ST40RA, CPU_ST40GX1, CPU_SH4_202, CPU_SH4_501,
-        CPU_SH73180, CPU_SH7770, CPU_SH7780, CPU_SH7781,
+        CPU_SH73180, CPU_SH7343, CPU_SH7770, CPU_SH7780, CPU_SH7781,
        /* Unknown subtype */
        CPU_SH_NONE
 };
 struct sh_cpuinfo {
-        enum cpu_type type;
+        unsigned int type;
        unsigned long loops_per_jiffy;
-        struct cache_info icache;
+        struct cache_info icache;       /* Primary I-cache */
-        struct cache_info dcache;
+        struct cache_info dcache;       /* Primary D-cache */
+        struct cache_info scache;       /* Secondary cache */
        unsigned long flags;
-};
+} __attribute__ ((aligned(SMP_CACHE_BYTES)));
 extern struct sh_cpuinfo boot_cpu_data;
@@ -125,17 +129,6 @@ union sh_fpu_union {
        struct sh_fpu_soft_struct soft;
 };
-/*
- * Processor flags
- */
-#define CPU_HAS_FPU             0x0001  /* Hardware FPU support */
-#define CPU_HAS_P2_FLUSH_BUG    0x0002  /* Need to flush the cache in P2 area */
-#define CPU_HAS_MMU_PAGE_ASSOC  0x0004  /* SH3: TLB way selection bit support */
-#define CPU_HAS_DSP             0x0008  /* SH-DSP: DSP support */
-#define CPU_HAS_PERF_COUNTER    0x0010  /* Hardware performance counters */
-#define CPU_HAS_PTEA            0x0020  /* PTEA register */
 struct thread_struct {
        unsigned long sp;
        unsigned long pc;
@@ -149,6 +142,10 @@ struct thread_struct {
        union sh_fpu_union fpu;
 };
+typedef struct {
+        unsigned long seg;
+} mm_segment_t;
 /* Count of active tasks with UBC settings */
 extern int ubc_usercnt;
@@ -266,5 +263,24 @@ extern unsigned long get_wchan(struct task_struct *p);
 #define cpu_sleep()     __asm__ __volatile__ ("sleep" : : : "memory")
 #define cpu_relax()     barrier()
+#if defined(CONFIG_CPU_SH2A) || defined(CONFIG_CPU_SH3) || \
+    defined(CONFIG_CPU_SH4)
+#define PREFETCH_STRIDE         L1_CACHE_BYTES
+#define ARCH_HAS_PREFETCH
+#define ARCH_HAS_PREFETCHW
+static inline void prefetch(void *x)
+{
+        __asm__ __volatile__ ("pref @%0\n\t" : : "r" (x) : "memory");
+}
+#define prefetchw(x)    prefetch(x)
+#endif
+#ifdef CONFIG_VSYSCALL
+extern int vsyscall_init(void);
+#else
+#define vsyscall_init() do { } while (0)
+#endif
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_PROCESSOR_H */
diff --git a/include/asm-sh/ptrace.h b/include/asm-sh/ptrace.h
index 792fc35bd624..ed358a376e6e 100644
--- a/include/asm-sh/ptrace.h
+++ b/include/asm-sh/ptrace.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_SH_PTRACE_H
 #define __ASM_SH_PTRACE_H
-#include <asm/ubc.h>
 /*
 * Copyright (C) 1999, 2000  Niibe Yutaka
 *
diff --git a/include/asm-sh/r7780rp/ide.h b/include/asm-sh/r7780rp/ide.h
new file mode 100644
index 000000000000..a1ed78e0f617
--- /dev/null
+++ b/include/asm-sh/r7780rp/ide.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_R7780RP_IDE_H
+#define __ASM_SH_R7780RP_IDE_H
+/* Nothing to see here.. */
+#include <asm/mach/r7780rp.h>
+#endif /* __ASM_SH_R7780RP_IDE_H */
diff --git a/include/asm-sh/r7780rp/r7780rp.h b/include/asm-sh/r7780rp/r7780rp.h
new file mode 100644
index 000000000000..f95d9dba31a2
--- /dev/null
+++ b/include/asm-sh/r7780rp/r7780rp.h
@@ -0,0 +1,177 @@
+#ifndef __ASM_SH_RENESAS_R7780RP_H
+#define __ASM_SH_RENESAS_R7780RP_H
+/*
+ * linux/include/asm-sh/r7780rp.h
+ *
+ * Copyright (C) 2000  Atom Create Engineering Co., Ltd.
+ *
+ * Renesas Solutions Highlander R7780RP support
+ */
+/* Box specific addresses.  */
+#if defined(CONFIG_SH_R7780MP)
+#define PA_BCR          0xa4000000      /* FPGA */
+#define PA_IRLMSK       (PA_BCR+0x0000) /* Interrupt Mask control */
+#define PA_IRLMON       (PA_BCR+0x0002) /* Interrupt Status control */
+#define PA_IRLPRI1      (PA_BCR+0x0004) /* Interrupt Priorty 1 */
+#define PA_IRLPRI2      (PA_BCR+0x0006) /* Interrupt Priorty 2 */
+#define PA_IRLPRI3      (PA_BCR+0x0008) /* Interrupt Priorty 3 */
+#define PA_IRLPRI4      (PA_BCR+0x000a) /* Interrupt Priorty 4 */
+#define PA_RSTCTL       (PA_BCR+0x000c) /* Reset Control */
+#define PA_PCIBD        (PA_BCR+0x000e) /* PCI Board detect control */
+#define PA_PCICD        (PA_BCR+0x0010) /* PCI Conector detect control */
+#define PA_EXTGIO       (PA_BCR+0x0016) /* Extension GPIO Control */
+#define PA_IVDRMON      (PA_BCR+0x0018) /* iVDR Moniter control */
+#define PA_IVDRCTL      (PA_BCR+0x001a) /* iVDR control */
+#define PA_OBLED        (PA_BCR+0x001c) /* On Board LED control */
+#define PA_OBSW         (PA_BCR+0x001e) /* On Board Switch control */
+#define PA_AUDIOSEL     (PA_BCR+0x0020) /* Sound Interface Select control */
+#define PA_EXTPLR       (PA_BCR+0x001e) /* Extention Pin Polarity control */
+#define PA_TPCTL        (PA_BCR+0x0100) /* Touch Panel Access control */
+#define PA_TPDCKCTL     (PA_BCR+0x0102) /* Touch Panel Access data control */
+#define PA_TPCTLCLR     (PA_BCR+0x0104) /* Touch Panel Access control */
+#define PA_TPXPOS       (PA_BCR+0x0106) /* Touch Panel X position control */
+#define PA_TPYPOS       (PA_BCR+0x0108) /* Touch Panel Y position control */
+#define PA_DBSW         (PA_BCR+0x0200) /* Debug Board Switch control */
+#define PA_CFCTL        (PA_BCR+0x0300) /* CF Timing control */
+#define PA_CFPOW        (PA_BCR+0x0302) /* CF Power control */
+#define PA_CFCDINTCLR   (PA_BCR+0x0304) /* CF Insert Interrupt clear */
+#define PA_SCSMR0       (PA_BCR+0x0400) /* SCIF0 Serial mode control */
+#define PA_SCBRR0       (PA_BCR+0x0404) /* SCIF0 Bit rate control */
+#define PA_SCSCR0       (PA_BCR+0x0408) /* SCIF0 Serial control */
+#define PA_SCFTDR0      (PA_BCR+0x040c) /* SCIF0 Send FIFO control */
+#define PA_SCFSR0       (PA_BCR+0x0410) /* SCIF0 Serial status control */
+#define PA_SCFRDR0      (PA_BCR+0x0414) /* SCIF0 Receive FIFO control */
+#define PA_SCFCR0       (PA_BCR+0x0418) /* SCIF0 FIFO control */
+#define PA_SCTFDR0      (PA_BCR+0x041c) /* SCIF0 Send FIFO data control */
+#define PA_SCRFDR0      (PA_BCR+0x0420) /* SCIF0 Receive FIFO data control */
+#define PA_SCSPTR0      (PA_BCR+0x0424) /* SCIF0 Serial Port control */
+#define PA_SCLSR0       (PA_BCR+0x0428) /* SCIF0 Line Status control */
+#define PA_SCRER0       (PA_BCR+0x042c) /* SCIF0 Serial Error control */
+#define PA_SCSMR1       (PA_BCR+0x0500) /* SCIF1 Serial mode control */
+#define PA_SCBRR1       (PA_BCR+0x0504) /* SCIF1 Bit rate control */
+#define PA_SCSCR1       (PA_BCR+0x0508) /* SCIF1 Serial control */
+#define PA_SCFTDR1      (PA_BCR+0x050c) /* SCIF1 Send FIFO control */
+#define PA_SCFSR1       (PA_BCR+0x0510) /* SCIF1 Serial status control */
+#define PA_SCFRDR1      (PA_BCR+0x0514) /* SCIF1 Receive FIFO control */
+#define PA_SCFCR1       (PA_BCR+0x0518) /* SCIF1 FIFO control */
+#define PA_SCTFDR1      (PA_BCR+0x051c) /* SCIF1 Send FIFO data control */
+#define PA_SCRFDR1      (PA_BCR+0x0520) /* SCIF1 Receive FIFO data control */
+#define PA_SCSPTR1      (PA_BCR+0x0524) /* SCIF1 Serial Port control */
+#define PA_SCLSR1       (PA_BCR+0x0528) /* SCIF1 Line Status control */
+#define PA_SCRER1       (PA_BCR+0x052c) /* SCIF1 Serial Error control */
+#define PA_ICCR         (PA_BCR+0x0600) /* Serial control */
+#define PA_SAR          (PA_BCR+0x0602) /* Serial Slave control */
+#define PA_MDR          (PA_BCR+0x0604) /* Serial Mode control */
+#define PA_ADR1         (PA_BCR+0x0606) /* Serial Address1 control */
+#define PA_DAR1         (PA_BCR+0x0646) /* Serial Data1 control */
+#define PA_VERREG       (PA_BCR+0x0700) /* FPGA Version Register */
+#define PA_POFF         (PA_BCR+0x0800) /* System Power Off control */
+#define PA_PMR          (PA_BCR+0x0900) /*  */
+#define PA_AX88796L     0xa4100400      /* AX88796L Area */
+#define PA_SC1602BSLB   0xa6000000      /* SC1602BSLB Area */
+#define PA_AREA5_IO     0xb4000000      /* Area 5 IO Memory */
+#define PA_AREA6_IO     0xb8000000      /* Area 6 IO Memory */
+#define PA_IDE_OFFSET   0x1f0           /* CF IDE Offset */
+#define AX88796L_IO_BASE        0x1000  /* AX88796L IO Base Address */
+#define IRLCNTR1        (PA_BCR + 0)    /* Interrupt Control Register1 */
+#define IRQ_PCISLOT1    65              /* PCI Slot #1 IRQ */
+#define IRQ_PCISLOT2    66              /* PCI Slot #2 IRQ */
+#define IRQ_PCISLOT3    67              /* PCI Slot #3 IRQ */
+#define IRQ_PCISLOT4    68              /* PCI Slot #4 IRQ */
+#define IRQ_CFCARD      1               /* CF Card IRQ */
+// #define IRQ_CFINST   0               /* CF Card Insert IRQ */
+#define IRQ_TP          2               /* Touch Panel IRQ */
+#define IRQ_SCI1        3               /* SCI1 IRQ */
+#define IRQ_SCI0        4               /* SCI0 IRQ */
+#define IRQ_2SERIAL     5               /* Serial IRQ */
+#define IRQ_RTC         6               /* RTC A / B IRQ */
+#define IRQ_EXTENTION6  7               /* EXT6n IRQ */
+#define IRQ_EXTENTION5  8               /* EXT5n IRQ */
+#define IRQ_EXTENTION4  9               /* EXT4n IRQ */
+#define IRQ_EXTENTION2  10              /* EXT2n IRQ */
+#define IRQ_EXTENTION1  11              /* EXT1n IRQ */
+#define IRQ_ONETH       13              /* On board Ethernet IRQ */
+#define IRQ_PSW         14              /* Push Switch IRQ */
+#else /* R7780RP */
+#define PA_BCR          0xa5000000      /* FPGA */
+#define PA_IRLMSK       (PA_BCR+0x0000) /* Interrupt Mask control */
+#define PA_IRLMON       (PA_BCR+0x0002) /* Interrupt Status control */
+#define PA_SDPOW        (PA_BCR+0x0004) /* SD Power control */
+#define PA_RSTCTL       (PA_BCR+0x0006) /* Device Reset control */
+#define PA_PCIBD        (PA_BCR+0x0008) /* PCI Board detect control */
+#define PA_PCICD        (PA_BCR+0x000a) /* PCI Conector detect control */
+#define PA_ZIGIO1       (PA_BCR+0x000c) /* Zigbee IO control 1 */
+#define PA_ZIGIO2       (PA_BCR+0x000e) /* Zigbee IO control 2 */
+#define PA_ZIGIO3       (PA_BCR+0x0010) /* Zigbee IO control 3 */
+#define PA_ZIGIO4       (PA_BCR+0x0012) /* Zigbee IO control 4 */
+#define PA_IVDRMON      (PA_BCR+0x0014) /* iVDR Moniter control */
+#define PA_IVDRCTL      (PA_BCR+0x0016) /* iVDR control */
+#define PA_OBLED        (PA_BCR+0x0018) /* On Board LED control */
+#define PA_OBSW         (PA_BCR+0x001a) /* On Board Switch control */
+#define PA_AUDIOSEL     (PA_BCR+0x001c) /* Sound Interface Select control */
+#define PA_EXTPLR       (PA_BCR+0x001e) /* Extention Pin Polarity control */
+#define PA_TPCTL        (PA_BCR+0x0100) /* Touch Panel Access control */
+#define PA_TPDCKCTL     (PA_BCR+0x0102) /* Touch Panel Access data control */
+#define PA_TPCTLCLR     (PA_BCR+0x0104) /* Touch Panel Access control */
+#define PA_TPXPOS       (PA_BCR+0x0106) /* Touch Panel X position control */
+#define PA_TPYPOS       (PA_BCR+0x0108) /* Touch Panel Y position control */
+#define PA_DBDET        (PA_BCR+0x0200) /* Debug Board detect control */
+#define PA_DBDISPCTL    (PA_BCR+0x0202) /* Debug Board Dot timing control */
+#define PA_DBSW         (PA_BCR+0x0204) /* Debug Board Switch control */
+#define PA_CFCTL        (PA_BCR+0x0300) /* CF Timing control */
+#define PA_CFPOW        (PA_BCR+0x0302) /* CF Power control */
+#define PA_CFCDINTCLR   (PA_BCR+0x0304) /* CF Insert Interrupt clear */
+#define PA_SCSMR        (PA_BCR+0x0400) /* SCIF Serial mode control */
+#define PA_SCBRR        (PA_BCR+0x0402) /* SCIF Bit rate control */
+#define PA_SCSCR        (PA_BCR+0x0404) /* SCIF Serial control */
+#define PA_SCFDTR       (PA_BCR+0x0406) /* SCIF Send FIFO control */
+#define PA_SCFSR        (PA_BCR+0x0408) /* SCIF Serial status control */
+#define PA_SCFRDR       (PA_BCR+0x040a) /* SCIF Receive FIFO control */
+#define PA_SCFCR        (PA_BCR+0x040c) /* SCIF FIFO control */
+#define PA_SCFDR        (PA_BCR+0x040e) /* SCIF FIFO data control */
+#define PA_SCLSR        (PA_BCR+0x0412) /* SCIF Line Status control */
+#define PA_ICCR         (PA_BCR+0x0500) /* Serial control */
+#define PA_SAR          (PA_BCR+0x0502) /* Serial Slave control */
+#define PA_MDR          (PA_BCR+0x0504) /* Serial Mode control */
+#define PA_ADR1         (PA_BCR+0x0506) /* Serial Address1 control */
+#define PA_DAR1         (PA_BCR+0x0546) /* Serial Data1 control */
+#define PA_VERREG       (PA_BCR+0x0600) /* FPGA Version Register */
+#define PA_AX88796L     0xa5800400      /* AX88796L Area */
+#define PA_SC1602BSLB   0xa6000000      /* SC1602BSLB Area */
+#define PA_AREA5_IO     0xb4000000      /* Area 5 IO Memory */
+#define PA_AREA6_IO     0xb8000000      /* Area 6 IO Memory */
+#define PA_IDE_OFFSET   0x1f0           /* CF IDE Offset */
+#define AX88796L_IO_BASE        0x1000  /* AX88796L IO Base Address */
+#define IRLCNTR1        (PA_BCR + 0)    /* Interrupt Control Register1 */
+#define IRQ_PCISLOT1    0               /* PCI Slot #1 IRQ */
+#define IRQ_PCISLOT2    1               /* PCI Slot #2 IRQ */
+#define IRQ_PCISLOT3    2               /* PCI Slot #3 IRQ */
+#define IRQ_PCISLOT4    3               /* PCI Slot #4 IRQ */
+#define IRQ_CFCARD      4               /* CF Card IRQ */
+#define IRQ_CFINST      5               /* CF Card Insert IRQ */
+#define IRQ_M66596      6               /* M66596 IRQ */
+#define IRQ_SDCARD      7               /* SD Card IRQ */
+#define IRQ_TUCHPANEL   8               /* Touch Panel IRQ */
+#define IRQ_SCI         9               /* SCI IRQ */
+#define IRQ_2SERIAL     10              /* Serial IRQ */
+#define IRQ_EXTENTION   11              /* EXTn IRQ */
+#define IRQ_ONETH       12              /* On board Ethernet IRQ */
+#define IRQ_PSW         13              /* Push Switch IRQ */
+#define IRQ_ZIGBEE      14              /* Ziggbee IO IRQ */
+#endif  /* CONFIG_SH_R7780MP */
+#define __IO_PREFIX     r7780rp
+#include <asm/io_generic.h>
+#endif  /* __ASM_SH_RENESAS_R7780RP */
diff --git a/include/asm-sh/rtc.h b/include/asm-sh/rtc.h
index cea9cdf9b925..91aacc96151b 100644
--- a/include/asm-sh/rtc.h
+++ b/include/asm-sh/rtc.h
@@ -1,29 +1,8 @@
 #ifndef _ASM_RTC_H
 #define _ASM_RTC_H
-#ifdef __KERNEL__
-#include <asm/machvec.h>
-#include <asm/cpu/rtc.h>
-extern void sh_rtc_gettimeofday(struct timespec *ts);
-extern int sh_rtc_settimeofday(const time_t secs);
 extern void (*board_time_init)(void);
-extern void (*rtc_get_time)(struct timespec *);
+extern void (*rtc_sh_get_time)(struct timespec *);
-extern int (*rtc_set_time)(const time_t);
+extern int (*rtc_sh_set_time)(const time_t);
-/* RCR1 Bits */
-#define RCR1_CF         0x80    /* Carry Flag             */
-#define RCR1_CIE        0x10    /* Carry Interrupt Enable */
-#define RCR1_AIE        0x08    /* Alarm Interrupt Enable */
-#define RCR1_AF         0x01    /* Alarm Flag             */
-/* RCR2 Bits */
-#define RCR2_PEF        0x80    /* PEriodic interrupt Flag */
-#define RCR2_PESMASK    0x70    /* Periodic interrupt Set  */
-#define RCR2_RTCEN      0x08    /* ENable RTC              */
-#define RCR2_ADJ        0x04    /* ADJustment (30-second)  */
-#define RCR2_RESET      0x02    /* Reset bit               */
-#define RCR2_START      0x01    /* Start bit               */
-#endif /* __KERNEL__ */
 #endif /* _ASM_RTC_H */
diff --git a/include/asm-sh/rts7751r2d/rts7751r2d.h b/include/asm-sh/rts7751r2d/rts7751r2d.h
index 4e09ba597e9a..b112ae221fd1 100644
--- a/include/asm-sh/rts7751r2d/rts7751r2d.h
+++ b/include/asm-sh/rts7751r2d/rts7751r2d.h
@@ -41,8 +41,6 @@
 #define PA_AX88796L     0xaa000400      /* AX88796L Area */
 #define PA_VOYAGER      0xab000000      /* VOYAGER GX Area */
-#define PA_AREA5_IO     0xb4000000      /* Area 5 IO Memory */
-#define PA_AREA6_IO     0xb8000000      /* Area 6 IO Memory */
 #define PA_IDE_OFFSET   0x1f0           /* CF IDE Offset */
 #define AX88796L_IO_BASE        0x1000  /* AX88796L IO Base Address */
diff --git a/include/asm-sh/scatterlist.h b/include/asm-sh/scatterlist.h
index 7b91df140022..d19e7cd3b023 100644
--- a/include/asm-sh/scatterlist.h
+++ b/include/asm-sh/scatterlist.h
@@ -10,4 +10,13 @@ struct scatterlist {
 #define ISA_DMA_THRESHOLD (0x1fffffff)
+/* These macros should be used after a pci_map_sg call has been done
+ * to get bus addresses of each of the SG entries and their lengths.
+ * You should only work with the number of sg entries pci_map_sg
+ * returns, or alternatively stop on the first sg_dma_len(sg) which
+ * is 0.
+ */
+#define sg_dma_address(sg)      ((sg)->dma_address)
+#define sg_dma_len(sg)          ((sg)->length)
 #endif /* !(__ASM_SH_SCATTERLIST_H) */
diff --git a/include/asm-sh/sci.h b/include/asm-sh/sci.h
new file mode 100644
index 000000000000..52e73660c129
--- /dev/null
+++ b/include/asm-sh/sci.h
@@ -0,0 +1,34 @@
+#ifndef __ASM_SH_SCI_H
+#define __ASM_SH_SCI_H
+#include <linux/serial_core.h>
+/*
+ * Generic header for SuperH SCI(F)
+ *
+ * Do not place SH-specific parts in here, sh64 and h8300 depend on this too.
+ */
+/* Offsets into the sci_port->irqs array */
+enum {
+        SCIx_ERI_IRQ,
+        SCIx_RXI_IRQ,
+        SCIx_TXI_IRQ,
+        SCIx_BRI_IRQ,
+        SCIx_NR_IRQS,
+};
+/*
+ * Platform device specific platform_data struct
+ */
+struct plat_sci_port {
+        void __iomem    *membase;               /* io cookie */
+        unsigned long   mapbase;                /* resource base */
+        unsigned int    irqs[SCIx_NR_IRQS];     /* ERI, RXI, TXI, BRI */
+        unsigned int    type;                   /* SCI / SCIF / IRDA */
+        upf_t           flags;                  /* UPF_* flags */
+};
+int early_sci_setup(struct uart_port *port);
+#endif /* __ASM_SH_SCI_H */
diff --git a/include/asm-sh/se/se.h b/include/asm-sh/se.h
index 791c5da0388a..a1832154a3aa 100644
--- a/include/asm-sh/se/se.h
+++ b/include/asm-sh/se.h
@@ -74,4 +74,7 @@
 #define IRQ_STNIC       10
 #endif
+#define __IO_PREFIX     se
+#include <asm/io_generic.h>
 #endif  /* __ASM_SH_HITACHI_SE_H */
diff --git a/include/asm-sh/se/io.h b/include/asm-sh/se/io.h
deleted file mode 100644
index 9eeb86cd6cef..000000000000
--- a/include/asm-sh/se/io.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * include/asm-sh/io_se.h
- *
- * Copyright 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * IO functions for an Hitachi SolutionEngine
- */
-#ifndef _ASM_SH_IO_SE_H
-#define _ASM_SH_IO_SE_H
-extern unsigned char se_inb(unsigned long port);
-extern unsigned short se_inw(unsigned long port);
-extern unsigned int se_inl(unsigned long port);
-extern void se_outb(unsigned char value, unsigned long port);
-extern void se_outw(unsigned short value, unsigned long port);
-extern void se_outl(unsigned int value, unsigned long port);
-extern unsigned char se_inb_p(unsigned long port);
-extern void se_outb_p(unsigned char value, unsigned long port);
-extern void se_insb(unsigned long port, void *addr, unsigned long count);
-extern void se_insw(unsigned long port, void *addr, unsigned long count);
-extern void se_insl(unsigned long port, void *addr, unsigned long count);
-extern void se_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void se_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void se_outsl(unsigned long port, const void *addr, unsigned long count);
-extern unsigned long se_isa_port2addr(unsigned long offset);
-#endif /* _ASM_SH_IO_SE_H */
diff --git a/include/asm-sh/se7300/se7300.h b/include/asm-sh/se7300.h
index 3ec1ded86c97..4e24edccb30d 100644
--- a/include/asm-sh/se7300/se7300.h
+++ b/include/asm-sh/se7300.h
@@ -58,4 +58,7 @@
 #define PA_LCD1         0xb8000000
 #define PA_LCD2         0xb8800000
+#define __IO_PREFIX     sh7300se
+#include <asm/io_generic.h>
 #endif  /* __ASM_SH_HITACHI_SE7300_H */
diff --git a/include/asm-sh/se7300/io.h b/include/asm-sh/se7300/io.h
deleted file mode 100644
index c6af85529714..000000000000
--- a/include/asm-sh/se7300/io.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * include/asm-sh/se7300/io.h
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- * IO functions for SH-Mobile(SH7300) SolutionEngine
- */
-#ifndef _ASM_SH_IO_7300SE_H
-#define _ASM_SH_IO_7300SE_H
-extern unsigned char sh7300se_inb(unsigned long port);
-extern unsigned short sh7300se_inw(unsigned long port);
-extern unsigned int sh7300se_inl(unsigned long port);
-extern void sh7300se_outb(unsigned char value, unsigned long port);
-extern void sh7300se_outw(unsigned short value, unsigned long port);
-extern void sh7300se_outl(unsigned int value, unsigned long port);
-extern unsigned char sh7300se_inb_p(unsigned long port);
-extern void sh7300se_outb_p(unsigned char value, unsigned long port);
-extern void sh7300se_insb(unsigned long port, void *addr, unsigned long count);
-extern void sh7300se_insw(unsigned long port, void *addr, unsigned long count);
-extern void sh7300se_insl(unsigned long port, void *addr, unsigned long count);
-extern void sh7300se_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void sh7300se_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void sh7300se_outsl(unsigned long port, const void *addr, unsigned long count);
-#endif /* _ASM_SH_IO_7300SE_H */
diff --git a/include/asm-sh/se73180/se73180.h b/include/asm-sh/se73180.h
index f5b93e39e768..3a4acb3e38a1 100644
--- a/include/asm-sh/se73180/se73180.h
+++ b/include/asm-sh/se73180.h
@@ -59,4 +59,7 @@
 #define PA_LCD1         0xb8000000
 #define PA_LCD2         0xb8800000
+#define __IO_PREFIX     sh73180se
+#include <asm/io_generic.h>
 #endif  /* __ASM_SH_HITACHI_SE73180_H */
diff --git a/include/asm-sh/se73180/io.h b/include/asm-sh/se73180/io.h
deleted file mode 100644
index c9cb1b9412c6..000000000000
--- a/include/asm-sh/se73180/io.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * include/asm-sh/se73180/io.h
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- * Based on include/asm-sh/se7300/io.h
- *
- * IO functions for SH-Mobile3(SH73180) SolutionEngine
- *
- */
-#ifndef _ASM_SH_IO_73180SE_H
-#define _ASM_SH_IO_73180SE_H
-extern unsigned char sh73180se_inb(unsigned long port);
-extern unsigned short sh73180se_inw(unsigned long port);
-extern unsigned int sh73180se_inl(unsigned long port);
-extern void sh73180se_outb(unsigned char value, unsigned long port);
-extern void sh73180se_outw(unsigned short value, unsigned long port);
-extern void sh73180se_outl(unsigned int value, unsigned long port);
-extern unsigned char sh73180se_inb_p(unsigned long port);
-extern void sh73180se_outb_p(unsigned char value, unsigned long port);
-extern void sh73180se_insb(unsigned long port, void *addr, unsigned long count);
-extern void sh73180se_insw(unsigned long port, void *addr, unsigned long count);
-extern void sh73180se_insl(unsigned long port, void *addr, unsigned long count);
-extern void sh73180se_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void sh73180se_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void sh73180se_outsl(unsigned long port, const void *addr, unsigned long count);
-#endif /* _ASM_SH_IO_73180SE_H */
diff --git a/include/asm-sh/se7343.h b/include/asm-sh/se7343.h
new file mode 100644
index 000000000000..e7914a54aa96
--- /dev/null
+++ b/include/asm-sh/se7343.h
@@ -0,0 +1,82 @@
+#ifndef __ASM_SH_HITACHI_SE7343_H
+#define __ASM_SH_HITACHI_SE7343_H
+/*
+ * include/asm-sh/se/se7343.h
+ *
+ * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
+ *
+ * SH-Mobile SolutionEngine 7343 support
+ */
+/* Box specific addresses.  */
+/* Area 0 */
+#define PA_ROM          0x00000000      /* EPROM */
+#define PA_ROM_SIZE     0x00400000      /* EPROM size 4M byte(Actually 2MB) */
+#define PA_FROM         0x00400000      /* Flash ROM */
+#define PA_FROM_SIZE    0x00400000      /* Flash size 4M byte */
+#define PA_SRAM         0x00800000      /* SRAM */
+#define PA_FROM_SIZE    0x00400000      /* SRAM size 4M byte */
+/* Area 1 */
+#define PA_EXT1         0x04000000
+#define PA_EXT1_SIZE    0x04000000
+/* Area 2 */
+#define PA_EXT2         0x08000000
+#define PA_EXT2_SIZE    0x04000000
+/* Area 3 */
+#define PA_SDRAM        0x0c000000
+#define PA_SDRAM_SIZE   0x04000000
+/* Area 4 */
+#define PA_PCIC         0x10000000      /* MR-SHPC-01 PCMCIA */
+#define PA_MRSHPC       0xb03fffe0      /* MR-SHPC-01 PCMCIA controller */
+#define PA_MRSHPC_MW1   0xb0400000      /* MR-SHPC-01 memory window base */
+#define PA_MRSHPC_MW2   0xb0500000      /* MR-SHPC-01 attribute window base */
+#define PA_MRSHPC_IO    0xb0600000      /* MR-SHPC-01 I/O window base */
+#define MRSHPC_OPTION   (PA_MRSHPC + 6)
+#define MRSHPC_CSR      (PA_MRSHPC + 8)
+#define MRSHPC_ISR      (PA_MRSHPC + 10)
+#define MRSHPC_ICR      (PA_MRSHPC + 12)
+#define MRSHPC_CPWCR    (PA_MRSHPC + 14)
+#define MRSHPC_MW0CR1   (PA_MRSHPC + 16)
+#define MRSHPC_MW1CR1   (PA_MRSHPC + 18)
+#define MRSHPC_IOWCR1   (PA_MRSHPC + 20)
+#define MRSHPC_MW0CR2   (PA_MRSHPC + 22)
+#define MRSHPC_MW1CR2   (PA_MRSHPC + 24)
+#define MRSHPC_IOWCR2   (PA_MRSHPC + 26)
+#define MRSHPC_CDCR     (PA_MRSHPC + 28)
+#define MRSHPC_PCIC_INFO (PA_MRSHPC + 30)
+#define PA_LED          0xb0C00000      /* LED */
+#define LED_SHIFT       0
+#define PA_DIPSW        0xb0900000      /* Dip switch 31 */
+#define PA_CPLD_MODESET 0xb1400004      /* CPLD Mode set register */
+#define PA_CPLD_ST      0xb1400008      /* CPLD Interrupt status register */
+#define PA_CPLD_IMSK    0xb140000a      /* CPLD Interrupt mask register */
+/* Area 5 */
+#define PA_EXT5         0x14000000
+#define PA_EXT5_SIZE    0x04000000
+/* Area 6 */
+#define PA_LCD1         0xb8000000
+#define PA_LCD2         0xb8800000
+#define __IO_PREFIX     sh7343se
+#include <asm/io_generic.h>
+/* External Multiplexed interrupts */
+#define PC_IRQ0         OFFCHIP_IRQ_BASE
+#define PC_IRQ1         (PC_IRQ0 + 1)
+#define PC_IRQ2         (PC_IRQ1 + 1)
+#define PC_IRQ3         (PC_IRQ2 + 1)
+#define EXT_IRQ0        (PC_IRQ3 + 1)
+#define EXT_IRQ1        (EXT_IRQ0 + 1)
+#define EXT_IRQ2        (EXT_IRQ1 + 1)
+#define EXT_IRQ3        (EXT_IRQ2 + 1)
+#define USB_IRQ0        (EXT_IRQ3 + 1)
+#define USB_IRQ1        (USB_IRQ0 + 1)
+#define UART_IRQ0       (USB_IRQ1 + 1)
+#define UART_IRQ1       (UART_IRQ0 + 1)
+#endif  /* __ASM_SH_HITACHI_SE7343_H */
diff --git a/include/asm-sh/se7751/se7751.h b/include/asm-sh/se7751.h
index 738e22bebdfb..88cd379d9084 100644
--- a/include/asm-sh/se7751/se7751.h
+++ b/include/asm-sh/se7751.h
@@ -65,4 +65,7 @@
 #define IRQ_79C973      13
+#define __IO_PREFIX     sh7751se
+#include <asm/io_generic.h>
 #endif  /* __ASM_SH_HITACHI_7751SE_H */
diff --git a/include/asm-sh/se7751/io.h b/include/asm-sh/se7751/io.h
deleted file mode 100644
index 78d8f5744bc5..000000000000
--- a/include/asm-sh/se7751/io.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * include/asm-sh/io_7751se.h
- *
- * Modified version of io_se.h for the 7751se-specific functions.
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * IO functions for an Hitachi SolutionEngine
- */
-#ifndef _ASM_SH_IO_7751SE_H
-#define _ASM_SH_IO_7751SE_H
-extern unsigned char sh7751se_inb(unsigned long port);
-extern unsigned short sh7751se_inw(unsigned long port);
-extern unsigned int sh7751se_inl(unsigned long port);
-extern void sh7751se_outb(unsigned char value, unsigned long port);
-extern void sh7751se_outw(unsigned short value, unsigned long port);
-extern void sh7751se_outl(unsigned int value, unsigned long port);
-extern unsigned char sh7751se_inb_p(unsigned long port);
-extern void sh7751se_outb_p(unsigned char value, unsigned long port);
-extern void sh7751se_insb(unsigned long port, void *addr, unsigned long count);
-extern void sh7751se_insw(unsigned long port, void *addr, unsigned long count);
-extern void sh7751se_insl(unsigned long port, void *addr, unsigned long count);
-extern void sh7751se_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void sh7751se_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void sh7751se_outsl(unsigned long port, const void *addr, unsigned long count);
-extern unsigned char sh7751se_readb(unsigned long addr);
-extern unsigned short sh7751se_readw(unsigned long addr);
-extern unsigned int sh7751se_readl(unsigned long addr);
-extern void sh7751se_writeb(unsigned char b, unsigned long addr);
-extern void sh7751se_writew(unsigned short b, unsigned long addr);
-extern void sh7751se_writel(unsigned int b, unsigned long addr);
-extern unsigned long sh7751se_isa_port2addr(unsigned long offset);
-#endif /* _ASM_SH_IO_7751SE_H */
diff --git a/include/asm-sh/setup.h b/include/asm-sh/setup.h
index d19de7c8df4e..34ca8a7f06ba 100644
--- a/include/asm-sh/setup.h
+++ b/include/asm-sh/setup.h
@@ -4,5 +4,7 @@
 #define COMMAND_LINE_SIZE 256
+int setup_early_printk(char *);
 #endif /* _SH_SETUP_H */
 #endif /* __KERNEL__ */
diff --git a/include/asm-sh/sfp-machine.h b/include/asm-sh/sfp-machine.h
new file mode 100644
index 000000000000..8a6399a8cfe0
--- /dev/null
+++ b/include/asm-sh/sfp-machine.h
@@ -0,0 +1,86 @@
+/* Machine-dependent software floating-point definitions.
+   SuperH kernel version.
+   Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Richard Henderson (rth@cygnus.com),
+                  Jakub Jelinek (jj@ultra.linux.cz),
+                  David S. Miller (davem@redhat.com) and
+                  Peter Maydell (pmaydell@chiark.greenend.org.uk).
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+   The GNU C Library 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
+   Library General Public License for more details.
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+#ifndef _SFP_MACHINE_H
+#define _SFP_MACHINE_H
+#include <linux/config.h>
+#define _FP_W_TYPE_SIZE         32
+#define _FP_W_TYPE              unsigned long
+#define _FP_WS_TYPE             signed long
+#define _FP_I_TYPE              long
+#define _FP_MUL_MEAT_S(R,X,Y)                                   \
+  _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)
+#define _FP_MUL_MEAT_D(R,X,Y)                                   \
+  _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm)
+#define _FP_MUL_MEAT_Q(R,X,Y)                                   \
+  _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm)
+#define _FP_DIV_MEAT_S(R,X,Y)   _FP_DIV_MEAT_1_udiv(S,R,X,Y)
+#define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv(D,R,X,Y)
+#define _FP_DIV_MEAT_Q(R,X,Y)   _FP_DIV_MEAT_4_udiv(Q,R,X,Y)
+#define _FP_NANFRAC_S           ((_FP_QNANBIT_S << 1) - 1)
+#define _FP_NANFRAC_D           ((_FP_QNANBIT_D << 1) - 1), -1
+#define _FP_NANFRAC_Q           ((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1
+#define _FP_NANSIGN_S           0
+#define _FP_NANSIGN_D           0
+#define _FP_NANSIGN_Q           0
+#define _FP_KEEPNANFRACP 1
+/*
+ * If one NaN is signaling and the other is not,
+ * we choose that one, otherwise we choose X.
+ */
+#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)                      \
+  do {                                                          \
+    if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs)          \
+        && !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs))     \
+      {                                                         \
+        R##_s = Y##_s;                                          \
+        _FP_FRAC_COPY_##wc(R,Y);                                \
+      }                                                         \
+    else                                                        \
+      {                                                         \
+        R##_s = X##_s;                                          \
+        _FP_FRAC_COPY_##wc(R,X);                                \
+      }                                                         \
+    R##_c = FP_CLS_NAN;                                         \
+  } while (0)
+//#define FP_ROUNDMODE          FPSCR_RM
+#define FP_DENORM_ZERO          1/*FPSCR_DN*/
+/* Exception flags. */
+#define FP_EX_INVALID           (1<<4)
+#define FP_EX_DIVZERO           (1<<3)
+#define FP_EX_OVERFLOW          (1<<2)
+#define FP_EX_UNDERFLOW         (1<<1)
+#define FP_EX_INEXACT           (1<<0)
+#endif
diff --git a/include/asm-sh/sh03/io.h b/include/asm-sh/sh03/io.h
index 25792e9831ea..df3b187ef883 100644
--- a/include/asm-sh/sh03/io.h
+++ b/include/asm-sh/sh03/io.h
@@ -33,14 +33,6 @@
 #define IRL3_IPR_POS    0
 #define IRL3_PRIORITY   4
+void heartbeat_sh03(void);
-extern unsigned long sh03_isa_port2addr(unsigned long offset);
-extern void setup_sh03(void);
-extern void init_sh03_IRQ(void);
-extern void heartbeat_sh03(void);
-extern void sh03_rtc_gettimeofday(struct timeval *tv);
-extern int sh03_rtc_settimeofday(const struct timeval *tv);
 #endif /* _ASM_SH_IO_SH03_H */
diff --git a/include/asm-sh/sh2000/sh2000.h b/include/asm-sh/sh2000/sh2000.h
deleted file mode 100644
index 8d547324d59a..000000000000
--- a/include/asm-sh/sh2000/sh2000.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ASM_SH_SH2000_SH2000_H
-#define __ASM_SH_SH2000_SH2000_H
-/* arch/sh/boards/sh2000/setup.c */
-extern int setup_sh2000(void);
-#endif /* __ASM_SH_SH2000_SH2000_H */
diff --git a/include/asm-sh/shmin/shmin.h b/include/asm-sh/shmin/shmin.h
new file mode 100644
index 000000000000..36ba138a81fb
--- /dev/null
+++ b/include/asm-sh/shmin/shmin.h
@@ -0,0 +1,9 @@
+#ifndef __ASM_SH_SHMIN_H
+#define __ASM_SH_SHMIN_H
+#define SHMIN_IO_BASE 0xb0000000UL
+#define SHMIN_NE_IRQ IRQ2_IRQ
+#define SHMIN_NE_BASE 0x300
+#endif
diff --git a/include/asm-sh/shmparam.h b/include/asm-sh/shmparam.h
index 0a95604b9b66..ba1758d90106 100644
--- a/include/asm-sh/shmparam.h
+++ b/include/asm-sh/shmparam.h
@@ -1,8 +1,22 @@
+/*
+ * include/asm-sh/shmparam.h
+ *
+ * Copyright (C) 1999 Niibe Yutaka
+ * Copyright (C) 2006 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
 #ifndef __ASM_SH_SHMPARAM_H
 #define __ASM_SH_SHMPARAM_H
-#ifdef __KERNEL__
-#include <asm/cpu/shmparam.h>
+/*
+ * SH-4 and SH-3 7705 have an aliasing dcache. Bump this up to a sensible value
+ * for everyone, and work out the specifics from the probed cache descriptor.
+ */
+#define SHMLBA  0x4000           /* attach addr a multiple of this */
+#define __ARCH_FORCE_SHMLBA
-#endif /* __KERNEL__ */
 #endif /* __ASM_SH_SHMPARAM_H */
diff --git a/include/asm-sh/se/smc37c93x.h b/include/asm-sh/smc37c93x.h
index 585da2a8fc45..585da2a8fc45 100644
--- a/include/asm-sh/se/smc37c93x.h
+++ b/include/asm-sh/smc37c93x.h
diff --git a/include/asm-sh/smp.h b/include/asm-sh/smp.h
index f57c4fe9692a..71ecddf70db3 100644
--- a/include/asm-sh/smp.h
+++ b/include/asm-sh/smp.h
@@ -19,11 +19,6 @@
 #include <asm/atomic.h>
 #include <asm/current.h>
-extern cpumask_t cpu_online_map;
-extern cpumask_t cpu_possible_map;
-#define cpu_online(cpu)         cpu_isset(cpu, cpu_online_map)
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
 /* I've no idea what the real meaning of this is */
diff --git a/include/asm-sh/snapgear/io.h b/include/asm-sh/snapgear.h
index bfa97ac06280..6b5e4ddc073a 100644
--- a/include/asm-sh/snapgear/io.h
+++ b/include/asm-sh/snapgear.h
@@ -40,21 +40,8 @@
 #define IRL3_PRIORITY   4
 #endif
-extern unsigned char snapgear_inb(unsigned long port);
+#define __IO_PREFIX     snapgear
-extern unsigned short snapgear_inw(unsigned long port);
+#include <asm/io_generic.h>
-extern unsigned int snapgear_inl(unsigned long port);
-extern void snapgear_outb(unsigned char value, unsigned long port);
-extern void snapgear_outw(unsigned short value, unsigned long port);
-extern void snapgear_outl(unsigned int value, unsigned long port);
-extern unsigned char snapgear_inb_p(unsigned long port);
-extern void snapgear_outb_p(unsigned char value, unsigned long port);
-extern void snapgear_insl(unsigned long port, void *addr, unsigned long count);
-extern void snapgear_outsl(unsigned long port, const void *addr, unsigned long count);
-extern unsigned long snapgear_isa_port2addr(unsigned long offset);
 #ifdef CONFIG_SH_SECUREEDGE5410
 /*
@@ -79,14 +66,14 @@ extern unsigned long snapgear_isa_port2addr(unsigned long offset);
 * D12        -                      RTS RESET
 */
- #define SECUREEDGE_IOPORT_ADDR ((volatile short *) 0xb0000000)
+#define SECUREEDGE_IOPORT_ADDR ((volatile short *) 0xb0000000)
- extern unsigned short secureedge5410_ioport;
+extern unsigned short secureedge5410_ioport;
- #define SECUREEDGE_WRITE_IOPORT(val, mask) (*SECUREEDGE_IOPORT_ADDR = \
+#define SECUREEDGE_WRITE_IOPORT(val, mask) (*SECUREEDGE_IOPORT_ADDR = \
-                 (secureedge5410_ioport = \
+         (secureedge5410_ioport = \
-                                ((secureedge5410_ioport & ~(mask)) | ((val) & (mask)))))
+                        ((secureedge5410_ioport & ~(mask)) | ((val) & (mask)))))
- #define SECUREEDGE_READ_IOPORT() \
+#define SECUREEDGE_READ_IOPORT() \
-                 ((*SECUREEDGE_IOPORT_ADDR&0x0817) | (secureedge5410_ioport&~0x0817))
+         ((*SECUREEDGE_IOPORT_ADDR&0x0817) | (secureedge5410_ioport&~0x0817))
 #endif
 #endif /* _ASM_SH_IO_SNAPGEAR_H */
diff --git a/include/asm-sh/spinlock.h b/include/asm-sh/spinlock.h
index 846322d4c35d..54458fd24981 100644
--- a/include/asm-sh/spinlock.h
+++ b/include/asm-sh/spinlock.h
@@ -100,4 +100,8 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
        return 0;
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* __ASM_SH_SPINLOCK_H */
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index ad35ad4958f4..6c1f8fde5ac4 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -6,6 +6,7 @@
 * Copyright (C) 2002 Paul Mundt
 */
+#include <asm/types.h>
 /*
 *      switch_to() should switch tasks to task nr n, first
@@ -66,13 +67,20 @@ static inline void sched_cacheflush(void)
 {
 }
-#define nop() __asm__ __volatile__ ("nop")
+#ifdef CONFIG_CPU_SH4A
+#define __icbi()                        \
+{                                       \
-#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
+        unsigned long __addr;           \
+        __addr = 0xa8000000;            \
+        __asm__ __volatile__(           \
+                "icbi   %0\n\t"         \
+                : /* no output */       \
+                : "m" (__m(__addr)));   \
+}
+#endif
-static __inline__ unsigned long tas(volatile int *m)
+static inline unsigned long tas(volatile int *m)
-{ /* #define tas(ptr) (xchg((ptr),1)) */
+{
        unsigned long retval;
        __asm__ __volatile__ ("tas.b    @%1\n\t"
@@ -81,12 +89,33 @@ static __inline__ unsigned long tas(volatile int *m)
        return retval;
 }
-extern void __xchg_called_with_bad_pointer(void);
+/*
+ * A brief note on ctrl_barrier(), the control register write barrier.
-#define mb()    __asm__ __volatile__ ("": : :"memory")
+ *
-#define rmb()   mb()
+ * Legacy SH cores typically require a sequence of 8 nops after
-#define wmb()   __asm__ __volatile__ ("": : :"memory")
+ * modification of a control register in order for the changes to take
+ * effect. On newer cores (like the sh4a and sh5) this is accomplished
+ * with icbi.
+ *
+ * Also note that on sh4a in the icbi case we can forego a synco for the
+ * write barrier, as it's not necessary for control registers.
+ *
+ * Historically we have only done this type of barrier for the MMUCR, but
+ * it's also necessary for the CCR, so we make it generic here instead.
+ */
+#ifdef CONFIG_CPU_SH4A
+#define mb()            __asm__ __volatile__ ("synco": : :"memory")
+#define rmb()           mb()
+#define wmb()           __asm__ __volatile__ ("synco": : :"memory")
+#define ctrl_barrier()  __icbi()
+#define read_barrier_depends()  do { } while(0)
+#else
+#define mb()            __asm__ __volatile__ ("": : :"memory")
+#define rmb()           mb()
+#define wmb()           __asm__ __volatile__ ("": : :"memory")
+#define ctrl_barrier()  __asm__ __volatile__ ("nop;nop;nop;nop;nop;nop;nop;nop")
 #define read_barrier_depends()  do { } while(0)
+#endif
 #ifdef CONFIG_SMP
 #define smp_mb()        mb()
@@ -103,7 +132,8 @@ extern void __xchg_called_with_bad_pointer(void);
 #define set_mb(var, value) do { xchg(&var, value); } while (0)
 /* Interrupt Control */
-static __inline__ void local_irq_enable(void)
+#ifdef CONFIG_CPU_HAS_SR_RB
+static inline void local_irq_enable(void)
 {
        unsigned long __dummy0, __dummy1;
@@ -116,8 +146,22 @@ static __inline__ void local_irq_enable(void)
                             : "1" (~0x000000f0)
                             : "memory");
 }
+#else
+static inline void local_irq_enable(void)
+{
+        unsigned long __dummy0, __dummy1;
+        __asm__ __volatile__ (
+                "stc    sr, %0\n\t"
+                "and    %1, %0\n\t"
+                "ldc    %0, sr\n\t"
+                : "=&r" (__dummy0), "=r" (__dummy1)
+                : "1" (~0x000000f0)
+                : "memory");
+}
+#endif
-static __inline__ void local_irq_disable(void)
+static inline void local_irq_disable(void)
 {
        unsigned long __dummy;
        __asm__ __volatile__("stc       sr, %0\n\t"
@@ -128,6 +172,31 @@ static __inline__ void local_irq_disable(void)
                             : "memory");
 }
+static inline void set_bl_bit(void)
+{
+        unsigned long __dummy0, __dummy1;
+        __asm__ __volatile__ ("stc      sr, %0\n\t"
+                             "or        %2, %0\n\t"
+                             "and       %3, %0\n\t"
+                             "ldc       %0, sr"
+                             : "=&r" (__dummy0), "=r" (__dummy1)
+                             : "r" (0x10000000), "r" (0xffffff0f)
+                             : "memory");
+}
+static inline void clear_bl_bit(void)
+{
+        unsigned long __dummy0, __dummy1;
+        __asm__ __volatile__ ("stc      sr, %0\n\t"
+                             "and       %2, %0\n\t"
+                             "ldc       %0, sr"
+                             : "=&r" (__dummy0), "=r" (__dummy1)
+                             : "1" (~0x10000000)
+                             : "memory");
+}
 #define local_save_flags(x) \
        __asm__("stc sr, %0; and #0xf0, %0" : "=&z" (x) :/**/: "memory" )
@@ -138,7 +207,7 @@ static __inline__ void local_irq_disable(void)
        (flags != 0);                   \
 })
-static __inline__ unsigned long local_irq_save(void)
+static inline unsigned long local_irq_save(void)
 {
        unsigned long flags, __dummy;
@@ -154,35 +223,9 @@ static __inline__ unsigned long local_irq_save(void)
        return flags;
 }
-#ifdef DEBUG_CLI_STI
+#define local_irq_restore(x) do {                       \
-static __inline__ void  local_irq_restore(unsigned long x)
-{
-        if ((x & 0x000000f0) != 0x000000f0)
-                local_irq_enable();
-        else {
-                unsigned long flags;
-                local_save_flags(flags);
-                if (flags == 0) {
-                        extern void dump_stack(void);
-                        printk(KERN_ERR "BUG!\n");
-                        dump_stack();
-                        local_irq_disable();
-                }
-        }
-}
-#else
-#define local_irq_restore(x) do {                       \
-        if ((x & 0x000000f0) != 0x000000f0)             \
-                local_irq_enable();                             \
-} while (0)
-#endif
-#define really_restore_flags(x) do {                    \
        if ((x & 0x000000f0) != 0x000000f0)             \
-                local_irq_enable();                             \
+                local_irq_enable();                     \
-        else                                            \
-                local_irq_disable();                            \
 } while (0)
 /*
@@ -210,8 +253,8 @@ do {					\
 #define back_to_P1()                                    \
 do {                                                    \
        unsigned long __dummy;                          \
+        ctrl_barrier();                                 \
        __asm__ __volatile__(                           \
-                "nop;nop;nop;nop;nop;nop;nop\n\t"       \
                "mov.l  1f, %0\n\t"                     \
                "jmp    @%0\n\t"                        \
                " nop\n\t"                              \
@@ -224,7 +267,7 @@ do {							\
 /* For spinlocks etc */
 #define local_irq_save(x)       x = local_irq_save()
-static __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
+static inline unsigned long xchg_u32(volatile u32 *m, unsigned long val)
 {
        unsigned long flags, retval;
@@ -235,7 +278,7 @@ static __inline__ unsigned long xchg_u32(volatile int * m, unsigned long val)
        return retval;
 }
-static __inline__ unsigned long xchg_u8(volatile unsigned char * m, unsigned long val)
+static inline unsigned long xchg_u8(volatile u8 *m, unsigned long val)
 {
        unsigned long flags, retval;
@@ -246,20 +289,70 @@ static __inline__ unsigned long xchg_u8(volatile unsigned char * m, unsigned lon
        return retval;
 }
-static __inline__ unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
+extern void __xchg_called_with_bad_pointer(void);
+#define __xchg(ptr, x, size)                            \
+({                                                      \
+        unsigned long __xchg__res;                      \
+        volatile void *__xchg_ptr = (ptr);              \
+        switch (size) {                                 \
+        case 4:                                         \
+                __xchg__res = xchg_u32(__xchg_ptr, x);  \
+                break;                                  \
+        case 1:                                         \
+                __xchg__res = xchg_u8(__xchg_ptr, x);   \
+                break;                                  \
+        default:                                        \
+                __xchg_called_with_bad_pointer();       \
+                __xchg__res = x;                        \
+                break;                                  \
+        }                                               \
+                                                        \
+        __xchg__res;                                    \
+})
+#define xchg(ptr,x)     \
+        ((__typeof__(*(ptr)))__xchg((ptr),(unsigned long)(x), sizeof(*(ptr))))
+static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
+        unsigned long new)
+{
+        __u32 retval;
+        unsigned long flags;
+        local_irq_save(flags);
+        retval = *m;
+        if (retval == old)
+                *m = new;
+        local_irq_restore(flags);       /* implies memory barrier  */
+        return retval;
+}
+/* This function doesn't exist, so you'll get a linker error
+ * if something tries to do an invalid cmpxchg(). */
+extern void __cmpxchg_called_with_bad_pointer(void);
+#define __HAVE_ARCH_CMPXCHG 1
+static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old,
+                unsigned long new, int size)
 {
        switch (size) {
        case 4:
-                return xchg_u32(ptr, x);
+                return __cmpxchg_u32(ptr, old, new);
-                break;
-        case 1:
-                return xchg_u8(ptr, x);
-                break;
        }
-        __xchg_called_with_bad_pointer();
+        __cmpxchg_called_with_bad_pointer();
-        return x;
+        return old;
 }
+#define cmpxchg(ptr,o,n)                                                 \
+  ({                                                                     \
+     __typeof__(*(ptr)) _o_ = (o);                                       \
+     __typeof__(*(ptr)) _n_ = (n);                                       \
+     (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_,           \
+                                    (unsigned long)_n_, sizeof(*(ptr))); \
+  })
 /* XXX
 * disable hlt during certain critical i/o operations
 */
diff --git a/include/asm-sh/systemh/io.h b/include/asm-sh/systemh/io.h
deleted file mode 100644
index 327849b49db8..000000000000
--- a/include/asm-sh/systemh/io.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * include/asm-sh/systemh/io.h
- *
- * Stupid I/O definitions for SystemH, cloned from SE7751.
- *
- * Copyright (C) 2003  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#ifndef __ASM_SH_SYSTEMH_IO_H
-#define __ASM_SH_SYSTEMH_IO_H
-extern unsigned char sh7751systemh_inb(unsigned long port);
-extern unsigned short sh7751systemh_inw(unsigned long port);
-extern unsigned int sh7751systemh_inl(unsigned long port);
-extern void sh7751systemh_outb(unsigned char value, unsigned long port);
-extern void sh7751systemh_outw(unsigned short value, unsigned long port);
-extern void sh7751systemh_outl(unsigned int value, unsigned long port);
-extern unsigned char sh7751systemh_inb_p(unsigned long port);
-extern void sh7751systemh_outb_p(unsigned char value, unsigned long port);
-extern void sh7751systemh_insb(unsigned long port, void *addr, unsigned long count);
-extern void sh7751systemh_insw(unsigned long port, void *addr, unsigned long count);
-extern void sh7751systemh_insl(unsigned long port, void *addr, unsigned long count);
-extern void sh7751systemh_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void sh7751systemh_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void sh7751systemh_outsl(unsigned long port, const void *addr, unsigned long count);
-extern unsigned char sh7751systemh_readb(unsigned long addr);
-extern unsigned short sh7751systemh_readw(unsigned long addr);
-extern unsigned int sh7751systemh_readl(unsigned long addr);
-extern void sh7751systemh_writeb(unsigned char b, unsigned long addr);
-extern void sh7751systemh_writew(unsigned short b, unsigned long addr);
-extern void sh7751systemh_writel(unsigned int b, unsigned long addr);
-extern unsigned long sh7751systemh_isa_port2addr(unsigned long offset);
-#endif /* __ASM_SH_SYSTEMH_IO_H */
diff --git a/include/asm-sh/systemh/7751systemh.h b/include/asm-sh/systemh7751.h
index 4170531bdbd9..b143bb2a2ca7 100644
--- a/include/asm-sh/systemh/7751systemh.h
+++ b/include/asm-sh/systemh7751.h
@@ -65,4 +65,7 @@
 #define IRQ_79C973      13
+#define __IO_PREFIX     sh7751systemh
+#include <asm/io_generic.h>
 #endif  /* __ASM_SH_SYSTEMH_7751SYSTEMH_H */
diff --git a/include/asm-sh/thread_info.h b/include/asm-sh/thread_info.h
index 7345350d98c0..3ebc3f9039eb 100644
--- a/include/asm-sh/thread_info.h
+++ b/include/asm-sh/thread_info.h
@@ -9,8 +9,8 @@
 *  Copyright (C) 2002  David Howells (dhowells@redhat.com)
 *  - Incorporating suggestions made by Linus Torvalds and Dave Miller
 */
 #ifdef __KERNEL__
+#include <asm/page.h>
 #ifndef __ASSEMBLY__
 #include <asm/processor.h>
@@ -21,7 +21,10 @@ struct thread_info {
        unsigned long           flags;          /* low level flags */
        __u32                   cpu;
        int                     preempt_count; /* 0 => preemptable, <0 => BUG */
+        mm_segment_t            addr_limit;     /* thread address space */
        struct restart_block    restart_block;
+        unsigned long           previous_sp;    /* sp of previous stack in case
+                                                   of nested IRQ stacks */
        __u8                    supervisor_stack[0];
 };
@@ -29,6 +32,13 @@ struct thread_info {
 #define PREEMPT_ACTIVE          0x10000000
+#ifdef CONFIG_4KSTACKS
+#define THREAD_SIZE             (PAGE_SIZE)
+#else
+#define THREAD_SIZE             (PAGE_SIZE * 2)
+#endif
+#define STACK_WARN              (THREAD_SIZE / 8)
 /*
 * macros/functions for gaining access to the thread information structure
 */
@@ -40,6 +50,7 @@ struct thread_info {
        .flags          = 0,                    \
        .cpu            = 0,                    \
        .preempt_count  = 1,                    \
+        .addr_limit     = KERNEL_DS,            \
        .restart_block  = {                     \
                .fn = do_no_restart_syscall,    \
        },                                      \
@@ -48,24 +59,42 @@ struct thread_info {
 #define init_thread_info        (init_thread_union.thread_info)
 #define init_stack              (init_thread_union.stack)
+/* how to get the current stack pointer from C */
+register unsigned long current_stack_pointer asm("r15") __attribute_used__;
 /* how to get the thread information struct from C */
 static inline struct thread_info *current_thread_info(void)
 {
        struct thread_info *ti;
+#ifdef CONFIG_CPU_HAS_SR_RB
        __asm__("stc    r7_bank, %0" : "=r" (ti));
+#else
+        unsigned long __dummy;
+        __asm__ __volatile__ (
+                "mov    r15, %0\n\t"
+                "and    %1, %0\n\t"
+                : "=&r" (ti), "=r" (__dummy)
+                : "1" (~(THREAD_SIZE - 1))
+                : "memory");
+#endif
        return ti;
 }
 /* thread information allocation */
-#define THREAD_SIZE (2*PAGE_SIZE)
+#ifdef CONFIG_DEBUG_STACK_USAGE
-#define alloc_thread_info(ti) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))
+#define alloc_thread_info(ti)   kzalloc(THREAD_SIZE, GFP_KERNEL)
-#define free_thread_info(ti) free_pages((unsigned long) (ti), 1)
+#else
+#define alloc_thread_info(ti)   kmalloc(THREAD_SIZE, GFP_KERNEL)
+#endif
+#define free_thread_info(ti)    kfree(ti)
 #else /* !__ASSEMBLY__ */
 /* how to get the thread information struct from ASM */
 #define GET_THREAD_INFO(reg) \
-        stc     r7_bank, reg
+        stc     r7_bank, reg
 #endif
@@ -79,18 +108,18 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_NOTIFY_RESUME       1       /* resumption notification requested */
 #define TIF_SIGPENDING          2       /* signal pending */
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
+#define TIF_RESTORE_SIGMASK     4       /* restore signal mask in do_signal() */
 #define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
 #define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18
-#define TIF_USERSPACE           31      /* true if FS sets userspace */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
+#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
-#define _TIF_USERSPACE          (1<<TIF_USERSPACE)
 #define _TIF_WORK_MASK          0x000000FE      /* work to do on interrupt/exception return */
 #define _TIF_ALLWORK_MASK       0x000000FF      /* work to do on any return to u-space */
diff --git a/include/asm-sh/timer.h b/include/asm-sh/timer.h
index dd6579c0b04c..c7ab28095ba0 100644
--- a/include/asm-sh/timer.h
+++ b/include/asm-sh/timer.h
@@ -6,6 +6,8 @@
 struct sys_timer_ops {
        int (*init)(void);
+        int (*start)(void);
+        int (*stop)(void);
        unsigned long (*get_offset)(void);
        unsigned long (*get_frequency)(void);
 };
diff --git a/include/asm-sh/titan.h b/include/asm-sh/titan.h
new file mode 100644
index 000000000000..270a4f4bc8a9
--- /dev/null
+++ b/include/asm-sh/titan.h
@@ -0,0 +1,43 @@
+/*
+ * Platform defintions for Titan
+ */
+#ifndef _ASM_SH_TITAN_TITAN_H
+#define _ASM_SH_TITAN_TITAN_H
+#define __IO_PREFIX titan
+#include <asm/io_generic.h>
+/* IRQ assignments */
+#define TITAN_IRQ_WAN           2       /* eth0 (WAN) */
+#define TITAN_IRQ_LAN           5       /* eth1 (LAN) */
+#define TITAN_IRQ_MPCIA         8       /* mPCI A */
+#define TITAN_IRQ_MPCIB         11      /* mPCI B */
+#define TITAN_IRQ_USB           11      /* USB */
+/*
+ * The external interrupt lines, these take up ints 0 - 15 inclusive
+ * depending on the priority for the interrupt.  In fact the priority
+ * is the interrupt :-)
+ */
+#define IRL0_IRQ        0
+#define IRL0_IPR_ADDR   INTC_IPRD
+#define IRL0_IPR_POS    3
+#define IRL0_PRIORITY   8
+#define IRL1_IRQ        1
+#define IRL1_IPR_ADDR   INTC_IPRD
+#define IRL1_IPR_POS    2
+#define IRL1_PRIORITY   8
+#define IRL2_IRQ        2
+#define IRL2_IPR_ADDR   INTC_IPRD
+#define IRL2_IPR_POS    1
+#define IRL2_PRIORITY   8
+#define IRL3_IRQ        3
+#define IRL3_IPR_ADDR   INTC_IPRD
+#define IRL3_IPR_POS    0
+#define IRL3_PRIORITY   8
+#endif
diff --git a/include/asm-sh/uaccess.h b/include/asm-sh/uaccess.h
index 2cb01861e7c5..5c49ed6715f2 100644
--- a/include/asm-sh/uaccess.h
+++ b/include/asm-sh/uaccess.h
@@ -16,21 +16,9 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
-/*
- * NOTE: Macro/functions in this file depends on threads_info.h implementation.
- * Assumes:
- * TI_FLAGS == 8
- * TIF_USERSPACE == 31
- * USER_ADDR_LIMIT == 0x80000000
- */
 #define VERIFY_READ    0
 #define VERIFY_WRITE   1
-typedef struct {
-        unsigned int is_user_space;
-} mm_segment_t;
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
@@ -40,16 +28,18 @@ typedef struct {
 */
 #define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-#define segment_eq(a,b) ((a).is_user_space == (b).is_user_space)
-#define USER_ADDR_LIMIT 0x80000000
+#define KERNEL_DS       MAKE_MM_SEG(0xFFFFFFFFUL)
+#define USER_DS         MAKE_MM_SEG(PAGE_OFFSET)
-#define KERNEL_DS       MAKE_MM_SEG(0)
+#define segment_eq(a,b) ((a).seg == (b).seg)
-#define USER_DS         MAKE_MM_SEG(1)
 #define get_ds()        (KERNEL_DS)
 #if !defined(CONFIG_MMU)
+/* NOMMU is always true */
+#define __addr_ok(addr) (1)
 static inline mm_segment_t get_fs(void)
 {
        return USER_DS;
@@ -76,31 +66,11 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
        return ((addr >= memory_start) && ((addr + size) < memory_end));
 }
 #else /* CONFIG_MMU */
-static inline mm_segment_t get_fs(void)
+#define __addr_ok(addr) \
-{
+        ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg))
-        return MAKE_MM_SEG(test_thread_flag(TIF_USERSPACE));
-}
-static inline void set_fs(mm_segment_t s)
+#define get_fs()        (current_thread_info()->addr_limit)
-{
+#define set_fs(x)       (current_thread_info()->addr_limit = (x))
-        unsigned long ti, flag;
-        __asm__ __volatile__(
-                "stc    r7_bank, %0\n\t"
-                "mov.l  @(8,%0), %1\n\t"
-                "shal   %1\n\t"
-                "cmp/pl %2\n\t"
-                "rotcr  %1\n\t"
-                "mov.l  %1, @(8,%0)"
-                : "=&r" (ti), "=&r" (flag)
-                : "r" (s.is_user_space)
-                : "t");
-/****
-        if (s.is_user_space)
-                set_thread_flag(TIF_USERSPACE);
-        else
-                clear_thread_flag(TIF_USERSPACE);
-****/
-}
 /*
 * __access_ok: Check if address with size is OK or not.
@@ -108,7 +78,7 @@ static inline void set_fs(mm_segment_t s)
 * We do three checks:
 * (1) is it user space? 
 * (2) addr + size --> carry?
- * (3) addr + size >= 0x80000000  (USER_ADDR_LIMIT)
+ * (3) addr + size >= 0x80000000  (PAGE_OFFSET)
 *
 * (1) (2) (3) | RESULT
 *  0   0   0  |  ok
@@ -201,6 +171,7 @@ do {								\
        __gu_err;                                               \
 })
+#ifdef CONFIG_MMU
 #define __get_user_check(x,ptr,size)                            \
 ({                                                              \
        long __gu_err, __gu_val;                                \
@@ -290,6 +261,18 @@ __asm__("stc	r7_bank, %1\n\t"		\
        : "r" (addr)                            \
        : "t");                                 \
 })
+#else /* CONFIG_MMU */
+#define __get_user_check(x,ptr,size)                                    \
+({                                                                      \
+        long __gu_err, __gu_val;                                        \
+        if (__access_ok((unsigned long)(ptr), (size))) {                \
+                __get_user_size(__gu_val, (ptr), (size), __gu_err);     \
+                (x) = (__typeof__(*(ptr)))__gu_val;                     \
+        } else                                                          \
+                __gu_err = -EFAULT;                                     \
+        __gu_err;                                                       \
+})
+#endif
 #define __get_user_asm(x, addr, err, insn) \
 ({ \
@@ -541,7 +524,7 @@ static __inline__ long __strnlen_user(const char __user *__s, long __n)
                "3:\n\t"
                "mov.l  4f, %1\n\t"
                "jmp    @%1\n\t"
-                " mov   %5, %0\n"
+                " mov   #0, %0\n"
                ".balign 4\n"
                "4:     .long 2b\n"
                ".previous\n"
@@ -550,26 +533,20 @@ static __inline__ long __strnlen_user(const char __user *__s, long __n)
                "       .long 1b,3b\n"
                ".previous"
                : "=z" (res), "=&r" (__dummy)
-                : "0" (0), "r" (__s), "r" (__n), "i" (-EFAULT)
+                : "0" (0), "r" (__s), "r" (__n)
                : "t");
        return res;
 }
 static __inline__ long strnlen_user(const char __user *s, long n)
 {
-        if (!access_ok(VERIFY_READ, s, n))
+        if (!__addr_ok(s))
                return 0;
        else
                return __strnlen_user(s, n);
 }
-static __inline__ long strlen_user(const char __user *s)
+#define strlen_user(str)        strnlen_user(str, ~0UL >> 1)
-{
-        if (!access_ok(VERIFY_READ, s, 0))
-                return 0;
-        else
-                return __strnlen_user(s, ~0UL >> 1);
-}
 /*
 * The exception table consists of pairs of addresses: the first is the
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index 76b5430cb458..5d5e9f94def5 100644
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@ -292,25 +292,51 @@
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
 #define __NR_kexec_load         283
 #define __NR_waitid             284
-#define __NR_add_key            285
+/* #define __NR_sys_setaltroot  285 */
-#define __NR_request_key        286
+#define __NR_add_key            286
-#define __NR_keyctl             287
+#define __NR_request_key        287
-#define __NR_ioprio_set         288
+#define __NR_keyctl             288
-#define __NR_ioprio_get         289
+#define __NR_ioprio_set         289
-#define __NR_inotify_init       290
+#define __NR_ioprio_get         290
-#define __NR_inotify_add_watch  291
+#define __NR_inotify_init       291
-#define __NR_inotify_rm_watch   292
+#define __NR_inotify_add_watch  292
+#define __NR_inotify_rm_watch   293
+#define __NR_migrate_pages      294
+#define __NR_openat             295
+#define __NR_mkdirat            296
+#define __NR_mknodat            297
+#define __NR_fchownat           298
+#define __NR_futimesat          299
+#define __NR_newfstatat         300
+#define __NR_unlinkat           301
+#define __NR_renameat           302
+#define __NR_linkat             303
+#define __NR_symlinkat          304
+#define __NR_readlinkat         305
+#define __NR_fchmodat           306
+#define __NR_faccessat          307
+#define __NR_pselect6           308
+#define __NR_ppoll              309
+#define __NR_unshare            310
+#define __NR_set_robust_list    311
+#define __NR_get_robust_list    312
+#define __NR_splice             313
+#define __NR_sync_file_range    314
+#define __NR_tee                315
+#define __NR_vmsplice           316
+#define NR_syscalls 317
-#define NR_syscalls 293
 #ifdef __KERNEL__
-/* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */
+#include <linux/err.h>
+/* user-visible error numbers are in the range -1 - -MAX_ERRNO:
+ * see <asm-sh/errno.h> */
 #define __syscall_return(type, res) \
 do { \
-        if ((unsigned long)(res) >= (unsigned long)(-124)) { \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
        /* Avoid using "res" which is declared to be in register r0; \
           errno might expand to a function call and clobber it.  */ \
                int __err = -(res); \
@@ -444,6 +470,7 @@ __syscall_return(type,__sc0); \
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #ifdef __KERNEL_SYSCALLS__
diff --git a/include/asm-sh/rts7751r2d/voyagergx_reg.h b/include/asm-sh/voyagergx.h
index f031b5d6cf54..99b0807d1c9f 100644
--- a/include/asm-sh/rts7751r2d/voyagergx_reg.h
+++ b/include/asm-sh/voyagergx.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------- */
-/* voyagergx_reg.h                                                      */
+/* voyagergx.h                                                        */
 /* -------------------------------------------------------------------- */
 /*  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
diff --git a/include/asm-sh/watchdog.h b/include/asm-sh/watchdog.h
index 09ca41972a11..d19ea62ef8c6 100644
--- a/include/asm-sh/watchdog.h
+++ b/include/asm-sh/watchdog.h
@@ -62,7 +62,6 @@
 /**
 *      sh_wdt_read_cnt - Read from Counter
- *
 *      Reads back the WTCNT value.
 */
 static inline __u8 sh_wdt_read_cnt(void)
@@ -72,7 +71,6 @@ static inline __u8 sh_wdt_read_cnt(void)
 /**
 *      sh_wdt_write_cnt - Write to Counter
- *
 *      @val: Value to write
 *
 *      Writes the given value @val to the lower byte of the timer counter.
@@ -95,7 +93,6 @@ static inline __u8 sh_wdt_read_csr(void)
 /**
 *      sh_wdt_write_csr - Write to Control/Status Register
- *
 *      @val: Value to write
 *
 *      Writes the given value @val to the lower byte of the control/status
diff --git a/include/asm-sh64/keyboard.h b/include/asm-sh64/keyboard.h
index 1fab96d792bf..0b01c3beb2f8 100644
--- a/include/asm-sh64/keyboard.h
+++ b/include/asm-sh64/keyboard.h
@@ -30,7 +30,6 @@ extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
 extern char pckbd_unexpected_up(unsigned char keycode);
 extern void pckbd_leds(unsigned char leds);
 extern void pckbd_init_hw(void);
-extern unsigned char pckbd_sysrq_xlate[128];
 #define kbd_setkeycode          pckbd_setkeycode
 #define kbd_getkeycode          pckbd_getkeycode
@@ -38,9 +37,6 @@ extern unsigned char pckbd_sysrq_xlate[128];
 #define kbd_unexpected_up       pckbd_unexpected_up
 #define kbd_leds                pckbd_leds
 #define kbd_init_hw             pckbd_init_hw
-#define kbd_sysrq_xlate         pckbd_sysrq_xlate
-#define SYSRQ_KEY 0x54
 /* resource allocation */
 #define kbd_request_region()
diff --git a/include/asm-sh64/page.h b/include/asm-sh64/page.h
index 34fb34754ae6..472089aefc60 100644
--- a/include/asm-sh64/page.h
+++ b/include/asm-sh64/page.h
@@ -112,9 +112,8 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 #define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* __KERNEL__ */
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
+#endif /* __KERNEL__ */
 #endif /* __ASM_SH64_PAGE_H */
diff --git a/include/asm-sh64/pgtable.h b/include/asm-sh64/pgtable.h
index 54c7821893f5..6b97c4cb1d64 100644
--- a/include/asm-sh64/pgtable.h
+++ b/include/asm-sh64/pgtable.h
@@ -190,7 +190,9 @@ static inline int pgd_bad(pgd_t pgd)		{ return 0; }
 #endif
-#define pgd_page(pgd_entry)     ((unsigned long) (pgd_val(pgd_entry) & PAGE_MASK))
+#define pgd_page_vaddr(pgd_entry)       ((unsigned long) (pgd_val(pgd_entry) & PAGE_MASK))
+#define pgd_page(pgd)   (virt_to_page(pgd_val(pgd)))
 /*
 * PMD defines. Middle level.
@@ -219,7 +221,7 @@ static inline pmd_t * pmd_offset(pgd_t * dir, unsigned long address)
 #define pmd_none(pmd_entry)     (pmd_val((pmd_entry)) == _PMD_EMPTY)
 #define pmd_bad(pmd_entry)      ((pmd_val(pmd_entry) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
-#define pmd_page_kernel(pmd_entry) \
+#define pmd_page_vaddr(pmd_entry) \
        ((unsigned long) __va(pmd_val(pmd_entry) & PAGE_MASK))
 #define pmd_page(pmd) \
diff --git a/include/asm-sh64/shmparam.h b/include/asm-sh64/shmparam.h
index d3a99a4dc0e3..1bb820c833ee 100644
--- a/include/asm-sh64/shmparam.h
+++ b/include/asm-sh64/shmparam.h
@@ -2,19 +2,11 @@
 #define __ASM_SH64_SHMPARAM_H
 /*
- * This file is subject to the terms and conditions of the GNU General Public
+ * Set this to a sensible safe default, we'll work out the specifics for the
- * License.  See the file "COPYING" in the main directory of this archive
+ * align mask from the cache descriptor at run-time.
- * for more details.
- *
- * include/asm-sh64/shmparam.h
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
 */
+#define SHMLBA  0x4000
-#include <asm/cache.h>
+#define __ARCH_FORCE_SHMLBA
-/* attach addr a multiple of this */
-#define SHMLBA  (cpu_data->dcache.sets * L1_CACHE_BYTES)
 #endif /* __ASM_SH64_SHMPARAM_H */
diff --git a/include/asm-sh64/signal.h b/include/asm-sh64/signal.h
index a5a28203cb3b..244e134730d9 100644
--- a/include/asm-sh64/signal.h
+++ b/include/asm-sh64/signal.h
@@ -13,7 +13,6 @@
 */
 #include <linux/types.h>
-#include <asm/processor.h>
 /* Avoid too many header ordering problems.  */
 struct siginfo;
diff --git a/include/asm-sh64/timex.h b/include/asm-sh64/timex.h
index af0b79269661..163e2b62fe27 100644
--- a/include/asm-sh64/timex.h
+++ b/include/asm-sh64/timex.h
@@ -17,9 +17,6 @@
 #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
 #define CLOCK_TICK_FACTOR       20      /* Factor of both 1000000 and CLOCK_TICK_RATE */
-#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
-        (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \
-                << (SHIFT_SCALE-SHIFT_HZ)) / HZ)
 typedef unsigned long cycles_t;
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h
index 9a1590fffc15..c113566bef33 100644
--- a/include/asm-sh64/unistd.h
+++ b/include/asm-sh64/unistd.h
@@ -347,8 +347,10 @@
 #ifdef __KERNEL__ 
 #define NR_syscalls 321
+#include <linux/err.h>
-/* user-visible error numbers are in the range -1 - -125: see <asm-sh64/errno.h> */
+/* user-visible error numbers are in the range -1 - -MAX_ERRNO:
+ * see <asm-sh64/errno.h> */
 #define __syscall_return(type, res) \
 do { \
@@ -358,7 +360,7 @@ do { \
        **       life easier in the system call epilogue (see entry.S)      \
        */                                                                  \
        register unsigned long __sr2 __asm__ ("r2") = res;                  \
-        if ((unsigned long)(res) >= (unsigned long)(-125)) { \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) {          \
                errno = -(res);                                             \
                __sr2 = -1;                                                 \
        } \
diff --git a/include/asm-sh64/user.h b/include/asm-sh64/user.h
index 8f32f39a8ca9..eb3b33edd73e 100644
--- a/include/asm-sh64/user.h
+++ b/include/asm-sh64/user.h
@@ -13,7 +13,6 @@
 */
 #include <linux/types.h>
-#include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
diff --git a/include/asm-sparc/Kbuild b/include/asm-sparc/Kbuild
index e2a57fd7abfa..c6a55cf0d337 100644
--- a/include/asm-sparc/Kbuild
+++ b/include/asm-sparc/Kbuild
@@ -1,6 +1,15 @@
 include include/asm-generic/Kbuild.asm
-unifdef-y += fbio.h perfctr.h psr.h
+header-y += apc.h
-header-y += apc.h asi.h auxio.h bpp.h head.h ipc.h jsflash.h    \
+header-y += asi.h
-        openpromio.h pbm.h pconf.h pgtsun4.h reg.h traps.h      \
+header-y += bpp.h
-        turbosparc.h vfc_ioctls.h winmacro.h
+header-y += jsflash.h
+header-y += openpromio.h
+header-y += pconf.h
+header-y += reg.h
+header-y += traps.h
+header-y += vfc_ioctls.h
+unifdef-y += fbio.h
+unifdef-y += perfctr.h
+unifdef-y += psr.h
diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h
index 5bab8a7c25ce..ff57648eb8f8 100644
--- a/include/asm-sparc/page.h
+++ b/include/asm-sparc/page.h
@@ -8,6 +8,8 @@
 #ifndef _SPARC_PAGE_H
 #define _SPARC_PAGE_H
+#ifdef __KERNEL__
 #ifdef CONFIG_SUN4
 #define PAGE_SHIFT   13
 #else
@@ -21,8 +23,6 @@
 #endif
 #define PAGE_MASK    (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
 #include <asm/btfixup.h>
 #ifndef __ASSEMBLY__
@@ -160,9 +160,9 @@ extern unsigned long pfn_base;
 #define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* __KERNEL__ */
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
+#endif /* __KERNEL__ */
 #endif /* _SPARC_PAGE_H */
diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h
index 226c6475c9a2..4f0a5ba0d6a0 100644
--- a/include/asm-sparc/pgtable.h
+++ b/include/asm-sparc/pgtable.h
@@ -143,10 +143,10 @@ extern unsigned long empty_zero_page;
 /*
 */
 BTFIXUPDEF_CALL_CONST(struct page *, pmd_page, pmd_t)
-BTFIXUPDEF_CALL_CONST(unsigned long, pgd_page, pgd_t)
+BTFIXUPDEF_CALL_CONST(unsigned long, pgd_page_vaddr, pgd_t)
 #define pmd_page(pmd) BTFIXUP_CALL(pmd_page)(pmd)
-#define pgd_page(pgd) BTFIXUP_CALL(pgd_page)(pgd)
+#define pgd_page_vaddr(pgd) BTFIXUP_CALL(pgd_page_vaddr)(pgd)
 BTFIXUPDEF_SETHI(none_mask)
 BTFIXUPDEF_CALL_CONST(int, pte_present, pte_t)
diff --git a/include/asm-sparc/spinlock.h b/include/asm-sparc/spinlock.h
index 1c75474ba1df..557d08959d2f 100644
--- a/include/asm-sparc/spinlock.h
+++ b/include/asm-sparc/spinlock.h
@@ -154,6 +154,10 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
 #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
 #define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #define __raw_read_can_lock(rw) (!((rw)->lock & 0xff))
 #define __raw_write_can_lock(rw) (!(rw)->lock)
diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
index 9284c3cb27ec..a7f44408c93b 100644
--- a/include/asm-sparc64/Kbuild
+++ b/include/asm-sparc64/Kbuild
@@ -4,7 +4,23 @@ ALTARCH := sparc
 ARCHDEF := defined __sparc__ && defined __arch64__
 ALTARCHDEF := defined __sparc__ && !defined __arch64__
-unifdef-y += fbio.h perfctr.h
+header-y += apb.h
-header-y += apb.h asi.h bbc.h bpp.h display7seg.h envctrl.h floppy.h    \
+header-y += asi.h
-        ipc.h kdebug.h mostek.h openprom.h openpromio.h parport.h       \
+header-y += bbc.h
-        pconf.h psrcompat.h pstate.h reg.h uctx.h utrap.h watchdog.h
+header-y += bpp.h
+header-y += const.h
+header-y += display7seg.h
+header-y += envctrl.h
+header-y += ipc.h
+header-y += openprom.h
+header-y += openpromio.h
+header-y += pconf.h
+header-y += psrcompat.h
+header-y += pstate.h
+header-y += reg.h
+header-y += uctx.h
+header-y += utrap.h
+header-y += watchdog.h
+unifdef-y += fbio.h
+unifdef-y += perfctr.h
diff --git a/include/asm-sparc64/page.h b/include/asm-sparc64/page.h
index fdf0ceb76028..ff736eafa64d 100644
--- a/include/asm-sparc64/page.h
+++ b/include/asm-sparc64/page.h
@@ -3,6 +3,8 @@
 #ifndef _SPARC64_PAGE_H
 #define _SPARC64_PAGE_H
+#ifdef __KERNEL__
 #include <asm/const.h>
 #if defined(CONFIG_SPARC64_PAGE_SIZE_8KB)
@@ -27,8 +29,6 @@
 #define DCACHE_ALIASING_POSSIBLE
 #endif
-#ifdef __KERNEL__
 #if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
 #define HPAGE_SHIFT             22
 #elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K)
@@ -141,8 +141,7 @@ typedef unsigned long pgprot_t;
 #define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-#endif /* !(__KERNEL__) */
 #include <asm-generic/page.h>
-#endif /* !(_SPARC64_PAGE_H) */
+#endif /* __KERNEL__ */
+#endif /* _SPARC64_PAGE_H */
diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h
index ebfe395cfb87..b12be7a869f6 100644
--- a/include/asm-sparc64/pgtable.h
+++ b/include/asm-sparc64/pgtable.h
@@ -630,8 +630,9 @@ static inline unsigned long pte_present(pte_t pte)
 #define __pmd_page(pmd)         \
        ((unsigned long) __va((((unsigned long)pmd_val(pmd))<<11UL)))
 #define pmd_page(pmd)                   virt_to_page((void *)__pmd_page(pmd))
-#define pud_page(pud)           \
+#define pud_page_vaddr(pud)             \
        ((unsigned long) __va((((unsigned long)pud_val(pud))<<11UL)))
+#define pud_page(pud)                   virt_to_page((void *)pud_page_vaddr(pud))
 #define pmd_none(pmd)                   (!pmd_val(pmd))
 #define pmd_bad(pmd)                    (0)
 #define pmd_present(pmd)                (pmd_val(pmd) != 0U)
@@ -653,7 +654,7 @@ static inline unsigned long pte_present(pte_t pte)
 /* Find an entry in the second-level page table.. */
 #define pmd_offset(pudp, address)       \
-        ((pmd_t *) pud_page(*(pudp)) + \
+        ((pmd_t *) pud_page_vaddr(*(pudp)) + \
         (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)))
 /* Find an entry in the third-level page table.. */
diff --git a/include/asm-sparc64/shmparam.h b/include/asm-sparc64/shmparam.h
index 8c66fded8a32..911d0427de6d 100644
--- a/include/asm-sparc64/shmparam.h
+++ b/include/asm-sparc64/shmparam.h
@@ -1,6 +1,7 @@
 /* $Id: shmparam.h,v 1.5 2001/09/24 21:17:57 kanoj Exp $ */
 #ifndef _ASMSPARC64_SHMPARAM_H
 #define _ASMSPARC64_SHMPARAM_H
+#ifdef __KERNEL__
 #include <asm/spitfire.h>
@@ -8,4 +9,5 @@
 /* attach addr a multiple of this */
 #define SHMLBA  ((PAGE_SIZE > L1DCACHE_SIZE) ? PAGE_SIZE : L1DCACHE_SIZE)
+#endif /* __KERNEL__ */
 #endif /* _ASMSPARC64_SHMPARAM_H */
diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h
index bd5ffc76bc7e..0006fe9f8c7a 100644
--- a/include/asm-sparc64/spinlock.h
+++ b/include/asm-sparc64/spinlock.h
@@ -241,6 +241,10 @@ static int inline __write_trylock(raw_rwlock_t *lock)
 #define __raw_read_can_lock(rw)         (!((rw)->lock & 0x80000000UL))
 #define __raw_write_can_lock(rw)        (!(rw)->lock)
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* !(__ASSEMBLY__) */
 #endif /* !(__SPARC64_SPINLOCK_H) */
diff --git a/include/asm-um/Kbuild b/include/asm-um/Kbuild
deleted file mode 100644
index c68e1680da01..000000000000
--- a/include/asm-um/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-include include/asm-generic/Kbuild.asm
diff --git a/include/asm-um/alternative-asm.i b/include/asm-um/alternative-asm.i
new file mode 100644
index 000000000000..cae9faca132f
--- /dev/null
+++ b/include/asm-um/alternative-asm.i
@@ -0,0 +1,6 @@
+#ifndef __UM_ALTERNATIVE_ASM_I
+#define __UM_ALTERNATIVE_ASM_I
+#include "asm/arch/alternative-asm.i"
+#endif
diff --git a/include/asm-um/frame.i b/include/asm-um/frame.i
new file mode 100644
index 000000000000..09d5dca5d928
--- /dev/null
+++ b/include/asm-um/frame.i
@@ -0,0 +1,6 @@
+#ifndef __UM_FRAME_I
+#define __UM_FRAME_I
+#include "asm/arch/frame.i"
+#endif
diff --git a/include/asm-um/pgtable-2level.h b/include/asm-um/pgtable-2level.h
index ffe017f6b64b..6050e0eb257e 100644
--- a/include/asm-um/pgtable-2level.h
+++ b/include/asm-um/pgtable-2level.h
@@ -41,7 +41,7 @@ static inline void pgd_mkuptodate(pgd_t pgd)	{ }
 #define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))
 #define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))
-#define pmd_page_kernel(pmd) \
+#define pmd_page_vaddr(pmd) \
        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 /*
diff --git a/include/asm-um/pgtable-3level.h b/include/asm-um/pgtable-3level.h
index 786c25727289..ca0c2a92a112 100644
--- a/include/asm-um/pgtable-3level.h
+++ b/include/asm-um/pgtable-3level.h
@@ -74,11 +74,12 @@ extern inline void pud_clear (pud_t *pud)
        set_pud(pud, __pud(0));
 }
-#define pud_page(pud) \
+#define pud_page(pud) phys_to_page(pud_val(pud) & PAGE_MASK)
+#define pud_page_vaddr(pud) \
        ((struct page *) __va(pud_val(pud) & PAGE_MASK))
 /* Find an entry in the second-level page table.. */
-#define pmd_offset(pud, address) ((pmd_t *) pud_page(*(pud)) + \
+#define pmd_offset(pud, address) ((pmd_t *) pud_page_vaddr(*(pud)) + \
                        pmd_index(address))
 static inline unsigned long pte_pfn(pte_t pte)
diff --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h
index ac64eb955868..188f72621776 100644
--- a/include/asm-um/pgtable.h
+++ b/include/asm-um/pgtable.h
@@ -274,12 +274,6 @@ static inline pte_t pte_mkread(pte_t pte)
        return(pte_mknewprot(pte)); 
 }
-static inline pte_t pte_mkexec(pte_t pte)
-{ 
-        pte_set_bits(pte, _PAGE_USER);
-        return(pte_mknewprot(pte)); 
-}
 static inline pte_t pte_mkdirty(pte_t pte)
 { 
        pte_set_bits(pte, _PAGE_DIRTY);
@@ -349,7 +343,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
        return pte; 
 }
-#define pmd_page_kernel(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+#define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 /*
 * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
@@ -389,7 +383,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 */
 #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
-        ((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
+        ((pte_t *) pmd_page_vaddr(*(dir)) +  pte_index(address))
 #define pte_offset_map(dir, address) \
        ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
 #define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)
diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
index 824c28896382..d99bbddffdb9 100644
--- a/include/asm-um/processor-generic.h
+++ b/include/asm-um/processor-generic.h
@@ -13,6 +13,7 @@ struct task_struct;
 #include "asm/ptrace.h"
 #include "choose-mode.h"
 #include "registers.h"
+#include "sysdep/archsetjmp.h"
 struct mm_struct;
@@ -43,8 +44,7 @@ struct thread_struct {
 #endif
 #ifdef CONFIG_MODE_SKAS
                struct {
-                        void *switch_buf;
+                        jmp_buf switch_buf;
-                        void *fork_buf;
                        int mm_count;
                } skas;
 #endif
@@ -138,9 +138,7 @@ extern struct cpuinfo_um cpu_data[];
 #ifdef CONFIG_MODE_SKAS
 #define KSTK_REG(tsk, reg) \
-        ({ union uml_pt_regs regs; \
+        get_thread_reg(reg, &tsk->thread.mode.skas.switch_buf)
-           get_thread_regs(&regs, tsk->thread.mode.skas.switch_buf); \
-           UPT_REG(&regs, reg); })
 #else
 #define KSTK_REG(tsk, reg) (0xbadbabe)
 #endif
diff --git a/include/asm-um/ptrace-generic.h b/include/asm-um/ptrace-generic.h
index a36f5371b36b..99c87c5ce994 100644
--- a/include/asm-um/ptrace-generic.h
+++ b/include/asm-um/ptrace-generic.h
@@ -8,19 +8,7 @@
 #ifndef __ASSEMBLY__
+#include "asm/arch/ptrace-abi.h"
-#define pt_regs pt_regs_subarch
-#define show_regs show_regs_subarch
-#define send_sigtrap send_sigtrap_subarch
-#include "asm/arch/ptrace.h"
-#undef pt_regs
-#undef show_regs
-#undef send_sigtrap
-#undef user_mode
-#undef instruction_pointer
 #include "sysdep/ptrace.h"
 struct pt_regs {
diff --git a/include/asm-um/ptrace-x86_64.h b/include/asm-um/ptrace-x86_64.h
index c894e68b1f96..03b4af4ac09a 100644
--- a/include/asm-um/ptrace-x86_64.h
+++ b/include/asm-um/ptrace-x86_64.h
@@ -11,21 +11,20 @@
 #include "asm/errno.h"
 #include "asm/host_ldt.h"
-#define signal_fault signal_fault_x86_64
 #define __FRAME_OFFSETS /* Needed to get the R* macros */
 #include "asm/ptrace-generic.h"
-#undef signal_fault
 #define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64
-void signal_fault(struct pt_regs_subarch *regs, void *frame, char *where);
+/* Also defined in sysdep/ptrace.h, so may already be defined. */
+#ifndef FS_BASE
 #define FS_BASE (21 * sizeof(unsigned long))
 #define GS_BASE (22 * sizeof(unsigned long))
 #define DS (23 * sizeof(unsigned long))
 #define ES (24 * sizeof(unsigned long))
 #define FS (25 * sizeof(unsigned long))
 #define GS (26 * sizeof(unsigned long))
+#endif
 #define PT_REGS_RBX(r) UPT_RBX(&(r)->regs)
 #define PT_REGS_RCX(r) UPT_RCX(&(r)->regs)
diff --git a/include/asm-v850/page.h b/include/asm-v850/page.h
index ad03c46a1f92..d693ffb1364d 100644
--- a/include/asm-v850/page.h
+++ b/include/asm-v850/page.h
@@ -14,6 +14,8 @@
 #ifndef __V850_PAGE_H__
 #define __V850_PAGE_H__
+#ifdef __KERNEL__
 #include <asm/machdep.h>
@@ -32,7 +34,6 @@
 #endif
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 #define STRICT_MM_TYPECHECKS
@@ -122,9 +123,9 @@ typedef unsigned long pgprot_t;
 #define __va(x)              ((void *)__phys_to_virt ((unsigned long)(x)))
-#endif /* KERNEL */
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
+#endif /* KERNEL */
 #endif /* __V850_PAGE_H__ */
diff --git a/include/asm-v850/param.h b/include/asm-v850/param.h
index 8d796e4bff52..3c65bd573782 100644
--- a/include/asm-v850/param.h
+++ b/include/asm-v850/param.h
@@ -14,8 +14,6 @@
 #ifndef __V850_PARAM_H__
 #define __V850_PARAM_H__
-#include <asm/machdep.h>        /* For HZ */
 #define EXEC_PAGESIZE   4096
 #ifndef NOGROUP
@@ -25,6 +23,8 @@
 #define MAXHOSTNAMELEN  64      /* max length of hostname */
 #ifdef __KERNEL__
+#include <asm/machdep.h>        /* For HZ */
 # define USER_HZ        100
 # define CLOCKS_PER_SEC USER_HZ
 #endif
diff --git a/include/asm-v850/unistd.h b/include/asm-v850/unistd.h
index bcb44bfe577a..552b7c873a57 100644
--- a/include/asm-v850/unistd.h
+++ b/include/asm-v850/unistd.h
@@ -238,12 +238,13 @@
 #ifdef __KERNEL__
 #include <asm/clinkage.h>
+#include <linux/err.h>
 #define __syscall_return(type, res)                                           \
  do {                                                                        \
-          /* user-visible error numbers are in the range -1 - -124:           \
+          /* user-visible error numbers are in the range -1 - -MAX_ERRNO:      \
             see <asm-v850/errno.h> */                                        \
-          if (__builtin_expect ((unsigned long)(res) >= (unsigned long)(-125), 0)) { \
+          if (__builtin_expect ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO), 0)) { \
                  errno = -(res);                                             \
                  res = -1;                                                   \
          }                                                                   \
diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
index dc4d101e8a16..1ee9b07f3fe6 100644
--- a/include/asm-x86_64/Kbuild
+++ b/include/asm-x86_64/Kbuild
@@ -4,8 +4,19 @@ ALTARCH := i386
 ARCHDEF := defined __x86_64__
 ALTARCHDEF := defined __i386__
-header-y += boot.h bootsetup.h cpufeature.h debugreg.h ldt.h \
+header-y += boot.h
-         msr.h prctl.h setup.h sigcontext32.h ucontext.h \
+header-y += bootsetup.h
-         vsyscall32.h
+header-y += cpufeature.h
+header-y += debugreg.h
+header-y += ldt.h
+header-y += msr.h
+header-y += prctl.h
+header-y += ptrace-abi.h
+header-y += setup.h
+header-y += sigcontext32.h
+header-y += ucontext.h
+header-y += vsyscall32.h
-unifdef-y += mce.h mtrr.h vsyscall.h
+unifdef-y += mce.h
+unifdef-y += mtrr.h
+unifdef-y += vsyscall.h
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h
index 2c95a319c056..ed59aa4c6ff9 100644
--- a/include/asm-x86_64/acpi.h
+++ b/include/asm-x86_64/acpi.h
@@ -155,8 +155,6 @@ extern void acpi_reserve_bootmem(void);
 #endif /*CONFIG_ACPI_SLEEP*/
-#define boot_cpu_physical_apicid boot_cpu_id
 extern int acpi_disabled;
 extern int acpi_pci_disabled;
diff --git a/include/asm-x86_64/alternative-asm.i b/include/asm-x86_64/alternative-asm.i
new file mode 100644
index 000000000000..e4041f4fa4dc
--- /dev/null
+++ b/include/asm-x86_64/alternative-asm.i
@@ -0,0 +1,14 @@
+#include <linux/config.h>
+#ifdef CONFIG_SMP
+        .macro LOCK_PREFIX
+1:      lock
+        .section .smp_locks,"a"
+        .align 8
+        .quad 1b
+        .previous
+        .endm
+#else
+        .macro LOCK_PREFIX
+        .endm
+#endif
diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h
index 9c96a0a8d1bd..9e66d32330c9 100644
--- a/include/asm-x86_64/apic.h
+++ b/include/asm-x86_64/apic.h
@@ -17,6 +17,8 @@
 extern int apic_verbosity;
 extern int apic_runs_main_timer;
+extern int ioapic_force;
+extern int apic_mapped;
 /*
 * Define the default level of output to be very little
@@ -29,8 +31,6 @@ extern int apic_runs_main_timer;
                        printk(s, ##a);    \
        } while (0)
-#ifdef CONFIG_X86_LOCAL_APIC
 struct pt_regs;
 /*
@@ -95,17 +95,12 @@ extern void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,
 #define K8_APIC_EXT_INT_MSG_EXT 0x7
 #define K8_APIC_EXT_LVT_ENTRY_THRESHOLD    0
-extern int disable_timer_pin_1;
 void smp_send_timer_broadcast_ipi(void);
 void switch_APIC_timer_to_ipi(void *cpumask);
 void switch_ipi_to_APIC_timer(void *cpumask);
 #define ARCH_APICTIMER_STOPS_ON_C3      1
-#endif /* CONFIG_X86_LOCAL_APIC */
 extern unsigned boot_cpu_id;
 #endif /* __ASM_APIC_H */
diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h
index f7ba57b1cc08..5b535eaf5309 100644
--- a/include/asm-x86_64/bitops.h
+++ b/include/asm-x86_64/bitops.h
@@ -399,6 +399,8 @@ static __inline__ int fls(int x)
        return r+1;
 }
+#define ARCH_HAS_FAST_MULTIPLIER 1
 #include <asm-generic/bitops/hweight.h>
 #endif /* __KERNEL__ */
diff --git a/include/asm-x86_64/calgary.h b/include/asm-x86_64/calgary.h
index 4e3919524240..6b93f5a3a5c8 100644
--- a/include/asm-x86_64/calgary.h
+++ b/include/asm-x86_64/calgary.h
@@ -24,7 +24,6 @@
 #ifndef _ASM_X86_64_CALGARY_H
 #define _ASM_X86_64_CALGARY_H
-#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
@@ -34,12 +33,12 @@ struct iommu_table {
        unsigned long  it_base;      /* mapped address of tce table */
        unsigned long  it_hint;      /* Hint for next alloc */
        unsigned long *it_map;       /* A simple allocation bitmap for now */
+        void __iomem  *bbar;         /* Bridge BAR */
+        u64            tar_val;      /* Table Address Register */
+        struct timer_list watchdog_timer;
        spinlock_t     it_lock;      /* Protects it_map */
        unsigned int   it_size;      /* Size of iommu table in entries */
        unsigned char  it_busno;     /* Bus number this table belongs to */
-        void __iomem  *bbar;
-        u64            tar_val;
-        struct timer_list watchdog_timer;
 };
 #define TCE_TABLE_SIZE_UNSPECIFIED      ~0
diff --git a/include/asm-x86_64/dma-mapping.h b/include/asm-x86_64/dma-mapping.h
index b6da83dcc7a6..10174b110a5c 100644
--- a/include/asm-x86_64/dma-mapping.h
+++ b/include/asm-x86_64/dma-mapping.h
@@ -55,13 +55,6 @@ extern dma_addr_t bad_dma_address;
 extern struct dma_mapping_ops* dma_ops;
 extern int iommu_merge;
-static inline int valid_dma_direction(int dma_direction)
-{
-        return ((dma_direction == DMA_BIDIRECTIONAL) ||
-                (dma_direction == DMA_TO_DEVICE) ||
-                (dma_direction == DMA_FROM_DEVICE));
-}
 static inline int dma_mapping_error(dma_addr_t dma_addr)
 {
        if (dma_ops->mapping_error)
diff --git a/include/asm-x86_64/dwarf2.h b/include/asm-x86_64/dwarf2.h
index 0744db777676..eedc08526b0b 100644
--- a/include/asm-x86_64/dwarf2.h
+++ b/include/asm-x86_64/dwarf2.h
@@ -13,7 +13,7 @@
   away for older version. 
 */
-#ifdef CONFIG_UNWIND_INFO
+#ifdef CONFIG_AS_CFI
 #define CFI_STARTPROC .cfi_startproc
 #define CFI_ENDPROC .cfi_endproc
@@ -28,6 +28,11 @@
 #define CFI_REMEMBER_STATE .cfi_remember_state
 #define CFI_RESTORE_STATE .cfi_restore_state
 #define CFI_UNDEFINED .cfi_undefined
+#ifdef CONFIG_AS_CFI_SIGNAL_FRAME
+#define CFI_SIGNAL_FRAME .cfi_signal_frame
+#else
+#define CFI_SIGNAL_FRAME
+#endif
 #else
@@ -45,6 +50,7 @@
 #define CFI_REMEMBER_STATE      #
 #define CFI_RESTORE_STATE       #
 #define CFI_UNDEFINED   #
+#define CFI_SIGNAL_FRAME        #
 #endif
diff --git a/include/asm-x86_64/e820.h b/include/asm-x86_64/e820.h
index 670a3388e70a..fa2086774105 100644
--- a/include/asm-x86_64/e820.h
+++ b/include/asm-x86_64/e820.h
@@ -19,13 +19,9 @@
 #define E820_RAM        1
 #define E820_RESERVED   2
-#define E820_ACPI       3 /* usable as RAM once ACPI tables have been read */
+#define E820_ACPI       3
 #define E820_NVS        4
-#define HIGH_MEMORY     (1024*1024)
-#define LOWMEMSIZE()    (0x9f000)
 #ifndef __ASSEMBLY__
 struct e820entry {
        u64 addr;       /* start of memory segment */
@@ -46,17 +42,16 @@ extern void setup_memory_region(void);
 extern void contig_e820_setup(void); 
 extern unsigned long e820_end_of_ram(void);
 extern void e820_reserve_resources(void);
+extern void e820_mark_nosave_regions(void);
 extern void e820_print_map(char *who);
 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);
-extern unsigned long e820_hole_size(unsigned long start_pfn,
+extern void e820_register_active_regions(int nid,
-                                    unsigned long end_pfn);
+                                unsigned long start_pfn, unsigned long end_pfn);
-extern void __init parse_memopt(char *p, char **end);
+extern void finish_e820_parsing(void);
-extern void __init parse_memmapopt(char *p, char **end);
 extern struct e820map e820;
diff --git a/include/asm-x86_64/fixmap.h b/include/asm-x86_64/fixmap.h
index 0b4ffbd1a125..1b620db5b9e3 100644
--- a/include/asm-x86_64/fixmap.h
+++ b/include/asm-x86_64/fixmap.h
@@ -37,13 +37,9 @@ enum fixed_addresses {
        VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
        VSYSCALL_HPET,
        FIX_HPET_BASE,
-#ifdef CONFIG_X86_LOCAL_APIC
        FIX_APIC_BASE,  /* local (CPU) APIC) -- required for SMP or not */
-#endif
-#ifdef CONFIG_X86_IO_APIC
        FIX_IO_APIC_BASE_0,
        FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
-#endif
        __end_of_fixed_addresses
 };
diff --git a/include/asm-x86_64/genapic.h b/include/asm-x86_64/genapic.h
index 50b38e7c58e4..81e714665344 100644
--- a/include/asm-x86_64/genapic.h
+++ b/include/asm-x86_64/genapic.h
@@ -16,7 +16,6 @@ struct genapic {
        char *name;
        u32 int_delivery_mode;
        u32 int_dest_mode;
-        u32 int_delivery_dest;  /* for quick IPIs */
        int (*apic_id_registered)(void);
        cpumask_t (*target_cpus)(void);
        void (*init_apic_ldr)(void);
diff --git a/include/asm-x86_64/i387.h b/include/asm-x86_64/i387.h
index cba8a3b0cded..0217b74cc9fc 100644
--- a/include/asm-x86_64/i387.h
+++ b/include/asm-x86_64/i387.h
@@ -24,6 +24,7 @@ extern unsigned int mxcsr_feature_mask;
 extern void mxcsr_feature_mask_init(void);
 extern void init_fpu(struct task_struct *child);
 extern int save_i387(struct _fpstate __user *buf);
+extern asmlinkage void math_state_restore(void);
 /*
 * FPU lazy state save handling...
@@ -31,7 +32,9 @@ extern int save_i387(struct _fpstate __user *buf);
 #define unlazy_fpu(tsk) do { \
        if (task_thread_info(tsk)->status & TS_USEDFPU) \
-                save_init_fpu(tsk); \
+                save_init_fpu(tsk);                     \
+        else                                            \
+                tsk->fpu_counter = 0;                   \
 } while (0)
 /* Ignore delayed exceptions from user space */
@@ -134,8 +137,8 @@ static inline int save_i387_checking(struct i387_fxsave_struct __user *fx)
 #else
                     : [fx] "cdaSDb" (fx), "0" (0));
 #endif
-        if (unlikely(err))
+        if (unlikely(err) && __clear_user(fx, sizeof(struct i387_fxsave_struct)))
-                __clear_user(fx, sizeof(struct i387_fxsave_struct));
+                err = -EFAULT;
        /* No need to clear here because the caller clears USED_MATH */
        return err;
 } 
diff --git a/include/asm-x86_64/intel_arch_perfmon.h b/include/asm-x86_64/intel_arch_perfmon.h
index 59c396431569..8633331420ec 100644
--- a/include/asm-x86_64/intel_arch_perfmon.h
+++ b/include/asm-x86_64/intel_arch_perfmon.h
@@ -14,6 +14,18 @@
 #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL   (0x3c)
 #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK (0x00 << 8)
-#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT (1 << 0)
+#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX (0)
+#define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT \
+                                (1 << (ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX))
+union cpuid10_eax {
+        struct {
+                unsigned int version_id:8;
+                unsigned int num_counters:8;
+                unsigned int bit_width:8;
+                unsigned int mask_length:8;
+        } split;
+        unsigned int full;
+};
 #endif  /* X86_64_INTEL_ARCH_PERFMON_H */
diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h
index fb7a0909a174..5d1b5c68e36e 100644
--- a/include/asm-x86_64/io_apic.h
+++ b/include/asm-x86_64/io_apic.h
@@ -10,8 +10,6 @@
 * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
 */
-#ifdef CONFIG_X86_IO_APIC
 #ifdef CONFIG_PCI_MSI
 static inline int use_pci_vector(void)  {return 1;}
 static inline void disable_edge_ioapic_vector(unsigned int vector) { }
@@ -209,10 +207,6 @@ extern int timer_uses_ioapic_pin_0;
 extern int sis_apic_bug; /* dummy */ 
-#else  /* !CONFIG_X86_IO_APIC */
-#define io_apic_assign_pci_irqs 0
-#endif
 extern int assign_irq_vector(int irq);
 void enable_NMI_through_LVT0 (void * dummy);
diff --git a/include/asm-x86_64/irq.h b/include/asm-x86_64/irq.h
index 9db5a1b4f7b1..43469d8ab71a 100644
--- a/include/asm-x86_64/irq.h
+++ b/include/asm-x86_64/irq.h
@@ -44,9 +44,7 @@ static __inline__ int irq_canonicalize(int irq)
        return ((irq == 2) ? 9 : irq);
 }
-#ifdef CONFIG_X86_LOCAL_APIC
 #define ARCH_HAS_NMI_WATCHDOG           /* See include/linux/nmi.h */
-#endif
 #ifdef CONFIG_HOTPLUG_CPU
 #include <linux/cpumask.h>
diff --git a/include/asm-x86_64/kexec.h b/include/asm-x86_64/kexec.h
index c564bae03433..5fab957e1091 100644
--- a/include/asm-x86_64/kexec.h
+++ b/include/asm-x86_64/kexec.h
@@ -1,6 +1,27 @@
 #ifndef _X86_64_KEXEC_H
 #define _X86_64_KEXEC_H
+#define PA_CONTROL_PAGE  0
+#define VA_CONTROL_PAGE  1
+#define PA_PGD           2
+#define VA_PGD           3
+#define PA_PUD_0         4
+#define VA_PUD_0         5
+#define PA_PMD_0         6
+#define VA_PMD_0         7
+#define PA_PTE_0         8
+#define VA_PTE_0         9
+#define PA_PUD_1         10
+#define VA_PUD_1         11
+#define PA_PMD_1         12
+#define VA_PMD_1         13
+#define PA_PTE_1         14
+#define VA_PTE_1         15
+#define PA_TABLE_PAGE    16
+#define PAGES_NR         17
+#ifndef __ASSEMBLY__
 #include <linux/string.h>
 #include <asm/page.h>
@@ -64,4 +85,12 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
                newregs->rip = (unsigned long)current_text_addr();
        }
 }
+NORET_TYPE void
+relocate_kernel(unsigned long indirection_page,
+                unsigned long page_list,
+                unsigned long start_address) ATTRIB_NORET;
+#endif /* __ASSEMBLY__ */
 #endif /* _X86_64_KEXEC_H */
diff --git a/include/asm-x86_64/linkage.h b/include/asm-x86_64/linkage.h
index 291c2d01c44f..b5f39d0189ce 100644
--- a/include/asm-x86_64/linkage.h
+++ b/include/asm-x86_64/linkage.h
@@ -1,6 +1,6 @@
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
-/* Nothing to see here... */
+#define __ALIGN .p2align 4,,15
 #endif
diff --git a/include/asm-x86_64/mach_apic.h b/include/asm-x86_64/mach_apic.h
index 0acea44c9377..d33422450c00 100644
--- a/include/asm-x86_64/mach_apic.h
+++ b/include/asm-x86_64/mach_apic.h
@@ -16,7 +16,6 @@
 #define INT_DELIVERY_MODE (genapic->int_delivery_mode)
 #define INT_DEST_MODE (genapic->int_dest_mode)
-#define INT_DELIVERY_DEST (genapic->int_delivery_dest)
 #define TARGET_CPUS       (genapic->target_cpus())
 #define apic_id_registered (genapic->apic_id_registered)
 #define init_apic_ldr (genapic->init_apic_ldr)
diff --git a/include/asm-x86_64/mce.h b/include/asm-x86_64/mce.h
index d13687dfd691..5a11146d6d9c 100644
--- a/include/asm-x86_64/mce.h
+++ b/include/asm-x86_64/mce.h
@@ -99,6 +99,8 @@ static inline void mce_amd_feature_init(struct cpuinfo_x86 *c)
 }
 #endif
+void mce_log_therm_throt_event(unsigned int cpu, __u64 status);
 extern atomic_t mce_entry;
 #endif
diff --git a/include/asm-x86_64/mmx.h b/include/asm-x86_64/mmx.h
deleted file mode 100644
index 46b71da99869..000000000000
--- a/include/asm-x86_64/mmx.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _ASM_MMX_H
-#define _ASM_MMX_H
-/*
- *      MMX 3Dnow! helper operations
- */
-#include <linux/types.h>
- 
-extern void *_mmx_memcpy(void *to, const void *from, size_t size);
-extern void mmx_clear_page(void *page);
-extern void mmx_copy_page(void *to, void *from);
-#endif
diff --git a/include/asm-x86_64/mpspec.h b/include/asm-x86_64/mpspec.h
index 14fc3ddd9031..017fddb61dc5 100644
--- a/include/asm-x86_64/mpspec.h
+++ b/include/asm-x86_64/mpspec.h
@@ -159,13 +159,7 @@ struct mpc_config_lintsrc
 #define MAX_MP_BUSSES 256
 /* Each PCI slot may be a combo card with its own bus.  4 IRQ pins per slot. */
 #define MAX_IRQ_SOURCES (MAX_MP_BUSSES * 4)
-enum mp_bustype {
+extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
-        MP_BUS_ISA = 1,
-        MP_BUS_EISA,
-        MP_BUS_PCI,
-        MP_BUS_MCA
-};
-extern unsigned char mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
 extern unsigned int boot_cpu_physical_apicid;
@@ -178,18 +172,15 @@ extern int mp_irq_entries;
 extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
 extern int mpc_default_type;
 extern unsigned long mp_lapic_addr;
-extern int pic_mode;
 #ifdef CONFIG_ACPI
 extern void mp_register_lapic (u8 id, u8 enabled);
 extern void mp_register_lapic_address (u64 address);
-#ifdef CONFIG_X86_IO_APIC
 extern void mp_register_ioapic (u8 id, u32 address, u32 gsi_base);
 extern void mp_override_legacy_irq (u8 bus_irq, u8 polarity, u8 trigger, u32 gsi);
 extern void mp_config_acpi_legacy_irqs (void);
 extern int mp_register_gsi (u32 gsi, int triggering, int polarity);
-#endif /*CONFIG_X86_IO_APIC*/
 #endif
 extern int using_apic_timer;
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h
index 10f8b51cec8b..37e194169fac 100644
--- a/include/asm-x86_64/msr.h
+++ b/include/asm-x86_64/msr.h
@@ -66,14 +66,25 @@
 #define rdtscl(low) \
     __asm__ __volatile__ ("rdtsc" : "=a" (low) : : "edx")
+#define rdtscp(low,high,aux) \
+     asm volatile (".byte 0x0f,0x01,0xf9" : "=a" (low), "=d" (high), "=c" (aux))
 #define rdtscll(val) do { \
     unsigned int __a,__d; \
     asm volatile("rdtsc" : "=a" (__a), "=d" (__d)); \
     (val) = ((unsigned long)__a) | (((unsigned long)__d)<<32); \
 } while(0)
+#define rdtscpll(val, aux) do { \
+     unsigned long __a, __d; \
+     asm volatile (".byte 0x0f,0x01,0xf9" : "=a" (__a), "=d" (__d), "=c" (aux)); \
+     (val) = (__d << 32) | __a; \
+} while (0)
 #define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
+#define write_rdtscp_aux(val) wrmsr(0xc0000103, val, 0)
 #define rdpmc(counter,low,high) \
     __asm__ __volatile__("rdpmc" \
                          : "=a" (low), "=d" (high) \
diff --git a/include/asm-x86_64/mutex.h b/include/asm-x86_64/mutex.h
index 06fab6de2a88..16396b1de3e4 100644
--- a/include/asm-x86_64/mutex.h
+++ b/include/asm-x86_64/mutex.h
@@ -25,13 +25,9 @@ do {									\
                                                                        \
        __asm__ __volatile__(                                           \
                LOCK_PREFIX "   decl (%%rdi)    \n"                     \
-                        "   js 2f               \n"                     \
+                        "   jns 1f              \n"                     \
-                        "1:                     \n"                     \
+                        "   call "#fail_fn"     \n"                     \
-                                                                        \
+                        "1:"                                            \
-                LOCK_SECTION_START("")                                  \
-                        "2: call "#fail_fn"     \n"                     \
-                        "   jmp 1b              \n"                     \
-                LOCK_SECTION_END                                        \
                                                                        \
                :"=D" (dummy)                                           \
                : "D" (v)                                               \
@@ -75,13 +71,9 @@ do {									\
                                                                        \
        __asm__ __volatile__(                                           \
                LOCK_PREFIX "   incl (%%rdi)    \n"                     \
-                        "   jle 2f              \n"                     \
+                        "   jg 1f               \n"                     \
-                        "1:                     \n"                     \
+                        "   call "#fail_fn"     \n"                     \
-                                                                        \
+                        "1:                       "                     \
-                LOCK_SECTION_START("")                                  \
-                        "2: call "#fail_fn"     \n"                     \
-                        "   jmp 1b              \n"                     \
-                LOCK_SECTION_END                                        \
                                                                        \
                :"=D" (dummy)                                           \
                : "D" (v)                                               \
diff --git a/include/asm-x86_64/nmi.h b/include/asm-x86_64/nmi.h
index efb45c894d76..f367d4014b42 100644
--- a/include/asm-x86_64/nmi.h
+++ b/include/asm-x86_64/nmi.h
@@ -7,24 +7,13 @@
 #include <linux/pm.h>
 #include <asm/io.h>
 
-struct pt_regs;
-typedef int (*nmi_callback_t)(struct pt_regs * regs, int cpu);
-/**
- * set_nmi_callback
- *
- * Set a handler for an NMI. Only one handler may be
- * set. Return 1 if the NMI was handled.
- */
-void set_nmi_callback(nmi_callback_t callback);
 /**
- * unset_nmi_callback
+ * do_nmi_callback
 *
- * Remove the handler previously set.
+ * Check to see if a callback exists and execute it.  Return 1
+ * if the handler exists and was handled successfully.
 */
-void unset_nmi_callback(void);
+int do_nmi_callback(struct pt_regs *regs, int cpu);
 #ifdef CONFIG_PM
 
@@ -48,25 +37,32 @@ static inline void unset_nmi_pm_callback(struct pm_dev * dev)
 #endif /* CONFIG_PM */
 
 extern void default_do_nmi(struct pt_regs *);
-extern void die_nmi(char *str, struct pt_regs *regs);
+extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
 #define get_nmi_reason() inb(0x61)
 extern int panic_on_timeout;
 extern int unknown_nmi_panic;
+extern int nmi_watchdog_enabled;
 extern int check_nmi_watchdog(void);
- 
+extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
-extern void setup_apic_nmi_watchdog (void);
+extern int avail_to_resrv_perfctr_nmi(unsigned int);
-extern int reserve_lapic_nmi(void);
+extern int reserve_perfctr_nmi(unsigned int);
-extern void release_lapic_nmi(void);
+extern void release_perfctr_nmi(unsigned int);
+extern int reserve_evntsel_nmi(unsigned int);
+extern void release_evntsel_nmi(unsigned int);
+extern void setup_apic_nmi_watchdog (void *);
+extern void stop_apic_nmi_watchdog (void *);
 extern void disable_timer_nmi_watchdog(void);
 extern void enable_timer_nmi_watchdog(void);
-extern void nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);
+extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);
 extern void nmi_watchdog_default(void);
 extern int setup_nmi_watchdog(char *);
+extern atomic_t nmi_active;
 extern unsigned int nmi_watchdog;
 #define NMI_DEFAULT     -1
 #define NMI_NONE        0
@@ -74,4 +70,11 @@ extern unsigned int nmi_watchdog;
 #define NMI_LOCAL_APIC  2
 #define NMI_INVALID     3
+struct ctl_table;
+struct file;
+extern int proc_nmi_enabled(struct ctl_table *, int , struct file *,
+                        void __user *, size_t *, loff_t *);
+extern int unknown_nmi_panic;
 #endif /* ASM_NMI_H */
diff --git a/include/asm-x86_64/pci-direct.h b/include/asm-x86_64/pci-direct.h
index 036b6ca5b53b..eba9cb471df3 100644
--- a/include/asm-x86_64/pci-direct.h
+++ b/include/asm-x86_64/pci-direct.h
@@ -2,47 +2,15 @@
 #define ASM_PCI_DIRECT_H 1
 #include <linux/types.h>
-#include <asm/io.h>
 /* Direct PCI access. This is used for PCI accesses in early boot before
   the PCI subsystem works. */ 
-#define PDprintk(x...)
+extern u32 read_pci_config(u8 bus, u8 slot, u8 func, u8 offset);
+extern u8 read_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset);
+extern u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset);
+extern void write_pci_config(u8 bus, u8 slot, u8 func, u8 offset, u32 val);
-static inline u32 read_pci_config(u8 bus, u8 slot, u8 func, u8 offset)
+extern int early_pci_allowed(void);
-{
-        u32 v; 
-        outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8);
-        v = inl(0xcfc); 
-        if (v != 0xffffffff)
-                PDprintk("%x reading 4 from %x: %x\n", slot, offset, v);
-        return v;
-}
-static inline u8 read_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset)
-{
-        u8 v; 
-        outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8);
-        v = inb(0xcfc + (offset&3)); 
-        PDprintk("%x reading 1 from %x: %x\n", slot, offset, v);
-        return v;
-}
-static inline u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset)
-{
-        u16 v; 
-        outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8);
-        v = inw(0xcfc + (offset&2)); 
-        PDprintk("%x reading 2 from %x: %x\n", slot, offset, v);
-        return v;
-}
-static inline void write_pci_config(u8 bus, u8 slot, u8 func, u8 offset,
-                                    u32 val)
-{
-        PDprintk("%x writing to %x: %x\n", slot, offset, val); 
-        outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8);
-        outl(val, 0xcfc); 
-}
 #endif
diff --git a/include/asm-x86_64/pda.h b/include/asm-x86_64/pda.h
index b47c3df9ed1d..14996d962bac 100644
--- a/include/asm-x86_64/pda.h
+++ b/include/asm-x86_64/pda.h
@@ -9,20 +9,24 @@
 /* Per processor datastructure. %gs points to it while the kernel runs */ 
 struct x8664_pda {
-        struct task_struct *pcurrent;   /* Current process */
+        struct task_struct *pcurrent;   /* 0  Current process */
-        unsigned long data_offset;      /* Per cpu data offset from linker address */
+        unsigned long data_offset;      /* 8 Per cpu data offset from linker
-        unsigned long kernelstack;  /* top of kernel stack for current */ 
+                                           address */
-        unsigned long oldrsp;       /* user rsp for system call */
+        unsigned long kernelstack;  /* 16 top of kernel stack for current */
-#if DEBUG_STKSZ > EXCEPTION_STKSZ
+        unsigned long oldrsp;       /* 24 user rsp for system call */
-        unsigned long debugstack;   /* #DB/#BP stack. */
+        int irqcount;               /* 32 Irq nesting counter. Starts with -1 */
+        int cpunumber;              /* 36 Logical CPU number */
+#ifdef CONFIG_CC_STACKPROTECTOR
+        unsigned long stack_canary;     /* 40 stack canary value */
+                                        /* gcc-ABI: this canary MUST be at
+                                           offset 40!!! */
 #endif
-        int irqcount;               /* Irq nesting counter. Starts with -1 */   
+        char *irqstackptr;
-        int cpunumber;              /* Logical CPU number */
-        char *irqstackptr;      /* top of irqstack */
        int nodenumber;             /* number of current node */
        unsigned int __softirq_pending;
        unsigned int __nmi_count;       /* number of NMI on this CPUs */
-        int mmu_state;     
+        short mmu_state;
+        short isidle;
        struct mm_struct *active_mm;
        unsigned apic_timer_irqs;
 } ____cacheline_aligned_in_smp;
@@ -36,44 +40,69 @@ extern struct x8664_pda boot_cpu_pda[];
 * There is no fast way to get the base address of the PDA, all the accesses
 * have to mention %fs/%gs.  So it needs to be done this Torvaldian way.
 */ 
-#define sizeof_field(type,field)  (sizeof(((type *)0)->field))
+extern void __bad_pda_field(void) __attribute__((noreturn));
-#define typeof_field(type,field)  typeof(((type *)0)->field)
-extern void __bad_pda_field(void);
+/*
+ * proxy_pda doesn't actually exist, but tell gcc it is accessed for
+ * all PDA accesses so it gets read/write dependencies right.
+ */
+extern struct x8664_pda _proxy_pda;
 #define pda_offset(field) offsetof(struct x8664_pda, field)
-#define pda_to_op(op,field,val) do { \
+#define pda_to_op(op,field,val) do {            \
-        typedef typeof_field(struct x8664_pda, field) T__; \
+        typedef typeof(_proxy_pda.field) T__;   \
-       switch (sizeof_field(struct x8664_pda, field)) {                 \
+        if (0) { T__ tmp__; tmp__ = (val); }    /* type checking */ \
-case 2: \
+        switch (sizeof(_proxy_pda.field)) {     \
-asm volatile(op "w %0,%%gs:%P1"::"ri" ((T__)val),"i"(pda_offset(field)):"memory"); break; \
+        case 2:                                 \
-case 4: \
+                asm(op "w %1,%%gs:%c2" :        \
-asm volatile(op "l %0,%%gs:%P1"::"ri" ((T__)val),"i"(pda_offset(field)):"memory"); break; \
+                    "+m" (_proxy_pda.field) :   \
-case 8: \
+                    "ri" ((T__)val),            \
-asm volatile(op "q %0,%%gs:%P1"::"ri" ((T__)val),"i"(pda_offset(field)):"memory"); break; \
+                    "i"(pda_offset(field)));    \
-       default: __bad_pda_field();                                      \
+                break;                          \
-       } \
+        case 4:                                 \
+                asm(op "l %1,%%gs:%c2" :        \
+                    "+m" (_proxy_pda.field) :   \
+                    "ri" ((T__)val),            \
+                    "i" (pda_offset(field)));   \
+                break;                          \
+        case 8:                                 \
+                asm(op "q %1,%%gs:%c2":         \
+                    "+m" (_proxy_pda.field) :   \
+                    "ri" ((T__)val),            \
+                    "i"(pda_offset(field)));    \
+                break;                          \
+       default:                                 \
+                __bad_pda_field();              \
+       }                                        \
       } while (0)
-/* 
+#define pda_from_op(op,field) ({                \
- * AK: PDA read accesses should be neither volatile nor have an memory clobber.
+        typeof(_proxy_pda.field) ret__;         \
- * Unfortunately removing them causes all hell to break lose currently.
+        switch (sizeof(_proxy_pda.field)) {     \
- */
+        case 2:                                 \
-#define pda_from_op(op,field) ({ \
+                asm(op "w %%gs:%c1,%0" :        \
-       typeof_field(struct x8664_pda, field) ret__; \
+                    "=r" (ret__) :              \
-       switch (sizeof_field(struct x8664_pda, field)) {                 \
+                    "i" (pda_offset(field)),    \
-case 2: \
+                    "m" (_proxy_pda.field));    \
-asm volatile(op "w %%gs:%P1,%0":"=r" (ret__):"i"(pda_offset(field)):"memory"); break;\
+                 break;                         \
-case 4: \
+        case 4:                                 \
-asm volatile(op "l %%gs:%P1,%0":"=r" (ret__):"i"(pda_offset(field)):"memory"); break;\
+                asm(op "l %%gs:%c1,%0":         \
-case 8: \
+                    "=r" (ret__):               \
-asm volatile(op "q %%gs:%P1,%0":"=r" (ret__):"i"(pda_offset(field)):"memory"); break;\
+                    "i" (pda_offset(field)),    \
-       default: __bad_pda_field();                                      \
+                    "m" (_proxy_pda.field));    \
-       } \
+                 break;                         \
+       case 8:                                  \
+                asm(op "q %%gs:%c1,%0":         \
+                    "=r" (ret__) :              \
+                    "i" (pda_offset(field)),    \
+                    "m" (_proxy_pda.field));    \
+                 break;                         \
+       default:                                 \
+                __bad_pda_field();              \
+       }                                        \
       ret__; })
 #define read_pda(field) pda_from_op("mov",field)
 #define write_pda(field,val) pda_to_op("mov",field,val)
 #define add_pda(field,val) pda_to_op("add",field,val)
diff --git a/include/asm-x86_64/percpu.h b/include/asm-x86_64/percpu.h
index 08dd9f9dda81..285756010c51 100644
--- a/include/asm-x86_64/percpu.h
+++ b/include/asm-x86_64/percpu.h
@@ -11,6 +11,16 @@
 #include <asm/pda.h>
+#ifdef CONFIG_MODULES
+# define PERCPU_MODULE_RESERVE 8192
+#else
+# define PERCPU_MODULE_RESERVE 0
+#endif
+#define PERCPU_ENOUGH_ROOM \
+        (ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES) + \
+         PERCPU_MODULE_RESERVE)
 #define __per_cpu_offset(cpu) (cpu_pda(cpu)->data_offset)
 #define __my_cpu_offset() read_pda(data_offset)
@@ -21,9 +31,15 @@
    __attribute__((__section__(".data.percpu"))) __typeof__(type) per_cpu__##name
 /* var is in discarded region: offset to particular copy we want */
-#define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)))
+#define per_cpu(var, cpu) (*({                          \
-#define __get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()))
+        extern int simple_indentifier_##var(void);      \
-#define __raw_get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()))
+        RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)); }))
+#define __get_cpu_var(var) (*({                         \
+        extern int simple_indentifier_##var(void);      \
+        RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); }))
+#define __raw_get_cpu_var(var) (*({                     \
+        extern int simple_indentifier_##var(void);      \
+        RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); }))
 /* A macro to avoid #include hell... */
 #define percpu_modcopy(pcpudst, src, size)                      \
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86_64/pgtable.h
index a31ab4e68a9b..6899e770b173 100644
--- a/include/asm-x86_64/pgtable.h
+++ b/include/asm-x86_64/pgtable.h
@@ -21,12 +21,9 @@ extern unsigned long __supported_pte_mask;
 #define swapper_pg_dir init_level4_pgt
-extern int nonx_setup(char *str);
 extern void paging_init(void);
 extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
-extern unsigned long pgkern_mask;
 /*
 * ZERO_PAGE is a global shared page that is always zero: used
 * for zero-mapped memory areas etc..
@@ -101,9 +98,6 @@ static inline void pgd_clear (pgd_t * pgd)
        set_pgd(pgd, __pgd(0));
 }
-#define pud_page(pud) \
-((unsigned long) __va(pud_val(pud) & PHYSICAL_PAGE_MASK))
 #define ptep_get_and_clear(mm,addr,xp)  __pte(xchg(&(xp)->pte, 0))
 struct mm_struct;
@@ -268,7 +262,7 @@ static inline pte_t pfn_pte(unsigned long page_nr, pgprot_t pgprot)
 #define __LARGE_PTE (_PAGE_PSE|_PAGE_PRESENT)
 static inline int pte_user(pte_t pte)           { return pte_val(pte) & _PAGE_USER; }
 static inline int pte_read(pte_t pte)           { return pte_val(pte) & _PAGE_USER; }
-static inline int pte_exec(pte_t pte)           { return pte_val(pte) & _PAGE_USER; }
+static inline int pte_exec(pte_t pte)           { return !(pte_val(pte) & _PAGE_NX); }
 static inline int pte_dirty(pte_t pte)          { return pte_val(pte) & _PAGE_DIRTY; }
 static inline int pte_young(pte_t pte)          { return pte_val(pte) & _PAGE_ACCESSED; }
 static inline int pte_write(pte_t pte)          { return pte_val(pte) & _PAGE_RW; }
@@ -281,11 +275,12 @@ static inline pte_t pte_mkclean(pte_t pte)	{ set_pte(&pte, __pte(pte_val(pte) &
 static inline pte_t pte_mkold(pte_t pte)        { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_ACCESSED)); return pte; }
 static inline pte_t pte_wrprotect(pte_t pte)    { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_RW)); return pte; }
 static inline pte_t pte_mkread(pte_t pte)       { set_pte(&pte, __pte(pte_val(pte) | _PAGE_USER)); return pte; }
-static inline pte_t pte_mkexec(pte_t pte)       { set_pte(&pte, __pte(pte_val(pte) | _PAGE_USER)); return pte; }
+static inline pte_t pte_mkexec(pte_t pte)       { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_NX)); return pte; }
 static inline pte_t pte_mkdirty(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) | _PAGE_DIRTY)); return pte; }
 static inline pte_t pte_mkyoung(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) | _PAGE_ACCESSED)); return pte; }
 static inline pte_t pte_mkwrite(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) | _PAGE_RW)); return pte; }
 static inline pte_t pte_mkhuge(pte_t pte)       { set_pte(&pte, __pte(pte_val(pte) | _PAGE_PSE)); return pte; }
+static inline pte_t pte_clrhuge(pte_t pte)      { set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_PSE)); return pte; }
 struct vm_area_struct;
@@ -326,7 +321,8 @@ static inline int pmd_large(pmd_t pte) {
 /*
 * Level 4 access.
 */
-#define pgd_page(pgd) ((unsigned long) __va((unsigned long)pgd_val(pgd) & PTE_MASK))
+#define pgd_page_vaddr(pgd) ((unsigned long) __va((unsigned long)pgd_val(pgd) & PTE_MASK))
+#define pgd_page(pgd)           (pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT))
 #define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
 #define pgd_offset(mm, addr) ((mm)->pgd + pgd_index(addr))
 #define pgd_offset_k(address) (init_level4_pgt + pgd_index(address))
@@ -335,16 +331,18 @@ static inline int pmd_large(pmd_t pte) {
 /* PUD - Level3 access */
 /* to find an entry in a page-table-directory. */
+#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PHYSICAL_PAGE_MASK))
+#define pud_page(pud)           (pfn_to_page(pud_val(pud) >> PAGE_SHIFT))
 #define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
-#define pud_offset(pgd, address) ((pud_t *) pgd_page(*(pgd)) + pud_index(address))
+#define pud_offset(pgd, address) ((pud_t *) pgd_page_vaddr(*(pgd)) + pud_index(address))
 #define pud_present(pud) (pud_val(pud) & _PAGE_PRESENT)
 /* PMD  - Level 2 access */
-#define pmd_page_kernel(pmd) ((unsigned long) __va(pmd_val(pmd) & PTE_MASK))
+#define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PTE_MASK))
 #define pmd_page(pmd)           (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
 #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
-#define pmd_offset(dir, address) ((pmd_t *) pud_page(*(dir)) + \
+#define pmd_offset(dir, address) ((pmd_t *) pud_page_vaddr(*(dir)) + \
                        pmd_index(address))
 #define pmd_none(x)     (!pmd_val(x))
 #define pmd_present(x)  (pmd_val(x) & _PAGE_PRESENT)
@@ -382,7 +380,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 #define pte_index(address) \
                (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_kernel(*(dir)) + \
+#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + \
                        pte_index(address))
 /* x86-64 always has all page tables mapped. */
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index 038fe1f47e6f..c28fc2db2171 100644
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -24,8 +24,6 @@ extern void mtrr_bp_init(void);
 #define mtrr_bp_init() do {} while (0)
 #endif
 extern void init_memory_mapping(unsigned long start, unsigned long end);
-extern void size_zones(unsigned long *z, unsigned long *h,
-                        unsigned long start_pfn, unsigned long end_pfn);
 extern void system_call(void); 
 extern int kernel_syscall(void);
@@ -51,10 +49,8 @@ extern unsigned long long monotonic_base;
 extern int sysctl_vsyscall;
 extern int nohpet;
 extern unsigned long vxtime_hz;
+extern void time_init_gtod(void);
-extern int numa_setup(char *opt);
-extern int setup_early_printk(char *); 
 extern void early_printk(const char *fmt, ...) __attribute__((format(printf,1,2)));
 extern void early_identify_cpu(struct cpuinfo_x86 *c);
@@ -91,7 +87,7 @@ extern void syscall32_cpu_init(void);
 extern void setup_node_bootmem(int nodeid, unsigned long start, unsigned long end);
-extern void check_ioapic(void);
+extern void early_quirks(void);
 extern void check_efer(void);
 extern int unhandled_signal(struct task_struct *tsk, int sig);
@@ -103,13 +99,7 @@ extern void select_idle_routine(const struct cpuinfo_x86 *c);
 extern unsigned long table_start, table_end;
 extern int exception_trace;
-extern int using_apic_timer;
-extern int disable_apic;
 extern unsigned cpu_khz;
-extern int ioapic_force;
-extern int skip_ioapic_setup;
-extern int acpi_ht;
-extern int acpi_disabled;
 extern void no_iommu_init(void);
 extern int force_iommu, no_iommu;
@@ -131,7 +121,8 @@ extern int fix_aperture;
 extern int reboot_force;
 extern int notsc_setup(char *);
-extern int setup_additional_cpus(char *);
+extern int gsi_irq_sharing(int gsi);
 extern void smp_local_timer_interrupt(struct pt_regs * regs);
diff --git a/include/asm-x86_64/ptrace-abi.h b/include/asm-x86_64/ptrace-abi.h
new file mode 100644
index 000000000000..19184b0806b1
--- /dev/null
+++ b/include/asm-x86_64/ptrace-abi.h
@@ -0,0 +1,51 @@
+#ifndef _X86_64_PTRACE_ABI_H
+#define _X86_64_PTRACE_ABI_H
+#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS)
+#define R15 0
+#define R14 8
+#define R13 16
+#define R12 24
+#define RBP 32
+#define RBX 40
+/* arguments: interrupts/non tracing syscalls only save upto here*/
+#define R11 48
+#define R10 56
+#define R9 64
+#define R8 72
+#define RAX 80
+#define RCX 88
+#define RDX 96
+#define RSI 104
+#define RDI 112
+#define ORIG_RAX 120       /* = ERROR */
+/* end of arguments */
+/* cpu exception frame or undefined in case of fast syscall. */
+#define RIP 128
+#define CS 136
+#define EFLAGS 144
+#define RSP 152
+#define SS 160
+#define ARGOFFSET R11
+#endif /* __ASSEMBLY__ */
+/* top of stack page */
+#define FRAME_SIZE 168
+#define PTRACE_OLDSETOPTIONS         21
+/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
+#define PTRACE_GETREGS            12
+#define PTRACE_SETREGS            13
+#define PTRACE_GETFPREGS          14
+#define PTRACE_SETFPREGS          15
+#define PTRACE_GETFPXREGS         18
+#define PTRACE_SETFPXREGS         19
+/* only useful for access 32bit programs */
+#define PTRACE_GET_THREAD_AREA    25
+#define PTRACE_SET_THREAD_AREA    26
+#define PTRACE_ARCH_PRCTL         30    /* arch_prctl for child */
+#endif
diff --git a/include/asm-x86_64/ptrace.h b/include/asm-x86_64/ptrace.h
index ca6f15ff61d4..ab827dc381d7 100644
--- a/include/asm-x86_64/ptrace.h
+++ b/include/asm-x86_64/ptrace.h
@@ -1,40 +1,9 @@
 #ifndef _X86_64_PTRACE_H
 #define _X86_64_PTRACE_H
-#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS) 
+#include <asm/ptrace-abi.h>
-#define R15 0
-#define R14 8
-#define R13 16
-#define R12 24
-#define RBP 32
-#define RBX 40
-/* arguments: interrupts/non tracing syscalls only save upto here*/
-#define R11 48
-#define R10 56  
-#define R9 64
-#define R8 72
-#define RAX 80
-#define RCX 88
-#define RDX 96
-#define RSI 104
-#define RDI 112
-#define ORIG_RAX 120       /* = ERROR */ 
-/* end of arguments */  
-/* cpu exception frame or undefined in case of fast syscall. */
-#define RIP 128
-#define CS 136
-#define EFLAGS 144
-#define RSP 152
-#define SS 160
-#define ARGOFFSET R11
-#endif /* __ASSEMBLY__ */
-/* top of stack page */ 
+#ifndef __ASSEMBLY__
-#define FRAME_SIZE 168
-#define PTRACE_OLDSETOPTIONS         21
-#ifndef __ASSEMBLY__ 
 struct pt_regs {
        unsigned long r15;
@@ -45,7 +14,7 @@ struct pt_regs {
        unsigned long rbx;
 /* arguments: non interrupts/non tracing syscalls only save upto here*/
        unsigned long r11;
-        unsigned long r10;      
+        unsigned long r10;
        unsigned long r9;
        unsigned long r8;
        unsigned long rax;
@@ -54,32 +23,18 @@ struct pt_regs {
        unsigned long rsi;
        unsigned long rdi;
        unsigned long orig_rax;
-/* end of arguments */  
+/* end of arguments */
 /* cpu exception frame or undefined */
        unsigned long rip;
        unsigned long cs;
-        unsigned long eflags; 
+        unsigned long eflags;
-        unsigned long rsp; 
+        unsigned long rsp;
        unsigned long ss;
-/* top of stack page */ 
+/* top of stack page */
 };
 #endif
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS            12
-#define PTRACE_SETREGS            13
-#define PTRACE_GETFPREGS          14
-#define PTRACE_SETFPREGS          15
-#define PTRACE_GETFPXREGS         18
-#define PTRACE_SETFPXREGS         19
-/* only useful for access 32bit programs */
-#define PTRACE_GET_THREAD_AREA    25
-#define PTRACE_SET_THREAD_AREA    26
-#define PTRACE_ARCH_PRCTL         30    /* arch_prctl for child */
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__) 
 #define user_mode(regs) (!!((regs)->cs & 3))
 #define user_mode_vm(regs) user_mode(regs)
diff --git a/include/asm-x86_64/rwlock.h b/include/asm-x86_64/rwlock.h
index dea0e9459264..72aeebed920b 100644
--- a/include/asm-x86_64/rwlock.h
+++ b/include/asm-x86_64/rwlock.h
@@ -18,69 +18,9 @@
 #ifndef _ASM_X86_64_RWLOCK_H
 #define _ASM_X86_64_RWLOCK_H
-#include <linux/stringify.h>
 #define RW_LOCK_BIAS             0x01000000
-#define RW_LOCK_BIAS_STR        "0x01000000"
+#define RW_LOCK_BIAS_STR         "0x01000000"
-#define __build_read_lock_ptr(rw, helper)   \
-        asm volatile(LOCK_PREFIX "subl $1,(%0)\n\t" \
-                     "js 2f\n" \
-                     "1:\n" \
-                    LOCK_SECTION_START("") \
-                     "2:\tcall " helper "\n\t" \
-                     "jmp 1b\n" \
-                    LOCK_SECTION_END \
-                     ::"a" (rw) : "memory")
-#define __build_read_lock_const(rw, helper)   \
-        asm volatile(LOCK_PREFIX "subl $1,%0\n\t" \
-                     "js 2f\n" \
-                     "1:\n" \
-                    LOCK_SECTION_START("") \
-                     "2:\tpushq %%rax\n\t" \
-                     "leaq %0,%%rax\n\t" \
-                     "call " helper "\n\t" \
-                     "popq %%rax\n\t" \
-                     "jmp 1b\n" \
-                    LOCK_SECTION_END \
-                     :"=m" (*((volatile int *)rw))::"memory")
-#define __build_read_lock(rw, helper)   do { \
-                                                if (__builtin_constant_p(rw)) \
-                                                        __build_read_lock_const(rw, helper); \
-                                                else \
-                                                        __build_read_lock_ptr(rw, helper); \
-                                        } while (0)
-#define __build_write_lock_ptr(rw, helper) \
-        asm volatile(LOCK_PREFIX "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
-                     "jnz 2f\n" \
-                     "1:\n" \
-                     LOCK_SECTION_START("") \
-                     "2:\tcall " helper "\n\t" \
-                     "jmp 1b\n" \
-                     LOCK_SECTION_END \
-                     ::"a" (rw) : "memory")
-#define __build_write_lock_const(rw, helper) \
-        asm volatile(LOCK_PREFIX "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
-                     "jnz 2f\n" \
-                     "1:\n" \
-                    LOCK_SECTION_START("") \
-                     "2:\tpushq %%rax\n\t" \
-                     "leaq %0,%%rax\n\t" \
-                     "call " helper "\n\t" \
-                     "popq %%rax\n\t" \
-                     "jmp 1b\n" \
-                    LOCK_SECTION_END \
-                     :"=m" (*((volatile long *)rw))::"memory")
-#define __build_write_lock(rw, helper)  do { \
+/* Actual code is in asm/spinlock.h or in arch/x86_64/lib/rwlock.S */
-                                                if (__builtin_constant_p(rw)) \
-                                                        __build_write_lock_const(rw, helper); \
-                                                else \
-                                                        __build_write_lock_ptr(rw, helper); \
-                                        } while (0)
 #endif
diff --git a/include/asm-x86_64/segment.h b/include/asm-x86_64/segment.h
index d4bed33fb32c..334ddcdd8f92 100644
--- a/include/asm-x86_64/segment.h
+++ b/include/asm-x86_64/segment.h
@@ -20,15 +20,16 @@
 #define __USER_CS     0x33   /* 6*8+3 */ 
 #define __USER32_DS     __USER_DS 
-#define GDT_ENTRY_TLS 1
 #define GDT_ENTRY_TSS 8 /* needs two entries */
 #define GDT_ENTRY_LDT 10 /* needs two entries */
 #define GDT_ENTRY_TLS_MIN 12
 #define GDT_ENTRY_TLS_MAX 14
-/* 15 free */
 #define GDT_ENTRY_TLS_ENTRIES 3
+#define GDT_ENTRY_PER_CPU 15    /* Abused to load per CPU data from limit */
+#define __PER_CPU_SEG   (GDT_ENTRY_PER_CPU * 8 + 3)
 /* TLS indexes for 64bit - hardcoded in arch_prctl */
 #define FS_TLS 0        
 #define GS_TLS 1        
diff --git a/include/asm-x86_64/semaphore.h b/include/asm-x86_64/semaphore.h
index 064df08b9a0f..1194888536b9 100644
--- a/include/asm-x86_64/semaphore.h
+++ b/include/asm-x86_64/semaphore.h
@@ -107,12 +107,9 @@ static inline void down(struct semaphore * sem)
        __asm__ __volatile__(
                "# atomic down operation\n\t"
                LOCK_PREFIX "decl %0\n\t"     /* --sem->count */
-                "js 2f\n"
+                "jns 1f\n\t"
-                "1:\n"
+                "call __down_failed\n"
-                LOCK_SECTION_START("")
+                "1:"
-                "2:\tcall __down_failed\n\t"
-                "jmp 1b\n"
-                LOCK_SECTION_END
                :"=m" (sem->count)
                :"D" (sem)
                :"memory");
@@ -130,15 +127,12 @@ static inline int down_interruptible(struct semaphore * sem)
        __asm__ __volatile__(
                "# atomic interruptible down operation\n\t"
+                "xorl %0,%0\n\t"
                LOCK_PREFIX "decl %1\n\t"     /* --sem->count */
-                "js 2f\n\t"
+                "jns 2f\n\t"
-                "xorl %0,%0\n"
+                "call __down_failed_interruptible\n"
-                "1:\n"
+                "2:\n"
-                LOCK_SECTION_START("")
+                :"=&a" (result), "=m" (sem->count)
-                "2:\tcall __down_failed_interruptible\n\t"
-                "jmp 1b\n"
-                LOCK_SECTION_END
-                :"=a" (result), "=m" (sem->count)
                :"D" (sem)
                :"memory");
        return result;
@@ -154,15 +148,12 @@ static inline int down_trylock(struct semaphore * sem)
        __asm__ __volatile__(
                "# atomic interruptible down operation\n\t"
+                "xorl %0,%0\n\t"
                LOCK_PREFIX "decl %1\n\t"     /* --sem->count */
-                "js 2f\n\t"
+                "jns 2f\n\t"
-                "xorl %0,%0\n"
+                "call __down_failed_trylock\n\t"
-                "1:\n"
+                "2:\n"
-                LOCK_SECTION_START("")
+                :"=&a" (result), "=m" (sem->count)
-                "2:\tcall __down_failed_trylock\n\t"
-                "jmp 1b\n"
-                LOCK_SECTION_END
-                :"=a" (result), "=m" (sem->count)
                :"D" (sem)
                :"memory","cc");
        return result;
@@ -179,12 +170,9 @@ static inline void up(struct semaphore * sem)
        __asm__ __volatile__(
                "# atomic up operation\n\t"
                LOCK_PREFIX "incl %0\n\t"     /* ++sem->count */
-                "jle 2f\n"
+                "jg 1f\n\t"
-                "1:\n"
+                "call __up_wakeup\n"
-                LOCK_SECTION_START("")
+                "1:"
-                "2:\tcall __up_wakeup\n\t"
-                "jmp 1b\n"
-                LOCK_SECTION_END
                :"=m" (sem->count)
                :"D" (sem)
                :"memory");
diff --git a/include/asm-x86_64/signal.h b/include/asm-x86_64/signal.h
index 3ede2a61973a..4581f978b299 100644
--- a/include/asm-x86_64/signal.h
+++ b/include/asm-x86_64/signal.h
@@ -24,10 +24,6 @@ typedef struct {
 } sigset_t;
-struct pt_regs; 
-asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
 #else
 /* Here we must cater to libcs that poke about in kernel headers.  */
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h
index 6805e1feb300..d6b7c057edba 100644
--- a/include/asm-x86_64/smp.h
+++ b/include/asm-x86_64/smp.h
@@ -4,27 +4,18 @@
 /*
 * We need the APIC definitions automatically as part of 'smp.h'
 */
-#ifndef __ASSEMBLY__
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <linux/bitops.h>
 extern int disable_apic;
-#endif
-#ifdef CONFIG_X86_LOCAL_APIC
-#ifndef __ASSEMBLY__
 #include <asm/fixmap.h>
 #include <asm/mpspec.h>
-#ifdef CONFIG_X86_IO_APIC
 #include <asm/io_apic.h>
-#endif
 #include <asm/apic.h>
 #include <asm/thread_info.h>
-#endif
-#endif
 #ifdef CONFIG_SMP
-#ifndef ASSEMBLY
 #include <asm/pda.h>
@@ -42,14 +33,11 @@ extern cpumask_t cpu_initialized;
 
 extern void smp_alloc_memory(void);
 extern volatile unsigned long smp_invalidate_needed;
-extern int pic_mode;
 extern void lock_ipi_call_lock(void);
 extern void unlock_ipi_call_lock(void);
 extern int smp_num_siblings;
 extern void smp_send_reschedule(int cpu);
 void smp_stop_cpu(void);
-extern int smp_call_function_single(int cpuid, void (*func) (void *info),
-                                void *info, int retry, int wait);
 extern cpumask_t cpu_sibling_map[NR_CPUS];
 extern cpumask_t cpu_core_map[NR_CPUS];
@@ -76,20 +64,16 @@ static inline int hard_smp_processor_id(void)
        return GET_APIC_ID(*(unsigned int *)(APIC_BASE+APIC_ID));
 }
-extern int safe_smp_processor_id(void);
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
 extern void prefill_possible_map(void);
 extern unsigned num_processors;
 extern unsigned disabled_cpus;
-#endif /* !ASSEMBLY */
 #define NO_PROC_ID              0xFF            /* No processor magic marker */
 #endif
-#ifndef ASSEMBLY
 /*
 * Some lowlevel functions might want to know about
 * the real APIC ID <-> CPU # mapping.
@@ -111,11 +95,8 @@ static inline int cpu_present_to_apicid(int mps_cpu)
                return BAD_APICID;
 }
-#endif /* !ASSEMBLY */
 #ifndef CONFIG_SMP
 #define stack_smp_processor_id() 0
-#define safe_smp_processor_id() 0
 #define cpu_logical_map(x) (x)
 #else
 #include <asm/thread_info.h>
@@ -127,19 +108,23 @@ static inline int cpu_present_to_apicid(int mps_cpu)
 })
 #endif
-#ifndef __ASSEMBLY__
 static __inline int logical_smp_processor_id(void)
 {
        /* we don't want to mark this access volatile - bad code generation */
        return GET_APIC_LOGICAL_ID(*(unsigned long *)(APIC_BASE+APIC_LDR));
 }
-#endif
 #ifdef CONFIG_SMP
 #define cpu_physical_id(cpu)            x86_cpu_to_apicid[cpu]
 #else
 #define cpu_physical_id(cpu)            boot_cpu_id
-#endif
+static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
+                                void *info, int retry, int wait)
+{
+        /* Disable interrupts here? */
+        func(info);
+        return 0;
+}
+#endif /* !CONFIG_SMP */
 #endif
diff --git a/include/asm-x86_64/spinlock.h b/include/asm-x86_64/spinlock.h
index 248a79f0eaff..05ef097ba55b 100644
--- a/include/asm-x86_64/spinlock.h
+++ b/include/asm-x86_64/spinlock.h
@@ -4,6 +4,7 @@
 #include <asm/atomic.h>
 #include <asm/rwlock.h>
 #include <asm/page.h>
+#include <asm/processor.h>
 /*
 * Your basic SMP spinlocks, allowing only a single CPU anywhere
@@ -16,31 +17,23 @@
 * (the type definitions are in asm/spinlock_types.h)
 */
-#define __raw_spin_is_locked(x) \
+static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
-                (*(volatile signed int *)(&(x)->slock) <= 0)
+{
+        return *(volatile signed int *)(&(lock)->slock) <= 0;
-#define __raw_spin_lock_string \
+}
-        "\n1:\t" \
-        LOCK_PREFIX " ; decl %0\n\t" \
-        "js 2f\n" \
-        LOCK_SECTION_START("") \
-        "2:\t" \
-        "rep;nop\n\t" \
-        "cmpl $0,%0\n\t" \
-        "jle 2b\n\t" \
-        "jmp 1b\n" \
-        LOCK_SECTION_END
-#define __raw_spin_lock_string_up \
-        "\n\tdecl %0"
-#define __raw_spin_unlock_string \
-        "movl $1,%0" \
-                :"=m" (lock->slock) : : "memory"
 static inline void __raw_spin_lock(raw_spinlock_t *lock)
 {
-        asm volatile(__raw_spin_lock_string : "=m" (lock->slock) : : "memory");
+        asm volatile(
+                "\n1:\t"
+                LOCK_PREFIX " ; decl %0\n\t"
+                "jns 2f\n"
+                "3:\n"
+                "rep;nop\n\t"
+                "cmpl $0,%0\n\t"
+                "jle 3b\n\t"
+                "jmp 1b\n"
+                "2:\t" : "=m" (lock->slock) : : "memory");
 }
 #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
@@ -49,7 +42,7 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
 {
        int oldval;
-        __asm__ __volatile__(
+        asm volatile(
                "xchgl %0,%1"
                :"=q" (oldval), "=m" (lock->slock)
                :"0" (0) : "memory");
@@ -59,13 +52,14 @@ static inline int __raw_spin_trylock(raw_spinlock_t *lock)
 static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
-        __asm__ __volatile__(
+        asm volatile("movl $1,%0" :"=m" (lock->slock) :: "memory");
-                __raw_spin_unlock_string
-        );
 }
-#define __raw_spin_unlock_wait(lock) \
+static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
-        do { while (__raw_spin_is_locked(lock)) cpu_relax(); } while (0)
+{
+        while (__raw_spin_is_locked(lock))
+                cpu_relax();
+}
 /*
 * Read-write spinlocks, allowing multiple readers
@@ -79,26 +73,34 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 *
 * On x86, we implement read-write locks as a 32-bit counter
 * with the high bit (sign) being the "contended" bit.
- *
- * The inline assembly is non-obvious. Think about it.
- *
- * Changed to use the same technique as rw semaphores.  See
- * semaphore.h for details.  -ben
- *
- * the helpers are in arch/i386/kernel/semaphore.c
 */
-#define __raw_read_can_lock(x)          ((int)(x)->lock > 0)
+static inline int __raw_read_can_lock(raw_rwlock_t *lock)
-#define __raw_write_can_lock(x)         ((x)->lock == RW_LOCK_BIAS)
+{
+        return (int)(lock)->lock > 0;
+}
+static inline int __raw_write_can_lock(raw_rwlock_t *lock)
+{
+        return (lock)->lock == RW_LOCK_BIAS;
+}
 static inline void __raw_read_lock(raw_rwlock_t *rw)
 {
-        __build_read_lock(rw, "__read_lock_failed");
+        asm volatile(LOCK_PREFIX "subl $1,(%0)\n\t"
+                     "jns 1f\n"
+                     "call __read_lock_failed\n"
+                     "1:\n"
+                     ::"D" (rw), "i" (RW_LOCK_BIAS) : "memory");
 }
 static inline void __raw_write_lock(raw_rwlock_t *rw)
 {
-        __build_write_lock(rw, "__write_lock_failed");
+        asm volatile(LOCK_PREFIX "subl %1,(%0)\n\t"
+                     "jz 1f\n"
+                     "\tcall __write_lock_failed\n\t"
+                     "1:\n"
+                     ::"D" (rw), "i" (RW_LOCK_BIAS) : "memory");
 }
 static inline int __raw_read_trylock(raw_rwlock_t *lock)
@@ -131,4 +133,8 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
                                : "=m" (rw->lock) : : "memory");
 }
+#define _raw_spin_relax(lock)   cpu_relax()
+#define _raw_read_relax(lock)   cpu_relax()
+#define _raw_write_relax(lock)  cpu_relax()
 #endif /* __ASM_SPINLOCK_H */
diff --git a/include/asm-x86_64/stacktrace.h b/include/asm-x86_64/stacktrace.h
new file mode 100644
index 000000000000..5eb9799bef76
--- /dev/null
+++ b/include/asm-x86_64/stacktrace.h
@@ -0,0 +1,18 @@
+#ifndef _ASM_STACKTRACE_H
+#define _ASM_STACKTRACE_H 1
+/* Generic stack tracer with callbacks */
+struct stacktrace_ops {
+        void (*warning)(void *data, char *msg);
+        /* msg must contain %s for the symbol */
+        void (*warning_symbol)(void *data, char *msg, unsigned long symbol);
+        void (*address)(void *data, unsigned long address);
+        /* On negative return stop dumping */
+        int (*stack)(void *data, char *name);
+};
+void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long *stack,
+                struct stacktrace_ops *ops, void *data);
+#endif
diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h
index 6bf170bceae1..bd376bc8c4ab 100644
--- a/include/asm-x86_64/system.h
+++ b/include/asm-x86_64/system.h
@@ -14,12 +14,13 @@
 #define __RESTORE(reg,offset) "movq (14-" #offset ")*8(%%rsp),%%" #reg "\n\t"
 /* frame pointer must be last for get_wchan */
-#define SAVE_CONTEXT    "pushq %%rbp ; movq %%rsi,%%rbp\n\t"
+#define SAVE_CONTEXT    "pushf ; pushq %%rbp ; movq %%rsi,%%rbp\n\t"
-#define RESTORE_CONTEXT "movq %%rbp,%%rsi ; popq %%rbp\n\t"
+#define RESTORE_CONTEXT "movq %%rbp,%%rsi ; popq %%rbp ; popf\t"
 #define __EXTRA_CLOBBER  \
        ,"rcx","rbx","rdx","r8","r9","r10","r11","r12","r13","r14","r15"
+/* Save restore flags to clear handle leaking NT */
 #define switch_to(prev,next,last) \
        asm volatile(SAVE_CONTEXT                                                   \
                     "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */       \
diff --git a/include/asm-x86_64/tce.h b/include/asm-x86_64/tce.h
index 53e9a68b3336..dbb047febc5e 100644
--- a/include/asm-x86_64/tce.h
+++ b/include/asm-x86_64/tce.h
@@ -24,7 +24,6 @@
 #ifndef _ASM_X86_64_TCE_H
 #define _ASM_X86_64_TCE_H
-extern void* tce_table_kva[];
 extern unsigned int specified_table_size;
 struct iommu_table;
diff --git a/include/asm-x86_64/therm_throt.h b/include/asm-x86_64/therm_throt.h
new file mode 100644
index 000000000000..5aac059007ba
--- /dev/null
+++ b/include/asm-x86_64/therm_throt.h
@@ -0,0 +1 @@
+#include <asm-i386/therm_throt.h>
diff --git a/include/asm-x86_64/thread_info.h b/include/asm-x86_64/thread_info.h
index 2029b00351f3..787a08114b48 100644
--- a/include/asm-x86_64/thread_info.h
+++ b/include/asm-x86_64/thread_info.h
@@ -114,11 +114,14 @@ static inline struct thread_info *stack_thread_info(void)
 #define TIF_IRET                5       /* force IRET */
 #define TIF_SYSCALL_AUDIT       7       /* syscall auditing active */
 #define TIF_SECCOMP             8       /* secure computing */
+#define TIF_RESTORE_SIGMASK     9       /* restore signal mask in do_signal */
 /* 16 free */
 #define TIF_IA32                17      /* 32bit process */ 
 #define TIF_FORK                18      /* ret_from_fork */
 #define TIF_ABI_PENDING         19
 #define TIF_MEMDIE              20
+#define TIF_DEBUG               21      /* uses debug registers */
+#define TIF_IO_BITMAP           22      /* uses I/O bitmap */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
@@ -128,9 +131,12 @@ static inline struct thread_info *stack_thread_info(void)
 #define _TIF_IRET               (1<<TIF_IRET)
 #define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
 #define _TIF_SECCOMP            (1<<TIF_SECCOMP)
+#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_IA32               (1<<TIF_IA32)
 #define _TIF_FORK               (1<<TIF_FORK)
 #define _TIF_ABI_PENDING        (1<<TIF_ABI_PENDING)
+#define _TIF_DEBUG              (1<<TIF_DEBUG)
+#define _TIF_IO_BITMAP          (1<<TIF_IO_BITMAP)
 /* work to do on interrupt/exception return */
 #define _TIF_WORK_MASK \
@@ -138,6 +144,9 @@ static inline struct thread_info *stack_thread_info(void)
 /* work to do on any return to user space */
 #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP)
+/* flags to check in __switch_to() */
+#define _TIF_WORK_CTXSW (_TIF_DEBUG|_TIF_IO_BITMAP)
 #define PREEMPT_ACTIVE     0x10000000
 /*
diff --git a/include/asm-x86_64/tlbflush.h b/include/asm-x86_64/tlbflush.h
index d16d5b60f419..983bd296c81a 100644
--- a/include/asm-x86_64/tlbflush.h
+++ b/include/asm-x86_64/tlbflush.h
@@ -4,44 +4,44 @@
 #include <linux/mm.h>
 #include <asm/processor.h>
-#define __flush_tlb()                                                   \
+static inline unsigned long get_cr3(void)
-        do {                                                            \
+{
-                unsigned long tmpreg;                                   \
+        unsigned long cr3;
-                                                                        \
+        asm volatile("mov %%cr3,%0" : "=r" (cr3));
-                __asm__ __volatile__(                                   \
+        return cr3;
-                        "movq %%cr3, %0;  # flush TLB \n"               \
+}
-                        "movq %0, %%cr3;              \n"               \
-                        : "=r" (tmpreg)                                 \
-                        :: "memory");                                   \
-        } while (0)
-/*
+static inline void set_cr3(unsigned long cr3)
- * Global pages have to be flushed a bit differently. Not a real
+{
- * performance problem because this does not happen often.
+        asm volatile("mov %0,%%cr3" :: "r" (cr3) : "memory");
- */
+}
-#define __flush_tlb_global()                                            \
-        do {                                                            \
+static inline void __flush_tlb(void)
-                unsigned long tmpreg, cr4, cr4_orig;                    \
+{
-                                                                        \
+        set_cr3(get_cr3());
-                __asm__ __volatile__(                                   \
+}
-                        "movq %%cr4, %2;  # turn off PGE     \n"        \
-                        "movq %2, %1;                        \n"        \
+static inline unsigned long get_cr4(void)
-                        "andq %3, %1;                        \n"        \
+{
-                        "movq %1, %%cr4;                     \n"        \
+        unsigned long cr4;
-                        "movq %%cr3, %0;  # flush TLB        \n"        \
+        asm volatile("mov %%cr4,%0" : "=r" (cr4));
-                        "movq %0, %%cr3;                     \n"        \
+        return cr4;
-                        "movq %2, %%cr4;  # turn PGE back on \n"        \
+}
-                        : "=&r" (tmpreg), "=&r" (cr4), "=&r" (cr4_orig) \
-                        : "i" (~X86_CR4_PGE)                            \
+static inline void set_cr4(unsigned long cr4)
-                        : "memory");                                    \
+{
-        } while (0)
+        asm volatile("mov %0,%%cr4" :: "r" (cr4) : "memory");
+}
-extern unsigned long pgkern_mask;
+static inline void __flush_tlb_all(void)
-#define __flush_tlb_all() __flush_tlb_global()
+{
+        unsigned long cr4 = get_cr4();
+        set_cr4(cr4 & ~X86_CR4_PGE);    /* clear PGE */
+        set_cr4(cr4);                   /* write old PGE again and flush TLBs */
+}
 #define __flush_tlb_one(addr) \
-        __asm__ __volatile__("invlpg %0": :"m" (*(char *) addr))
+        __asm__ __volatile__("invlpg (%0)" :: "r" (addr) : "memory")
 /*
diff --git a/include/asm-x86_64/uaccess.h b/include/asm-x86_64/uaccess.h
index 1e1fa003daa3..19f99178fe83 100644
--- a/include/asm-x86_64/uaccess.h
+++ b/include/asm-x86_64/uaccess.h
@@ -84,7 +84,7 @@ struct exception_table_entry
 */
 #define __get_user_x(size,ret,x,ptr) \
-        __asm__ __volatile__("call __get_user_" #size \
+        asm volatile("call __get_user_" #size \
                :"=a" (ret),"=d" (x) \
                :"c" (ptr) \
                :"r8")
@@ -101,7 +101,7 @@ struct exception_table_entry
        case 8:  __get_user_x(8,__ret_gu,__val_gu,ptr); break;          \
        default: __get_user_bad(); break;                               \
        }                                                               \
-        (x) = (__typeof__(*(ptr)))__val_gu;                             \
+        (x) = (typeof(*(ptr)))__val_gu;                         \
        __ret_gu;                                                       \
 })
@@ -112,7 +112,7 @@ extern void __put_user_8(void);
 extern void __put_user_bad(void);
 #define __put_user_x(size,ret,x,ptr)                                    \
-        __asm__ __volatile__("call __put_user_" #size                   \
+        asm volatile("call __put_user_" #size                   \
                :"=a" (ret)                                             \
                :"c" (ptr),"d" (x)                                      \
                :"r8")
@@ -139,7 +139,7 @@ extern void __put_user_bad(void);
 #define __put_user_check(x,ptr,size)                    \
 ({                                                      \
        int __pu_err;                                   \
-        __typeof__(*(ptr)) __user *__pu_addr = (ptr);   \
+        typeof(*(ptr)) __user *__pu_addr = (ptr);       \
        switch (size) {                                 \
        case 1: __put_user_x(1,__pu_err,x,__pu_addr); break;    \
        case 2: __put_user_x(2,__pu_err,x,__pu_addr); break;    \
@@ -173,7 +173,7 @@ struct __large_struct { unsigned long buf[100]; };
 * aliasing issues.
 */
 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errno)        \
-        __asm__ __volatile__(                                   \
+        asm volatile(                                   \
                "1:     mov"itype" %"rtype"1,%2\n"              \
                "2:\n"                                          \
                ".section .fixup,\"ax\"\n"                      \
@@ -193,7 +193,7 @@ struct __large_struct { unsigned long buf[100]; };
        int __gu_err;                                           \
        unsigned long __gu_val;                                 \
        __get_user_size(__gu_val,(ptr),(size),__gu_err);        \
-        (x) = (__typeof__(*(ptr)))__gu_val;                     \
+        (x) = (typeof(*(ptr)))__gu_val;                 \
        __gu_err;                                               \
 })
@@ -217,7 +217,7 @@ do {									\
 } while (0)
 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errno)        \
-        __asm__ __volatile__(                                   \
+        asm volatile(                                   \
                "1:     mov"itype" %2,%"rtype"1\n"              \
                "2:\n"                                          \
                ".section .fixup,\"ax\"\n"                      \
@@ -237,15 +237,20 @@ do {									\
 */
 /* Handles exceptions in both to and from, but doesn't do access_ok */
-extern unsigned long copy_user_generic(void *to, const void *from, unsigned len); 
+__must_check unsigned long
+copy_user_generic(void *to, const void *from, unsigned len);
-extern unsigned long copy_to_user(void __user *to, const void *from, unsigned len); 
-extern unsigned long copy_from_user(void *to, const void __user *from, unsigned len); 
+__must_check unsigned long
-extern unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len); 
+copy_to_user(void __user *to, const void *from, unsigned len);
+__must_check unsigned long
-static __always_inline int __copy_from_user(void *dst, const void __user *src, unsigned size)
+copy_from_user(void *to, const void __user *from, unsigned len);
+__must_check unsigned long
+copy_in_user(void __user *to, const void __user *from, unsigned len);
+static __always_inline __must_check
+int __copy_from_user(void *dst, const void __user *src, unsigned size)
 { 
-       int ret = 0;
+        int ret = 0;
        if (!__builtin_constant_p(size))
                return copy_user_generic(dst,(__force void *)src,size);
        switch (size) { 
@@ -272,9 +277,10 @@ static __always_inline int __copy_from_user(void *dst, const void __user *src, u
        }
 }       
-static __always_inline int __copy_to_user(void __user *dst, const void *src, unsigned size)
+static __always_inline __must_check
+int __copy_to_user(void __user *dst, const void *src, unsigned size)
 { 
-       int ret = 0;
+        int ret = 0;
        if (!__builtin_constant_p(size))
                return copy_user_generic((__force void *)dst,src,size);
        switch (size) { 
@@ -303,10 +309,10 @@ static __always_inline int __copy_to_user(void __user *dst, const void *src, uns
        }
 }       
+static __always_inline __must_check
-static __always_inline int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
 { 
-       int ret = 0;
+        int ret = 0;
        if (!__builtin_constant_p(size))
                return copy_user_generic((__force void *)dst,(__force void *)src,size);
        switch (size) { 
@@ -344,15 +350,22 @@ static __always_inline int __copy_in_user(void __user *dst, const void __user *s
        }
 }       
-long strncpy_from_user(char *dst, const char __user *src, long count);
+__must_check long 
-long __strncpy_from_user(char *dst, const char __user *src, long count);
+strncpy_from_user(char *dst, const char __user *src, long count);
-long strnlen_user(const char __user *str, long n);
+__must_check long 
-long __strnlen_user(const char __user *str, long n);
+__strncpy_from_user(char *dst, const char __user *src, long count);
-long strlen_user(const char __user *str);
+__must_check long strnlen_user(const char __user *str, long n);
-unsigned long clear_user(void __user *mem, unsigned long len);
+__must_check long __strnlen_user(const char __user *str, long n);
-unsigned long __clear_user(void __user *mem, unsigned long len);
+__must_check long strlen_user(const char __user *str);
+__must_check unsigned long clear_user(void __user *mem, unsigned long len);
+__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
-#define __copy_to_user_inatomic __copy_to_user
+__must_check long __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size);
-#define __copy_from_user_inatomic __copy_from_user
+static __must_check __always_inline int
+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
+{
+        return copy_user_generic((__force void *)dst, src, size);
+}
 #endif /* __X86_64_UACCESS_H */
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
index 80fd48e84bbb..6137146516d3 100644
--- a/include/asm-x86_64/unistd.h
+++ b/include/asm-x86_64/unistd.h
@@ -600,9 +600,9 @@ __SYSCALL(__NR_fchmodat, sys_fchmodat)
 #define __NR_faccessat          269
 __SYSCALL(__NR_faccessat, sys_faccessat)
 #define __NR_pselect6           270
-__SYSCALL(__NR_pselect6, sys_ni_syscall)        /* for now */
+__SYSCALL(__NR_pselect6, sys_pselect6)
 #define __NR_ppoll              271
-__SYSCALL(__NR_ppoll,   sys_ni_syscall)         /* for now */
+__SYSCALL(__NR_ppoll,   sys_ppoll)
 #define __NR_unshare            272
 __SYSCALL(__NR_unshare, sys_unshare)
 #define __NR_set_robust_list    273
@@ -623,16 +623,17 @@ __SYSCALL(__NR_move_pages, sys_move_pages)
 #ifdef __KERNEL__
 #define __NR_syscall_max __NR_move_pages
+#include <linux/err.h>
 #ifndef __NO_STUBS
-/* user-visible error numbers are in the range -1 - -4095 */
+/* user-visible error numbers are in the range -1 - -MAX_ERRNO */
 #define __syscall_clobber "r11","rcx","memory" 
 #define __syscall_return(type, res) \
 do { \
-        if ((unsigned long)(res) >= (unsigned long)(-127)) { \
+        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) { \
                errno = -(res); \
                res = -1; \
        } \
@@ -658,6 +659,7 @@ do { \
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_TIME
 #define __ARCH_WANT_COMPAT_SYS_TIME
diff --git a/include/asm-x86_64/unwind.h b/include/asm-x86_64/unwind.h
index 1f6e9bfb569e..2e7ff10fd775 100644
--- a/include/asm-x86_64/unwind.h
+++ b/include/asm-x86_64/unwind.h
@@ -18,6 +18,7 @@ struct unwind_frame_info
 {
        struct pt_regs regs;
        struct task_struct *task;
+        unsigned call_frame:1;
 };
 #define UNW_PC(frame)        (frame)->regs.rip
@@ -57,6 +58,10 @@ struct unwind_frame_info
        PTREGS_INFO(r15), \
        PTREGS_INFO(rip)
+#define UNW_DEFAULT_RA(raItem, dataAlign) \
+        ((raItem).where == Memory && \
+         !((raItem).value * (dataAlign) + 8))
 static inline void arch_unw_init_frame_info(struct unwind_frame_info *info,
                                            /*const*/ struct pt_regs *regs)
 {
@@ -94,8 +99,8 @@ static inline int arch_unw_user_mode(const struct unwind_frame_info *info)
 #else
-#define UNW_PC(frame) ((void)(frame), 0)
+#define UNW_PC(frame) ((void)(frame), 0UL)
-#define UNW_SP(frame) ((void)(frame), 0)
+#define UNW_SP(frame) ((void)(frame), 0UL)
 static inline int arch_unw_user_mode(const void *info)
 {
diff --git a/include/asm-x86_64/vsyscall.h b/include/asm-x86_64/vsyscall.h
index 146b24402a5f..fd452fc2c037 100644
--- a/include/asm-x86_64/vsyscall.h
+++ b/include/asm-x86_64/vsyscall.h
@@ -4,6 +4,7 @@
 enum vsyscall_num {
        __NR_vgettimeofday,
        __NR_vtime,
+        __NR_vgetcpu,
 };
 #define VSYSCALL_START (-10UL << 20)
@@ -15,7 +16,7 @@ enum vsyscall_num {
 #include <linux/seqlock.h>
 #define __section_vxtime __attribute__ ((unused, __section__ (".vxtime"), aligned(16)))
-#define __section_wall_jiffies __attribute__ ((unused, __section__ (".wall_jiffies"), aligned(16)))
+#define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16)))
 #define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
 #define __section_sys_tz __attribute__ ((unused, __section__ (".sys_tz"), aligned(16)))
 #define __section_sysctl_vsyscall __attribute__ ((unused, __section__ (".sysctl_vsyscall"), aligned(16)))
@@ -26,6 +27,9 @@ enum vsyscall_num {
 #define VXTIME_HPET     2
 #define VXTIME_PMTMR    3
+#define VGETCPU_RDTSCP  1
+#define VGETCPU_LSL     2
 struct vxtime_data {
        long hpet_address;      /* HPET base address */
        int last;
@@ -40,21 +44,23 @@ struct vxtime_data {
 /* vsyscall space (readonly) */
 extern struct vxtime_data __vxtime;
+extern int __vgetcpu_mode;
 extern struct timespec __xtime;
 extern volatile unsigned long __jiffies;
-extern unsigned long __wall_jiffies;
 extern struct timezone __sys_tz;
 extern seqlock_t __xtime_lock;
 /* kernel space (writeable) */
 extern struct vxtime_data vxtime;
-extern unsigned long wall_jiffies;
+extern int vgetcpu_mode;
 extern struct timezone sys_tz;
 extern int sysctl_vsyscall;
 extern seqlock_t xtime_lock;
 extern int sysctl_vsyscall;
+extern void vsyscall_set_cpu(int cpu);
 #define ARCH_HAVE_XTIME_LOCK 1
 #endif /* __KERNEL__ */
diff --git a/include/asm-xtensa/pgtable.h b/include/asm-xtensa/pgtable.h
index 7b15afb70c56..a47cc734c20c 100644
--- a/include/asm-xtensa/pgtable.h
+++ b/include/asm-xtensa/pgtable.h
@@ -218,7 +218,7 @@ extern pgd_t swapper_pg_dir[PAGE_SIZE/sizeof(pgd_t)];
 /*
 * The pmd contains the kernel virtual address of the pte page.
 */
-#define pmd_page_kernel(pmd) ((unsigned long)(pmd_val(pmd) & PAGE_MASK))
+#define pmd_page_vaddr(pmd) ((unsigned long)(pmd_val(pmd) & PAGE_MASK))
 #define pmd_page(pmd) virt_to_page(pmd_val(pmd))
 /*
@@ -349,7 +349,7 @@ ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 /* Find an entry in the third-level page table.. */
 #define pte_index(address)      (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir,addr)                                     \
-        ((pte_t*) pmd_page_kernel(*(dir)) + pte_index(addr))
+        ((pte_t*) pmd_page_vaddr(*(dir)) + pte_index(addr))
 #define pte_offset_map(dir,addr)        pte_offset_kernel((dir),(addr))
 #define pte_offset_map_nested(dir,addr) pte_offset_kernel((dir),(addr))
diff --git a/include/asm-xtensa/timex.h b/include/asm-xtensa/timex.h
index d14a3755a12b..c7b705e66655 100644
--- a/include/asm-xtensa/timex.h
+++ b/include/asm-xtensa/timex.h
@@ -31,9 +31,6 @@
 #define CLOCK_TICK_RATE         1193180 /* (everyone is using this value) */
 #define CLOCK_TICK_FACTOR       20 /* Factor of both 10^6 and CLOCK_TICK_RATE */
-#define FINETUNE ((((((long)LATCH * HZ - CLOCK_TICK_RATE) << SHIFT_HZ) * \
-        (1000000/CLOCK_TICK_FACTOR) / (CLOCK_TICK_RATE/CLOCK_TICK_FACTOR)) \
-                << (SHIFT_SCALE-SHIFT_HZ)) / HZ)
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 extern unsigned long ccount_per_jiffy;
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
new file mode 100644
index 000000000000..5748aecdb414
--- /dev/null
+++ b/include/crypto/algapi.h
@@ -0,0 +1,156 @@
+/*
+ * Cryptographic API for algorithms (i.e., low-level API).
+ *
+ * Copyright (c) 2006 Herbert Xu <herbert@gondor.apana.org.au>
+ *
+ * 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.
+ *
+ */
+#ifndef _CRYPTO_ALGAPI_H
+#define _CRYPTO_ALGAPI_H
+#include <linux/crypto.h>
+struct module;
+struct seq_file;
+struct crypto_type {
+        unsigned int (*ctxsize)(struct crypto_alg *alg);
+        int (*init)(struct crypto_tfm *tfm);
+        void (*exit)(struct crypto_tfm *tfm);
+        void (*show)(struct seq_file *m, struct crypto_alg *alg);
+};
+struct crypto_instance {
+        struct crypto_alg alg;
+        struct crypto_template *tmpl;
+        struct hlist_node list;
+        void *__ctx[] CRYPTO_MINALIGN_ATTR;
+};
+struct crypto_template {
+        struct list_head list;
+        struct hlist_head instances;
+        struct module *module;
+        struct crypto_instance *(*alloc)(void *param, unsigned int len);
+        void (*free)(struct crypto_instance *inst);
+        char name[CRYPTO_MAX_ALG_NAME];
+};
+struct crypto_spawn {
+        struct list_head list;
+        struct crypto_alg *alg;
+        struct crypto_instance *inst;
+};
+struct scatter_walk {
+        struct scatterlist *sg;
+        unsigned int offset;
+};
+struct blkcipher_walk {
+        union {
+                struct {
+                        struct page *page;
+                        unsigned long offset;
+                } phys;
+                struct {
+                        u8 *page;
+                        u8 *addr;
+                } virt;
+        } src, dst;
+        struct scatter_walk in;
+        unsigned int nbytes;
+        struct scatter_walk out;
+        unsigned int total;
+        void *page;
+        u8 *buffer;
+        u8 *iv;
+        int flags;
+};
+extern const struct crypto_type crypto_blkcipher_type;
+extern const struct crypto_type crypto_hash_type;
+void crypto_mod_put(struct crypto_alg *alg);
+int crypto_register_template(struct crypto_template *tmpl);
+void crypto_unregister_template(struct crypto_template *tmpl);
+struct crypto_template *crypto_lookup_template(const char *name);
+int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
+                      struct crypto_instance *inst);
+void crypto_drop_spawn(struct crypto_spawn *spawn);
+struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn);
+struct crypto_alg *crypto_get_attr_alg(void *param, unsigned int len,
+                                       u32 type, u32 mask);
+struct crypto_instance *crypto_alloc_instance(const char *name,
+                                              struct crypto_alg *alg);
+int blkcipher_walk_done(struct blkcipher_desc *desc,
+                        struct blkcipher_walk *walk, int err);
+int blkcipher_walk_virt(struct blkcipher_desc *desc,
+                        struct blkcipher_walk *walk);
+int blkcipher_walk_phys(struct blkcipher_desc *desc,
+                        struct blkcipher_walk *walk);
+static inline void *crypto_tfm_ctx_aligned(struct crypto_tfm *tfm)
+{
+        unsigned long addr = (unsigned long)crypto_tfm_ctx(tfm);
+        unsigned long align = crypto_tfm_alg_alignmask(tfm);
+        if (align <= crypto_tfm_ctx_alignment())
+                align = 1;
+        return (void *)ALIGN(addr, align);
+}
+static inline void *crypto_instance_ctx(struct crypto_instance *inst)
+{
+        return inst->__ctx;
+}
+static inline void *crypto_blkcipher_ctx(struct crypto_blkcipher *tfm)
+{
+        return crypto_tfm_ctx(&tfm->base);
+}
+static inline void *crypto_blkcipher_ctx_aligned(struct crypto_blkcipher *tfm)
+{
+        return crypto_tfm_ctx_aligned(&tfm->base);
+}
+static inline struct cipher_alg *crypto_cipher_alg(struct crypto_cipher *tfm)
+{
+        return &crypto_cipher_tfm(tfm)->__crt_alg->cra_cipher;
+}
+static inline void *crypto_hash_ctx_aligned(struct crypto_hash *tfm)
+{
+        return crypto_tfm_ctx_aligned(&tfm->base);
+}
+static inline void blkcipher_walk_init(struct blkcipher_walk *walk,
+                                       struct scatterlist *dst,
+                                       struct scatterlist *src,
+                                       unsigned int nbytes)
+{
+        walk->in.sg = src;
+        walk->out.sg = dst;
+        walk->total = nbytes;
+}
+#endif  /* _CRYPTO_ALGAPI_H */
diff --git a/include/crypto/twofish.h b/include/crypto/twofish.h
new file mode 100644
index 000000000000..c408522595c6
--- /dev/null
+++ b/include/crypto/twofish.h
@@ -0,0 +1,22 @@
+#ifndef _CRYPTO_TWOFISH_H
+#define _CRYPTO_TWOFISH_H
+#include <linux/types.h>
+#define TF_MIN_KEY_SIZE 16
+#define TF_MAX_KEY_SIZE 32
+#define TF_BLOCK_SIZE 16
+struct crypto_tfm;
+/* Structure for an expanded Twofish key.  s contains the key-dependent
+ * S-boxes composed with the MDS matrix; w contains the eight "whitening"
+ * subkeys, K[0] through K[7].  k holds the remaining, "round" subkeys.  Note
+ * that k[i] corresponds to what the Twofish paper calls K[i+8]. */
+struct twofish_ctx {
+        u32 s[4][256], w[8], k[32];
+};
+int twofish_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int key_len);
+#endif
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 2b8a7d68fae3..f7a52e19b4be 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -1,63 +1,344 @@
-header-y := byteorder/ dvb/ hdlc/ isdn/ nfsd/ raid/ sunrpc/ tc_act/     \
+header-y += byteorder/
-        netfilter/ netfilter_arp/ netfilter_bridge/ netfilter_ipv4/     \
+header-y += dvb/
-        netfilter_ipv6/
+header-y += hdlc/
+header-y += isdn/
+header-y += nfsd/
+header-y += raid/
+header-y += sunrpc/
+header-y += tc_act/
+header-y += netfilter/
+header-y += netfilter_arp/
+header-y += netfilter_bridge/
+header-y += netfilter_ipv4/
+header-y += netfilter_ipv6/
-header-y += affs_fs.h affs_hardblocks.h aio_abi.h a.out.h arcfb.h       \
+header-y += affs_hardblocks.h
-        atmapi.h atmbr2684.h atmclip.h atm_eni.h atm_he.h               \
+header-y += aio_abi.h
-        atm_idt77105.h atmioc.h atmlec.h atmmpc.h atm_nicstar.h         \
+header-y += a.out.h
-        atmppp.h atmsap.h atmsvc.h atm_zatm.h auto_fs4.h auxvec.h       \
+header-y += arcfb.h
-        awe_voice.h ax25.h b1lli.h baycom.h bfs_fs.h blkpg.h            \
+header-y += atmapi.h
-        bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h          \
+header-y += atmbr2684.h
-        consolemap.h cycx_cfm.h dm-ioctl.h dn.h dqblk_v1.h              \
+header-y += atmclip.h
-        dqblk_v2.h dqblk_xfs.h efs_fs_sb.h elf-fdpic.h elf.h elf-em.h   \
+header-y += atm_eni.h
-        fadvise.h fd.h fdreg.h ftape-header-segment.h ftape-vendors.h   \
+header-y += atm_he.h
-        fuse.h futex.h genetlink.h gen_stats.h gigaset_dev.h hdsmart.h  \
+header-y += atm_idt77105.h
-        hpfs_fs.h hysdn_if.h i2c-dev.h i8k.h icmp.h                     \
+header-y += atmioc.h
-        if_arcnet.h if_arp.h if_bonding.h if_cablemodem.h if_fc.h       \
+header-y += atmlec.h
-        if_fddi.h if.h if_hippi.h if_infiniband.h if_packet.h           \
+header-y += atmmpc.h
-        if_plip.h if_ppp.h if_slip.h if_strip.h if_tunnel.h in6.h       \
+header-y += atm_nicstar.h
-        in_route.h ioctl.h ip.h ipmi_msgdefs.h ip_mp_alg.h ipsec.h      \
+header-y += atmppp.h
-        ipx.h irda.h isdn_divertif.h iso_fs.h ite_gpio.h ixjuser.h      \
+header-y += atmsap.h
-        jffs2.h keyctl.h limits.h major.h matroxfb.h meye.h minix_fs.h  \
+header-y += atmsvc.h
-        mmtimer.h mqueue.h mtio.h ncp_no.h netfilter_arp.h netrom.h     \
+header-y += atm_zatm.h
-        nfs2.h nfs4_mount.h nfs_mount.h openprom_fs.h param.h           \
+header-y += auto_fs4.h
-        pci_ids.h pci_regs.h personality.h pfkeyv2.h pg.h pkt_cls.h     \
+header-y += auxvec.h
-        pkt_sched.h posix_types.h ppdev.h prctl.h ps2esdi.h qic117.h    \
+header-y += awe_voice.h
-        qnxtypes.h quotaio_v1.h quotaio_v2.h radeonfb.h raw.h           \
+header-y += ax25.h
-        resource.h rose.h sctp.h smbno.h snmp.h sockios.h som.h         \
+header-y += b1lli.h
-        sound.h stddef.h synclink.h telephony.h termios.h ticable.h     \
+header-y += baycom.h
-        times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h utime.h      \
+header-y += bfs_fs.h
-        utsname.h video_decoder.h video_encoder.h videotext.h vt.h      \
+header-y += blkpg.h
-        wavefront.h wireless.h xattr.h x25.h zorro_ids.h
+header-y += bpqether.h
+header-y += cdk.h
+header-y += chio.h
+header-y += coda_psdev.h
+header-y += coff.h
+header-y += comstats.h
+header-y += consolemap.h
+header-y += cycx_cfm.h
+header-y += dm-ioctl.h
+header-y += dn.h
+header-y += dqblk_v1.h
+header-y += dqblk_v2.h
+header-y += dqblk_xfs.h
+header-y += efs_fs_sb.h
+header-y += elf-fdpic.h
+header-y += elf.h
+header-y += elf-em.h
+header-y += fadvise.h
+header-y += fd.h
+header-y += fdreg.h
+header-y += fib_rules.h
+header-y += ftape-header-segment.h
+header-y += ftape-vendors.h
+header-y += fuse.h
+header-y += futex.h
+header-y += genetlink.h
+header-y += gen_stats.h
+header-y += gigaset_dev.h
+header-y += hdsmart.h
+header-y += hysdn_if.h
+header-y += i2c-dev.h
+header-y += i8k.h
+header-y += icmp.h
+header-y += if_addr.h
+header-y += if_arcnet.h
+header-y += if_arp.h
+header-y += if_bonding.h
+header-y += if_cablemodem.h
+header-y += if_fc.h
+header-y += if_fddi.h
+header-y += if.h
+header-y += if_hippi.h
+header-y += if_infiniband.h
+header-y += if_link.h
+header-y += if_packet.h
+header-y += if_plip.h
+header-y += if_ppp.h
+header-y += if_slip.h
+header-y += if_strip.h
+header-y += if_tunnel.h
+header-y += in6.h
+header-y += in_route.h
+header-y += ioctl.h
+header-y += ip.h
+header-y += ipmi_msgdefs.h
+header-y += ip_mp_alg.h
+header-y += ipsec.h
+header-y += ipx.h
+header-y += irda.h
+header-y += isdn_divertif.h
+header-y += iso_fs.h
+header-y += ite_gpio.h
+header-y += ixjuser.h
+header-y += jffs2.h
+header-y += keyctl.h
+header-y += limits.h
+header-y += magic.h
+header-y += major.h
+header-y += matroxfb.h
+header-y += meye.h
+header-y += minix_fs.h
+header-y += mmtimer.h
+header-y += mqueue.h
+header-y += mtio.h
+header-y += ncp_no.h
+header-y += neighbour.h
+header-y += netfilter_arp.h
+header-y += netrom.h
+header-y += nfs2.h
+header-y += nfs4_mount.h
+header-y += nfs_mount.h
+header-y += param.h
+header-y += pci_ids.h
+header-y += pci_regs.h
+header-y += personality.h
+header-y += pfkeyv2.h
+header-y += pg.h
+header-y += pkt_cls.h
+header-y += pkt_sched.h
+header-y += posix_types.h
+header-y += ppdev.h
+header-y += prctl.h
+header-y += ps2esdi.h
+header-y += qic117.h
+header-y += qnxtypes.h
+header-y += quotaio_v1.h
+header-y += quotaio_v2.h
+header-y += radeonfb.h
+header-y += raw.h
+header-y += resource.h
+header-y += rose.h
+header-y += sctp.h
+header-y += smbno.h
+header-y += snmp.h
+header-y += sockios.h
+header-y += som.h
+header-y += sound.h
+header-y += synclink.h
+header-y += telephony.h
+header-y += termios.h
+header-y += ticable.h
+header-y += times.h
+header-y += tiocl.h
+header-y += tipc.h
+header-y += toshiba.h
+header-y += ultrasound.h
+header-y += un.h
+header-y += utime.h
+header-y += utsname.h
+header-y += video_decoder.h
+header-y += video_encoder.h
+header-y += videotext.h
+header-y += vt.h
+header-y += wavefront.h
+header-y += wireless.h
+header-y += xattr.h
+header-y += x25.h
+header-y += zorro_ids.h
-unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h        \
+unifdef-y += acct.h
-        atmarp.h atmdev.h atm.h atm_tcp.h audit.h auto_fs.h binfmts.h   \
+unifdef-y += adb.h
-        capability.h capi.h cciss_ioctl.h cdrom.h cm4000_cs.h           \
+unifdef-y += adfs_fs.h
-        cn_proc.h coda.h connector.h cramfs_fs.h cuda.h cyclades.h      \
+unifdef-y += agpgart.h
-        dccp.h dirent.h divert.h elfcore.h errno.h errqueue.h           \
+unifdef-y += apm_bios.h
-        ethtool.h eventpoll.h ext2_fs.h ext3_fs.h fb.h fcntl.h          \
+unifdef-y += atalk.h
-        filter.h flat.h fs.h ftape.h gameport.h generic_serial.h        \
+unifdef-y += atmarp.h
-        genhd.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h hiddev.h hpet.h     \
+unifdef-y += atmdev.h
-        i2c.h i2o-dev.h icmpv6.h if_bridge.h if_ec.h                    \
+unifdef-y += atm.h
-        if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h             \
+unifdef-y += atm_tcp.h
-        if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h      \
+unifdef-y += audit.h
-        inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h          \
+unifdef-y += auto_fs.h
-        ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h          \
+unifdef-y += binfmts.h
-        joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h       \
+unifdef-y += capability.h
-        llc.h loop.h lp.h mempolicy.h mii.h mman.h mroute.h msdos_fs.h  \
+unifdef-y += capi.h
-        msg.h nbd.h ncp_fs.h ncp.h ncp_mount.h netdevice.h              \
+unifdef-y += cciss_ioctl.h
-        netfilter_bridge.h netfilter_decnet.h netfilter.h               \
+unifdef-y += cdrom.h
-        netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h     \
+unifdef-y += cm4000_cs.h
-        netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h     \
+unifdef-y += cn_proc.h
-        n_r3964.h nubus.h nvram.h parport.h patchkey.h pci.h pktcdvd.h  \
+unifdef-y += coda.h
-        pmu.h poll.h ppp_defs.h ppp-comp.h ptrace.h qnx4_fs.h quota.h   \
+unifdef-y += connector.h
-        random.h reboot.h reiserfs_fs.h reiserfs_xattr.h romfs_fs.h     \
+unifdef-y += cramfs_fs.h
-        route.h rtc.h rtnetlink.h scc.h sched.h sdla.h                  \
+unifdef-y += cuda.h
-        selinux_netlink.h sem.h serial_core.h serial.h serio.h shm.h    \
+unifdef-y += cyclades.h
-        signal.h smb_fs.h smb.h smb_mount.h socket.h sonet.h sonypi.h   \
+unifdef-y += dccp.h
-        soundcard.h stat.h sysctl.h tcp.h time.h timex.h tty.h types.h  \
+unifdef-y += dirent.h
-        udf_fs_i.h udp.h uinput.h uio.h unistd.h usb_ch9.h              \
+unifdef-y += divert.h
-        usbdevice_fs.h user.h videodev2.h videodev.h wait.h             \
+unifdef-y += elfcore.h
-        wanrouter.h watchdog.h xfrm.h zftape.h
+unifdef-y += errno.h
+unifdef-y += errqueue.h
+unifdef-y += ethtool.h
+unifdef-y += eventpoll.h
+unifdef-y += ext2_fs.h
+unifdef-y += ext3_fs.h
+unifdef-y += fb.h
+unifdef-y += fcntl.h
+unifdef-y += filter.h
+unifdef-y += flat.h
+unifdef-y += fs.h
+unifdef-y += ftape.h
+unifdef-y += gameport.h
+unifdef-y += generic_serial.h
+unifdef-y += genhd.h
+unifdef-y += hayesesp.h
+unifdef-y += hdlcdrv.h
+unifdef-y += hdlc.h
+unifdef-y += hdreg.h
+unifdef-y += hiddev.h
+unifdef-y += hpet.h
+unifdef-y += i2c.h
+unifdef-y += i2o-dev.h
+unifdef-y += icmpv6.h
+unifdef-y += if_bridge.h
+unifdef-y += if_ec.h
+unifdef-y += if_eql.h
+unifdef-y += if_ether.h
+unifdef-y += if_frad.h
+unifdef-y += if_ltalk.h
+unifdef-y += if_pppox.h
+unifdef-y += if_shaper.h
+unifdef-y += if_tr.h
+unifdef-y += if_tun.h
+unifdef-y += if_vlan.h
+unifdef-y += if_wanpipe.h
+unifdef-y += igmp.h
+unifdef-y += inet_diag.h
+unifdef-y += in.h
+unifdef-y += inotify.h
+unifdef-y += input.h
+unifdef-y += ipc.h
+unifdef-y += ipmi.h
+unifdef-y += ipv6.h
+unifdef-y += ipv6_route.h
+unifdef-y += isdn.h
+unifdef-y += isdnif.h
+unifdef-y += isdn_ppp.h
+unifdef-y += isicom.h
+unifdef-y += jbd.h
+unifdef-y += joystick.h
+unifdef-y += kdev_t.h
+unifdef-y += kd.h
+unifdef-y += kernelcapi.h
+unifdef-y += kernel.h
+unifdef-y += keyboard.h
+unifdef-y += llc.h
+unifdef-y += loop.h
+unifdef-y += lp.h
+unifdef-y += mempolicy.h
+unifdef-y += mii.h
+unifdef-y += mman.h
+unifdef-y += mroute.h
+unifdef-y += msdos_fs.h
+unifdef-y += msg.h
+unifdef-y += nbd.h
+unifdef-y += ncp_fs.h
+unifdef-y += ncp.h
+unifdef-y += ncp_mount.h
+unifdef-y += netdevice.h
+unifdef-y += netfilter_bridge.h
+unifdef-y += netfilter_decnet.h
+unifdef-y += netfilter.h
+unifdef-y += netfilter_ipv4.h
+unifdef-y += netfilter_ipv6.h
+unifdef-y += net.h
+unifdef-y += netlink.h
+unifdef-y += nfs3.h
+unifdef-y += nfs4.h
+unifdef-y += nfsacl.h
+unifdef-y += nfs_fs.h
+unifdef-y += nfs.h
+unifdef-y += nfs_idmap.h
+unifdef-y += n_r3964.h
+unifdef-y += nubus.h
+unifdef-y += nvram.h
+unifdef-y += parport.h
+unifdef-y += patchkey.h
+unifdef-y += pci.h
+unifdef-y += pktcdvd.h
+unifdef-y += pmu.h
+unifdef-y += poll.h
+unifdef-y += ppp_defs.h
+unifdef-y += ppp-comp.h
+unifdef-y += ptrace.h
+unifdef-y += qnx4_fs.h
+unifdef-y += quota.h
+unifdef-y += random.h
+unifdef-y += reboot.h
+unifdef-y += reiserfs_fs.h
+unifdef-y += reiserfs_xattr.h
+unifdef-y += romfs_fs.h
+unifdef-y += route.h
+unifdef-y += rtc.h
+unifdef-y += rtnetlink.h
+unifdef-y += scc.h
+unifdef-y += sched.h
+unifdef-y += sdla.h
+unifdef-y += selinux_netlink.h
+unifdef-y += sem.h
+unifdef-y += serial_core.h
+unifdef-y += serial.h
+unifdef-y += serio.h
+unifdef-y += shm.h
+unifdef-y += signal.h
+unifdef-y += smb_fs.h
+unifdef-y += smb.h
+unifdef-y += smb_mount.h
+unifdef-y += socket.h
+unifdef-y += sonet.h
+unifdef-y += sonypi.h
+unifdef-y += soundcard.h
+unifdef-y += stat.h
+unifdef-y += stddef.h
+unifdef-y += sysctl.h
+unifdef-y += tcp.h
+unifdef-y += time.h
+unifdef-y += timex.h
+unifdef-y += tty.h
+unifdef-y += types.h
+unifdef-y += udf_fs_i.h
+unifdef-y += udp.h
+unifdef-y += uinput.h
+unifdef-y += uio.h
+unifdef-y += unistd.h
+unifdef-y += usb_ch9.h
+unifdef-y += usbdevice_fs.h
+unifdef-y += user.h
+unifdef-y += videodev2.h
+unifdef-y += videodev.h
+unifdef-y += wait.h
+unifdef-y += wanrouter.h
+unifdef-y += watchdog.h
+unifdef-y += xfrm.h
+unifdef-y += zftape.h
-objhdr-y := version.h
+objhdr-y += version.h
diff --git a/include/linux/acct.h b/include/linux/acct.h
index e86bae7324d2..0496d1f09952 100644
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -124,16 +124,12 @@ extern void acct_auto_close(struct super_block *sb);
 extern void acct_init_pacct(struct pacct_struct *pacct);
 extern void acct_collect(long exitcode, int group_dead);
 extern void acct_process(void);
-extern void acct_update_integrals(struct task_struct *tsk);
-extern void acct_clear_integrals(struct task_struct *tsk);
 #else
 #define acct_auto_close_mnt(x)  do { } while (0)
 #define acct_auto_close(x)      do { } while (0)
 #define acct_init_pacct(x)      do { } while (0)
 #define acct_collect(x,y)       do { } while (0)
 #define acct_process()          do { } while (0)
-#define acct_update_integrals(x)                do { } while (0)
-#define acct_clear_integrals(task)      do { } while (0)
 #endif
 /*
diff --git a/include/linux/adfs_fs.h b/include/linux/adfs_fs.h
index 4a5d50c2bdbf..ef788c2085a1 100644
--- a/include/linux/adfs_fs.h
+++ b/include/linux/adfs_fs.h
@@ -2,6 +2,7 @@
 #define _ADFS_FS_H
 #include <linux/types.h>
+#include <linux/magic.h>
 /*
 * Disc Record at disc address 0xc00
@@ -38,7 +39,6 @@ struct adfs_discrecord {
 #define ADFS_DR_OFFSET          (0x1c0)
 #define ADFS_DR_SIZE             60
 #define ADFS_DR_SIZE_BITS       (ADFS_DR_SIZE << 3)
-#define ADFS_SUPER_MAGIC         0xadf5
 #ifdef __KERNEL__
 #include <linux/adfs_fs_i.h>
diff --git a/include/linux/aer.h b/include/linux/aer.h
new file mode 100644
index 000000000000..402e178b38eb
--- /dev/null
+++ b/include/linux/aer.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2006 Intel Corp.
+ *     Tom Long Nguyen (tom.l.nguyen@intel.com)
+ *     Zhang Yanmin (yanmin.zhang@intel.com)
+ */
+#ifndef _AER_H_
+#define _AER_H_
+#if defined(CONFIG_PCIEAER)
+/* pci-e port driver needs this function to enable aer */
+extern int pci_enable_pcie_error_reporting(struct pci_dev *dev);
+extern int pci_find_aer_capability(struct pci_dev *dev);
+extern int pci_disable_pcie_error_reporting(struct pci_dev *dev);
+extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
+#else
+#define pci_enable_pcie_error_reporting(dev)            do { } while (0)
+#define pci_find_aer_capability(dev)                    do { } while (0)
+#define pci_disable_pcie_error_reporting(dev)           do { } while (0)
+#define pci_cleanup_aer_uncorrect_error_status(dev)     do { } while (0)
+#endif
+#endif //_AER_H_
diff --git a/include/linux/affs_fs.h b/include/linux/affs_fs.h
deleted file mode 100644
index c57b5ee87d55..000000000000
--- a/include/linux/affs_fs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _AFFS_FS_H
-#define _AFFS_FS_H
-/*
- * The affs filesystem constants/structures
- */
-#define AFFS_SUPER_MAGIC 0xadff
-#endif
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 00c8efa95cc3..0d71c0041f13 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -4,8 +4,10 @@
 #include <linux/list.h>
 #include <linux/workqueue.h>
 #include <linux/aio_abi.h>
+#include <linux/uio.h>
 #include <asm/atomic.h>
+#include <linux/uio.h>
 #define AIO_MAXSEGS             4
 #define AIO_KIOGRP_NR_ATOMIC    8
@@ -110,8 +112,10 @@ struct kiocb {
        char                    __user *ki_buf; /* remaining iocb->aio_buf */
        size_t                  ki_left;        /* remaining bytes */
        long                    ki_retried;     /* just for testing */
-        long                    ki_kicked;      /* just for testing */
+        struct iovec            ki_inline_vec;  /* inline vector */
-        long                    ki_queued;      /* just for testing */
+        struct iovec            *ki_iovec;
+        unsigned long           ki_nr_segs;
+        unsigned long           ki_cur_seg;
        struct list_head        ki_list;        /* the aio core uses this
                                                 * for cancellation */
@@ -213,11 +217,11 @@ int FASTCALL(io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
                                  struct iocb *iocb));
 #define get_ioctx(kioctx) do {                                          \
-        BUG_ON(unlikely(atomic_read(&(kioctx)->users) <= 0));           \
+        BUG_ON(atomic_read(&(kioctx)->users) <= 0);                     \
        atomic_inc(&(kioctx)->users);                                   \
 } while (0)
 #define put_ioctx(kioctx) do {                                          \
-        BUG_ON(unlikely(atomic_read(&(kioctx)->users) <= 0));           \
+        BUG_ON(atomic_read(&(kioctx)->users) <= 0);                     \
        if (unlikely(atomic_dec_and_test(&(kioctx)->users)))            \
                __put_ioctx(kioctx);                                    \
 } while (0)
diff --git a/include/linux/aio_abi.h b/include/linux/aio_abi.h
index 30fdcc89d142..3466b1d0ffd2 100644
--- a/include/linux/aio_abi.h
+++ b/include/linux/aio_abi.h
@@ -41,6 +41,8 @@ enum {
         * IOCB_CMD_POLL = 5,
         */
        IOCB_CMD_NOOP = 6,
+        IOCB_CMD_PREADV = 7,
+        IOCB_CMD_PWRITEV = 8,
 };
 /* read() from /dev/aio returns these structures. */
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 3671af869696..d89441907024 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -40,6 +40,8 @@ enum {
        ATA_MAX_DEVICES         = 2,    /* per bus/port */
        ATA_MAX_PRD             = 256,  /* we could make these 256/256 */
        ATA_SECT_SIZE           = 512,
+        ATA_MAX_SECTORS         = 256,
+        ATA_MAX_SECTORS_LBA48   = 65535,/* TODO: 65536? */
        ATA_ID_WORDS            = 256,
        ATA_ID_SERNO_OFS        = 10,
@@ -168,12 +170,16 @@ enum {
        XFER_UDMA_2             = 0x42,
        XFER_UDMA_1             = 0x41,
        XFER_UDMA_0             = 0x40,
+        XFER_MW_DMA_4           = 0x24, /* CFA only */
+        XFER_MW_DMA_3           = 0x23, /* CFA only */
        XFER_MW_DMA_2           = 0x22,
        XFER_MW_DMA_1           = 0x21,
        XFER_MW_DMA_0           = 0x20,
        XFER_SW_DMA_2           = 0x12,
        XFER_SW_DMA_1           = 0x11,
        XFER_SW_DMA_0           = 0x10,
+        XFER_PIO_6              = 0x0E, /* CFA only */
+        XFER_PIO_5              = 0x0D, /* CFA only */
        XFER_PIO_4              = 0x0C,
        XFER_PIO_3              = 0x0B,
        XFER_PIO_2              = 0x0A,
@@ -272,7 +278,6 @@ struct ata_taskfile {
 };
 #define ata_id_is_ata(id)       (((id)[0] & (1 << 15)) == 0)
-#define ata_id_is_cfa(id)       ((id)[0] == 0x848A)
 #define ata_id_is_sata(id)      ((id)[93] == 0)
 #define ata_id_rahead_enabled(id) ((id)[85] & (1 << 6))
 #define ata_id_wcache_enabled(id) ((id)[85] & (1 << 5))
@@ -304,6 +309,9 @@ static inline unsigned int ata_id_major_version(const u16 *id)
 {
        unsigned int mver;
+        if (id[ATA_ID_MAJOR_VER] == 0xFFFF)
+                return 0;
        for (mver = 14; mver >= 1; mver--)
                if (id[ATA_ID_MAJOR_VER] & (1 << mver))
                        break;
@@ -312,8 +320,8 @@ static inline unsigned int ata_id_major_version(const u16 *id)
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
-        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command 
+        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
-           has not been issued to the device then the values of 
+           has not been issued to the device then the values of
           id[54] to id[56] are vendor specific. */
        return (id[53] & 0x01) && /* Current translation valid */
                id[54] &&  /* cylinders in current translation */
@@ -322,6 +330,18 @@ static inline int ata_id_current_chs_valid(const u16 *id)
                id[56];    /* sectors in current translation */
 }
+static inline int ata_id_is_cfa(const u16 *id)
+{
+        u16 v = id[0];
+        if (v == 0x848A)        /* Standard CF */
+                return 1;
+        /* Could be CF hiding as standard ATA */
+        if (ata_id_major_version(id) >= 3 &&  id[82] != 0xFFFF &&
+                        (id[82] & ( 1 << 2)))
+                return 1;
+        return 0;
+}
 static inline int atapi_cdb_len(const u16 *dev_id)
 {
        u16 tmp = dev_id[0] & 0x3;
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 6ba3aa8a81f4..75b8baca08f3 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -88,15 +88,7 @@ static inline struct atalk_sock *at_sk(struct sock *sk)
 #include <asm/byteorder.h>
 struct ddpehdr {
-#ifdef __LITTLE_ENDIAN_BITFIELD
+        __be16  deh_len_hops;   /* lower 10 bits are length, next 4 - hops */
-        __u16   deh_len:10,
-                deh_hops:4,
-                deh_pad:2;
-#else
-        __u16   deh_pad:2,
-                deh_hops:4,
-                deh_len:10;
-#endif
        __be16  deh_sum;
        __be16  deh_dnet;
        __be16  deh_snet;
@@ -112,36 +104,6 @@ static __inline__ struct ddpehdr *ddp_hdr(struct sk_buff *skb)
        return (struct ddpehdr *)skb->h.raw;
 }
-/*
- *      Don't drop the struct into the struct above.  You'll get some
- *      surprise padding.
- */
-struct ddpebits {
-#ifdef __LITTLE_ENDIAN_BITFIELD
-        __u16   deh_len:10,
-                deh_hops:4,
-                deh_pad:2;
-#else
-        __u16   deh_pad:2,
-                deh_hops:4,
-                deh_len:10;
-#endif
-};
-/* Short form header */
-struct ddpshdr {
-#ifdef __LITTLE_ENDIAN_BITFIELD
-        __u16   dsh_len:10,
-                dsh_pad:6;
-#else
-        __u16   dsh_pad:6,
-                dsh_len:10;
-#endif
-        __u8    dsh_dport;
-        __u8    dsh_sport;
-        /* And netatalk apps expect to stick the type in themselves */
-};
 /* AppleTalk AARP headers */
 struct elapaarp {
        __be16  hw_type;
diff --git a/include/linux/atmlec.h b/include/linux/atmlec.h
index f267f2442766..6f5a1bab8f50 100644
--- a/include/linux/atmlec.h
+++ b/include/linux/atmlec.h
@@ -1,9 +1,7 @@
 /*
- * 
+ * ATM Lan Emulation Daemon driver interface
- * ATM Lan Emulation Daemon vs. driver interface
- *
- * mkiiskila@yahoo.com
 *
+ * Marko Kiiskila <mkiiskila@yahoo.com>
 */
 #ifndef _ATMLEC_H_
@@ -13,76 +11,87 @@
 #include <linux/atmioc.h>
 #include <linux/atm.h>
 #include <linux/if_ether.h>
 /* ATM lec daemon control socket */
-#define ATMLEC_CTRL _IO('a',ATMIOC_LANE)
+#define ATMLEC_CTRL     _IO('a', ATMIOC_LANE)
-#define ATMLEC_DATA _IO('a',ATMIOC_LANE+1)
+#define ATMLEC_DATA     _IO('a', ATMIOC_LANE+1)
-#define ATMLEC_MCAST _IO('a',ATMIOC_LANE+2)
+#define ATMLEC_MCAST    _IO('a', ATMIOC_LANE+2)
 /* Maximum number of LEC interfaces (tweakable) */
 #define MAX_LEC_ITF 48
-/* From the total of MAX_LEC_ITF, last NUM_TR_DEVS are reserved for Token Ring.
+/*
+ * From the total of MAX_LEC_ITF, last NUM_TR_DEVS are reserved for Token Ring.
 * E.g. if MAX_LEC_ITF = 48 and NUM_TR_DEVS = 8, then lec0-lec39 are for
 * Ethernet ELANs and lec40-lec47 are for Token Ring ELANS.
 */
 #define NUM_TR_DEVS 8
-typedef enum { 
+typedef enum {
-        l_set_mac_addr,   l_del_mac_addr, 
+        l_set_mac_addr,
-        l_svc_setup, 
+        l_del_mac_addr,
-        l_addr_delete,    l_topology_change, 
+        l_svc_setup,
-        l_flush_complete, l_arp_update,
+        l_addr_delete,
-        l_narp_req, /* LANE2 mandates the use of this */
+        l_topology_change,
-        l_config,         l_flush_tran_id, 
+        l_flush_complete,
-        l_set_lecid,      l_arp_xmt,
+        l_arp_update,
-        l_rdesc_arp_xmt,
+        l_narp_req,             /* LANE2 mandates the use of this */
-        l_associate_req,
+        l_config,
-        l_should_bridge   /* should we bridge this MAC? */
+        l_flush_tran_id,
+        l_set_lecid,
+        l_arp_xmt,
+        l_rdesc_arp_xmt,
+        l_associate_req,
+        l_should_bridge         /* should we bridge this MAC? */
 } atmlec_msg_type;
 #define ATMLEC_MSG_TYPE_MAX l_should_bridge
 struct atmlec_config_msg {
-        unsigned int maximum_unknown_frame_count;
+        unsigned int maximum_unknown_frame_count;
-        unsigned int max_unknown_frame_time;
+        unsigned int max_unknown_frame_time;
-        unsigned short max_retry_count;
+        unsigned short max_retry_count;
-        unsigned int aging_time;
+        unsigned int aging_time;
-        unsigned int forward_delay_time;
+        unsigned int forward_delay_time;
-        unsigned int arp_response_time;
+        unsigned int arp_response_time;
-        unsigned int flush_timeout;
+        unsigned int flush_timeout;
-        unsigned int path_switching_delay;
+        unsigned int path_switching_delay;
-        unsigned int  lane_version; /* LANE2: 1 for LANEv1, 2 for LANEv2 */
+        unsigned int lane_version;      /* LANE2: 1 for LANEv1, 2 for LANEv2 */
-        int mtu;
+        int mtu;
-        int is_proxy;
+        int is_proxy;
 };
- 
 struct atmlec_msg {
-        atmlec_msg_type type;
+        atmlec_msg_type type;
-        int             sizeoftlvs;        /* LANE2: if != 0, tlvs follow */ 
+        int sizeoftlvs;         /* LANE2: if != 0, tlvs follow */
-        union {
+        union {
-                struct {
+                struct {
-                        unsigned char mac_addr[ETH_ALEN];
+                        unsigned char mac_addr[ETH_ALEN];
-                        unsigned char atm_addr[ATM_ESA_LEN];
+                        unsigned char atm_addr[ATM_ESA_LEN];
-                        unsigned int flag;/* Topology_change flag, 
+                        unsigned int flag;      /*
-                                              remoteflag, permanent flag,
+                                                 * Topology_change flag,
-                                              lecid, transaction id */
+                                                 * remoteflag, permanent flag,
-                        unsigned int targetless_le_arp; /* LANE2 */
+                                                 * lecid, transaction id
-                        unsigned int no_source_le_narp; /* LANE2 */
+                                                 */
-                } normal;
+                        unsigned int targetless_le_arp; /* LANE2 */
-                struct atmlec_config_msg config;
+                        unsigned int no_source_le_narp; /* LANE2 */
-                struct {
+                } normal;
-                        uint16_t lec_id;                     /* requestor lec_id  */
+                struct atmlec_config_msg config;
-                        uint32_t tran_id;                    /* transaction id    */
+                struct {
-                        unsigned char mac_addr[ETH_ALEN];    /* dst mac addr      */
+                        uint16_t lec_id;                        /* requestor lec_id  */
-                        unsigned char atm_addr[ATM_ESA_LEN]; /* reqestor ATM addr */
+                        uint32_t tran_id;                       /* transaction id    */
-                } proxy;
+                        unsigned char mac_addr[ETH_ALEN];       /* dst mac addr      */
-                     /* For mapping LE_ARP requests to responses. Filled by */
+                        unsigned char atm_addr[ATM_ESA_LEN];    /* reqestor ATM addr */
-        } content;       /* zeppelin, returned by kernel. Used only when proxying */ 
+                } proxy;        /*
+                                 * For mapping LE_ARP requests to responses. Filled by
+                                 * zeppelin, returned by kernel. Used only when proxying
+                                 */
+        } content;
 } __ATM_API_ALIGN;
 struct atmlec_ioc {
-        int dev_num;
+        int dev_num;
-        unsigned char atm_addr[ATM_ESA_LEN];
+        unsigned char atm_addr[ATM_ESA_LEN];
-        unsigned char receive;    /* 1= receive vcc, 0 = send vcc */
+        unsigned char receive;  /* 1= receive vcc, 0 = send vcc */
 };
 #endif /* _ATMLEC_H_ */
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 40a6c26294ae..c3aa09751814 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -95,6 +95,11 @@
 #define AUDIT_MAC_POLICY_LOAD   1403    /* Policy file load */
 #define AUDIT_MAC_STATUS        1404    /* Changed enforcing,permissive,off */
 #define AUDIT_MAC_CONFIG_CHANGE 1405    /* Changes to booleans */
+#define AUDIT_MAC_UNLBL_ALLOW   1406    /* NetLabel: allow unlabeled traffic */
+#define AUDIT_MAC_CIPSOV4_ADD   1407    /* NetLabel: add CIPSOv4 DOI entry */
+#define AUDIT_MAC_CIPSOV4_DEL   1408    /* NetLabel: del CIPSOv4 DOI entry */
+#define AUDIT_MAC_MAP_ADD       1409    /* NetLabel: add LSM domain mapping */
+#define AUDIT_MAC_MAP_DEL       1410    /* NetLabel: del LSM domain mapping */
 #define AUDIT_FIRST_KERN_ANOM_MSG   1700
 #define AUDIT_LAST_KERN_ANOM_MSG    1799
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 76bdaeab6f62..711c321a7011 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -148,6 +148,7 @@ struct bio {
 #define BIO_RW_BARRIER  2
 #define BIO_RW_FAILFAST 3
 #define BIO_RW_SYNC     4
+#define BIO_RW_META     5
 /*
 * upper 16 bits of bi_rw define the io priority of this bio
@@ -178,6 +179,7 @@ struct bio {
 #define bio_sync(bio)           ((bio)->bi_rw & (1 << BIO_RW_SYNC))
 #define bio_failfast(bio)       ((bio)->bi_rw & (1 << BIO_RW_FAILFAST))
 #define bio_rw_ahead(bio)       ((bio)->bi_rw & (1 << BIO_RW_AHEAD))
+#define bio_rw_meta(bio)        ((bio)->bi_rw & (1 << BIO_RW_META))
 /*
 * will die
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index aafe82788b4e..1d79b8d4ca6d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_BLKDEV_H
 #define _LINUX_BLKDEV_H
+#include <linux/sched.h>
 #include <linux/major.h>
 #include <linux/genhd.h>
 #include <linux/list.h>
@@ -16,6 +17,22 @@
 #include <asm/scatterlist.h>
+#ifdef CONFIG_LBD
+# include <asm/div64.h>
+# define sector_div(a, b) do_div(a, b)
+#else
+# define sector_div(n, b)( \
+{ \
+        int _res; \
+        _res = (n) % (b); \
+        (n) /= (b); \
+        _res; \
+} \
+)
+#endif
+#ifdef CONFIG_BLOCK
 struct scsi_ioctl_command;
 struct request_queue;
@@ -90,7 +107,7 @@ struct io_context {
        atomic_t refcount;
        struct task_struct *task;
-        int (*set_ioprio)(struct io_context *, unsigned int);
+        unsigned int ioprio_changed;
        /*
         * For request batching
@@ -104,8 +121,7 @@ struct io_context {
 void put_io_context(struct io_context *ioc);
 void exit_io_context(void);
-struct io_context *current_io_context(gfp_t gfp_flags);
+struct io_context *get_io_context(gfp_t gfp_flags, int node);
-struct io_context *get_io_context(gfp_t gfp_flags);
 void copy_io_context(struct io_context **pdst, struct io_context **psrc);
 void swap_io_context(struct io_context **ioc1, struct io_context **ioc2);
@@ -120,6 +136,90 @@ struct request_list {
        wait_queue_head_t wait[2];
 };
+/*
+ * request command types
+ */
+enum rq_cmd_type_bits {
+        REQ_TYPE_FS             = 1,    /* fs request */
+        REQ_TYPE_BLOCK_PC,              /* scsi command */
+        REQ_TYPE_SENSE,                 /* sense request */
+        REQ_TYPE_PM_SUSPEND,            /* suspend request */
+        REQ_TYPE_PM_RESUME,             /* resume request */
+        REQ_TYPE_PM_SHUTDOWN,           /* shutdown request */
+        REQ_TYPE_FLUSH,                 /* flush request */
+        REQ_TYPE_SPECIAL,               /* driver defined type */
+        REQ_TYPE_LINUX_BLOCK,           /* generic block layer message */
+        /*
+         * for ATA/ATAPI devices. this really doesn't belong here, ide should
+         * use REQ_TYPE_SPECIAL and use rq->cmd[0] with the range of driver
+         * private REQ_LB opcodes to differentiate what type of request this is
+         */
+        REQ_TYPE_ATA_CMD,
+        REQ_TYPE_ATA_TASK,
+        REQ_TYPE_ATA_TASKFILE,
+};
+/*
+ * For request of type REQ_TYPE_LINUX_BLOCK, rq->cmd[0] is the opcode being
+ * sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a
+ * SCSI cdb.
+ *
+ * 0x00 -> 0x3f are driver private, to be used for whatever purpose they need,
+ * typically to differentiate REQ_TYPE_SPECIAL requests.
+ *
+ */
+enum {
+        /*
+         * just examples for now
+         */
+        REQ_LB_OP_EJECT = 0x40,         /* eject request */
+        REQ_LB_OP_FLUSH = 0x41,         /* flush device */
+};
+/*
+ * request type modified bits. first three bits match BIO_RW* bits, important
+ */
+enum rq_flag_bits {
+        __REQ_RW,               /* not set, read. set, write */
+        __REQ_FAILFAST,         /* no low level driver retries */
+        __REQ_SORTED,           /* elevator knows about this request */
+        __REQ_SOFTBARRIER,      /* may not be passed by ioscheduler */
+        __REQ_HARDBARRIER,      /* may not be passed by drive either */
+        __REQ_FUA,              /* forced unit access */
+        __REQ_NOMERGE,          /* don't touch this for merging */
+        __REQ_STARTED,          /* drive already may have started this one */
+        __REQ_DONTPREP,         /* don't call prep for this one */
+        __REQ_QUEUED,           /* uses queueing */
+        __REQ_ELVPRIV,          /* elevator private data attached */
+        __REQ_FAILED,           /* set if the request failed */
+        __REQ_QUIET,            /* don't worry about errors */
+        __REQ_PREEMPT,          /* set for "ide_preempt" requests */
+        __REQ_ORDERED_COLOR,    /* is before or after barrier */
+        __REQ_RW_SYNC,          /* request is sync (O_DIRECT) */
+        __REQ_ALLOCED,          /* request came from our alloc pool */
+        __REQ_RW_META,          /* metadata io request */
+        __REQ_NR_BITS,          /* stops here */
+};
+#define REQ_RW          (1 << __REQ_RW)
+#define REQ_FAILFAST    (1 << __REQ_FAILFAST)
+#define REQ_SORTED      (1 << __REQ_SORTED)
+#define REQ_SOFTBARRIER (1 << __REQ_SOFTBARRIER)
+#define REQ_HARDBARRIER (1 << __REQ_HARDBARRIER)
+#define REQ_FUA         (1 << __REQ_FUA)
+#define REQ_NOMERGE     (1 << __REQ_NOMERGE)
+#define REQ_STARTED     (1 << __REQ_STARTED)
+#define REQ_DONTPREP    (1 << __REQ_DONTPREP)
+#define REQ_QUEUED      (1 << __REQ_QUEUED)
+#define REQ_ELVPRIV     (1 << __REQ_ELVPRIV)
+#define REQ_FAILED      (1 << __REQ_FAILED)
+#define REQ_QUIET       (1 << __REQ_QUIET)
+#define REQ_PREEMPT     (1 << __REQ_PREEMPT)
+#define REQ_ORDERED_COLOR       (1 << __REQ_ORDERED_COLOR)
+#define REQ_RW_SYNC     (1 << __REQ_RW_SYNC)
+#define REQ_ALLOCED     (1 << __REQ_ALLOCED)
+#define REQ_RW_META     (1 << __REQ_RW_META)
 #define BLK_MAX_CDB     16
 /*
@@ -129,30 +229,46 @@ struct request {
        struct list_head queuelist;
        struct list_head donelist;
-        unsigned long flags;            /* see REQ_ bits below */
+        request_queue_t *q;
+        unsigned int cmd_flags;
+        enum rq_cmd_type_bits cmd_type;
        /* Maintain bio traversal state for part by part I/O submission.
         * hard_* are block layer internals, no driver should touch them!
         */
        sector_t sector;                /* next sector to submit */
+        sector_t hard_sector;           /* next sector to complete */
        unsigned long nr_sectors;       /* no. of sectors left to submit */
+        unsigned long hard_nr_sectors;  /* no. of sectors left to complete */
        /* no. of sectors left to submit in the current segment */
        unsigned int current_nr_sectors;
-        sector_t hard_sector;           /* next sector to complete */
-        unsigned long hard_nr_sectors;  /* no. of sectors left to complete */
        /* no. of sectors left to complete in the current segment */
        unsigned int hard_cur_sectors;
        struct bio *bio;
        struct bio *biotail;
+        struct hlist_node hash; /* merge hash */
+        /*
+         * The rb_node is only used inside the io scheduler, requests
+         * are pruned when moved to the dispatch queue. So let the
+         * completion_data share space with the rb_node.
+         */
+        union {
+                struct rb_node rb_node; /* sort/lookup */
+                void *completion_data;
+        };
+        /*
+         * two pointers are available for the IO schedulers, if they need
+         * more they have to dynamically allocate it.
+         */
        void *elevator_private;
-        void *completion_data;
+        void *elevator_private2;
-        int rq_status;  /* should split this into a few status bits */
-        int errors;
        struct gendisk *rq_disk;
        unsigned long start_time;
@@ -170,15 +286,13 @@ struct request {
        unsigned short ioprio;
+        void *special;
+        char *buffer;
        int tag;
+        int errors;
        int ref_count;
-        request_queue_t *q;
-        struct request_list *rl;
-        struct completion *waiting;
-        void *special;
-        char *buffer;
        /*
         * when request is used as a packet command carrier
@@ -195,80 +309,14 @@ struct request {
        int retries;
        /*
-         * completion callback. end_io_data should be folded in with waiting
+         * completion callback.
         */
        rq_end_io_fn *end_io;
        void *end_io_data;
 };
 /*
- * first three bits match BIO_RW* bits, important
+ * State information carried for REQ_TYPE_PM_SUSPEND and REQ_TYPE_PM_RESUME
- */
-enum rq_flag_bits {
-        __REQ_RW,               /* not set, read. set, write */
-        __REQ_FAILFAST,         /* no low level driver retries */
-        __REQ_SORTED,           /* elevator knows about this request */
-        __REQ_SOFTBARRIER,      /* may not be passed by ioscheduler */
-        __REQ_HARDBARRIER,      /* may not be passed by drive either */
-        __REQ_FUA,              /* forced unit access */
-        __REQ_CMD,              /* is a regular fs rw request */
-        __REQ_NOMERGE,          /* don't touch this for merging */
-        __REQ_STARTED,          /* drive already may have started this one */
-        __REQ_DONTPREP,         /* don't call prep for this one */
-        __REQ_QUEUED,           /* uses queueing */
-        __REQ_ELVPRIV,          /* elevator private data attached */
-        /*
-         * for ATA/ATAPI devices
-         */
-        __REQ_PC,               /* packet command (special) */
-        __REQ_BLOCK_PC,         /* queued down pc from block layer */
-        __REQ_SENSE,            /* sense retrival */
-        __REQ_FAILED,           /* set if the request failed */
-        __REQ_QUIET,            /* don't worry about errors */
-        __REQ_SPECIAL,          /* driver suplied command */
-        __REQ_DRIVE_CMD,
-        __REQ_DRIVE_TASK,
-        __REQ_DRIVE_TASKFILE,
-        __REQ_PREEMPT,          /* set for "ide_preempt" requests */
-        __REQ_PM_SUSPEND,       /* suspend request */
-        __REQ_PM_RESUME,        /* resume request */
-        __REQ_PM_SHUTDOWN,      /* shutdown request */
-        __REQ_ORDERED_COLOR,    /* is before or after barrier */
-        __REQ_RW_SYNC,          /* request is sync (O_DIRECT) */
-        __REQ_NR_BITS,          /* stops here */
-};
-#define REQ_RW          (1 << __REQ_RW)
-#define REQ_FAILFAST    (1 << __REQ_FAILFAST)
-#define REQ_SORTED      (1 << __REQ_SORTED)
-#define REQ_SOFTBARRIER (1 << __REQ_SOFTBARRIER)
-#define REQ_HARDBARRIER (1 << __REQ_HARDBARRIER)
-#define REQ_FUA         (1 << __REQ_FUA)
-#define REQ_CMD         (1 << __REQ_CMD)
-#define REQ_NOMERGE     (1 << __REQ_NOMERGE)
-#define REQ_STARTED     (1 << __REQ_STARTED)
-#define REQ_DONTPREP    (1 << __REQ_DONTPREP)
-#define REQ_QUEUED      (1 << __REQ_QUEUED)
-#define REQ_ELVPRIV     (1 << __REQ_ELVPRIV)
-#define REQ_PC          (1 << __REQ_PC)
-#define REQ_BLOCK_PC    (1 << __REQ_BLOCK_PC)
-#define REQ_SENSE       (1 << __REQ_SENSE)
-#define REQ_FAILED      (1 << __REQ_FAILED)
-#define REQ_QUIET       (1 << __REQ_QUIET)
-#define REQ_SPECIAL     (1 << __REQ_SPECIAL)
-#define REQ_DRIVE_CMD   (1 << __REQ_DRIVE_CMD)
-#define REQ_DRIVE_TASK  (1 << __REQ_DRIVE_TASK)
-#define REQ_DRIVE_TASKFILE      (1 << __REQ_DRIVE_TASKFILE)
-#define REQ_PREEMPT     (1 << __REQ_PREEMPT)
-#define REQ_PM_SUSPEND  (1 << __REQ_PM_SUSPEND)
-#define REQ_PM_RESUME   (1 << __REQ_PM_RESUME)
-#define REQ_PM_SHUTDOWN (1 << __REQ_PM_SHUTDOWN)
-#define REQ_ORDERED_COLOR       (1 << __REQ_ORDERED_COLOR)
-#define REQ_RW_SYNC     (1 << __REQ_RW_SYNC)
-/*
- * State information carried for REQ_PM_SUSPEND and REQ_PM_RESUME
 * requests. Some step values could eventually be made generic.
 */
 struct request_pm_state
@@ -417,9 +465,9 @@ struct request_queue
        unsigned int            sg_timeout;
        unsigned int            sg_reserved_size;
        int                     node;
+#ifdef CONFIG_BLK_DEV_IO_TRACE
        struct blk_trace        *blk_trace;
+#endif
        /*
         * reserved for flush operations
         */
@@ -432,9 +480,6 @@ struct request_queue
        struct mutex            sysfs_lock;
 };
-#define RQ_INACTIVE             (-1)
-#define RQ_ACTIVE               1
 #define QUEUE_FLAG_CLUSTER      0       /* cluster several segments into 1 */
 #define QUEUE_FLAG_QUEUED       1       /* uses generic tag queueing */
 #define QUEUE_FLAG_STOPPED      2       /* queue is stopped */
@@ -490,25 +535,34 @@ enum {
 #define blk_queue_stopped(q)    test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)
 #define blk_queue_flushing(q)   ((q)->ordseq)
-#define blk_fs_request(rq)      ((rq)->flags & REQ_CMD)
+#define blk_fs_request(rq)      ((rq)->cmd_type == REQ_TYPE_FS)
-#define blk_pc_request(rq)      ((rq)->flags & REQ_BLOCK_PC)
+#define blk_pc_request(rq)      ((rq)->cmd_type == REQ_TYPE_BLOCK_PC)
-#define blk_noretry_request(rq) ((rq)->flags & REQ_FAILFAST)
+#define blk_special_request(rq) ((rq)->cmd_type == REQ_TYPE_SPECIAL)
-#define blk_rq_started(rq)      ((rq)->flags & REQ_STARTED)
+#define blk_sense_request(rq)   ((rq)->cmd_type == REQ_TYPE_SENSE)
+#define blk_noretry_request(rq) ((rq)->cmd_flags & REQ_FAILFAST)
+#define blk_rq_started(rq)      ((rq)->cmd_flags & REQ_STARTED)
 #define blk_account_rq(rq)      (blk_rq_started(rq) && blk_fs_request(rq))
-#define blk_pm_suspend_request(rq)      ((rq)->flags & REQ_PM_SUSPEND)
+#define blk_pm_suspend_request(rq)      ((rq)->cmd_type == REQ_TYPE_PM_SUSPEND)
-#define blk_pm_resume_request(rq)       ((rq)->flags & REQ_PM_RESUME)
+#define blk_pm_resume_request(rq)       ((rq)->cmd_type == REQ_TYPE_PM_RESUME)
 #define blk_pm_request(rq)      \
-        ((rq)->flags & (REQ_PM_SUSPEND | REQ_PM_RESUME))
+        (blk_pm_suspend_request(rq) || blk_pm_resume_request(rq))
-#define blk_sorted_rq(rq)       ((rq)->flags & REQ_SORTED)
+#define blk_sorted_rq(rq)       ((rq)->cmd_flags & REQ_SORTED)
-#define blk_barrier_rq(rq)      ((rq)->flags & REQ_HARDBARRIER)
+#define blk_barrier_rq(rq)      ((rq)->cmd_flags & REQ_HARDBARRIER)
-#define blk_fua_rq(rq)          ((rq)->flags & REQ_FUA)
+#define blk_fua_rq(rq)          ((rq)->cmd_flags & REQ_FUA)
 #define list_entry_rq(ptr)      list_entry((ptr), struct request, queuelist)
-#define rq_data_dir(rq)         ((rq)->flags & 1)
+#define rq_data_dir(rq)         ((rq)->cmd_flags & 1)
+/*
+ * We regard a request as sync, if it's a READ or a SYNC write.
+ */
+#define rq_is_sync(rq)          (rq_data_dir((rq)) == READ || (rq)->cmd_flags & REQ_RW_SYNC)
+#define rq_is_meta(rq)          ((rq)->cmd_flags & REQ_RW_META)
 static inline int blk_queue_full(struct request_queue *q, int rw)
 {
@@ -541,13 +595,7 @@ static inline void blk_clear_queue_full(struct request_queue *q, int rw)
 #define RQ_NOMERGE_FLAGS        \
        (REQ_NOMERGE | REQ_STARTED | REQ_HARDBARRIER | REQ_SOFTBARRIER)
 #define rq_mergeable(rq)        \
-        (!((rq)->flags & RQ_NOMERGE_FLAGS) && blk_fs_request((rq)))
+        (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && blk_fs_request((rq)))
-/*
- * noop, requests are automagically marked as active/inactive by I/O
- * scheduler -- see elv_next_request
- */
-#define blk_queue_headactive(q, head_active)
 /*
 * q->prep_rq_fn return values
@@ -586,11 +634,6 @@ static inline void blk_queue_bounce(request_queue_t *q, struct bio **bio)
        if ((rq->bio))                  \
                for (_bio = (rq)->bio; _bio; _bio = _bio->bi_next)
-struct sec_size {
-        unsigned block_size;
-        unsigned block_size_bits;
-};
 extern int blk_register_queue(struct gendisk *disk);
 extern void blk_unregister_queue(struct gendisk *disk);
 extern void register_disk(struct gendisk *dev);
@@ -612,6 +655,7 @@ extern void blk_stop_queue(request_queue_t *q);
 extern void blk_sync_queue(struct request_queue *q);
 extern void __blk_stop_queue(request_queue_t *q);
 extern void blk_run_queue(request_queue_t *);
+extern void blk_start_queueing(request_queue_t *);
 extern void blk_queue_activity_fn(request_queue_t *, activity_fn *, void *);
 extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned int);
 extern int blk_rq_unmap_user(struct bio *, unsigned int);
@@ -655,16 +699,6 @@ extern void end_that_request_last(struct request *, int);
 extern void end_request(struct request *req, int uptodate);
 extern void blk_complete_request(struct request *);
-static inline int rq_all_done(struct request *rq, unsigned int nr_bytes)
-{
-        if (blk_fs_request(rq))
-                return (nr_bytes >= (rq->hard_nr_sectors << 9));
-        else if (blk_pc_request(rq))
-                return nr_bytes >= rq->data_len;
-        return 0;
-}
 /*
 * end_that_request_first/chunk() takes an uptodate argument. we account
 * any value <= as an io error. 0 means -EIO for compatability reasons,
@@ -679,21 +713,6 @@ static inline void blkdev_dequeue_request(struct request *req)
 }
 /*
- * This should be in elevator.h, but that requires pulling in rq and q
- */
-static inline void elv_dispatch_add_tail(struct request_queue *q,
-                                         struct request *rq)
-{
-        if (q->last_merge == rq)
-                q->last_merge = NULL;
-        q->nr_sorted--;
-        q->end_sector = rq_end_sector(rq);
-        q->boundary_rq = rq;
-        list_add_tail(&rq->queuelist, &q->queue_head);
-}
-/*
 * Access functions for manipulating queue properties
 */
 extern request_queue_t *blk_init_queue_node(request_fn_proc *rfn,
@@ -737,7 +756,7 @@ extern void blk_put_queue(request_queue_t *);
 */
 #define blk_queue_tag_depth(q)          ((q)->queue_tags->busy)
 #define blk_queue_tag_queue(q)          ((q)->queue_tags->busy < (q)->queue_tags->max_depth)
-#define blk_rq_tagged(rq)               ((rq)->flags & REQ_QUEUED)
+#define blk_rq_tagged(rq)               ((rq)->cmd_flags & REQ_QUEUED)
 extern int blk_queue_start_tag(request_queue_t *, struct request *);
 extern struct request *blk_queue_find_tag(request_queue_t *, int);
 extern void blk_queue_end_tag(request_queue_t *, struct request *);
@@ -746,6 +765,9 @@ extern void blk_queue_free_tags(request_queue_t *);
 extern int blk_queue_resize_tags(request_queue_t *, int);
 extern void blk_queue_invalidate_tags(request_queue_t *);
 extern long blk_congestion_wait(int rw, long timeout);
+extern struct blk_queue_tag *blk_init_tags(int);
+extern void blk_free_tags(struct blk_queue_tag *);
+extern void blk_congestion_end(int rw);
 extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
 extern int blkdev_issue_flush(struct block_device *, sector_t *);
@@ -784,14 +806,6 @@ static inline int queue_dma_alignment(request_queue_t *q)
        return retval;
 }
-static inline int bdev_dma_aligment(struct block_device *bdev)
-{
-        return queue_dma_alignment(bdev_get_queue(bdev));
-}
-#define blk_finished_io(nsects) do { } while (0)
-#define blk_started_io(nsects)  do { } while (0)
 /* assumes size > 256 */
 static inline unsigned int blksize_bits(unsigned int size)
 {
@@ -821,24 +835,32 @@ struct work_struct;
 int kblockd_schedule_work(struct work_struct *work);
 void kblockd_flush(void);
-#ifdef CONFIG_LBD
-# include <asm/div64.h>
-# define sector_div(a, b) do_div(a, b)
-#else
-# define sector_div(n, b)( \
-{ \
-        int _res; \
-        _res = (n) % (b); \
-        (n) /= (b); \
-        _res; \
-} \
-)
-#endif 
 #define MODULE_ALIAS_BLOCKDEV(major,minor) \
        MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))
 #define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \
        MODULE_ALIAS("block-major-" __stringify(major) "-*")
+#else /* CONFIG_BLOCK */
+/*
+ * stubs for when the block layer is configured out
+ */
+#define buffer_heads_over_limit 0
+static inline long blk_congestion_wait(int rw, long timeout)
+{
+        return io_schedule_timeout(timeout);
+}
+static inline long nr_blockdev_pages(void)
+{
+        return 0;
+}
+static inline void exit_io_context(void)
+{
+}
+#endif /* CONFIG_BLOCK */
 #endif
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 7520cc1ff9e2..b99a714fcac6 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -20,6 +20,7 @@ enum blktrace_cat {
        BLK_TC_PC       = 1 << 9,       /* pc requests */
        BLK_TC_NOTIFY   = 1 << 10,      /* special message */
        BLK_TC_AHEAD    = 1 << 11,      /* readahead */
+        BLK_TC_META     = 1 << 12,      /* metadata */
        BLK_TC_END      = 1 << 15,      /* only 16-bits, reminder */
 };
@@ -148,7 +149,7 @@ static inline void blk_add_trace_rq(struct request_queue *q, struct request *rq,
                                    u32 what)
 {
        struct blk_trace *bt = q->blk_trace;
-        int rw = rq->flags & 0x03;
+        int rw = rq->cmd_flags & 0x03;
        if (likely(!bt))
                return;
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 1021f508d82c..31e9abb6d977 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -4,11 +4,8 @@
 #ifndef _LINUX_BOOTMEM_H
 #define _LINUX_BOOTMEM_H
-#include <asm/pgtable.h>
-#include <asm/dma.h>
-#include <linux/cache.h>
-#include <linux/init.h>
 #include <linux/mmzone.h>
+#include <asm/dma.h>
 /*
 *  simple boot-time physical memory area allocator.
@@ -41,45 +38,64 @@ typedef struct bootmem_data {
        struct list_head list;
 } bootmem_data_t;
-extern unsigned long __init bootmem_bootmap_pages (unsigned long);
+extern unsigned long bootmem_bootmap_pages(unsigned long);
-extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend);
+extern unsigned long init_bootmem(unsigned long addr, unsigned long memend);
-extern void __init free_bootmem (unsigned long addr, unsigned long size);
+extern void free_bootmem(unsigned long addr, unsigned long size);
-extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal);
+extern void *__alloc_bootmem(unsigned long size,
-extern void * __init __alloc_bootmem_nopanic (unsigned long size, unsigned long align, unsigned long goal);
+                             unsigned long align,
-extern void * __init __alloc_bootmem_low(unsigned long size,
+                             unsigned long goal);
-                                         unsigned long align,
+extern void *__alloc_bootmem_nopanic(unsigned long size,
-                                         unsigned long goal);
+                                     unsigned long align,
-extern void * __init __alloc_bootmem_low_node(pg_data_t *pgdat,
+                                     unsigned long goal);
-                                              unsigned long size,
+extern void *__alloc_bootmem_low(unsigned long size,
-                                              unsigned long align,
+                                 unsigned long align,
-                                              unsigned long goal);
+                                 unsigned long goal);
-extern void * __init __alloc_bootmem_core(struct bootmem_data *bdata,
+extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
-                unsigned long size, unsigned long align, unsigned long goal,
+                                      unsigned long size,
-                unsigned long limit);
+                                      unsigned long align,
+                                      unsigned long goal);
+extern void *__alloc_bootmem_core(struct bootmem_data *bdata,
+                                  unsigned long size,
+                                  unsigned long align,
+                                  unsigned long goal,
+                                  unsigned long limit);
 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
-extern void __init reserve_bootmem (unsigned long addr, unsigned long size);
+extern void reserve_bootmem(unsigned long addr, unsigned long size);
 #define alloc_bootmem(x) \
-        __alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
+        __alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low(x) \
-        __alloc_bootmem_low((x), SMP_CACHE_BYTES, 0)
+        __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
 #define alloc_bootmem_pages(x) \
-        __alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
+        __alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low_pages(x) \
-        __alloc_bootmem_low((x), PAGE_SIZE, 0)
+        __alloc_bootmem_low(x, PAGE_SIZE, 0)
 #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
-extern unsigned long __init free_all_bootmem (void);
-extern void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal);
+extern unsigned long free_all_bootmem(void);
-extern unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn);
+extern unsigned long free_all_bootmem_node(pg_data_t *pgdat);
-extern void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size);
+extern void *__alloc_bootmem_node(pg_data_t *pgdat,
-extern void __init free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size);
+                                  unsigned long size,
-extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat);
+                                  unsigned long align,
+                                  unsigned long goal);
+extern unsigned long init_bootmem_node(pg_data_t *pgdat,
+                                       unsigned long freepfn,
+                                       unsigned long startpfn,
+                                       unsigned long endpfn);
+extern void reserve_bootmem_node(pg_data_t *pgdat,
+                                 unsigned long physaddr,
+                                 unsigned long size);
+extern void free_bootmem_node(pg_data_t *pgdat,
+                              unsigned long addr,
+                              unsigned long size);
 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
 #define alloc_bootmem_node(pgdat, x) \
-        __alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
+        __alloc_bootmem_node(pgdat, x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_pages_node(pgdat, x) \
-        __alloc_bootmem_node((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
+        __alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
 #define alloc_bootmem_low_pages_node(pgdat, x) \
-        __alloc_bootmem_low_node((pgdat), (x), PAGE_SIZE, 0)
+        __alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)
 #endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */
 #ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
@@ -89,19 +105,19 @@ static inline void *alloc_remap(int nid, unsigned long size)
 {
        return NULL;
 }
-#endif
+#endif /* CONFIG_HAVE_ARCH_ALLOC_REMAP */
 extern unsigned long __meminitdata nr_kernel_pages;
 extern unsigned long nr_all_pages;
-extern void *__init alloc_large_system_hash(const char *tablename,
+extern void *alloc_large_system_hash(const char *tablename,
-                                            unsigned long bucketsize,
+                                     unsigned long bucketsize,
-                                            unsigned long numentries,
+                                     unsigned long numentries,
-                                            int scale,
+                                     int scale,
-                                            int flags,
+                                     int flags,
-                                            unsigned int *_hash_shift,
+                                     unsigned int *_hash_shift,
-                                            unsigned int *_hash_mask,
+                                     unsigned int *_hash_mask,
-                                            unsigned long limit);
+                                     unsigned long limit);
 #define HASH_HIGHMEM    0x00000001      /* Consider highmem? */
 #define HASH_EARLY      0x00000002      /* Allocating during early boot? */
@@ -114,7 +130,7 @@ extern void *__init alloc_large_system_hash(const char *tablename,
 #else
 #define HASHDIST_DEFAULT 0
 #endif
-extern int __initdata hashdist;         /* Distribute hashes across NUMA nodes? */
+extern int hashdist;            /* Distribute hashes across NUMA nodes? */
 #endif /* _LINUX_BOOTMEM_H */
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 737e407d0cd1..131ffd37e716 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -14,6 +14,8 @@
 #include <linux/wait.h>
 #include <asm/atomic.h>
+#ifdef CONFIG_BLOCK
 enum bh_state_bits {
        BH_Uptodate,    /* Contains valid data */
        BH_Dirty,       /* Is dirty */
@@ -190,9 +192,7 @@ extern int buffer_heads_over_limit;
 * Generic address_space_operations implementations for buffer_head-backed
 * address_spaces.
 */
-int try_to_release_page(struct page * page, gfp_t gfp_mask);
 void block_invalidatepage(struct page *page, unsigned long offset);
-void do_invalidatepage(struct page *page, unsigned long offset);
 int block_write_full_page(struct page *page, get_block_t *get_block,
                                struct writeback_control *wbc);
 int block_read_full_page(struct page*, get_block_t*);
@@ -302,4 +302,19 @@ static inline void lock_buffer(struct buffer_head *bh)
                __lock_buffer(bh);
 }
+extern int __set_page_dirty_buffers(struct page *page);
+#else /* CONFIG_BLOCK */
+static inline void buffer_init(void) {}
+static inline int try_to_free_buffers(struct page *page) { return 1; }
+static inline int sync_blockdev(struct block_device *bdev) { return 0; }
+static inline int inode_has_buffers(struct inode *inode) { return 0; }
+static inline void invalidate_inode_buffers(struct inode *inode) {}
+static inline int remove_inode_buffers(struct inode *inode) { return 1; }
+static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }
+static inline void invalidate_bdev(struct block_device *bdev, int destroy_dirty_buffers) {}
+#endif /* CONFIG_BLOCK */
 #endif /* _LINUX_BUFFER_HEAD_H */
diff --git a/include/linux/byteorder/Kbuild b/include/linux/byteorder/Kbuild
index 84a57d4fb212..56499ab9e32e 100644
--- a/include/linux/byteorder/Kbuild
+++ b/include/linux/byteorder/Kbuild
@@ -1,2 +1,7 @@
-unifdef-y += generic.h swabb.h swab.h
+header-y += big_endian.h
-header-y += big_endian.h little_endian.h pdp_endian.h
+header-y += little_endian.h
+header-y += pdp_endian.h
+unifdef-y += generic.h
+unifdef-y += swabb.h
+unifdef-y += swab.h
diff --git a/include/linux/cdev.h b/include/linux/cdev.h
index 2216638962d2..ee5f53f2ca15 100644
--- a/include/linux/cdev.h
+++ b/include/linux/cdev.h
@@ -23,5 +23,7 @@ void cdev_del(struct cdev *);
 void cd_forget(struct inode *);
+extern struct backing_dev_info directly_mappable_cdev_bdi;
 #endif
 #endif
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 98f6c52c152b..b541bb3d1f4b 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -1,11 +1,11 @@
 #ifndef __CODA_PSDEV_H
 #define __CODA_PSDEV_H
+#include <linux/magic.h>
 #define CODA_PSDEV_MAJOR 67
 #define MAX_CODADEVS  5    /* how many do we allow */
-#define CODA_SUPER_MAGIC        0x73757245
 struct kstatfs;
 struct coda_sb_info
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h
index bea0255196c4..d5b7abc4f409 100644
--- a/include/linux/compat_ioctl.h
+++ b/include/linux/compat_ioctl.h
@@ -90,6 +90,7 @@ COMPATIBLE_IOCTL(FDTWADDLE)
 COMPATIBLE_IOCTL(FDFMTTRK)
 COMPATIBLE_IOCTL(FDRAWCMD)
 /* 0x12 */
+#ifdef CONFIG_BLOCK
 COMPATIBLE_IOCTL(BLKRASET)
 COMPATIBLE_IOCTL(BLKROSET)
 COMPATIBLE_IOCTL(BLKROGET)
@@ -103,6 +104,7 @@ COMPATIBLE_IOCTL(BLKTRACESETUP)
 COMPATIBLE_IOCTL(BLKTRACETEARDOWN)
 ULONG_IOCTL(BLKRASET)
 ULONG_IOCTL(BLKFRASET)
+#endif
 /* RAID */
 COMPATIBLE_IOCTL(RAID_VERSION)
 COMPATIBLE_IOCTL(GET_ARRAY_INFO)
@@ -395,12 +397,6 @@ COMPATIBLE_IOCTL(DVD_WRITE_STRUCT)
 COMPATIBLE_IOCTL(DVD_AUTH)
 /* pktcdvd */
 COMPATIBLE_IOCTL(PACKET_CTRL_CMD)
-/* Big L */
-ULONG_IOCTL(LOOP_SET_FD)
-ULONG_IOCTL(LOOP_CHANGE_FD)
-COMPATIBLE_IOCTL(LOOP_CLR_FD)
-COMPATIBLE_IOCTL(LOOP_GET_STATUS64)
-COMPATIBLE_IOCTL(LOOP_SET_STATUS64)
 /* Big A */
 /* sparc only */
 /* Big Q for sound/OSS */
@@ -573,18 +569,6 @@ COMPATIBLE_IOCTL(RAW_SETBIND)
 COMPATIBLE_IOCTL(RAW_GETBIND)
 /* SMB ioctls which do not need any translations */
 COMPATIBLE_IOCTL(SMB_IOC_NEWCONN)
-/* NCP ioctls which do not need any translations */
-COMPATIBLE_IOCTL(NCP_IOC_CONN_LOGGED_IN)
-COMPATIBLE_IOCTL(NCP_IOC_SIGN_INIT)
-COMPATIBLE_IOCTL(NCP_IOC_SIGN_WANTED)
-COMPATIBLE_IOCTL(NCP_IOC_SET_SIGN_WANTED)
-COMPATIBLE_IOCTL(NCP_IOC_LOCKUNLOCK)
-COMPATIBLE_IOCTL(NCP_IOC_GETROOT)
-COMPATIBLE_IOCTL(NCP_IOC_SETROOT)
-COMPATIBLE_IOCTL(NCP_IOC_GETCHARSETS)
-COMPATIBLE_IOCTL(NCP_IOC_SETCHARSETS)
-COMPATIBLE_IOCTL(NCP_IOC_GETDENTRYTTL)
-COMPATIBLE_IOCTL(NCP_IOC_SETDENTRYTTL)
 /* Little a */
 COMPATIBLE_IOCTL(ATMSIGD_CTRL)
 COMPATIBLE_IOCTL(ATMARPD_CTRL)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 9b4f11094937..538423d4a865 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -10,11 +10,11 @@
 # define __force        __attribute__((force))
 # define __nocast       __attribute__((nocast))
 # define __iomem        __attribute__((noderef, address_space(2)))
-# define __acquires(x)  __attribute__((context(0,1)))
+# define __acquires(x)  __attribute__((context(x,0,1)))
-# define __releases(x)  __attribute__((context(1,0)))
+# define __releases(x)  __attribute__((context(x,1,0)))
-# define __acquire(x)   __context__(1)
+# define __acquire(x)   __context__(x,1)
-# define __release(x)   __context__(-1)
+# define __release(x)   __context__(x,-1)
-# define __cond_lock(x) ((x) ? ({ __context__(1); 1; }) : 0)
+# define __cond_lock(x,c)       ((c) ? ({ __acquire(x); 1; }) : 0)
 extern void __chk_user_ptr(void __user *);
 extern void __chk_io_ptr(void __iomem *);
 #else
@@ -31,7 +31,7 @@ extern void __chk_io_ptr(void __iomem *);
 # define __releases(x)
 # define __acquire(x) (void)0
 # define __release(x) (void)0
-# define __cond_lock(x) (x)
+# define __cond_lock(x,c) (c)
 #endif
 #ifdef __KERNEL__
@@ -99,6 +99,11 @@ extern void __chk_io_ptr(void __iomem *);
 #define __must_check
 #endif
+#ifndef CONFIG_ENABLE_MUST_CHECK
+#undef __must_check
+#define __must_check
+#endif
 /*
 * Allow us to avoid 'defined but not used' warnings on functions and data,
 * as well as force them to be emitted to the assembly file.
diff --git a/include/linux/console.h b/include/linux/console.h
index 3bdf2155e565..76a1807726eb 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -120,9 +120,14 @@ extern void console_stop(struct console *);
 extern void console_start(struct console *);
 extern int is_console_locked(void);
+#ifndef CONFIG_DISABLE_CONSOLE_SUSPEND
 /* Suspend and resume console messages over PM events */
 extern void suspend_console(void);
 extern void resume_console(void);
+#else
+static inline void suspend_console(void) {}
+static inline void resume_console(void) {}
+#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
 /* Some debug stub to catch some of the obvious races in the VT code */
 #if 1
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 8fb344a9abd8..3fef7d67aedc 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -89,4 +89,12 @@ int cpu_down(unsigned int cpu);
 static inline int cpu_is_offline(int cpu) { return 0; }
 #endif
+#ifdef CONFIG_SUSPEND_SMP
+extern int disable_nonboot_cpus(void);
+extern void enable_nonboot_cpus(void);
+#else
+static inline int disable_nonboot_cpus(void) { return 0; }
+static inline void enable_nonboot_cpus(void) {}
+#endif
 #endif /* _LINUX_CPU_H_ */
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index 9354722a9217..4d8adf663681 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -63,6 +63,8 @@ static inline int cpuset_do_slab_mem_spread(void)
        return current->flags & PF_SPREAD_SLAB;
 }
+extern void cpuset_track_online_nodes(void);
 #else /* !CONFIG_CPUSETS */
 static inline int cpuset_init_early(void) { return 0; }
@@ -126,6 +128,8 @@ static inline int cpuset_do_slab_mem_spread(void)
        return 0;
 }
+static inline void cpuset_track_online_nodes(void) {}
 #endif /* !CONFIG_CPUSETS */
 #endif /* _LINUX_CPUSET_H */
diff --git a/include/linux/cramfs_fs.h b/include/linux/cramfs_fs.h
index a41f38428c37..1dba681e428d 100644
--- a/include/linux/cramfs_fs.h
+++ b/include/linux/cramfs_fs.h
@@ -87,6 +87,6 @@ struct cramfs_super {
 /* Uncompression interfaces to the underlying zlib */
 int cramfs_uncompress_block(void *dst, int dstlen, void *src, int srclen);
 int cramfs_uncompress_init(void);
-int cramfs_uncompress_exit(void);
+void cramfs_uncompress_exit(void);
 #endif
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 7f946241b879..8f2ffa4caabf 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -17,20 +17,36 @@
 #ifndef _LINUX_CRYPTO_H
 #define _LINUX_CRYPTO_H
+#include <asm/atomic.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/types.h>
 #include <linux/list.h>
+#include <linux/slab.h>
 #include <linux/string.h>
-#include <asm/page.h>
+#include <linux/uaccess.h>
 /*
 * Algorithm masks and types.
 */
-#define CRYPTO_ALG_TYPE_MASK            0x000000ff
+#define CRYPTO_ALG_TYPE_MASK            0x0000000f
 #define CRYPTO_ALG_TYPE_CIPHER          0x00000001
 #define CRYPTO_ALG_TYPE_DIGEST          0x00000002
-#define CRYPTO_ALG_TYPE_COMPRESS        0x00000004
+#define CRYPTO_ALG_TYPE_HASH            0x00000003
+#define CRYPTO_ALG_TYPE_BLKCIPHER       0x00000004
+#define CRYPTO_ALG_TYPE_COMPRESS        0x00000005
+#define CRYPTO_ALG_TYPE_HASH_MASK       0x0000000e
+#define CRYPTO_ALG_LARVAL               0x00000010
+#define CRYPTO_ALG_DEAD                 0x00000020
+#define CRYPTO_ALG_DYING                0x00000040
+#define CRYPTO_ALG_ASYNC                0x00000080
+/*
+ * Set this bit if and only if the algorithm requires another algorithm of
+ * the same type to handle corner cases.
+ */
+#define CRYPTO_ALG_NEED_FALLBACK        0x00000100
 /*
 * Transform masks and values (for crt_flags).
@@ -61,8 +77,37 @@
 #define CRYPTO_DIR_ENCRYPT              1
 #define CRYPTO_DIR_DECRYPT              0
+/*
+ * The macro CRYPTO_MINALIGN_ATTR (along with the void * type in the actual
+ * declaration) is used to ensure that the crypto_tfm context structure is
+ * aligned correctly for the given architecture so that there are no alignment
+ * faults for C data types.  In particular, this is required on platforms such
+ * as arm where pointers are 32-bit aligned but there are data types such as
+ * u64 which require 64-bit alignment.
+ */
+#if defined(ARCH_KMALLOC_MINALIGN)
+#define CRYPTO_MINALIGN ARCH_KMALLOC_MINALIGN
+#elif defined(ARCH_SLAB_MINALIGN)
+#define CRYPTO_MINALIGN ARCH_SLAB_MINALIGN
+#endif
+#ifdef CRYPTO_MINALIGN
+#define CRYPTO_MINALIGN_ATTR __attribute__ ((__aligned__(CRYPTO_MINALIGN)))
+#else
+#define CRYPTO_MINALIGN_ATTR
+#endif
 struct scatterlist;
+struct crypto_blkcipher;
+struct crypto_hash;
 struct crypto_tfm;
+struct crypto_type;
+struct blkcipher_desc {
+        struct crypto_blkcipher *tfm;
+        void *info;
+        u32 flags;
+};
 struct cipher_desc {
        struct crypto_tfm *tfm;
@@ -72,30 +117,50 @@ struct cipher_desc {
        void *info;
 };
+struct hash_desc {
+        struct crypto_hash *tfm;
+        u32 flags;
+};
 /*
 * Algorithms: modular crypto algorithm implementations, managed
 * via crypto_register_alg() and crypto_unregister_alg().
 */
+struct blkcipher_alg {
+        int (*setkey)(struct crypto_tfm *tfm, const u8 *key,
+                      unsigned int keylen);
+        int (*encrypt)(struct blkcipher_desc *desc,
+                       struct scatterlist *dst, struct scatterlist *src,
+                       unsigned int nbytes);
+        int (*decrypt)(struct blkcipher_desc *desc,
+                       struct scatterlist *dst, struct scatterlist *src,
+                       unsigned int nbytes);
+        unsigned int min_keysize;
+        unsigned int max_keysize;
+        unsigned int ivsize;
+};
 struct cipher_alg {
        unsigned int cia_min_keysize;
        unsigned int cia_max_keysize;
        int (*cia_setkey)(struct crypto_tfm *tfm, const u8 *key,
-                          unsigned int keylen, u32 *flags);
+                          unsigned int keylen);
        void (*cia_encrypt)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
        void (*cia_decrypt)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
        unsigned int (*cia_encrypt_ecb)(const struct cipher_desc *desc,
                                        u8 *dst, const u8 *src,
-                                        unsigned int nbytes);
+                                        unsigned int nbytes) __deprecated;
        unsigned int (*cia_decrypt_ecb)(const struct cipher_desc *desc,
                                        u8 *dst, const u8 *src,
-                                        unsigned int nbytes);
+                                        unsigned int nbytes) __deprecated;
        unsigned int (*cia_encrypt_cbc)(const struct cipher_desc *desc,
                                        u8 *dst, const u8 *src,
-                                        unsigned int nbytes);
+                                        unsigned int nbytes) __deprecated;
        unsigned int (*cia_decrypt_cbc)(const struct cipher_desc *desc,
                                        u8 *dst, const u8 *src,
-                                        unsigned int nbytes);
+                                        unsigned int nbytes) __deprecated;
 };
 struct digest_alg {
@@ -105,7 +170,20 @@ struct digest_alg {
                           unsigned int len);
        void (*dia_final)(struct crypto_tfm *tfm, u8 *out);
        int (*dia_setkey)(struct crypto_tfm *tfm, const u8 *key,
-                          unsigned int keylen, u32 *flags);
+                          unsigned int keylen);
+};
+struct hash_alg {
+        int (*init)(struct hash_desc *desc);
+        int (*update)(struct hash_desc *desc, struct scatterlist *sg,
+                      unsigned int nbytes);
+        int (*final)(struct hash_desc *desc, u8 *out);
+        int (*digest)(struct hash_desc *desc, struct scatterlist *sg,
+                      unsigned int nbytes, u8 *out);
+        int (*setkey)(struct crypto_hash *tfm, const u8 *key,
+                      unsigned int keylen);
+        unsigned int digestsize;
 };
 struct compress_alg {
@@ -115,30 +193,40 @@ struct compress_alg {
                              unsigned int slen, u8 *dst, unsigned int *dlen);
 };
+#define cra_blkcipher   cra_u.blkcipher
 #define cra_cipher      cra_u.cipher
 #define cra_digest      cra_u.digest
+#define cra_hash        cra_u.hash
 #define cra_compress    cra_u.compress
 struct crypto_alg {
        struct list_head cra_list;
+        struct list_head cra_users;
        u32 cra_flags;
        unsigned int cra_blocksize;
        unsigned int cra_ctxsize;
        unsigned int cra_alignmask;
        int cra_priority;
+        atomic_t cra_refcnt;
        char cra_name[CRYPTO_MAX_ALG_NAME];
        char cra_driver_name[CRYPTO_MAX_ALG_NAME];
+        const struct crypto_type *cra_type;
        union {
+                struct blkcipher_alg blkcipher;
                struct cipher_alg cipher;
                struct digest_alg digest;
+                struct hash_alg hash;
                struct compress_alg compress;
        } cra_u;
        int (*cra_init)(struct crypto_tfm *tfm);
        void (*cra_exit)(struct crypto_tfm *tfm);
+        void (*cra_destroy)(struct crypto_alg *alg);
        
        struct module *cra_module;
 };
@@ -153,20 +241,39 @@ int crypto_unregister_alg(struct crypto_alg *alg);
 * Algorithm query interface.
 */
 #ifdef CONFIG_CRYPTO
-int crypto_alg_available(const char *name, u32 flags);
+int crypto_alg_available(const char *name, u32 flags)
+        __deprecated_for_modules;
+int crypto_has_alg(const char *name, u32 type, u32 mask);
 #else
+static int crypto_alg_available(const char *name, u32 flags);
+        __deprecated_for_modules;
 static inline int crypto_alg_available(const char *name, u32 flags)
 {
        return 0;
 }
+static inline int crypto_has_alg(const char *name, u32 type, u32 mask)
+{
+        return 0;
+}
 #endif
 /*
 * Transforms: user-instantiated objects which encapsulate algorithms
- * and core processing logic.  Managed via crypto_alloc_tfm() and
+ * and core processing logic.  Managed via crypto_alloc_*() and
- * crypto_free_tfm(), as well as the various helpers below.
+ * crypto_free_*(), as well as the various helpers below.
 */
+struct blkcipher_tfm {
+        void *iv;
+        int (*setkey)(struct crypto_tfm *tfm, const u8 *key,
+                      unsigned int keylen);
+        int (*encrypt)(struct blkcipher_desc *desc, struct scatterlist *dst,
+                       struct scatterlist *src, unsigned int nbytes);
+        int (*decrypt)(struct blkcipher_desc *desc, struct scatterlist *dst,
+                       struct scatterlist *src, unsigned int nbytes);
+};
 struct cipher_tfm {
        void *cit_iv;
        unsigned int cit_ivsize;
@@ -190,20 +297,20 @@ struct cipher_tfm {
                           struct scatterlist *src,
                           unsigned int nbytes, u8 *iv);
        void (*cit_xor_block)(u8 *dst, const u8 *src);
+        void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
+        void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
 };
-struct digest_tfm {
+struct hash_tfm {
-        void (*dit_init)(struct crypto_tfm *tfm);
+        int (*init)(struct hash_desc *desc);
-        void (*dit_update)(struct crypto_tfm *tfm,
+        int (*update)(struct hash_desc *desc,
-                           struct scatterlist *sg, unsigned int nsg);
+                      struct scatterlist *sg, unsigned int nsg);
-        void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
+        int (*final)(struct hash_desc *desc, u8 *out);
-        void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
+        int (*digest)(struct hash_desc *desc, struct scatterlist *sg,
-                           unsigned int nsg, u8 *out);
+                      unsigned int nsg, u8 *out);
-        int (*dit_setkey)(struct crypto_tfm *tfm,
+        int (*setkey)(struct crypto_hash *tfm, const u8 *key,
-                          const u8 *key, unsigned int keylen);
+                      unsigned int keylen);
-#ifdef CONFIG_CRYPTO_HMAC
+        unsigned int digestsize;
-        void *dit_hmac_block;
-#endif
 };
 struct compress_tfm {
@@ -215,8 +322,9 @@ struct compress_tfm {
                              u8 *dst, unsigned int *dlen);
 };
+#define crt_blkcipher   crt_u.blkcipher
 #define crt_cipher      crt_u.cipher
-#define crt_digest      crt_u.digest
+#define crt_hash        crt_u.hash
 #define crt_compress    crt_u.compress
 struct crypto_tfm {
@@ -224,30 +332,43 @@ struct crypto_tfm {
        u32 crt_flags;
        
        union {
+                struct blkcipher_tfm blkcipher;
                struct cipher_tfm cipher;
-                struct digest_tfm digest;
+                struct hash_tfm hash;
                struct compress_tfm compress;
        } crt_u;
        
        struct crypto_alg *__crt_alg;
-        char __crt_ctx[] __attribute__ ((__aligned__));
+        void *__crt_ctx[] CRYPTO_MINALIGN_ATTR;
+};
+#define crypto_cipher crypto_tfm
+#define crypto_comp crypto_tfm
+struct crypto_blkcipher {
+        struct crypto_tfm base;
+};
+struct crypto_hash {
+        struct crypto_tfm base;
+};
+enum {
+        CRYPTOA_UNSPEC,
+        CRYPTOA_ALG,
+};
+struct crypto_attr_alg {
+        char name[CRYPTO_MAX_ALG_NAME];
 };
 /* 
 * Transform user interface.
 */
 
-/*
- * crypto_alloc_tfm() will first attempt to locate an already loaded algorithm.
- * If that fails and the kernel supports dynamically loadable modules, it
- * will then attempt to load a module of the same name or alias.  A refcount
- * is grabbed on the algorithm which is then associated with the new transform.
- *
- * crypto_free_tfm() frees up the transform and any associated resources,
- * then drops the refcount on the associated algorithm.
- */
 struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, u32 tfm_flags);
+struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask);
 void crypto_free_tfm(struct crypto_tfm *tfm);
 /*
@@ -258,6 +379,16 @@ static inline const char *crypto_tfm_alg_name(struct crypto_tfm *tfm)
        return tfm->__crt_alg->cra_name;
 }
+static inline const char *crypto_tfm_alg_driver_name(struct crypto_tfm *tfm)
+{
+        return tfm->__crt_alg->cra_driver_name;
+}
+static inline int crypto_tfm_alg_priority(struct crypto_tfm *tfm)
+{
+        return tfm->__crt_alg->cra_priority;
+}
 static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm)
 {
        return module_name(tfm->__crt_alg->cra_module);
@@ -268,18 +399,23 @@ static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)
        return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK;
 }
+static unsigned int crypto_tfm_alg_min_keysize(struct crypto_tfm *tfm)
+        __deprecated;
 static inline unsigned int crypto_tfm_alg_min_keysize(struct crypto_tfm *tfm)
 {
        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
        return tfm->__crt_alg->cra_cipher.cia_min_keysize;
 }
+static unsigned int crypto_tfm_alg_max_keysize(struct crypto_tfm *tfm)
+        __deprecated;
 static inline unsigned int crypto_tfm_alg_max_keysize(struct crypto_tfm *tfm)
 {
        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
        return tfm->__crt_alg->cra_cipher.cia_max_keysize;
 }
+static unsigned int crypto_tfm_alg_ivsize(struct crypto_tfm *tfm) __deprecated;
 static inline unsigned int crypto_tfm_alg_ivsize(struct crypto_tfm *tfm)
 {
        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
@@ -302,6 +438,21 @@ static inline unsigned int crypto_tfm_alg_alignmask(struct crypto_tfm *tfm)
        return tfm->__crt_alg->cra_alignmask;
 }
+static inline u32 crypto_tfm_get_flags(struct crypto_tfm *tfm)
+{
+        return tfm->crt_flags;
+}
+static inline void crypto_tfm_set_flags(struct crypto_tfm *tfm, u32 flags)
+{
+        tfm->crt_flags |= flags;
+}
+static inline void crypto_tfm_clear_flags(struct crypto_tfm *tfm, u32 flags)
+{
+        tfm->crt_flags &= ~flags;
+}
 static inline void *crypto_tfm_ctx(struct crypto_tfm *tfm)
 {
        return tfm->__crt_ctx;
@@ -316,50 +467,374 @@ static inline unsigned int crypto_tfm_ctx_alignment(void)
 /*
 * API wrappers.
 */
-static inline void crypto_digest_init(struct crypto_tfm *tfm)
+static inline struct crypto_blkcipher *__crypto_blkcipher_cast(
+        struct crypto_tfm *tfm)
 {
-        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
+        return (struct crypto_blkcipher *)tfm;
-        tfm->crt_digest.dit_init(tfm);
 }
-static inline void crypto_digest_update(struct crypto_tfm *tfm,
+static inline struct crypto_blkcipher *crypto_blkcipher_cast(
-                                        struct scatterlist *sg,
+        struct crypto_tfm *tfm)
-                                        unsigned int nsg)
 {
-        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
+        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_BLKCIPHER);
-        tfm->crt_digest.dit_update(tfm, sg, nsg);
+        return __crypto_blkcipher_cast(tfm);
 }
-static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
+static inline struct crypto_blkcipher *crypto_alloc_blkcipher(
+        const char *alg_name, u32 type, u32 mask)
 {
-        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
+        type &= ~CRYPTO_ALG_TYPE_MASK;
-        tfm->crt_digest.dit_final(tfm, out);
+        type |= CRYPTO_ALG_TYPE_BLKCIPHER;
+        mask |= CRYPTO_ALG_TYPE_MASK;
+        return __crypto_blkcipher_cast(crypto_alloc_base(alg_name, type, mask));
 }
-static inline void crypto_digest_digest(struct crypto_tfm *tfm,
+static inline struct crypto_tfm *crypto_blkcipher_tfm(
-                                        struct scatterlist *sg,
+        struct crypto_blkcipher *tfm)
-                                        unsigned int nsg, u8 *out)
 {
-        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
+        return &tfm->base;
-        tfm->crt_digest.dit_digest(tfm, sg, nsg, out);
 }
-static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
+static inline void crypto_free_blkcipher(struct crypto_blkcipher *tfm)
+{
+        crypto_free_tfm(crypto_blkcipher_tfm(tfm));
+}
+static inline int crypto_has_blkcipher(const char *alg_name, u32 type, u32 mask)
+{
+        type &= ~CRYPTO_ALG_TYPE_MASK;
+        type |= CRYPTO_ALG_TYPE_BLKCIPHER;
+        mask |= CRYPTO_ALG_TYPE_MASK;
+        return crypto_has_alg(alg_name, type, mask);
+}
+static inline const char *crypto_blkcipher_name(struct crypto_blkcipher *tfm)
+{
+        return crypto_tfm_alg_name(crypto_blkcipher_tfm(tfm));
+}
+static inline struct blkcipher_tfm *crypto_blkcipher_crt(
+        struct crypto_blkcipher *tfm)
+{
+        return &crypto_blkcipher_tfm(tfm)->crt_blkcipher;
+}
+static inline struct blkcipher_alg *crypto_blkcipher_alg(
+        struct crypto_blkcipher *tfm)
+{
+        return &crypto_blkcipher_tfm(tfm)->__crt_alg->cra_blkcipher;
+}
+static inline unsigned int crypto_blkcipher_ivsize(struct crypto_blkcipher *tfm)
+{
+        return crypto_blkcipher_alg(tfm)->ivsize;
+}
+static inline unsigned int crypto_blkcipher_blocksize(
+        struct crypto_blkcipher *tfm)
+{
+        return crypto_tfm_alg_blocksize(crypto_blkcipher_tfm(tfm));
+}
+static inline unsigned int crypto_blkcipher_alignmask(
+        struct crypto_blkcipher *tfm)
+{
+        return crypto_tfm_alg_alignmask(crypto_blkcipher_tfm(tfm));
+}
+static inline u32 crypto_blkcipher_get_flags(struct crypto_blkcipher *tfm)
+{
+        return crypto_tfm_get_flags(crypto_blkcipher_tfm(tfm));
+}
+static inline void crypto_blkcipher_set_flags(struct crypto_blkcipher *tfm,
+                                              u32 flags)
+{
+        crypto_tfm_set_flags(crypto_blkcipher_tfm(tfm), flags);
+}
+static inline void crypto_blkcipher_clear_flags(struct crypto_blkcipher *tfm,
+                                                u32 flags)
+{
+        crypto_tfm_clear_flags(crypto_blkcipher_tfm(tfm), flags);
+}
+static inline int crypto_blkcipher_setkey(struct crypto_blkcipher *tfm,
+                                          const u8 *key, unsigned int keylen)
+{
+        return crypto_blkcipher_crt(tfm)->setkey(crypto_blkcipher_tfm(tfm),
+                                                 key, keylen);
+}
+static inline int crypto_blkcipher_encrypt(struct blkcipher_desc *desc,
+                                           struct scatterlist *dst,
+                                           struct scatterlist *src,
+                                           unsigned int nbytes)
+{
+        desc->info = crypto_blkcipher_crt(desc->tfm)->iv;
+        return crypto_blkcipher_crt(desc->tfm)->encrypt(desc, dst, src, nbytes);
+}
+static inline int crypto_blkcipher_encrypt_iv(struct blkcipher_desc *desc,
+                                              struct scatterlist *dst,
+                                              struct scatterlist *src,
+                                              unsigned int nbytes)
+{
+        return crypto_blkcipher_crt(desc->tfm)->encrypt(desc, dst, src, nbytes);
+}
+static inline int crypto_blkcipher_decrypt(struct blkcipher_desc *desc,
+                                           struct scatterlist *dst,
+                                           struct scatterlist *src,
+                                           unsigned int nbytes)
+{
+        desc->info = crypto_blkcipher_crt(desc->tfm)->iv;
+        return crypto_blkcipher_crt(desc->tfm)->decrypt(desc, dst, src, nbytes);
+}
+static inline int crypto_blkcipher_decrypt_iv(struct blkcipher_desc *desc,
+                                              struct scatterlist *dst,
+                                              struct scatterlist *src,
+                                              unsigned int nbytes)
+{
+        return crypto_blkcipher_crt(desc->tfm)->decrypt(desc, dst, src, nbytes);
+}
+static inline void crypto_blkcipher_set_iv(struct crypto_blkcipher *tfm,
+                                           const u8 *src, unsigned int len)
+{
+        memcpy(crypto_blkcipher_crt(tfm)->iv, src, len);
+}
+static inline void crypto_blkcipher_get_iv(struct crypto_blkcipher *tfm,
+                                           u8 *dst, unsigned int len)
+{
+        memcpy(dst, crypto_blkcipher_crt(tfm)->iv, len);
+}
+static inline struct crypto_cipher *__crypto_cipher_cast(struct crypto_tfm *tfm)
+{
+        return (struct crypto_cipher *)tfm;
+}
+static inline struct crypto_cipher *crypto_cipher_cast(struct crypto_tfm *tfm)
+{
+        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
+        return __crypto_cipher_cast(tfm);
+}
+static inline struct crypto_cipher *crypto_alloc_cipher(const char *alg_name,
+                                                        u32 type, u32 mask)
+{
+        type &= ~CRYPTO_ALG_TYPE_MASK;
+        type |= CRYPTO_ALG_TYPE_CIPHER;
+        mask |= CRYPTO_ALG_TYPE_MASK;
+        return __crypto_cipher_cast(crypto_alloc_base(alg_name, type, mask));
+}
+static inline struct crypto_tfm *crypto_cipher_tfm(struct crypto_cipher *tfm)
+{
+        return tfm;
+}
+static inline void crypto_free_cipher(struct crypto_cipher *tfm)
+{
+        crypto_free_tfm(crypto_cipher_tfm(tfm));
+}
+static inline int crypto_has_cipher(const char *alg_name, u32 type, u32 mask)
+{
+        type &= ~CRYPTO_ALG_TYPE_MASK;
+        type |= CRYPTO_ALG_TYPE_CIPHER;
+        mask |= CRYPTO_ALG_TYPE_MASK;
+        return crypto_has_alg(alg_name, type, mask);
+}
+static inline struct cipher_tfm *crypto_cipher_crt(struct crypto_cipher *tfm)
+{
+        return &crypto_cipher_tfm(tfm)->crt_cipher;
+}
+static inline unsigned int crypto_cipher_blocksize(struct crypto_cipher *tfm)
+{
+        return crypto_tfm_alg_blocksize(crypto_cipher_tfm(tfm));
+}
+static inline unsigned int crypto_cipher_alignmask(struct crypto_cipher *tfm)
+{
+        return crypto_tfm_alg_alignmask(crypto_cipher_tfm(tfm));
+}
+static inline u32 crypto_cipher_get_flags(struct crypto_cipher *tfm)
+{
+        return crypto_tfm_get_flags(crypto_cipher_tfm(tfm));
+}
+static inline void crypto_cipher_set_flags(struct crypto_cipher *tfm,
+                                           u32 flags)
+{
+        crypto_tfm_set_flags(crypto_cipher_tfm(tfm), flags);
+}
+static inline void crypto_cipher_clear_flags(struct crypto_cipher *tfm,
+                                             u32 flags)
+{
+        crypto_tfm_clear_flags(crypto_cipher_tfm(tfm), flags);
+}
+static inline int crypto_cipher_setkey(struct crypto_cipher *tfm,
                                       const u8 *key, unsigned int keylen)
 {
-        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
+        return crypto_cipher_crt(tfm)->cit_setkey(crypto_cipher_tfm(tfm),
-        if (tfm->crt_digest.dit_setkey == NULL)
+                                                  key, keylen);
-                return -ENOSYS;
+}
-        return tfm->crt_digest.dit_setkey(tfm, key, keylen);
+static inline void crypto_cipher_encrypt_one(struct crypto_cipher *tfm,
+                                             u8 *dst, const u8 *src)
+{
+        crypto_cipher_crt(tfm)->cit_encrypt_one(crypto_cipher_tfm(tfm),
+                                                dst, src);
+}
+static inline void crypto_cipher_decrypt_one(struct crypto_cipher *tfm,
+                                             u8 *dst, const u8 *src)
+{
+        crypto_cipher_crt(tfm)->cit_decrypt_one(crypto_cipher_tfm(tfm),
+                                                dst, src);
+}
+void crypto_digest_init(struct crypto_tfm *tfm) __deprecated_for_modules;
+void crypto_digest_update(struct crypto_tfm *tfm,
+                          struct scatterlist *sg, unsigned int nsg)
+        __deprecated_for_modules;
+void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
+        __deprecated_for_modules;
+void crypto_digest_digest(struct crypto_tfm *tfm,
+                          struct scatterlist *sg, unsigned int nsg, u8 *out)
+        __deprecated_for_modules;
+static inline struct crypto_hash *__crypto_hash_cast(struct crypto_tfm *tfm)
+{
+        return (struct crypto_hash *)tfm;
+}
+static inline struct crypto_hash *crypto_hash_cast(struct crypto_tfm *tfm)
+{
+        BUG_ON((crypto_tfm_alg_type(tfm) ^ CRYPTO_ALG_TYPE_HASH) &
+               CRYPTO_ALG_TYPE_HASH_MASK);
+        return __crypto_hash_cast(tfm);
 }
-static inline int crypto_cipher_setkey(struct crypto_tfm *tfm,
+static int crypto_digest_setkey(struct crypto_tfm *tfm, const u8 *key,
+                                unsigned int keylen) __deprecated;
+static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
                                       const u8 *key, unsigned int keylen)
 {
-        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
+        return tfm->crt_hash.setkey(crypto_hash_cast(tfm), key, keylen);
-        return tfm->crt_cipher.cit_setkey(tfm, key, keylen);
+}
+static inline struct crypto_hash *crypto_alloc_hash(const char *alg_name,
+                                                    u32 type, u32 mask)
+{
+        type &= ~CRYPTO_ALG_TYPE_MASK;
+        type |= CRYPTO_ALG_TYPE_HASH;
+        mask |= CRYPTO_ALG_TYPE_HASH_MASK;
+        return __crypto_hash_cast(crypto_alloc_base(alg_name, type, mask));
+}
+static inline struct crypto_tfm *crypto_hash_tfm(struct crypto_hash *tfm)
+{
+        return &tfm->base;
+}
+static inline void crypto_free_hash(struct crypto_hash *tfm)
+{
+        crypto_free_tfm(crypto_hash_tfm(tfm));
+}
+static inline int crypto_has_hash(const char *alg_name, u32 type, u32 mask)
+{
+        type &= ~CRYPTO_ALG_TYPE_MASK;
+        type |= CRYPTO_ALG_TYPE_HASH;
+        mask |= CRYPTO_ALG_TYPE_HASH_MASK;
+        return crypto_has_alg(alg_name, type, mask);
+}
+static inline struct hash_tfm *crypto_hash_crt(struct crypto_hash *tfm)
+{
+        return &crypto_hash_tfm(tfm)->crt_hash;
+}
+static inline unsigned int crypto_hash_blocksize(struct crypto_hash *tfm)
+{
+        return crypto_tfm_alg_blocksize(crypto_hash_tfm(tfm));
+}
+static inline unsigned int crypto_hash_alignmask(struct crypto_hash *tfm)
+{
+        return crypto_tfm_alg_alignmask(crypto_hash_tfm(tfm));
+}
+static inline unsigned int crypto_hash_digestsize(struct crypto_hash *tfm)
+{
+        return crypto_hash_crt(tfm)->digestsize;
+}
+static inline u32 crypto_hash_get_flags(struct crypto_hash *tfm)
+{
+        return crypto_tfm_get_flags(crypto_hash_tfm(tfm));
+}
+static inline void crypto_hash_set_flags(struct crypto_hash *tfm, u32 flags)
+{
+        crypto_tfm_set_flags(crypto_hash_tfm(tfm), flags);
 }
+static inline void crypto_hash_clear_flags(struct crypto_hash *tfm, u32 flags)
+{
+        crypto_tfm_clear_flags(crypto_hash_tfm(tfm), flags);
+}
+static inline int crypto_hash_init(struct hash_desc *desc)
+{
+        return crypto_hash_crt(desc->tfm)->init(desc);
+}
+static inline int crypto_hash_update(struct hash_desc *desc,
+                                     struct scatterlist *sg,
+                                     unsigned int nbytes)
+{
+        return crypto_hash_crt(desc->tfm)->update(desc, sg, nbytes);
+}
+static inline int crypto_hash_final(struct hash_desc *desc, u8 *out)
+{
+        return crypto_hash_crt(desc->tfm)->final(desc, out);
+}
+static inline int crypto_hash_digest(struct hash_desc *desc,
+                                     struct scatterlist *sg,
+                                     unsigned int nbytes, u8 *out)
+{
+        return crypto_hash_crt(desc->tfm)->digest(desc, sg, nbytes, out);
+}
+static inline int crypto_hash_setkey(struct crypto_hash *hash,
+                                     const u8 *key, unsigned int keylen)
+{
+        return crypto_hash_crt(hash)->setkey(hash, key, keylen);
+}
+static int crypto_cipher_encrypt(struct crypto_tfm *tfm,
+                                 struct scatterlist *dst,
+                                 struct scatterlist *src,
+                                 unsigned int nbytes) __deprecated;
 static inline int crypto_cipher_encrypt(struct crypto_tfm *tfm,
                                        struct scatterlist *dst,
                                        struct scatterlist *src,
@@ -369,16 +844,23 @@ static inline int crypto_cipher_encrypt(struct crypto_tfm *tfm,
        return tfm->crt_cipher.cit_encrypt(tfm, dst, src, nbytes);
 }                                        
+static int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
+                                    struct scatterlist *dst,
+                                    struct scatterlist *src,
+                                    unsigned int nbytes, u8 *iv) __deprecated;
 static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
                                           struct scatterlist *dst,
                                           struct scatterlist *src,
                                           unsigned int nbytes, u8 *iv)
 {
        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
-        BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
        return tfm->crt_cipher.cit_encrypt_iv(tfm, dst, src, nbytes, iv);
 }                                        
+static int crypto_cipher_decrypt(struct crypto_tfm *tfm,
+                                 struct scatterlist *dst,
+                                 struct scatterlist *src,
+                                 unsigned int nbytes) __deprecated;
 static inline int crypto_cipher_decrypt(struct crypto_tfm *tfm,
                                        struct scatterlist *dst,
                                        struct scatterlist *src,
@@ -388,16 +870,21 @@ static inline int crypto_cipher_decrypt(struct crypto_tfm *tfm,
        return tfm->crt_cipher.cit_decrypt(tfm, dst, src, nbytes);
 }
+static int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
+                                    struct scatterlist *dst,
+                                    struct scatterlist *src,
+                                    unsigned int nbytes, u8 *iv) __deprecated;
 static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
                                           struct scatterlist *dst,
                                           struct scatterlist *src,
                                           unsigned int nbytes, u8 *iv)
 {
        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
-        BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
        return tfm->crt_cipher.cit_decrypt_iv(tfm, dst, src, nbytes, iv);
 }
+static void crypto_cipher_set_iv(struct crypto_tfm *tfm,
+                                 const u8 *src, unsigned int len) __deprecated;
 static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm,
                                        const u8 *src, unsigned int len)
 {
@@ -405,6 +892,8 @@ static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm,
        memcpy(tfm->crt_cipher.cit_iv, src, len);
 }
+static void crypto_cipher_get_iv(struct crypto_tfm *tfm,
+                                 u8 *dst, unsigned int len) __deprecated;
 static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm,
                                        u8 *dst, unsigned int len)
 {
@@ -412,34 +901,70 @@ static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm,
        memcpy(dst, tfm->crt_cipher.cit_iv, len);
 }
-static inline int crypto_comp_compress(struct crypto_tfm *tfm,
+static inline struct crypto_comp *__crypto_comp_cast(struct crypto_tfm *tfm)
+{
+        return (struct crypto_comp *)tfm;
+}
+static inline struct crypto_comp *crypto_comp_cast(struct crypto_tfm *tfm)
+{
+        BUG_ON((crypto_tfm_alg_type(tfm) ^ CRYPTO_ALG_TYPE_COMPRESS) &
+               CRYPTO_ALG_TYPE_MASK);
+        return __crypto_comp_cast(tfm);
+}
+static inline struct crypto_comp *crypto_alloc_comp(const char *alg_name,
+                                                    u32 type, u32 mask)
+{
+        type &= ~CRYPTO_ALG_TYPE_MASK;
+        type |= CRYPTO_ALG_TYPE_COMPRESS;
+        mask |= CRYPTO_ALG_TYPE_MASK;
+        return __crypto_comp_cast(crypto_alloc_base(alg_name, type, mask));
+}
+static inline struct crypto_tfm *crypto_comp_tfm(struct crypto_comp *tfm)
+{
+        return tfm;
+}
+static inline void crypto_free_comp(struct crypto_comp *tfm)
+{
+        crypto_free_tfm(crypto_comp_tfm(tfm));
+}
+static inline int crypto_has_comp(const char *alg_name, u32 type, u32 mask)
+{
+        type &= ~CRYPTO_ALG_TYPE_MASK;
+        type |= CRYPTO_ALG_TYPE_COMPRESS;
+        mask |= CRYPTO_ALG_TYPE_MASK;
+        return crypto_has_alg(alg_name, type, mask);
+}
+static inline const char *crypto_comp_name(struct crypto_comp *tfm)
+{
+        return crypto_tfm_alg_name(crypto_comp_tfm(tfm));
+}
+static inline struct compress_tfm *crypto_comp_crt(struct crypto_comp *tfm)
+{
+        return &crypto_comp_tfm(tfm)->crt_compress;
+}
+static inline int crypto_comp_compress(struct crypto_comp *tfm,
                                       const u8 *src, unsigned int slen,
                                       u8 *dst, unsigned int *dlen)
 {
-        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
+        return crypto_comp_crt(tfm)->cot_compress(tfm, src, slen, dst, dlen);
-        return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen);
 }
-static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
+static inline int crypto_comp_decompress(struct crypto_comp *tfm,
                                         const u8 *src, unsigned int slen,
                                         u8 *dst, unsigned int *dlen)
 {
-        BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
+        return crypto_comp_crt(tfm)->cot_decompress(tfm, src, slen, dst, dlen);
-        return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);
 }
-/*
- * HMAC support.
- */
-#ifdef CONFIG_CRYPTO_HMAC
-void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen);
-void crypto_hmac_update(struct crypto_tfm *tfm,
-                        struct scatterlist *sg, unsigned int nsg);
-void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
-                       unsigned int *keylen, u8 *out);
-void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
-                 struct scatterlist *sg, unsigned int nsg, u8 *out);
-#endif  /* CONFIG_CRYPTO_HMAC */
 #endif  /* _LINUX_CRYPTO_H */
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 471781ffeab1..44605be59409 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -221,6 +221,7 @@ static inline int dname_external(struct dentry *dentry)
 */
 extern void d_instantiate(struct dentry *, struct inode *);
 extern struct dentry * d_instantiate_unique(struct dentry *, struct inode *);
+extern struct dentry * d_materialise_unique(struct dentry *, struct inode *);
 extern void d_delete(struct dentry *);
 /* allocate/de-allocate */
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 676333b9fad0..d6f4ec467a4b 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -169,6 +169,12 @@ enum {
        DCCPO_MAX_CCID_SPECIFIC = 255,
 };
+/* DCCP CCIDS */
+enum {
+        DCCPC_CCID2 = 2,
+        DCCPC_CCID3 = 3,
+};
 /* DCCP features */
 enum {
        DCCPF_RESERVED = 0,
@@ -320,7 +326,7 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
 /* initial values for each feature */
 #define DCCPF_INITIAL_SEQUENCE_WINDOW           100
 #define DCCPF_INITIAL_ACK_RATIO                 2
-#define DCCPF_INITIAL_CCID                      2
+#define DCCPF_INITIAL_CCID                      DCCPC_CCID2
 #define DCCPF_INITIAL_SEND_ACK_VECTOR           1
 /* FIXME: for now we're default to 1 but it should really be 0 */
 #define DCCPF_INITIAL_SEND_NDP_COUNT            1
@@ -404,6 +410,7 @@ struct dccp_service_list {
 };
 #define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1)
+#define DCCP_SERVICE_CODE_IS_ABSENT              0
 static inline int dccp_list_has_service(const struct dccp_service_list *sl,
                                        const __be32 service)
@@ -438,6 +445,7 @@ struct dccp_ackvec;
 * @dccps_role - Role of this sock, one of %dccp_role
 * @dccps_ndp_count - number of Non Data Packets since last data packet
 * @dccps_hc_rx_ackvec - rx half connection ack vector
+ * @dccps_xmit_timer - timer for when CCID is not ready to send
 */
 struct dccp_sock {
        /* inet_connection_sock has to be the first member of dccp_sock */
@@ -470,6 +478,7 @@ struct dccp_sock {
        enum dccp_role                  dccps_role:2;
        __u8                            dccps_hc_rx_insert_options:1;
        __u8                            dccps_hc_tx_insert_options:1;
+        struct timer_list               dccps_xmit_timer;
 };
 
 static inline struct dccp_sock *dccp_sk(const struct sock *sk)
@@ -482,11 +491,6 @@ static inline struct dccp_minisock *dccp_msk(const struct sock *sk)
        return (struct dccp_minisock *)&dccp_sk(sk)->dccps_minisock;
 }
-static inline int dccp_service_not_initialized(const struct sock *sk)
-{
-        return dccp_sk(sk)->dccps_service == DCCP_SERVICE_INVALID_VALUE;
-}
 static inline const char *dccp_role(const struct sock *sk)
 {
        switch (dccp_sk(sk)->dccps_role) {
diff --git a/include/linux/device.h b/include/linux/device.h
index 1e5f30da98bc..662e6a10144e 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -15,6 +15,7 @@
 #include <linux/kobject.h>
 #include <linux/klist.h>
 #include <linux/list.h>
+#include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pm.h>
@@ -51,14 +52,17 @@ struct bus_type {
        int             (*probe)(struct device * dev);
        int             (*remove)(struct device * dev);
        void            (*shutdown)(struct device * dev);
-        int             (*suspend)(struct device * dev, pm_message_t state);
-        int             (*resume)(struct device * dev);
+        int (*suspend)(struct device * dev, pm_message_t state);
+        int (*suspend_late)(struct device * dev, pm_message_t state);
+        int (*resume_early)(struct device * dev);
+        int (*resume)(struct device * dev);
 };
-extern int bus_register(struct bus_type * bus);
+extern int __must_check bus_register(struct bus_type * bus);
 extern void bus_unregister(struct bus_type * bus);
-extern void bus_rescan_devices(struct bus_type * bus);
+extern int __must_check bus_rescan_devices(struct bus_type * bus);
 /* iterator helpers for buses */
@@ -67,9 +71,9 @@ int bus_for_each_dev(struct bus_type * bus, struct device * start, void * data,
 struct device * bus_find_device(struct bus_type *bus, struct device *start,
                                void *data, int (*match)(struct device *, void *));
-int bus_for_each_drv(struct bus_type * bus, struct device_driver * start, 
+int __must_check bus_for_each_drv(struct bus_type *bus,
-                     void * data, int (*fn)(struct device_driver *, void *));
+                struct device_driver *start, void *data,
+                int (*fn)(struct device_driver *, void *));
 /* driverfs interface for exporting bus attributes */
@@ -82,7 +86,8 @@ struct bus_attribute {
 #define BUS_ATTR(_name,_mode,_show,_store)      \
 struct bus_attribute bus_attr_##_name = __ATTR(_name,_mode,_show,_store)
-extern int bus_create_file(struct bus_type *, struct bus_attribute *);
+extern int __must_check bus_create_file(struct bus_type *,
+                                        struct bus_attribute *);
 extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
 struct device_driver {
@@ -101,16 +106,18 @@ struct device_driver {
        void    (*shutdown)     (struct device * dev);
        int     (*suspend)      (struct device * dev, pm_message_t state);
        int     (*resume)       (struct device * dev);
+        unsigned int multithread_probe:1;
 };
-extern int driver_register(struct device_driver * drv);
+extern int __must_check driver_register(struct device_driver * drv);
 extern void driver_unregister(struct device_driver * drv);
 extern struct device_driver * get_driver(struct device_driver * drv);
 extern void put_driver(struct device_driver * drv);
 extern struct device_driver *driver_find(const char *name, struct bus_type *bus);
+extern int driver_probe_done(void);
 /* driverfs interface for exporting driver attributes */
@@ -123,16 +130,17 @@ struct driver_attribute {
 #define DRIVER_ATTR(_name,_mode,_show,_store)   \
 struct driver_attribute driver_attr_##_name = __ATTR(_name,_mode,_show,_store)
-extern int driver_create_file(struct device_driver *, struct driver_attribute *);
+extern int __must_check driver_create_file(struct device_driver *,
+                                        struct driver_attribute *);
 extern void driver_remove_file(struct device_driver *, struct driver_attribute *);
-extern int driver_for_each_device(struct device_driver * drv, struct device * start,
+extern int __must_check driver_for_each_device(struct device_driver * drv,
-                                  void * data, int (*fn)(struct device *, void *));
+                struct device *start, void *data,
+                int (*fn)(struct device *, void *));
 struct device * driver_find_device(struct device_driver *drv,
                                   struct device *start, void *data,
                                   int (*match)(struct device *, void *));
 /*
 * device classes
 */
@@ -146,17 +154,26 @@ struct class {
        struct list_head        interfaces;
        struct semaphore        sem;    /* locks both the children and interfaces lists */
+        struct kobject          *virtual_dir;
        struct class_attribute          * class_attrs;
        struct class_device_attribute   * class_dev_attrs;
+        struct device_attribute         * dev_attrs;
        int     (*uevent)(struct class_device *dev, char **envp,
                           int num_envp, char *buffer, int buffer_size);
+        int     (*dev_uevent)(struct device *dev, char **envp, int num_envp,
+                                char *buffer, int buffer_size);
        void    (*release)(struct class_device *dev);
        void    (*class_release)(struct class *class);
+        void    (*dev_release)(struct device *dev);
+        int     (*suspend)(struct device *, pm_message_t state);
+        int     (*resume)(struct device *);
 };
-extern int class_register(struct class *);
+extern int __must_check class_register(struct class *);
 extern void class_unregister(struct class *);
@@ -169,7 +186,8 @@ struct class_attribute {
 #define CLASS_ATTR(_name,_mode,_show,_store)                    \
 struct class_attribute class_attr_##_name = __ATTR(_name,_mode,_show,_store) 
-extern int class_create_file(struct class *, const struct class_attribute *);
+extern int __must_check class_create_file(struct class *,
+                                        const struct class_attribute *);
 extern void class_remove_file(struct class *, const struct class_attribute *);
 struct class_device_attribute {
@@ -182,7 +200,7 @@ struct class_device_attribute {
 struct class_device_attribute class_device_attr_##_name =       \
        __ATTR(_name,_mode,_show,_store)
-extern int class_device_create_file(struct class_device *,
+extern int __must_check class_device_create_file(struct class_device *,
                                    const struct class_device_attribute *);
 /**
@@ -242,10 +260,10 @@ class_set_devdata (struct class_device *dev, void *data)
 }
-extern int class_device_register(struct class_device *);
+extern int __must_check class_device_register(struct class_device *);
 extern void class_device_unregister(struct class_device *);
 extern void class_device_initialize(struct class_device *);
-extern int class_device_add(struct class_device *);
+extern int __must_check class_device_add(struct class_device *);
 extern void class_device_del(struct class_device *);
 extern int class_device_rename(struct class_device *, char *);
@@ -255,7 +273,7 @@ extern void class_device_put(struct class_device *);
 extern void class_device_remove_file(struct class_device *, 
                                     const struct class_device_attribute *);
-extern int class_device_create_bin_file(struct class_device *,
+extern int __must_check class_device_create_bin_file(struct class_device *,
                                        struct bin_attribute *);
 extern void class_device_remove_bin_file(struct class_device *,
                                         struct bin_attribute *);
@@ -266,22 +284,23 @@ struct class_interface {
        int (*add)      (struct class_device *, struct class_interface *);
        void (*remove)  (struct class_device *, struct class_interface *);
+        int (*add_dev)          (struct device *, struct class_interface *);
+        void (*remove_dev)      (struct device *, struct class_interface *);
 };
-extern int class_interface_register(struct class_interface *);
+extern int __must_check class_interface_register(struct class_interface *);
 extern void class_interface_unregister(struct class_interface *);
-extern struct class *class_create(struct module *owner, char *name);
+extern struct class *class_create(struct module *owner, const char *name);
 extern void class_destroy(struct class *cls);
 extern struct class_device *class_device_create(struct class *cls,
                                                struct class_device *parent,
                                                dev_t devt,
                                                struct device *device,
-                                                char *fmt, ...)
+                                                const char *fmt, ...)
                                        __attribute__((format(printf,5,6)));
 extern void class_device_destroy(struct class *cls, dev_t devt);
 /* interface for exporting device attributes */
 struct device_attribute {
        struct attribute        attr;
@@ -294,8 +313,13 @@ struct device_attribute {
 #define DEVICE_ATTR(_name,_mode,_show,_store) \
 struct device_attribute dev_attr_##_name = __ATTR(_name,_mode,_show,_store)
-extern int device_create_file(struct device *device, struct device_attribute * entry);
+extern int __must_check device_create_file(struct device *device,
+                                        struct device_attribute * entry);
 extern void device_remove_file(struct device * dev, struct device_attribute * attr);
+extern int __must_check device_create_bin_file(struct device *dev,
+                                               struct bin_attribute *attr);
+extern void device_remove_bin_file(struct device *dev,
+                                   struct bin_attribute *attr);
 struct device {
        struct klist            klist_children;
        struct klist_node       knode_parent;           /* node in sibling list */
@@ -305,6 +329,7 @@ struct device {
        struct kobject kobj;
        char    bus_id[BUS_ID_SIZE];    /* position on parent bus */
+        unsigned                is_registered:1;
        struct device_attribute uevent_attr;
        struct device_attribute *devt_attr;
@@ -338,6 +363,7 @@ struct device {
        struct list_head        node;
        struct class            *class;         /* optional*/
        dev_t                   devt;           /* dev_t, creates the sysfs "dev" */
+        struct attribute_group  **groups;       /* optional groups */
        void    (*release)(struct device * dev);
 };
@@ -356,38 +382,41 @@ dev_set_drvdata (struct device *dev, void *data)
 static inline int device_is_registered(struct device *dev)
 {
-        return klist_node_attached(&dev->knode_bus);
+        return dev->is_registered;
 }
 /*
 * High level routines for use by the bus drivers
 */
-extern int device_register(struct device * dev);
+extern int __must_check device_register(struct device * dev);
 extern void device_unregister(struct device * dev);
 extern void device_initialize(struct device * dev);
-extern int device_add(struct device * dev);
+extern int __must_check device_add(struct device * dev);
 extern void device_del(struct device * dev);
-extern int device_for_each_child(struct device *, void *,
+extern int __must_check device_for_each_child(struct device *, void *,
                     int (*fn)(struct device *, void *));
+extern int device_rename(struct device *dev, char *new_name);
 /*
 * Manual binding of a device to driver. See drivers/base/bus.c
 * for information on use.
 */
-extern void device_bind_driver(struct device * dev);
+extern int __must_check device_bind_driver(struct device *dev);
 extern void device_release_driver(struct device * dev);
-extern int  device_attach(struct device * dev);
+extern int  __must_check device_attach(struct device * dev);
-extern void driver_attach(struct device_driver * drv);
+extern int __must_check driver_attach(struct device_driver *drv);
-extern void device_reprobe(struct device *dev);
+extern int __must_check device_reprobe(struct device *dev);
 /*
 * Easy functions for dynamically creating devices on the fly
 */
 extern struct device *device_create(struct class *cls, struct device *parent,
-                                    dev_t devt, char *fmt, ...)
+                                    dev_t devt, const char *fmt, ...)
                                    __attribute__((format(printf,4,5)));
 extern void device_destroy(struct class *cls, dev_t devt);
+extern int virtual_device_parent(struct device *dev);
 /*
 * Platform "fixup" functions - allow the platform to have their say
 * about devices and actions that the general device layer doesn't
@@ -412,7 +441,7 @@ extern void device_shutdown(void);
 /* drivers/base/firmware.c */
-extern int firmware_register(struct subsystem *);
+extern int __must_check firmware_register(struct subsystem *);
 extern void firmware_unregister(struct subsystem *);
 /* debugging and troubleshooting/diagnostic helpers. */
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 635690cf3e3d..ff203c465fed 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -24,6 +24,13 @@ enum dma_data_direction {
 #define DMA_28BIT_MASK  0x000000000fffffffULL
 #define DMA_24BIT_MASK  0x0000000000ffffffULL
+static inline int valid_dma_direction(int dma_direction)
+{
+        return ((dma_direction == DMA_BIDIRECTIONAL) ||
+                (dma_direction == DMA_TO_DEVICE) ||
+                (dma_direction == DMA_FROM_DEVICE));
+}
 #include <asm/dma-mapping.h>
 /* Backwards compat, remove in 2.7.x */
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index b2cd2071d432..38dc403be70b 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -27,7 +27,8 @@ enum dmi_device_type {
        DMI_DEV_TYPE_ETHERNET,
        DMI_DEV_TYPE_TOKENRING,
        DMI_DEV_TYPE_SOUND,
-        DMI_DEV_TYPE_IPMI = -1
+        DMI_DEV_TYPE_IPMI = -1,
+        DMI_DEV_TYPE_OEM_STRING = -2
 };
 struct dmi_header {
diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild
index 63973af72fd5..d97b3a51e227 100644
--- a/include/linux/dvb/Kbuild
+++ b/include/linux/dvb/Kbuild
@@ -1,2 +1,9 @@
-header-y += ca.h frontend.h net.h osd.h version.h
+header-y += ca.h
-unifdef-y := audio.h dmx.h video.h
+header-y += frontend.h
+header-y += net.h
+header-y += osd.h
+header-y += version.h
+unifdef-y += audio.h
+unifdef-y += dmx.h
+unifdef-y += video.h
diff --git a/include/linux/edd.h b/include/linux/edd.h
index 162512b886f7..b2b3e68aa512 100644
--- a/include/linux/edd.h
+++ b/include/linux/edd.h
@@ -52,6 +52,7 @@
 #define EDD_CL_EQUALS   0x3d646465     /* "edd=" */
 #define EDD_CL_OFF      0x666f         /* "of" for off  */
 #define EDD_CL_SKIP     0x6b73         /* "sk" for skipmbr */
+#define EDD_CL_ON       0x6e6f         /* "on" for on */
 #ifndef __ASSEMBLY__
diff --git a/include/linux/efs_fs_sb.h b/include/linux/efs_fs_sb.h
index c76088baef28..ff1945e37790 100644
--- a/include/linux/efs_fs_sb.h
+++ b/include/linux/efs_fs_sb.h
@@ -9,8 +9,7 @@
 #ifndef __EFS_FS_SB_H__
 #define __EFS_FS_SB_H__
-/* statfs() magic number for EFS */
+#include <linux/magic.h>
-#define EFS_SUPER_MAGIC 0x414A53
 /* EFS superblock magic numbers */
 #define EFS_MAGIC       0x072959
diff --git a/include/linux/eisa.h b/include/linux/eisa.h
index 4079242dced8..1ff7c1392525 100644
--- a/include/linux/eisa.h
+++ b/include/linux/eisa.h
@@ -3,8 +3,8 @@
 #include <linux/ioport.h>
 #include <linux/device.h>
+#include <linux/mod_devicetable.h>
-#define EISA_SIG_LEN   8
 #define EISA_MAX_SLOTS 8
 #define EISA_MAX_RESOURCES 4
@@ -27,12 +27,6 @@
 #define EISA_CONFIG_ENABLED         1
 #define EISA_CONFIG_FORCED          2
-/* The EISA signature, in ASCII form, null terminated */
-struct eisa_device_id {
-        char          sig[EISA_SIG_LEN];
-        unsigned long driver_data;
-};
 /* There is not much we can say about an EISA device, apart from
 * signature, slot number, and base address. dma_mask is set by
 * default to parent device mask..*/
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 1713ace808bf..b3370ef5164d 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -1,12 +1,16 @@
 #ifndef _LINUX_ELEVATOR_H
 #define _LINUX_ELEVATOR_H
+#include <linux/percpu.h>
+#ifdef CONFIG_BLOCK
 typedef int (elevator_merge_fn) (request_queue_t *, struct request **,
                                 struct bio *);
 typedef void (elevator_merge_req_fn) (request_queue_t *, struct request *, struct request *);
-typedef void (elevator_merged_fn) (request_queue_t *, struct request *);
+typedef void (elevator_merged_fn) (request_queue_t *, struct request *, int);
 typedef int (elevator_dispatch_fn) (request_queue_t *, int);
@@ -14,9 +18,9 @@ typedef void (elevator_add_req_fn) (request_queue_t *, struct request *);
 typedef int (elevator_queue_empty_fn) (request_queue_t *);
 typedef struct request *(elevator_request_list_fn) (request_queue_t *, struct request *);
 typedef void (elevator_completed_req_fn) (request_queue_t *, struct request *);
-typedef int (elevator_may_queue_fn) (request_queue_t *, int, struct bio *);
+typedef int (elevator_may_queue_fn) (request_queue_t *, int);
-typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, struct bio *, gfp_t);
+typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, gfp_t);
 typedef void (elevator_put_req_fn) (request_queue_t *, struct request *);
 typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *);
 typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *);
@@ -82,19 +86,21 @@ struct elevator_queue
        struct kobject kobj;
        struct elevator_type *elevator_type;
        struct mutex sysfs_lock;
+        struct hlist_head *hash;
 };
 /*
 * block elevator interface
 */
 extern void elv_dispatch_sort(request_queue_t *, struct request *);
+extern void elv_dispatch_add_tail(request_queue_t *, struct request *);
 extern void elv_add_request(request_queue_t *, struct request *, int, int);
 extern void __elv_add_request(request_queue_t *, struct request *, int, int);
 extern void elv_insert(request_queue_t *, struct request *, int);
 extern int elv_merge(request_queue_t *, struct request **, struct bio *);
 extern void elv_merge_requests(request_queue_t *, struct request *,
                               struct request *);
-extern void elv_merged_request(request_queue_t *, struct request *);
+extern void elv_merged_request(request_queue_t *, struct request *, int);
 extern void elv_dequeue_request(request_queue_t *, struct request *);
 extern void elv_requeue_request(request_queue_t *, struct request *);
 extern int elv_queue_empty(request_queue_t *);
@@ -103,9 +109,9 @@ extern struct request *elv_former_request(request_queue_t *, struct request *);
 extern struct request *elv_latter_request(request_queue_t *, struct request *);
 extern int elv_register_queue(request_queue_t *q);
 extern void elv_unregister_queue(request_queue_t *q);
-extern int elv_may_queue(request_queue_t *, int, struct bio *);
+extern int elv_may_queue(request_queue_t *, int);
 extern void elv_completed_request(request_queue_t *, struct request *);
-extern int elv_set_request(request_queue_t *, struct request *, struct bio *, gfp_t);
+extern int elv_set_request(request_queue_t *, struct request *, gfp_t);
 extern void elv_put_request(request_queue_t *, struct request *);
 /*
@@ -125,6 +131,19 @@ extern void elevator_exit(elevator_t *);
 extern int elv_rq_merge_ok(struct request *, struct bio *);
 /*
+ * Helper functions.
+ */
+extern struct request *elv_rb_former_request(request_queue_t *, struct request *);
+extern struct request *elv_rb_latter_request(request_queue_t *, struct request *);
+/*
+ * rb support functions.
+ */
+extern struct request *elv_rb_add(struct rb_root *, struct request *);
+extern void elv_rb_del(struct rb_root *, struct request *);
+extern struct request *elv_rb_find(struct rb_root *, sector_t);
+/*
 * Return values from elevator merger
 */
 #define ELEVATOR_NO_MERGE       0
@@ -149,5 +168,42 @@ enum {
 };
 #define rq_end_sector(rq)       ((rq)->sector + (rq)->nr_sectors)
+#define rb_entry_rq(node)       rb_entry((node), struct request, rb_node)
+/*
+ * Hack to reuse the donelist list_head as the fifo time holder while
+ * the request is in the io scheduler. Saves an unsigned long in rq.
+ */
+#define rq_fifo_time(rq)        ((unsigned long) (rq)->donelist.next)
+#define rq_set_fifo_time(rq,exp)        ((rq)->donelist.next = (void *) (exp))
+#define rq_entry_fifo(ptr)      list_entry((ptr), struct request, queuelist)
+#define rq_fifo_clear(rq)       do {            \
+        list_del_init(&(rq)->queuelist);        \
+        INIT_LIST_HEAD(&(rq)->donelist);        \
+        } while (0)
+/*
+ * io context count accounting
+ */
+#define elv_ioc_count_mod(name, __val)                          \
+        do {                                                    \
+                preempt_disable();                              \
+                __get_cpu_var(name) += (__val);                 \
+                preempt_enable();                               \
+        } while (0)
+#define elv_ioc_count_inc(name) elv_ioc_count_mod(name, 1)
+#define elv_ioc_count_dec(name) elv_ioc_count_mod(name, -1)
+#define elv_ioc_count_read(name)                                \
+({                                                              \
+        unsigned long __val = 0;                                \
+        int __cpu;                                              \
+        smp_wmb();                                              \
+        for_each_possible_cpu(__cpu)                            \
+                __val += per_cpu(name, __cpu);                  \
+        __val;                                                  \
+})
+#endif /* CONFIG_BLOCK */
 #endif
diff --git a/include/linux/elf-em.h b/include/linux/elf-em.h
index 6a5796c81c90..666e0a5f00fc 100644
--- a/include/linux/elf-em.h
+++ b/include/linux/elf-em.h
@@ -31,6 +31,7 @@
 #define EM_M32R         88      /* Renesas M32R */
 #define EM_H8_300       46      /* Renesas H8/300,300H,H8S */
 #define EM_FRV          0x5441  /* Fujitsu FR-V */
+#define EM_AVR32        0x18ad  /* Atmel AVR32 */
 /*
 * This is an interim value that we will use until the committee comes
diff --git a/include/linux/elfnote.h b/include/linux/elfnote.h
new file mode 100644
index 000000000000..67396db141e8
--- /dev/null
+++ b/include/linux/elfnote.h
@@ -0,0 +1,90 @@
+#ifndef _LINUX_ELFNOTE_H
+#define _LINUX_ELFNOTE_H
+/*
+ * Helper macros to generate ELF Note structures, which are put into a
+ * PT_NOTE segment of the final vmlinux image.  These are useful for
+ * including name-value pairs of metadata into the kernel binary (or
+ * modules?) for use by external programs.
+ *
+ * Each note has three parts: a name, a type and a desc.  The name is
+ * intended to distinguish the note's originator, so it would be a
+ * company, project, subsystem, etc; it must be in a suitable form for
+ * use in a section name.  The type is an integer which is used to tag
+ * the data, and is considered to be within the "name" namespace (so
+ * "FooCo"'s type 42 is distinct from "BarProj"'s type 42).  The
+ * "desc" field is the actual data.  There are no constraints on the
+ * desc field's contents, though typically they're fairly small.
+ *
+ * All notes from a given NAME are put into a section named
+ * .note.NAME.  When the kernel image is finally linked, all the notes
+ * are packed into a single .notes section, which is mapped into the
+ * PT_NOTE segment.  Because notes for a given name are grouped into
+ * the same section, they'll all be adjacent the output file.
+ *
+ * This file defines macros for both C and assembler use.  Their
+ * syntax is slightly different, but they're semantically similar.
+ *
+ * See the ELF specification for more detail about ELF notes.
+ */
+#ifdef __ASSEMBLER__
+/*
+ * Generate a structure with the same shape as Elf{32,64}_Nhdr (which
+ * turn out to be the same size and shape), followed by the name and
+ * desc data with appropriate padding.  The 'desctype' argument is the
+ * assembler pseudo op defining the type of the data e.g. .asciz while
+ * 'descdata' is the data itself e.g.  "hello, world".
+ *
+ * e.g. ELFNOTE(XYZCo, 42, .asciz, "forty-two")
+ *      ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
+ */
+#define ELFNOTE(name, type, desctype, descdata) \
+.pushsection .note.name                 ;       \
+  .align 4                              ;       \
+  .long 2f - 1f         /* namesz */    ;       \
+  .long 4f - 3f         /* descsz */    ;       \
+  .long type                            ;       \
+1:.asciz "name"                         ;       \
+2:.align 4                              ;       \
+3:desctype descdata                     ;       \
+4:.align 4                              ;       \
+.popsection                             ;
+#else   /* !__ASSEMBLER__ */
+#include <linux/elf.h>
+/*
+ * Use an anonymous structure which matches the shape of
+ * Elf{32,64}_Nhdr, but includes the name and desc data.  The size and
+ * type of name and desc depend on the macro arguments.  "name" must
+ * be a literal string, and "desc" must be passed by value.  You may
+ * only define one note per line, since __LINE__ is used to generate
+ * unique symbols.
+ */
+#define _ELFNOTE_PASTE(a,b)     a##b
+#define _ELFNOTE(size, name, unique, type, desc)                        \
+        static const struct {                                           \
+                struct elf##size##_note _nhdr;                          \
+                unsigned char _name[sizeof(name)]                       \
+                __attribute__((aligned(sizeof(Elf##size##_Word))));     \
+                typeof(desc) _desc                                      \
+                             __attribute__((aligned(sizeof(Elf##size##_Word)))); \
+        } _ELFNOTE_PASTE(_note_, unique)                                \
+                __attribute_used__                                      \
+                __attribute__((section(".note." name),                  \
+                               aligned(sizeof(Elf##size##_Word)),       \
+                               unused)) = {                             \
+                {                                                       \
+                        sizeof(name),                                   \
+                        sizeof(desc),                                   \
+                        type,                                           \
+                },                                                      \
+                name,                                                   \
+                desc                                                    \
+        }
+#define ELFNOTE(size, name, type, desc)         \
+        _ELFNOTE(size, name, __LINE__, type, desc)
+#define ELFNOTE32(name, type, desc) ELFNOTE(32, name, type, desc)
+#define ELFNOTE64(name, type, desc) ELFNOTE(64, name, type, desc)
+#endif  /* __ASSEMBLER__ */
+#endif /* _LINUX_ELFNOTE_H */
diff --git a/include/linux/err.h b/include/linux/err.h
index cd3b367f7445..1ab1d44f8d3b 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -15,6 +15,8 @@
 */
 #define MAX_ERRNO       4095
+#ifndef __ASSEMBLY__
 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
 static inline void *ERR_PTR(long error)
@@ -32,4 +34,6 @@ static inline long IS_ERR(const void *ptr)
        return IS_ERR_VALUE((unsigned long)ptr);
 }
+#endif
 #endif /* _LINUX_ERR_H */
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index 408118a07763..92f8d4fab32b 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -38,7 +38,7 @@ struct sock_exterr_skb
        } header;
        struct sock_extended_err        ee;
        u16                             addr_offset;
-        u16                             port;
+        __be16                          port;
 };
 #endif
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index facf34e98954..153d755376a4 100644
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -17,6 +17,7 @@
 #define _LINUX_EXT2_FS_H
 #include <linux/types.h>
+#include <linux/magic.h>
 /*
 * The second extended filesystem constants/structures
@@ -63,11 +64,6 @@
 /* First non-reserved inode for old ext2 filesystems */
 #define EXT2_GOOD_OLD_FIRST_INO 11
-/*
- * The second extended file system magic number
- */
-#define EXT2_SUPER_MAGIC        0xEF53
 #ifdef __KERNEL__
 #include <linux/ext2_fs_sb.h>
 static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb)
@@ -169,41 +165,49 @@ struct ext2_group_desc
 #define EXT2_N_BLOCKS                   (EXT2_TIND_BLOCK + 1)
 /*
- * Inode flags
+ * Inode flags (GETFLAGS/SETFLAGS)
 */
-#define EXT2_SECRM_FL                   0x00000001 /* Secure deletion */
+#define EXT2_SECRM_FL                   FS_SECRM_FL     /* Secure deletion */
-#define EXT2_UNRM_FL                    0x00000002 /* Undelete */
+#define EXT2_UNRM_FL                    FS_UNRM_FL      /* Undelete */
-#define EXT2_COMPR_FL                   0x00000004 /* Compress file */
+#define EXT2_COMPR_FL                   FS_COMPR_FL     /* Compress file */
-#define EXT2_SYNC_FL                    0x00000008 /* Synchronous updates */
+#define EXT2_SYNC_FL                    FS_SYNC_FL      /* Synchronous updates */
-#define EXT2_IMMUTABLE_FL               0x00000010 /* Immutable file */
+#define EXT2_IMMUTABLE_FL               FS_IMMUTABLE_FL /* Immutable file */
-#define EXT2_APPEND_FL                  0x00000020 /* writes to file may only append */
+#define EXT2_APPEND_FL                  FS_APPEND_FL    /* writes to file may only append */
-#define EXT2_NODUMP_FL                  0x00000040 /* do not dump file */
+#define EXT2_NODUMP_FL                  FS_NODUMP_FL    /* do not dump file */
-#define EXT2_NOATIME_FL                 0x00000080 /* do not update atime */
+#define EXT2_NOATIME_FL                 FS_NOATIME_FL   /* do not update atime */
 /* Reserved for compression usage... */
-#define EXT2_DIRTY_FL                   0x00000100
+#define EXT2_DIRTY_FL                   FS_DIRTY_FL
-#define EXT2_COMPRBLK_FL                0x00000200 /* One or more compressed clusters */
+#define EXT2_COMPRBLK_FL                FS_COMPRBLK_FL  /* One or more compressed clusters */
-#define EXT2_NOCOMP_FL                  0x00000400 /* Don't compress */
+#define EXT2_NOCOMP_FL                  FS_NOCOMP_FL    /* Don't compress */
-#define EXT2_ECOMPR_FL                  0x00000800 /* Compression error */
+#define EXT2_ECOMPR_FL                  FS_ECOMPR_FL    /* Compression error */
 /* End compression flags --- maybe not all used */      
-#define EXT2_BTREE_FL                   0x00001000 /* btree format dir */
+#define EXT2_BTREE_FL                   FS_BTREE_FL     /* btree format dir */
-#define EXT2_INDEX_FL                   0x00001000 /* hash-indexed directory */
+#define EXT2_INDEX_FL                   FS_INDEX_FL     /* hash-indexed directory */
-#define EXT2_IMAGIC_FL                  0x00002000 /* AFS directory */
+#define EXT2_IMAGIC_FL                  FS_IMAGIC_FL    /* AFS directory */
-#define EXT2_JOURNAL_DATA_FL            0x00004000 /* Reserved for ext3 */
+#define EXT2_JOURNAL_DATA_FL            FS_JOURNAL_DATA_FL /* Reserved for ext3 */
-#define EXT2_NOTAIL_FL                  0x00008000 /* file tail should not be merged */
+#define EXT2_NOTAIL_FL                  FS_NOTAIL_FL    /* file tail should not be merged */
-#define EXT2_DIRSYNC_FL                 0x00010000 /* dirsync behaviour (directories only) */
+#define EXT2_DIRSYNC_FL                 FS_DIRSYNC_FL   /* dirsync behaviour (directories only) */
-#define EXT2_TOPDIR_FL                  0x00020000 /* Top of directory hierarchies*/
+#define EXT2_TOPDIR_FL                  FS_TOPDIR_FL    /* Top of directory hierarchies*/
-#define EXT2_RESERVED_FL                0x80000000 /* reserved for ext2 lib */
+#define EXT2_RESERVED_FL                FS_RESERVED_FL  /* reserved for ext2 lib */
-#define EXT2_FL_USER_VISIBLE            0x0003DFFF /* User visible flags */
+#define EXT2_FL_USER_VISIBLE            FS_FL_USER_VISIBLE      /* User visible flags */
-#define EXT2_FL_USER_MODIFIABLE         0x000380FF /* User modifiable flags */
+#define EXT2_FL_USER_MODIFIABLE         FS_FL_USER_MODIFIABLE   /* User modifiable flags */
 /*
 * ioctl commands
 */
-#define EXT2_IOC_GETFLAGS               _IOR('f', 1, long)
+#define EXT2_IOC_GETFLAGS               FS_IOC_GETFLAGS
-#define EXT2_IOC_SETFLAGS               _IOW('f', 2, long)
+#define EXT2_IOC_SETFLAGS               FS_IOC_SETFLAGS
-#define EXT2_IOC_GETVERSION             _IOR('v', 1, long)
+#define EXT2_IOC_GETVERSION             FS_IOC_GETVERSION
-#define EXT2_IOC_SETVERSION             _IOW('v', 2, long)
+#define EXT2_IOC_SETVERSION             FS_IOC_SETVERSION
+/*
+ * ioctl commands in 32 bit emulation
+ */
+#define EXT2_IOC32_GETFLAGS             FS_IOC32_GETFLAGS
+#define EXT2_IOC32_SETFLAGS             FS_IOC32_SETFLAGS
+#define EXT2_IOC32_GETVERSION           FS_IOC32_GETVERSION
+#define EXT2_IOC32_SETVERSION           FS_IOC32_SETVERSION
 /*
 * Structure of an inode on the disk
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 9f9cce7bd86d..11cca1bdc0c7 100644
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -17,6 +17,7 @@
 #define _LINUX_EXT3_FS_H
 #include <linux/types.h>
+#include <linux/magic.h>
 /*
 * The second extended filesystem constants/structures
@@ -67,11 +68,6 @@
 #define EXT3_GOOD_OLD_FIRST_INO 11
 /*
- * The second extended file system magic number
- */
-#define EXT3_SUPER_MAGIC        0xEF53
-/*
 * Maximal count of links to a file
 */
 #define EXT3_LINK_MAX           32000
@@ -220,14 +216,14 @@ struct ext3_new_group_data {
 /*
 * ioctl commands
 */
-#define EXT3_IOC_GETFLAGS               _IOR('f', 1, long)
+#define EXT3_IOC_GETFLAGS               FS_IOC_GETFLAGS
-#define EXT3_IOC_SETFLAGS               _IOW('f', 2, long)
+#define EXT3_IOC_SETFLAGS               FS_IOC_SETFLAGS
 #define EXT3_IOC_GETVERSION             _IOR('f', 3, long)
 #define EXT3_IOC_SETVERSION             _IOW('f', 4, long)
 #define EXT3_IOC_GROUP_EXTEND           _IOW('f', 7, unsigned long)
 #define EXT3_IOC_GROUP_ADD              _IOW('f', 8,struct ext3_new_group_input)
-#define EXT3_IOC_GETVERSION_OLD         _IOR('v', 1, long)
+#define EXT3_IOC_GETVERSION_OLD         FS_IOC_GETVERSION
-#define EXT3_IOC_SETVERSION_OLD         _IOW('v', 2, long)
+#define EXT3_IOC_SETVERSION_OLD         FS_IOC_SETVERSION
 #ifdef CONFIG_JBD_DEBUG
 #define EXT3_IOC_WAIT_FOR_READONLY      _IOR('f', 99, long)
 #endif
@@ -235,6 +231,23 @@ struct ext3_new_group_data {
 #define EXT3_IOC_SETRSVSZ               _IOW('f', 6, long)
 /*
+ * ioctl commands in 32 bit emulation
+ */
+#define EXT3_IOC32_GETFLAGS             FS_IOC32_GETFLAGS
+#define EXT3_IOC32_SETFLAGS             FS_IOC32_SETFLAGS
+#define EXT3_IOC32_GETVERSION           _IOR('f', 3, int)
+#define EXT3_IOC32_SETVERSION           _IOW('f', 4, int)
+#define EXT3_IOC32_GETRSVSZ             _IOR('f', 5, int)
+#define EXT3_IOC32_SETRSVSZ             _IOW('f', 6, int)
+#define EXT3_IOC32_GROUP_EXTEND         _IOW('f', 7, unsigned int)
+#ifdef CONFIG_JBD_DEBUG
+#define EXT3_IOC32_WAIT_FOR_READONLY    _IOR('f', 99, int)
+#endif
+#define EXT3_IOC32_GETVERSION_OLD       FS_IOC32_GETVERSION
+#define EXT3_IOC32_SETVERSION_OLD       FS_IOC32_SETVERSION
+/*
 *  Mount options
 */
 struct ext3_mount_options {
@@ -464,7 +477,7 @@ struct ext3_super_block {
         */
        __u8    s_prealloc_blocks;      /* Nr of blocks to try to preallocate*/
        __u8    s_prealloc_dir_blocks;  /* Nr to preallocate for dirs */
-        __u16   s_reserved_gdt_blocks;  /* Per group desc for online growth */
+        __le16  s_reserved_gdt_blocks;  /* Per group desc for online growth */
        /*
         * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set.
         */
@@ -477,7 +490,7 @@ struct ext3_super_block {
        __u8    s_reserved_char_pad;
        __u16   s_reserved_word_pad;
        __le32  s_default_mount_opts;
-        __le32  s_first_meta_bg;        /* First metablock block group */
+        __le32  s_first_meta_bg;        /* First metablock block group */
        __u32   s_reserved[190];        /* Padding to the end of the block */
 };
@@ -816,6 +829,7 @@ extern void ext3_set_aops(struct inode *inode);
 /* ioctl.c */
 extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
                       unsigned long);
+extern long ext3_compat_ioctl (struct file *, unsigned int, unsigned long);
 /* namei.c */
 extern int ext3_orphan_add(handle_t *, struct inode *);
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index 2f18b9511f21..4395e5206746 100644
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -35,7 +35,7 @@ struct ext3_reserve_window {
 };
 struct ext3_reserve_window_node {
-        struct rb_node          rsv_node;
+        struct rb_node          rsv_node;
        __u32                   rsv_goal_size;
        __u32                   rsv_alloc_hit;
        struct ext3_reserve_window      rsv_window;
diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h
index c8307c02dd07..ce0e6109aff0 100644
--- a/include/linux/ext3_jbd.h
+++ b/include/linux/ext3_jbd.h
@@ -23,7 +23,7 @@
 /* Define the number of blocks we need to account to a transaction to
 * modify one block of data.
- * 
+ *
 * We may have to touch one inode, one bitmap buffer, up to three
 * indirection blocks, the group and superblock summaries, and the data
 * block to complete the transaction.  */
@@ -88,16 +88,16 @@
 #endif
 int
-ext3_mark_iloc_dirty(handle_t *handle, 
+ext3_mark_iloc_dirty(handle_t *handle,
                     struct inode *inode,
                     struct ext3_iloc *iloc);
-/* 
+/*
 * On success, We end up with an outstanding reference count against
- * iloc->bh.  This _must_ be cleaned up later. 
+ * iloc->bh.  This _must_ be cleaned up later.
 */
-int ext3_reserve_inode_write(handle_t *handle, struct inode *inode, 
+int ext3_reserve_inode_write(handle_t *handle, struct inode *inode,
                        struct ext3_iloc *iloc);
 int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode);
diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
new file mode 100644
index 000000000000..4418c8d9d479
--- /dev/null
+++ b/include/linux/fib_rules.h
@@ -0,0 +1,65 @@
+#ifndef __LINUX_FIB_RULES_H
+#define __LINUX_FIB_RULES_H
+#include <linux/types.h>
+#include <linux/rtnetlink.h>
+/* rule is permanent, and cannot be deleted */
+#define FIB_RULE_PERMANENT      1
+struct fib_rule_hdr
+{
+        __u8            family;
+        __u8            dst_len;
+        __u8            src_len;
+        __u8            tos;
+        __u8            table;
+        __u8            res1;   /* reserved */
+        __u8            res2;   /* reserved */
+        __u8            action;
+        __u32           flags;
+};
+enum
+{
+        FRA_UNSPEC,
+        FRA_DST,        /* destination address */
+        FRA_SRC,        /* source address */
+        FRA_IFNAME,     /* interface name */
+        FRA_UNUSED1,
+        FRA_UNUSED2,
+        FRA_PRIORITY,   /* priority/preference */
+        FRA_UNUSED3,
+        FRA_UNUSED4,
+        FRA_UNUSED5,
+        FRA_FWMARK,     /* netfilter mark */
+        FRA_FLOW,       /* flow/class id */
+        FRA_UNUSED6,
+        FRA_UNUSED7,
+        FRA_UNUSED8,
+        FRA_TABLE,      /* Extended table id */
+        FRA_FWMASK,     /* mask for netfilter mark */
+        __FRA_MAX
+};
+#define FRA_MAX (__FRA_MAX - 1)
+enum
+{
+        FR_ACT_UNSPEC,
+        FR_ACT_TO_TBL,          /* Pass to fixed table */
+        FR_ACT_RES1,
+        FR_ACT_RES2,
+        FR_ACT_RES3,
+        FR_ACT_RES4,
+        FR_ACT_BLACKHOLE,       /* Drop without notification */
+        FR_ACT_UNREACHABLE,     /* Drop with ENETUNREACH */
+        FR_ACT_PROHIBIT,        /* Drop with EACCES */
+        __FR_ACT_MAX,
+};
+#define FR_ACT_MAX (__FR_ACT_MAX - 1)
+#endif
diff --git a/include/linux/file.h b/include/linux/file.h
index 9f7c2513866f..74183e6f7f45 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -112,5 +112,6 @@ struct task_struct;
 struct files_struct *get_files_struct(struct task_struct *);
 void FASTCALL(put_files_struct(struct files_struct *fs));
+void reset_files_struct(struct task_struct *, struct files_struct *);
 #endif /* __LINUX_FILE_H */
diff --git a/include/linux/filter.h b/include/linux/filter.h
index c6cb8f095088..91b2e3b9251e 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -25,10 +25,10 @@
 
 struct sock_filter      /* Filter block */
 {
-        __u16   code;   /* Actual filter code */
+        __u16   code;   /* Actual filter code */
-        __u8    jt;     /* Jump true */
+        __u8    jt;     /* Jump true */
-        __u8    jf;     /* Jump false */
+        __u8    jf;     /* Jump false */
-        __u32   k;      /* Generic multiuse field */
+        __u32   k;      /* Generic multiuse field */
 };
 struct sock_fprog       /* Required for SO_ATTACH_FILTER. */
@@ -41,8 +41,9 @@ struct sock_fprog	/* Required for SO_ATTACH_FILTER. */
 struct sk_filter
 {
        atomic_t                refcnt;
-        unsigned int            len;    /* Number of filter blocks */
+        unsigned int            len;    /* Number of filter blocks */
-        struct sock_filter      insns[0];
+        struct rcu_head         rcu;
+        struct sock_filter      insns[0];
 };
 static inline unsigned int sk_filter_len(struct sk_filter *fp)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 555bc195c420..2e29a2edaeec 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -79,8 +79,8 @@ extern int dir_notify_enable;
 #define WRITE 1
 #define READA 2         /* read-ahead  - don't block if no resources */
 #define SWRITE 3        /* for ll_rw_block() - wait for buffer lock */
-#define SPECIAL 4       /* For non-blockdevice requests in request queue */
 #define READ_SYNC       (READ | (1 << BIO_RW_SYNC))
+#define READ_META       (READ | (1 << BIO_RW_META))
 #define WRITE_SYNC      (WRITE | (1 << BIO_RW_SYNC))
 #define WRITE_BARRIER   ((1 << BIO_RW) | (1 << BIO_RW_BARRIER))
@@ -92,9 +92,10 @@ extern int dir_notify_enable;
 #define FS_REQUIRES_DEV 1 
 #define FS_BINARY_MOUNTDATA 2
 #define FS_REVAL_DOT    16384   /* Check the paths ".", ".." for staleness */
-#define FS_ODD_RENAME   32768   /* Temporary stuff; will go away as soon
+#define FS_RENAME_DOES_D_MOVE   32768   /* FS will handle d_move()
-                                  * as nfs_rename() will be cleaned up
+                                         * during rename() internally.
-                                  */
+                                         */
 /*
 * These are the fs-independent mount-flags: up to 32 flags are supported
 */
@@ -216,6 +217,45 @@ extern int dir_notify_enable;
 #define FIBMAP     _IO(0x00,1)  /* bmap access */
 #define FIGETBSZ   _IO(0x00,2)  /* get the block size used for bmap */
+#define FS_IOC_GETFLAGS                 _IOR('f', 1, long)
+#define FS_IOC_SETFLAGS                 _IOW('f', 2, long)
+#define FS_IOC_GETVERSION               _IOR('v', 1, long)
+#define FS_IOC_SETVERSION               _IOW('v', 2, long)
+#define FS_IOC32_GETFLAGS               _IOR('f', 1, int)
+#define FS_IOC32_SETFLAGS               _IOW('f', 2, int)
+#define FS_IOC32_GETVERSION             _IOR('v', 1, int)
+#define FS_IOC32_SETVERSION             _IOW('v', 2, int)
+/*
+ * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
+ */
+#define FS_SECRM_FL                     0x00000001 /* Secure deletion */
+#define FS_UNRM_FL                      0x00000002 /* Undelete */
+#define FS_COMPR_FL                     0x00000004 /* Compress file */
+#define FS_SYNC_FL                      0x00000008 /* Synchronous updates */
+#define FS_IMMUTABLE_FL                 0x00000010 /* Immutable file */
+#define FS_APPEND_FL                    0x00000020 /* writes to file may only append */
+#define FS_NODUMP_FL                    0x00000040 /* do not dump file */
+#define FS_NOATIME_FL                   0x00000080 /* do not update atime */
+/* Reserved for compression usage... */
+#define FS_DIRTY_FL                     0x00000100
+#define FS_COMPRBLK_FL                  0x00000200 /* One or more compressed clusters */
+#define FS_NOCOMP_FL                    0x00000400 /* Don't compress */
+#define FS_ECOMPR_FL                    0x00000800 /* Compression error */
+/* End compression flags --- maybe not all used */
+#define FS_BTREE_FL                     0x00001000 /* btree format dir */
+#define FS_INDEX_FL                     0x00001000 /* hash-indexed directory */
+#define FS_IMAGIC_FL                    0x00002000 /* AFS directory */
+#define FS_JOURNAL_DATA_FL              0x00004000 /* Reserved for ext3 */
+#define FS_NOTAIL_FL                    0x00008000 /* file tail should not be merged */
+#define FS_DIRSYNC_FL                   0x00010000 /* dirsync behaviour (directories only) */
+#define FS_TOPDIR_FL                    0x00020000 /* Top of directory hierarchies*/
+#define FS_RESERVED_FL                  0x80000000 /* reserved for ext2 lib */
+#define FS_FL_USER_VISIBLE              0x0003DFFF /* User visible flags */
+#define FS_FL_USER_MODIFIABLE           0x000380FF /* User modifiable flags */
 #define SYNC_FILE_RANGE_WAIT_BEFORE     1
 #define SYNC_FILE_RANGE_WRITE           2
 #define SYNC_FILE_RANGE_WAIT_AFTER      4
@@ -511,7 +551,6 @@ struct inode {
        struct timespec         i_mtime;
        struct timespec         i_ctime;
        unsigned int            i_blkbits;
-        unsigned long           i_blksize;
        unsigned long           i_version;
        blkcnt_t                i_blocks;
        unsigned short          i_bytes;
@@ -527,11 +566,12 @@ struct inode {
 #ifdef CONFIG_QUOTA
        struct dquot            *i_dquot[MAXQUOTAS];
 #endif
-        /* These three should probably be a union */
        struct list_head        i_devices;
-        struct pipe_inode_info  *i_pipe;
+        union {
-        struct block_device     *i_bdev;
+                struct pipe_inode_info  *i_pipe;
-        struct cdev             *i_cdev;
+                struct block_device     *i_bdev;
+                struct cdev             *i_cdev;
+        };
        int                     i_cindex;
        __u32                   i_generation;
@@ -552,10 +592,10 @@ struct inode {
        unsigned int            i_flags;
        atomic_t                i_writecount;
+#ifdef CONFIG_SECURITY
        void                    *i_security;
-        union {
+#endif
-                void            *generic_ip;
+        void                    *i_private; /* fs or device private pointer */
-        } u;
 #ifdef __NEED_I_SIZE_ORDERED
        seqcount_t              i_size_seqcount;
 #endif
@@ -646,7 +686,6 @@ struct fown_struct {
        rwlock_t lock;          /* protects pid, uid, euid fields */
        int pid;                /* pid or -pgrp where SIGIO should be sent */
        uid_t uid, euid;        /* uid/euid of process setting the owner */
-        void *security;
        int signum;             /* posix.1b rt signal to be delivered on IO */
 };
@@ -689,8 +728,9 @@ struct file {
        struct file_ra_state    f_ra;
        unsigned long           f_version;
+#ifdef CONFIG_SECURITY
        void                    *f_security;
+#endif
        /* needed for tty driver, and maybe others */
        void                    *private_data;
@@ -878,7 +918,9 @@ struct super_block {
        int                     s_syncing;
        int                     s_need_sync_fs;
        atomic_t                s_active;
+#ifdef CONFIG_SECURITY
        void                    *s_security;
+#endif
        struct xattr_handler    **s_xattr;
        struct list_head        s_inodes;       /* all inodes */
@@ -1055,9 +1097,9 @@ struct file_operations {
        struct module *owner;
        loff_t (*llseek) (struct file *, loff_t, int);
        ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
-        ssize_t (*aio_read) (struct kiocb *, char __user *, size_t, loff_t);
        ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
-        ssize_t (*aio_write) (struct kiocb *, const char __user *, size_t, loff_t);
+        ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
+        ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
        int (*readdir) (struct file *, void *, filldir_t);
        unsigned int (*poll) (struct file *, struct poll_table_struct *);
        int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long);
@@ -1071,8 +1113,6 @@ struct file_operations {
        int (*aio_fsync) (struct kiocb *, int datasync);
        int (*fasync) (int, struct file *, int);
        int (*lock) (struct file *, int, struct file_lock *);
-        ssize_t (*readv) (struct file *, const struct iovec *, unsigned long, loff_t *);
-        ssize_t (*writev) (struct file *, const struct iovec *, unsigned long, loff_t *);
        ssize_t (*sendfile) (struct file *, loff_t *, size_t, read_actor_t, void *);
        ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
        unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
@@ -1110,6 +1150,11 @@ struct inode_operations {
 struct seq_file;
+ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+                                unsigned long nr_segs, unsigned long fast_segs,
+                                struct iovec *fast_pointer,
+                                struct iovec **ret_pointer);
 extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
 extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
 extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
@@ -1144,9 +1189,10 @@ struct super_operations {
        int (*show_options)(struct seq_file *, struct vfsmount *);
        int (*show_stats)(struct seq_file *, struct vfsmount *);
+#ifdef CONFIG_QUOTA
        ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
        ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
+#endif
 };
 /* Inode state bits.  Protected by inode_lock. */
@@ -1173,15 +1219,30 @@ static inline void mark_inode_dirty_sync(struct inode *inode)
        __mark_inode_dirty(inode, I_DIRTY_SYNC);
 }
-static inline void inode_inc_link_count(struct inode *inode)
+static inline void inc_nlink(struct inode *inode)
 {
        inode->i_nlink++;
+}
+static inline void inode_inc_link_count(struct inode *inode)
+{
+        inc_nlink(inode);
        mark_inode_dirty(inode);
 }
-static inline void inode_dec_link_count(struct inode *inode)
+static inline void drop_nlink(struct inode *inode)
 {
        inode->i_nlink--;
+}
+static inline void clear_nlink(struct inode *inode)
+{
+        inode->i_nlink = 0;
+}
+static inline void inode_dec_link_count(struct inode *inode)
+{
+        drop_nlink(inode);
        mark_inode_dirty(inode);
 }
@@ -1439,6 +1500,7 @@ extern void __init vfs_caches_init(unsigned long);
 extern void putname(const char *name);
 #endif
+#ifdef CONFIG_BLOCK
 extern int register_blkdev(unsigned int, const char *);
 extern int unregister_blkdev(unsigned int, const char *);
 extern struct block_device *bdget(dev_t);
@@ -1447,11 +1509,15 @@ extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
 extern struct block_device *open_by_devnum(dev_t, unsigned);
 extern struct block_device *open_partition_by_devnum(dev_t, unsigned);
-extern const struct file_operations def_blk_fops;
 extern const struct address_space_operations def_blk_aops;
+#else
+static inline void bd_forget(struct inode *inode) {}
+#endif
+extern const struct file_operations def_blk_fops;
 extern const struct file_operations def_chr_fops;
 extern const struct file_operations bad_sock_fops;
 extern const struct file_operations def_fifo_fops;
+#ifdef CONFIG_BLOCK
 extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);
 extern int blkdev_ioctl(struct inode *, struct file *, unsigned, unsigned long);
 extern long compat_blkdev_ioctl(struct file *, unsigned, unsigned long);
@@ -1467,6 +1533,7 @@ extern void bd_release_from_disk(struct block_device *, struct gendisk *);
 #define bd_claim_by_disk(bdev, holder, disk)    bd_claim(bdev, holder)
 #define bd_release_from_disk(bdev, disk)        bd_release(bdev)
 #endif
+#endif
 /* fs/char_dev.c */
 #define CHRDEV_MAJOR_HASH_SIZE  255
@@ -1480,14 +1547,19 @@ extern int chrdev_open(struct inode *, struct file *);
 extern void chrdev_show(struct seq_file *,off_t);
 /* fs/block_dev.c */
-#define BLKDEV_MAJOR_HASH_SIZE  255
 #define BDEVNAME_SIZE   32      /* Largest string for a blockdev identifier */
+#ifdef CONFIG_BLOCK
+#define BLKDEV_MAJOR_HASH_SIZE  255
 extern const char *__bdevname(dev_t, char *buffer);
 extern const char *bdevname(struct block_device *bdev, char *buffer);
 extern struct block_device *lookup_bdev(const char *);
 extern struct block_device *open_bdev_excl(const char *, int, void *);
 extern void close_bdev_excl(struct block_device *);
 extern void blkdev_show(struct seq_file *,off_t);
+#else
+#define BLKDEV_MAJOR_HASH_SIZE  0
+#endif
 extern void init_special_inode(struct inode *, umode_t, dev_t);
@@ -1501,6 +1573,7 @@ extern const struct file_operations rdwr_fifo_fops;
 extern int fs_may_remount_ro(struct super_block *);
+#ifdef CONFIG_BLOCK
 /*
 * return READ, READA, or WRITE
 */
@@ -1512,9 +1585,10 @@ extern int fs_may_remount_ro(struct super_block *);
 #define bio_data_dir(bio)       ((bio)->bi_rw & 1)
 extern int check_disk_change(struct block_device *);
-extern int invalidate_inodes(struct super_block *);
 extern int __invalidate_device(struct block_device *);
 extern int invalidate_partition(struct gendisk *, int);
+#endif
+extern int invalidate_inodes(struct super_block *);
 unsigned long invalidate_mapping_pages(struct address_space *mapping,
                                        pgoff_t start, pgoff_t end);
 unsigned long invalidate_inode_pages(struct address_space *mapping);
@@ -1542,11 +1616,14 @@ extern int __filemap_fdatawrite_range(struct address_space *mapping,
 extern long do_fsync(struct file *file, int datasync);
 extern void sync_supers(void);
 extern void sync_filesystems(int wait);
+extern void __fsync_super(struct super_block *sb);
 extern void emergency_sync(void);
 extern void emergency_remount(void);
 extern int do_remount_sb(struct super_block *sb, int flags,
                         void *data, int force);
+#ifdef CONFIG_BLOCK
 extern sector_t bmap(struct inode *, sector_t);
+#endif
 extern int notify_change(struct dentry *, struct iattr *);
 extern int permission(struct inode *, int, struct nameidata *);
 extern int generic_permission(struct inode *, int,
@@ -1564,6 +1641,9 @@ static inline void allow_write_access(struct file *file)
                atomic_inc(&file->f_dentry->d_inode->i_writecount);
 }
 extern int do_pipe(int *);
+extern struct file *create_read_pipe(struct file *f);
+extern struct file *create_write_pipe(void);
+extern void free_write_pipe(struct file *);
 extern int open_namei(int dfd, const char *, int, int, struct nameidata *);
 extern int may_open(struct nameidata *, int, int);
@@ -1629,9 +1709,11 @@ static inline void insert_inode_hash(struct inode *inode) {
 extern struct file * get_empty_filp(void);
 extern void file_move(struct file *f, struct list_head *list);
 extern void file_kill(struct file *f);
+#ifdef CONFIG_BLOCK
 struct bio;
 extern void submit_bio(int, struct bio *);
 extern int bdev_read_only(struct block_device *);
+#endif
 extern int set_blocksize(struct block_device *, int);
 extern int sb_set_blocksize(struct super_block *, int);
 extern int sb_min_blocksize(struct super_block *, int);
@@ -1640,22 +1722,17 @@ extern int generic_file_mmap(struct file *, struct vm_area_struct *);
 extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
 extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
 extern int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
-extern ssize_t generic_file_read(struct file *, char __user *, size_t, loff_t *);
 int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
-extern ssize_t generic_file_write(struct file *, const char __user *, size_t, loff_t *);
+extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
-extern ssize_t generic_file_aio_read(struct kiocb *, char __user *, size_t, loff_t);
+extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
-extern ssize_t __generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t *);
-extern ssize_t generic_file_aio_write(struct kiocb *, const char __user *, size_t, loff_t);
 extern ssize_t generic_file_aio_write_nolock(struct kiocb *, const struct iovec *,
-                unsigned long, loff_t *);
+                unsigned long, loff_t);
 extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
                unsigned long *, loff_t, loff_t *, size_t, size_t);
 extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
                unsigned long, loff_t, loff_t *, size_t, ssize_t);
 extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
 extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
-ssize_t generic_file_write_nolock(struct file *file, const struct iovec *iov,
-                                unsigned long nr_segs, loff_t *ppos);
 extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
 extern void do_generic_mapping_read(struct address_space *mapping,
                                    struct file_ra_state *, struct file *,
@@ -1673,10 +1750,6 @@ extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
 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, 
-        unsigned long nr_segs, loff_t *ppos);
-ssize_t generic_file_writev(struct file *filp, const struct iovec *iov, 
-                        unsigned long nr_segs, loff_t *ppos);
 extern loff_t no_llseek(struct file *file, loff_t offset, int origin);
 extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin);
 extern loff_t remote_llseek(struct file *file, loff_t offset, int origin);
@@ -1712,6 +1785,7 @@ static inline void do_generic_file_read(struct file * filp, loff_t *ppos,
                                actor);
 }
+#ifdef CONFIG_BLOCK
 ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
        struct block_device *bdev, const struct iovec *iov, loff_t offset,
        unsigned long nr_segs, get_block_t get_block, dio_iodone_t end_io,
@@ -1749,6 +1823,7 @@ static inline ssize_t blockdev_direct_IO_own_locking(int rw, struct kiocb *iocb,
        return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
                                nr_segs, get_block, end_io, DIO_OWN_LOCKING);
 }
+#endif
 extern const struct file_operations generic_ro_fops;
diff --git a/include/linux/generic_acl.h b/include/linux/generic_acl.h
new file mode 100644
index 000000000000..80764f40be75
--- /dev/null
+++ b/include/linux/generic_acl.h
@@ -0,0 +1,36 @@
+/*
+ * fs/generic_acl.c
+ *
+ * (C) 2005 Andreas Gruenbacher <agruen@suse.de>
+ *
+ * This file is released under the GPL.
+ */
+#ifndef GENERIC_ACL_H
+#define GENERIC_ACL_H
+#include <linux/posix_acl.h>
+#include <linux/posix_acl_xattr.h>
+/**
+ * struct generic_acl_operations  -  filesystem operations
+ *
+ * Filesystems must make these operations available to the generic
+ * operations.
+ */
+struct generic_acl_operations {
+        struct posix_acl *(*getacl)(struct inode *, int);
+        void (*setacl)(struct inode *, int, struct posix_acl *);
+};
+size_t generic_acl_list(struct inode *, struct generic_acl_operations *, int,
+                        char *, size_t);
+int generic_acl_get(struct inode *, struct generic_acl_operations *, int,
+                    void *, size_t);
+int generic_acl_set(struct inode *, struct generic_acl_operations *, int,
+                    const void *, size_t);
+int generic_acl_init(struct inode *, struct inode *,
+                     struct generic_acl_operations *);
+int generic_acl_chmod(struct inode *, struct generic_acl_operations *);
+#endif
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 84f12a41dc01..9049dc65ae51 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -16,6 +16,8 @@ struct genlmsghdr {
 #define GENL_HDRLEN     NLMSG_ALIGN(sizeof(struct genlmsghdr))
+#define GENL_ADMIN_PERM         0x01
 /*
 * List of reserved static generic netlink identifiers:
 */
@@ -43,9 +45,25 @@ enum {
        CTRL_ATTR_UNSPEC,
        CTRL_ATTR_FAMILY_ID,
        CTRL_ATTR_FAMILY_NAME,
+        CTRL_ATTR_VERSION,
+        CTRL_ATTR_HDRSIZE,
+        CTRL_ATTR_MAXATTR,
+        CTRL_ATTR_OPS,
        __CTRL_ATTR_MAX,
 };
 #define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1)
+enum {
+        CTRL_ATTR_OP_UNSPEC,
+        CTRL_ATTR_OP_ID,
+        CTRL_ATTR_OP_FLAGS,
+        CTRL_ATTR_OP_POLICY,
+        CTRL_ATTR_OP_DOIT,
+        CTRL_ATTR_OP_DUMPIT,
+        __CTRL_ATTR_OP_MAX,
+};
+#define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1)
 #endif  /* __LINUX_GENERIC_NETLINK_H */
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index e4af57e87c17..41f276fdd185 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -11,6 +11,8 @@
 #include <linux/types.h>
+#ifdef CONFIG_BLOCK
 enum {
 /* These three have identical behaviour; use the second one if DOS FDISK gets
   confused about extended/logical partitions starting past cylinder 1023. */
@@ -420,3 +422,5 @@ static inline struct block_device *bdget_disk(struct gendisk *disk, int index)
 #endif
 #endif
+#endif
diff --git a/include/linux/getcpu.h b/include/linux/getcpu.h
new file mode 100644
index 000000000000..c7372d7a97be
--- /dev/null
+++ b/include/linux/getcpu.h
@@ -0,0 +1,18 @@
+#ifndef _LINUX_GETCPU_H
+#define _LINUX_GETCPU_H 1
+/* Cache for getcpu() to speed it up. Results might be a short time
+   out of date, but will be faster.
+   User programs should not refer to the contents of this structure.
+   I repeat they should not refer to it. If they do they will break
+   in future kernels.
+   It is only a private cache for vgetcpu(). It will change in future kernels.
+   The user program must store this information per thread (__thread)
+   If you want 100% accurate information pass NULL instead. */
+struct getcpu_cache {
+        unsigned long blob[128 / sizeof(long)];
+};
+#endif
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index cc9e60844484..bf2b6bc3f6fd 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -9,17 +9,16 @@ struct vm_area_struct;
 /*
 * GFP bitmasks..
+ *
+ * Zone modifiers (see linux/mmzone.h - low three bits)
+ *
+ * Do not put any conditional on these. If necessary modify the definitions
+ * without the underscores and use the consistently. The definitions here may
+ * be used in bit comparisons.
 */
-/* Zone modifiers in GFP_ZONEMASK (see linux/mmzone.h - low three bits) */
 #define __GFP_DMA       ((__force gfp_t)0x01u)
 #define __GFP_HIGHMEM   ((__force gfp_t)0x02u)
-#ifdef CONFIG_DMA_IS_DMA32
+#define __GFP_DMA32     ((__force gfp_t)0x04u)
-#define __GFP_DMA32     ((__force gfp_t)0x01)   /* ZONE_DMA is ZONE_DMA32 */
-#elif BITS_PER_LONG < 64
-#define __GFP_DMA32     ((__force gfp_t)0x00)   /* ZONE_NORMAL is ZONE_DMA32 */
-#else
-#define __GFP_DMA32     ((__force gfp_t)0x04)   /* Has own ZONE_DMA32 */
-#endif
 /*
 * Action modifiers - doesn't change the zoning
@@ -46,6 +45,7 @@ struct vm_area_struct;
 #define __GFP_ZERO      ((__force gfp_t)0x8000u)/* Return zeroed page on success */
 #define __GFP_NOMEMALLOC ((__force gfp_t)0x10000u) /* Don't use emergency reserves */
 #define __GFP_HARDWALL   ((__force gfp_t)0x20000u) /* Enforce hardwall cpuset memory allocs */
+#define __GFP_THISNODE  ((__force gfp_t)0x40000u)/* No fallback, no policies */
 #define __GFP_BITS_SHIFT 20     /* Room for 20 __GFP_FOO bits */
 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
@@ -54,7 +54,7 @@ struct vm_area_struct;
 #define GFP_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS| \
                        __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \
                        __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP| \
-                        __GFP_NOMEMALLOC|__GFP_HARDWALL)
+                        __GFP_NOMEMALLOC|__GFP_HARDWALL|__GFP_THISNODE)
 /* This equals 0, but use constants in case they ever change */
 #define GFP_NOWAIT      (GFP_ATOMIC & ~__GFP_HIGH)
@@ -67,6 +67,13 @@ struct vm_area_struct;
 #define GFP_HIGHUSER    (__GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HARDWALL | \
                         __GFP_HIGHMEM)
+#ifdef CONFIG_NUMA
+#define GFP_THISNODE    (__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY)
+#else
+#define GFP_THISNODE    0
+#endif
 /* Flag - indicates that the buffer will be suitable for DMA.  Ignored on some
   platforms, used as appropriate on others */
@@ -76,11 +83,19 @@ struct vm_area_struct;
 #define GFP_DMA32       __GFP_DMA32
-static inline int gfp_zone(gfp_t gfp)
+static inline enum zone_type gfp_zone(gfp_t flags)
 {
-        int zone = GFP_ZONEMASK & (__force int) gfp;
+        if (flags & __GFP_DMA)
-        BUG_ON(zone >= GFP_ZONETYPES);
+                return ZONE_DMA;
-        return zone;
+#ifdef CONFIG_ZONE_DMA32
+        if (flags & __GFP_DMA32)
+                return ZONE_DMA32;
+#endif
+#ifdef CONFIG_HIGHMEM
+        if (flags & __GFP_HIGHMEM)
+                return ZONE_HIGHMEM;
+#endif
+        return ZONE_NORMAL;
 }
 /*
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index d5ebbb29aeae..d4b333938f73 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -11,95 +11,46 @@
 #ifndef __HDLC_H
 #define __HDLC_H
-#define GENERIC_HDLC_VERSION 4  /* For synchronization with sethdlc utility */
-#define CLOCK_DEFAULT   0       /* Default setting */
-#define CLOCK_EXT       1       /* External TX and RX clock - DTE */
-#define CLOCK_INT       2       /* Internal TX and RX clock - DCE */
-#define CLOCK_TXINT     3       /* Internal TX and external RX clock */
-#define CLOCK_TXFROMRX  4       /* TX clock derived from external RX clock */
-#define ENCODING_DEFAULT        0 /* Default setting */
-#define ENCODING_NRZ            1
-#define ENCODING_NRZI           2
-#define ENCODING_FM_MARK        3
-#define ENCODING_FM_SPACE       4
-#define ENCODING_MANCHESTER     5
-#define PARITY_DEFAULT          0 /* Default setting */
-#define PARITY_NONE             1 /* No parity */
-#define PARITY_CRC16_PR0        2 /* CRC16, initial value 0x0000 */
-#define PARITY_CRC16_PR1        3 /* CRC16, initial value 0xFFFF */
-#define PARITY_CRC16_PR0_CCITT  4 /* CRC16, initial 0x0000, ITU-T version */
-#define PARITY_CRC16_PR1_CCITT  5 /* CRC16, initial 0xFFFF, ITU-T version */
-#define PARITY_CRC32_PR0_CCITT  6 /* CRC32, initial value 0x00000000 */
-#define PARITY_CRC32_PR1_CCITT  7 /* CRC32, initial value 0xFFFFFFFF */
-#define LMI_DEFAULT             0 /* Default setting */
-#define LMI_NONE                1 /* No LMI, all PVCs are static */
-#define LMI_ANSI                2 /* ANSI Annex D */
-#define LMI_CCITT               3 /* ITU-T Annex A */
-#define LMI_CISCO               4 /* The "original" LMI, aka Gang of Four */
 #define HDLC_MAX_MTU 1500       /* Ethernet 1500 bytes */
+#if 0
 #define HDLC_MAX_MRU (HDLC_MAX_MTU + 10 + 14 + 4) /* for ETH+VLAN over FR */
+#else
+#define HDLC_MAX_MRU 1600 /* as required for FR network */
+#endif
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#include <net/syncppp.h>
 #include <linux/hdlc/ioctl.h>
-typedef struct {                /* Used in Cisco and PPP mode */
+/* Used by all network devices here, pointed to by netdev_priv(dev) */
-        u8 address;
+struct hdlc_device_desc {
-        u8 control;
+        int (*netif_rx)(struct sk_buff *skb);
-        u16 protocol;
-}__attribute__ ((packed)) hdlc_header;
-typedef struct {
-        u32 type;               /* code */
-        u32 par1;
-        u32 par2;
-        u16 rel;                /* reliability */
-        u32 time;
-}__attribute__ ((packed)) cisco_packet;
-#define CISCO_PACKET_LEN        18
-#define CISCO_BIG_PACKET_LEN    20
-typedef struct pvc_device_struct {
-        struct net_device *master;
-        struct net_device *main;
-        struct net_device *ether; /* bridged Ethernet interface */
-        struct pvc_device_struct *next; /* Sorted in ascending DLCI order */
-        int dlci;
-        int open_count;
-        struct {
-                unsigned int new: 1;
-                unsigned int active: 1;
-                unsigned int exist: 1;
-                unsigned int deleted: 1;
-                unsigned int fecn: 1;
-                unsigned int becn: 1;
-                unsigned int bandwidth; /* Cisco LMI reporting only */
-        }state;
-}pvc_device;
-typedef struct hdlc_device_struct {
-        /* To be initialized by hardware driver */
        struct net_device_stats stats;
+};
+/* This structure is a private property of HDLC protocols.
+   Hardware drivers have no interest here */
+struct hdlc_proto {
+        int (*open)(struct net_device *dev);
+        void (*close)(struct net_device *dev);
+        void (*start)(struct net_device *dev); /* if open & DCD */
+        void (*stop)(struct net_device *dev); /* if open & !DCD */
+        void (*detach)(struct net_device *dev);
+        int (*ioctl)(struct net_device *dev, struct ifreq *ifr);
+        unsigned short (*type_trans)(struct sk_buff *skb,
+                                     struct net_device *dev);
+        struct module *module;
+        struct hdlc_proto *next; /* next protocol in the list */
+};
+typedef struct hdlc_device {
        /* used by HDLC layer to take control over HDLC device from hw driver*/
        int (*attach)(struct net_device *dev,
                      unsigned short encoding, unsigned short parity);
@@ -107,82 +58,18 @@ typedef struct hdlc_device_struct {
        /* hardware driver must handle this instead of dev->hard_start_xmit */
        int (*xmit)(struct sk_buff *skb, struct net_device *dev);
        /* Things below are for HDLC layer internal use only */
-        struct {
+        const struct hdlc_proto *proto;
-                int (*open)(struct net_device *dev);
-                void (*close)(struct net_device *dev);
-                /* if open & DCD */
-                void (*start)(struct net_device *dev);
-                /* if open & !DCD */
-                void (*stop)(struct net_device *dev);
-                void (*detach)(struct hdlc_device_struct *hdlc);
-                int (*netif_rx)(struct sk_buff *skb);
-                unsigned short (*type_trans)(struct sk_buff *skb,
-                                             struct net_device *dev);
-                int id;         /* IF_PROTO_HDLC/CISCO/FR/etc. */
-        }proto;
        int carrier;
        int open;
        spinlock_t state_lock;
+        void *state;
-        union {
-                struct {
-                        fr_proto settings;
-                        pvc_device *first_pvc;
-                        int dce_pvc_count;
-                        struct timer_list timer;
-                        unsigned long last_poll;
-                        int reliable;
-                        int dce_changed;
-                        int request;
-                        int fullrep_sent;
-                        u32 last_errors; /* last errors bit list */
-                        u8 n391cnt;
-                        u8 txseq; /* TX sequence number */
-                        u8 rxseq; /* RX sequence number */
-                }fr;
-                struct {
-                        cisco_proto settings;
-                        struct timer_list timer;
-                        unsigned long last_poll;
-                        int up;
-                        int request_sent;
-                        u32 txseq; /* TX sequence number */
-                        u32 rxseq; /* RX sequence number */
-                }cisco;
-                struct {
-                        raw_hdlc_proto settings;
-                }raw_hdlc;
-                struct {
-                        struct ppp_device pppdev;
-                        struct ppp_device *syncppp_ptr;
-                        int (*old_change_mtu)(struct net_device *dev,
-                                              int new_mtu);
-                }ppp;
-        }state;
        void *priv;
 }hdlc_device;
-int hdlc_raw_ioctl(struct net_device *dev, struct ifreq *ifr);
+/* Exported from hdlc module */
-int hdlc_raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_cisco_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_ppp_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_fr_ioctl(struct net_device *dev, struct ifreq *ifr);
-int hdlc_x25_ioctl(struct net_device *dev, struct ifreq *ifr);
-/* Exported from hdlc.o */
 /* Called by hardware driver when a user requests HDLC service */
 int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
@@ -191,17 +78,21 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 #define register_hdlc_device(dev)       register_netdev(dev)
 void unregister_hdlc_device(struct net_device *dev);
+void register_hdlc_protocol(struct hdlc_proto *proto);
+void unregister_hdlc_protocol(struct hdlc_proto *proto);
 struct net_device *alloc_hdlcdev(void *priv);
-static __inline__ hdlc_device* dev_to_hdlc(struct net_device *dev)
+static __inline__ struct hdlc_device_desc* dev_to_desc(struct net_device *dev)
 {
        return netdev_priv(dev);
 }
+static __inline__ hdlc_device* dev_to_hdlc(struct net_device *dev)
-static __inline__ pvc_device* dev_to_pvc(struct net_device *dev)
 {
-        return (pvc_device*)dev->priv;
+        return netdev_priv(dev) + sizeof(struct hdlc_device_desc);
 }
@@ -225,18 +116,14 @@ int hdlc_open(struct net_device *dev);
 /* Must be called by hardware driver when HDLC device is being closed */
 void hdlc_close(struct net_device *dev);
+int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,
+                         int (*rx)(struct sk_buff *skb), size_t size);
 /* May be used by hardware driver to gain control over HDLC device */
-static __inline__ void hdlc_proto_detach(hdlc_device *hdlc)
+void detach_hdlc_protocol(struct net_device *dev);
-{
-        if (hdlc->proto.detach)
-                hdlc->proto.detach(hdlc);
-        hdlc->proto.detach = NULL;
-}
 static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev)
 {
-        return &dev_to_hdlc(dev)->stats;
+        return &dev_to_desc(dev)->stats;
 }
@@ -248,8 +135,8 @@ static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb,
        skb->mac.raw  = skb->data;
        skb->dev      = dev;
-        if (hdlc->proto.type_trans)
+        if (hdlc->proto->type_trans)
-                return hdlc->proto.type_trans(skb, dev);
+                return hdlc->proto->type_trans(skb, dev);
        else
                return htons(ETH_P_HDLC);
 }
diff --git a/include/linux/hdlc/ioctl.h b/include/linux/hdlc/ioctl.h
index 78430ba3ea69..583972364357 100644
--- a/include/linux/hdlc/ioctl.h
+++ b/include/linux/hdlc/ioctl.h
@@ -1,6 +1,39 @@
 #ifndef __HDLC_IOCTL_H__
 #define __HDLC_IOCTL_H__
+#define GENERIC_HDLC_VERSION 4  /* For synchronization with sethdlc utility */
+#define CLOCK_DEFAULT   0       /* Default setting */
+#define CLOCK_EXT       1       /* External TX and RX clock - DTE */
+#define CLOCK_INT       2       /* Internal TX and RX clock - DCE */
+#define CLOCK_TXINT     3       /* Internal TX and external RX clock */
+#define CLOCK_TXFROMRX  4       /* TX clock derived from external RX clock */
+#define ENCODING_DEFAULT        0 /* Default setting */
+#define ENCODING_NRZ            1
+#define ENCODING_NRZI           2
+#define ENCODING_FM_MARK        3
+#define ENCODING_FM_SPACE       4
+#define ENCODING_MANCHESTER     5
+#define PARITY_DEFAULT          0 /* Default setting */
+#define PARITY_NONE             1 /* No parity */
+#define PARITY_CRC16_PR0        2 /* CRC16, initial value 0x0000 */
+#define PARITY_CRC16_PR1        3 /* CRC16, initial value 0xFFFF */
+#define PARITY_CRC16_PR0_CCITT  4 /* CRC16, initial 0x0000, ITU-T version */
+#define PARITY_CRC16_PR1_CCITT  5 /* CRC16, initial 0xFFFF, ITU-T version */
+#define PARITY_CRC32_PR0_CCITT  6 /* CRC32, initial value 0x00000000 */
+#define PARITY_CRC32_PR1_CCITT  7 /* CRC32, initial value 0xFFFFFFFF */
+#define LMI_DEFAULT             0 /* Default setting */
+#define LMI_NONE                1 /* No LMI, all PVCs are static */
+#define LMI_ANSI                2 /* ANSI Annex D */
+#define LMI_CCITT               3 /* ITU-T Annex A */
+#define LMI_CISCO               4 /* The "original" LMI, aka Gang of Four */
 typedef struct { 
        unsigned int clock_rate; /* bits per second */
        unsigned int clock_type; /* internal, external, TX-internal etc. */
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 85ce7ef9a512..fd7d12daa94f 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -24,11 +24,15 @@ static inline void flush_kernel_dcache_page(struct page *page)
 /* declarations for linux/mm/highmem.c */
 unsigned int nr_free_highpages(void);
+extern unsigned long totalhigh_pages;
 #else /* CONFIG_HIGHMEM */
 static inline unsigned int nr_free_highpages(void) { return 0; }
+#define totalhigh_pages 0
+#ifndef ARCH_HAS_KMAP
 static inline void *kmap(struct page *page)
 {
        might_sleep();
@@ -41,6 +45,7 @@ static inline void *kmap(struct page *page)
 #define kunmap_atomic(addr, idx)        do { } while (0)
 #define kmap_atomic_pfn(pfn, idx)       page_address(pfn_to_page(pfn))
 #define kmap_atomic_to_page(ptr)        virt_to_page(ptr)
+#endif
 #endif /* CONFIG_HIGHMEM */
diff --git a/include/linux/hpfs_fs.h b/include/linux/hpfs_fs.h
deleted file mode 100644
index a5028dd94d31..000000000000
--- a/include/linux/hpfs_fs.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _LINUX_HPFS_FS_H
-#define _LINUX_HPFS_FS_H
-/* HPFS magic number (word 0 of block 16) */
-#define HPFS_SUPER_MAGIC 0xf995e849
-#endif
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 4fc379de6c2f..fca93025ab51 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -138,6 +138,7 @@ extern long hrtimer_nanosleep(struct timespec *rqtp,
                              struct timespec __user *rmtp,
                              const enum hrtimer_mode mode,
                              const clockid_t clockid);
+extern long hrtimer_nanosleep_restart(struct restart_block *restart_block);
 extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
                                 struct task_struct *tsk);
diff --git a/include/linux/i2c-algo-bit.h b/include/linux/i2c-algo-bit.h
index c0e7fab28ce3..c8f8df25c7e0 100644
--- a/include/linux/i2c-algo-bit.h
+++ b/include/linux/i2c-algo-bit.h
@@ -40,7 +40,6 @@ struct i2c_algo_bit_data {
        /* local settings */
        int udelay;             /* half-clock-cycle time in microsecs */
                                /* i.e. clock is (500 / udelay) KHz */
-        int mdelay;             /* in millisecs, unused */
        int timeout;            /* in jiffies */
 };
diff --git a/include/linux/i2c-algo-pcf.h b/include/linux/i2c-algo-pcf.h
index 18b0adf57a3d..9908f3fc4839 100644
--- a/include/linux/i2c-algo-pcf.h
+++ b/include/linux/i2c-algo-pcf.h
@@ -35,7 +35,6 @@ struct i2c_algo_pcf_data {
        /* local settings */
        int udelay;
-        int mdelay;
        int timeout;
 };
diff --git a/include/linux/i2c-algo-sibyte.h b/include/linux/i2c-algo-sibyte.h
deleted file mode 100644
index 03914ded8614..000000000000
--- a/include/linux/i2c-algo-sibyte.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2001,2002,2003 Broadcom Corporation
- *
- * 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.
- */
-#ifndef I2C_ALGO_SIBYTE_H
-#define I2C_ALGO_SIBYTE_H 1
-#include <linux/i2c.h>
-struct i2c_algo_sibyte_data {
-        void *data;             /* private data */
-        int   bus;              /* which bus */
-        void *reg_base;         /* CSR base */
-};
-int i2c_sibyte_add_bus(struct i2c_adapter *, int speed);
-int i2c_sibyte_del_bus(struct i2c_adapter *);
-#endif /* I2C_ALGO_SIBYTE_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 9418519a55d1..0a8f750cbede 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -193,6 +193,7 @@
 #define I2C_HW_B_RADEON         0x01001e /* radeon framebuffer driver */
 #define I2C_HW_B_EM28XX         0x01001f /* em28xx video capture cards */
 #define I2C_HW_B_CX2341X        0x010020 /* Conexant CX2341X MPEG encoder cards */
+#define I2C_HW_B_INTELFB        0x010021 /* intel framebuffer driver */
 /* --- PCF 8584 based algorithms                                        */
 #define I2C_HW_P_LP             0x020000 /* Parallel port interface */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index eb0628a7ecc6..9b5d04768c2c 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -64,14 +64,6 @@ extern int i2c_master_recv(struct i2c_client *,char* ,int);
 */
 extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num);
-/*
- * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. 
- * This is not tested/implemented yet and will change in the future.
- */
-extern int i2c_slave_send(struct i2c_client *,char*,int);
-extern int i2c_slave_recv(struct i2c_client *,char*,int);
 /* This is the very generalized SMBus access routine. You probably do not
   want to use this, though; one of the functions below may be much easier,
@@ -201,10 +193,6 @@ struct i2c_algorithm {
                           unsigned short flags, char read_write,
                           u8 command, int size, union i2c_smbus_data * data);
-        /* --- these optional/future use for some adapter types.*/
-        int (*slave_send)(struct i2c_adapter *,char*,int);
-        int (*slave_recv)(struct i2c_adapter *,char*,int);
        /* --- ioctl like call to set div. parameters. */
        int (*algo_control)(struct i2c_adapter *, unsigned int, unsigned long);
@@ -220,7 +208,7 @@ struct i2c_adapter {
        struct module *owner;
        unsigned int id;
        unsigned int class;
-        struct i2c_algorithm *algo;/* the algorithm to access the bus   */
+        const struct i2c_algorithm *algo; /* the algorithm to access the bus */
        void *algo_data;
        /* --- administration stuff. */
diff --git a/include/linux/icmp.h b/include/linux/icmp.h
index f0b571f1060b..878cfe4e587f 100644
--- a/include/linux/icmp.h
+++ b/include/linux/icmp.h
@@ -68,16 +68,16 @@
 struct icmphdr {
  __u8          type;
  __u8          code;
-  __u16         checksum;
+  __be16        checksum;
  union {
        struct {
-                __u16   id;
+                __be16  id;
-                __u16   sequence;
+                __be16  sequence;
        } echo;
-        __u32   gateway;
+        __be32  gateway;
        struct {
-                __u16   __unused;
+                __be16  __unused;
-                __u16   mtu;
+                __be16  mtu;
        } frag;
  } un;
 };
diff --git a/include/linux/if.h b/include/linux/if.h
index 374e20ad8b0d..32bf419351f1 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -59,6 +59,8 @@
 #define IFF_SLAVE_INACTIVE      0x4     /* bonding slave not the curr. active */
 #define IFF_MASTER_8023AD       0x8     /* bonding master, 802.3ad.     */
 #define IFF_MASTER_ALB  0x10            /* bonding master, balance-alb. */
+#define IFF_BONDING     0x20            /* bonding master or slave      */
+#define IFF_SLAVE_NEEDARP 0x40          /* need ARPs for validation     */
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002
@@ -212,5 +214,4 @@ struct ifconf
 #define ifc_buf ifc_ifcu.ifcu_buf               /* buffer address       */
 #define ifc_req ifc_ifcu.ifcu_req               /* array of structures  */
 #endif /* _LINUX_IF_H */
diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
new file mode 100644
index 000000000000..dbe8f6120a40
--- /dev/null
+++ b/include/linux/if_addr.h
@@ -0,0 +1,55 @@
+#ifndef __LINUX_IF_ADDR_H
+#define __LINUX_IF_ADDR_H
+#include <linux/netlink.h>
+struct ifaddrmsg
+{
+        __u8            ifa_family;
+        __u8            ifa_prefixlen;  /* The prefix length            */
+        __u8            ifa_flags;      /* Flags                        */
+        __u8            ifa_scope;      /* Address scope                */
+        __u32           ifa_index;      /* Link index                   */
+};
+/*
+ * Important comment:
+ * IFA_ADDRESS is prefix address, rather than local interface address.
+ * It makes no difference for normally configured broadcast interfaces,
+ * but for point-to-point IFA_ADDRESS is DESTINATION address,
+ * local address is supplied in IFA_LOCAL attribute.
+ */
+enum
+{
+        IFA_UNSPEC,
+        IFA_ADDRESS,
+        IFA_LOCAL,
+        IFA_LABEL,
+        IFA_BROADCAST,
+        IFA_ANYCAST,
+        IFA_CACHEINFO,
+        IFA_MULTICAST,
+        __IFA_MAX,
+};
+#define IFA_MAX (__IFA_MAX - 1)
+/* ifa_flags */
+#define IFA_F_SECONDARY         0x01
+#define IFA_F_TEMPORARY         IFA_F_SECONDARY
+#define IFA_F_NODAD             0x02
+#define IFA_F_HOMEADDRESS       0x10
+#define IFA_F_DEPRECATED        0x20
+#define IFA_F_TENTATIVE         0x40
+#define IFA_F_PERMANENT         0x80
+struct ifa_cacheinfo
+{
+        __u32   ifa_prefered;
+        __u32   ifa_valid;
+        __u32   cstamp; /* created timestamp, hundredths of seconds */
+        __u32   tstamp; /* updated timestamp, hundredths of seconds */
+};
+#endif
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index a8b1a2071838..7f5714214ee3 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -130,11 +130,11 @@ struct arpreq_old {
 struct arphdr
 {
-        unsigned short  ar_hrd;         /* format of hardware address   */
+        __be16          ar_hrd;         /* format of hardware address   */
-        unsigned short  ar_pro;         /* format of protocol address   */
+        __be16          ar_pro;         /* format of protocol address   */
        unsigned char   ar_hln;         /* length of hardware address   */
        unsigned char   ar_pln;         /* length of protocol address   */
-        unsigned short  ar_op;          /* ARP opcode (command)         */
+        __be16          ar_op;          /* ARP opcode (command)         */
 #if 0
         /*
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
new file mode 100644
index 000000000000..e963a077e6f5
--- /dev/null
+++ b/include/linux/if_link.h
@@ -0,0 +1,136 @@
+#ifndef _LINUX_IF_LINK_H
+#define _LINUX_IF_LINK_H
+#include <linux/netlink.h>
+/* The struct should be in sync with struct net_device_stats */
+struct rtnl_link_stats
+{
+        __u32   rx_packets;             /* total packets received       */
+        __u32   tx_packets;             /* total packets transmitted    */
+        __u32   rx_bytes;               /* total bytes received         */
+        __u32   tx_bytes;               /* total bytes transmitted      */
+        __u32   rx_errors;              /* bad packets received         */
+        __u32   tx_errors;              /* packet transmit problems     */
+        __u32   rx_dropped;             /* no space in linux buffers    */
+        __u32   tx_dropped;             /* no space available in linux  */
+        __u32   multicast;              /* multicast packets received   */
+        __u32   collisions;
+        /* detailed rx_errors: */
+        __u32   rx_length_errors;
+        __u32   rx_over_errors;         /* receiver ring buff overflow  */
+        __u32   rx_crc_errors;          /* recved pkt with crc error    */
+        __u32   rx_frame_errors;        /* recv'd frame alignment error */
+        __u32   rx_fifo_errors;         /* recv'r fifo overrun          */
+        __u32   rx_missed_errors;       /* receiver missed packet       */
+        /* detailed tx_errors */
+        __u32   tx_aborted_errors;
+        __u32   tx_carrier_errors;
+        __u32   tx_fifo_errors;
+        __u32   tx_heartbeat_errors;
+        __u32   tx_window_errors;
+        /* for cslip etc */
+        __u32   rx_compressed;
+        __u32   tx_compressed;
+};
+/* The struct should be in sync with struct ifmap */
+struct rtnl_link_ifmap
+{
+        __u64   mem_start;
+        __u64   mem_end;
+        __u64   base_addr;
+        __u16   irq;
+        __u8    dma;
+        __u8    port;
+};
+enum
+{
+        IFLA_UNSPEC,
+        IFLA_ADDRESS,
+        IFLA_BROADCAST,
+        IFLA_IFNAME,
+        IFLA_MTU,
+        IFLA_LINK,
+        IFLA_QDISC,
+        IFLA_STATS,
+        IFLA_COST,
+#define IFLA_COST IFLA_COST
+        IFLA_PRIORITY,
+#define IFLA_PRIORITY IFLA_PRIORITY
+        IFLA_MASTER,
+#define IFLA_MASTER IFLA_MASTER
+        IFLA_WIRELESS,          /* Wireless Extension event - see wireless.h */
+#define IFLA_WIRELESS IFLA_WIRELESS
+        IFLA_PROTINFO,          /* Protocol specific information for a link */
+#define IFLA_PROTINFO IFLA_PROTINFO
+        IFLA_TXQLEN,
+#define IFLA_TXQLEN IFLA_TXQLEN
+        IFLA_MAP,
+#define IFLA_MAP IFLA_MAP
+        IFLA_WEIGHT,
+#define IFLA_WEIGHT IFLA_WEIGHT
+        IFLA_OPERSTATE,
+        IFLA_LINKMODE,
+        __IFLA_MAX
+};
+#define IFLA_MAX (__IFLA_MAX - 1)
+/* ifi_flags.
+   IFF_* flags.
+   The only change is:
+   IFF_LOOPBACK, IFF_BROADCAST and IFF_POINTOPOINT are
+   more not changeable by user. They describe link media
+   characteristics and set by device driver.
+   Comments:
+   - Combination IFF_BROADCAST|IFF_POINTOPOINT is invalid
+   - If neither of these three flags are set;
+     the interface is NBMA.
+   - IFF_MULTICAST does not mean anything special:
+   multicasts can be used on all not-NBMA links.
+   IFF_MULTICAST means that this media uses special encapsulation
+   for multicast frames. Apparently, all IFF_POINTOPOINT and
+   IFF_BROADCAST devices are able to use multicasts too.
+ */
+/* IFLA_LINK.
+   For usual devices it is equal ifi_index.
+   If it is a "virtual interface" (f.e. tunnel), ifi_link
+   can point to real physical interface (f.e. for bandwidth calculations),
+   or maybe 0, what means, that real media is unknown (usual
+   for IPIP tunnels, when route to endpoint is allowed to change)
+ */
+/* Subtype attributes for IFLA_PROTINFO */
+enum
+{
+        IFLA_INET6_UNSPEC,
+        IFLA_INET6_FLAGS,       /* link flags                   */
+        IFLA_INET6_CONF,        /* sysctl parameters            */
+        IFLA_INET6_STATS,       /* statistics                   */
+        IFLA_INET6_MCAST,       /* MC things. What of them?     */
+        IFLA_INET6_CACHEINFO,   /* time values and max reasm size */
+        __IFLA_INET6_MAX
+};
+#define IFLA_INET6_MAX  (__IFLA_INET6_MAX - 1)
+struct ifla_cacheinfo
+{
+        __u32   max_reasm_len;
+        __u32   tstamp;         /* ipv6InterfaceTable updated timestamp */
+        __u32   reachable_time;
+        __u32   retrans_time;
+};
+#endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 899c3d4776f3..03f43e2893a4 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -30,8 +30,8 @@ struct igmphdr
 {
        __u8 type;
        __u8 code;              /* For newer IGMP */
-        __u16 csum;
+        __be16 csum;
-        __u32 group;
+        __be32 group;
 };
 /* V3 group record types [grec_type] */
@@ -45,25 +45,25 @@ struct igmphdr
 struct igmpv3_grec {
        __u8    grec_type;
        __u8    grec_auxwords;
-        __u16   grec_nsrcs;
+        __be16  grec_nsrcs;
-        __u32   grec_mca;
+        __be32  grec_mca;
-        __u32   grec_src[0];
+        __be32  grec_src[0];
 };
 struct igmpv3_report {
        __u8 type;
        __u8 resv1;
-        __u16 csum;
+        __be16 csum;
-        __u16 resv2;
+        __be16 resv2;
-        __u16 ngrec;
+        __be16 ngrec;
        struct igmpv3_grec grec[0];
 };
 struct igmpv3_query {
        __u8 type;
        __u8 code;
-        __u16 csum;
+        __be16 csum;
-        __u32 group;
+        __be32 group;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
        __u8 qrv:3,
             suppress:1,
@@ -76,8 +76,8 @@ struct igmpv3_query {
 #error "Please fix <asm/byteorder.h>"
 #endif
        __u8 qqic;
-        __u16 nsrcs;
+        __be16 nsrcs;
-        __u32 srcs[0];
+        __be32 srcs[0];
 };
 #define IGMP_HOST_MEMBERSHIP_QUERY      0x11    /* From RFC1112 */
@@ -136,11 +136,11 @@ struct ip_sf_socklist
 {
        unsigned int            sl_max;
        unsigned int            sl_count;
-        __u32                   sl_addr[0];
+        __be32                  sl_addr[0];
 };
 #define IP_SFLSIZE(count)       (sizeof(struct ip_sf_socklist) + \
-        (count) * sizeof(__u32))
+        (count) * sizeof(__be32))
 #define IP_SFBLOCK      10      /* allocate this many at once */
@@ -159,7 +159,7 @@ struct ip_mc_socklist
 struct ip_sf_list
 {
        struct ip_sf_list       *sf_next;
-        __u32                   sf_inaddr;
+        __be32                  sf_inaddr;
        unsigned long           sf_count[2];    /* include/exclude counts */
        unsigned char           sf_gsresp;      /* include in g & s response? */
        unsigned char           sf_oldin;       /* change state */
@@ -197,7 +197,7 @@ struct ip_mc_list
 #define IGMPV3_QQIC(value) IGMPV3_EXP(0x80, 4, 3, value)
 #define IGMPV3_MRC(value) IGMPV3_EXP(0x80, 4, 3, value)
-extern int ip_check_mc(struct in_device *dev, u32 mc_addr, u32 src_addr, u16 proto);
+extern int ip_check_mc(struct in_device *dev, __be32 mc_addr, __be32 src_addr, u16 proto);
 extern int igmp_rcv(struct sk_buff *);
 extern int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr);
 extern int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr);
@@ -209,13 +209,13 @@ extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
                struct ip_msfilter __user *optval, int __user *optlen);
 extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
                struct group_filter __user *optval, int __user *optlen);
-extern int ip_mc_sf_allow(struct sock *sk, u32 local, u32 rmt, int dif);
+extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt, int dif);
 extern void ip_mr_init(void);
 extern void ip_mc_init_dev(struct in_device *);
 extern void ip_mc_destroy_dev(struct in_device *);
 extern void ip_mc_up(struct in_device *);
 extern void ip_mc_down(struct in_device *);
-extern void ip_mc_dec_group(struct in_device *in_dev, u32 addr);
+extern void ip_mc_dec_group(struct in_device *in_dev, __be32 addr);
-extern void ip_mc_inc_group(struct in_device *in_dev, u32 addr);
+extern void ip_mc_inc_group(struct in_device *in_dev, __be32 addr);
 #endif
 #endif
diff --git a/include/linux/in.h b/include/linux/in.h
index 94f557fa4636..d79fc75fa7c2 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -52,7 +52,7 @@ enum {
 /* Internet address. */
 struct in_addr {
-        __u32   s_addr;
+        __be32  s_addr;
 };
 #define IP_TOS          1
@@ -123,17 +123,17 @@ struct ip_mreqn
 };
 struct ip_mreq_source {
-        __u32           imr_multiaddr;
+        __be32          imr_multiaddr;
-        __u32           imr_interface;
+        __be32          imr_interface;
-        __u32           imr_sourceaddr;
+        __be32          imr_sourceaddr;
 };
 struct ip_msfilter {
-        __u32           imsf_multiaddr;
+        __be32          imsf_multiaddr;
-        __u32           imsf_interface;
+        __be32          imsf_interface;
        __u32           imsf_fmode;
        __u32           imsf_numsrc;
-        __u32           imsf_slist[1];
+        __be32          imsf_slist[1];
 };
 #define IP_MSFILTER_SIZE(numsrc) \
@@ -177,7 +177,7 @@ struct in_pktinfo
 #define __SOCK_SIZE__   16              /* sizeof(struct sockaddr)      */
 struct sockaddr_in {
  sa_family_t           sin_family;     /* Address family               */
-  unsigned short int    sin_port;       /* Port number                  */
+  __be16                sin_port;       /* Port number                  */
  struct in_addr        sin_addr;       /* Internet address             */
  /* Pad to size of `struct sockaddr'. */
diff --git a/include/linux/in6.h b/include/linux/in6.h
index 304aaedea305..9be6a4756f0b 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -32,8 +32,8 @@ struct in6_addr
        union 
        {
                __u8            u6_addr8[16];
-                __u16           u6_addr16[8];
+                __be16          u6_addr16[8];
-                __u32           u6_addr32[4];
+                __be32          u6_addr32[4];
        } in6_u;
 #define s6_addr                 in6_u.u6_addr8
 #define s6_addr16               in6_u.u6_addr16
@@ -53,7 +53,7 @@ extern const struct in6_addr in6addr_loopback;
 struct sockaddr_in6 {
        unsigned short int      sin6_family;    /* AF_INET6 */
-        __u16                   sin6_port;      /* Transport layer port # */
+        __be16                  sin6_port;      /* Transport layer port # */
        __u32                   sin6_flowinfo;  /* IPv6 flow information */
        struct in6_addr         sin6_addr;      /* IPv6 address */
        __u32                   sin6_scope_id;  /* scope id (new in RFC2553) */
@@ -134,6 +134,7 @@ struct in6_flowlabel_req
 #define IPPROTO_ICMPV6          58      /* ICMPv6                       */
 #define IPPROTO_NONE            59      /* IPv6 no next header          */
 #define IPPROTO_DSTOPTS         60      /* IPv6 destination options     */
+#define IPPROTO_MH              135     /* IPv6 mobility header         */
 /*
 *      IPv6 TLV options.
@@ -142,6 +143,7 @@ struct in6_flowlabel_req
 #define IPV6_TLV_PADN           1
 #define IPV6_TLV_ROUTERALERT    5
 #define IPV6_TLV_JUMBO          194
+#define IPV6_TLV_HAO            201     /* home address option */
 /*
 *      IPV6 socket options
diff --git a/include/linux/inet.h b/include/linux/inet.h
index 6c5587af118d..b7c6da7d6d32 100644
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -46,5 +46,7 @@
 #include <linux/types.h>
 extern __be32 in_aton(const char *str);
+extern int in4_pton(const char *src, int srclen, u8 *dst, char delim, const char **end);
+extern int in6_pton(const char *src, int srclen, u8 *dst, char delim, const char **end);
 #endif
 #endif  /* _LINUX_INET_H */
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index a4606e5810e5..6e8bc548635a 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -9,10 +9,10 @@
 /* Socket identity */
 struct inet_diag_sockid {
-        __u16   idiag_sport;
+        __be16  idiag_sport;
-        __u16   idiag_dport;
+        __be16  idiag_dport;
-        __u32   idiag_src[4];
+        __be32  idiag_src[4];
-        __u32   idiag_dst[4];
+        __be32  idiag_dst[4];
        __u32   idiag_if;
        __u32   idiag_cookie[2];
 #define INET_DIAG_NOCOOKIE (~0U)
@@ -67,7 +67,7 @@ struct inet_diag_hostcond {
        __u8    family;
        __u8    prefix_len;
        int     port;
-        __u32   addr[0];
+        __be32  addr[0];
 };
 /* Base info structure. It contains socket identity (addrs/ports/cookie)
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 92297ff24e85..5a0ab04627bc 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -90,11 +90,11 @@ struct in_ifaddr
        struct in_ifaddr        *ifa_next;
        struct in_device        *ifa_dev;
        struct rcu_head         rcu_head;
-        u32                     ifa_local;
+        __be32                  ifa_local;
-        u32                     ifa_address;
+        __be32                  ifa_address;
-        u32                     ifa_mask;
+        __be32                  ifa_mask;
-        u32                     ifa_broadcast;
+        __be32                  ifa_broadcast;
-        u32                     ifa_anycast;
+        __be32                  ifa_anycast;
        unsigned char           ifa_scope;
        unsigned char           ifa_flags;
        unsigned char           ifa_prefixlen;
@@ -104,18 +104,18 @@ struct in_ifaddr
 extern int register_inetaddr_notifier(struct notifier_block *nb);
 extern int unregister_inetaddr_notifier(struct notifier_block *nb);
-extern struct net_device        *ip_dev_find(u32 addr);
+extern struct net_device        *ip_dev_find(__be32 addr);
-extern int              inet_addr_onlink(struct in_device *in_dev, u32 a, u32 b);
+extern int              inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b);
 extern int              devinet_ioctl(unsigned int cmd, void __user *);
 extern void             devinet_init(void);
 extern struct in_device *inetdev_init(struct net_device *dev);
 extern struct in_device *inetdev_by_index(int);
-extern u32              inet_select_addr(const struct net_device *dev, u32 dst, int scope);
+extern __be32           inet_select_addr(const struct net_device *dev, __be32 dst, int scope);
-extern u32              inet_confirm_addr(const struct net_device *dev, u32 dst, u32 local, int scope);
+extern __be32           inet_confirm_addr(const struct net_device *dev, __be32 dst, __be32 local, int scope);
-extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, u32 prefix, u32 mask);
+extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, __be32 mask);
 extern void             inet_forward_change(void);
-static __inline__ int inet_ifa_match(u32 addr, struct in_ifaddr *ifa)
+static __inline__ int inet_ifa_match(__be32 addr, struct in_ifaddr *ifa)
 {
        return !((addr^ifa->ifa_address)&ifa->ifa_mask);
 }
@@ -183,7 +183,7 @@ static inline void in_dev_put(struct in_device *idev)
 #endif /* __KERNEL__ */
-static __inline__ __u32 inet_make_mask(int logmask)
+static __inline__ __be32 inet_make_mask(int logmask)
 {
        if (logmask)
                return htonl(~((1<<(32-logmask))-1));
diff --git a/include/linux/init.h b/include/linux/init.h
index 6667785dd1ff..e92b1455d7af 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -68,6 +68,7 @@ extern initcall_t __security_initcall_start[], __security_initcall_end[];
 /* Defined in init/main.c */
 extern char saved_command_line[];
+extern unsigned int reset_devices;
 /* used by init/main.c */
 extern void setup_arch(char **);
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index d5afee95fd43..1f97e3d92639 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -123,6 +123,14 @@ static inline void disable_irq_nosync_lockdep(unsigned int irq)
 #endif
 }
+static inline void disable_irq_nosync_lockdep_irqsave(unsigned int irq, unsigned long *flags)
+{
+        disable_irq_nosync(irq);
+#ifdef CONFIG_LOCKDEP
+        local_irq_save(*flags);
+#endif
+}
 static inline void disable_irq_lockdep(unsigned int irq)
 {
        disable_irq(irq);
@@ -139,6 +147,14 @@ static inline void enable_irq_lockdep(unsigned int irq)
        enable_irq(irq);
 }
+static inline void enable_irq_lockdep_irqrestore(unsigned int irq, unsigned long *flags)
+{
+#ifdef CONFIG_LOCKDEP
+        local_irq_restore(*flags);
+#endif
+        enable_irq(irq);
+}
 /* IRQ wakeup (PM) control: */
 extern int set_irq_wake(unsigned int irq, unsigned int on);
diff --git a/include/linux/io.h b/include/linux/io.h
index 420e2fdf26f6..aa3f5af670b5 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -19,8 +19,12 @@
 #define _LINUX_IO_H
 #include <asm/io.h>
+#include <asm/page.h>
 void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
 void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
+int ioremap_page_range(unsigned long addr, unsigned long end,
+                       unsigned long phys_addr, pgprot_t prot);
 #endif /* _LINUX_IO_H */
diff --git a/include/linux/ip.h b/include/linux/ip.h
index 4b55cf1df732..6b25d36fc54c 100644
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -57,6 +57,7 @@
 #define IPOPT_SEC       (2 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_LSRR      (3 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_TIMESTAMP (4 |IPOPT_MEASUREMENT)
+#define IPOPT_CIPSO     (6 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_RR        (7 |IPOPT_CONTROL)
 #define IPOPT_SID       (8 |IPOPT_CONTROL|IPOPT_COPY)
 #define IPOPT_SSRR      (9 |IPOPT_CONTROL|IPOPT_COPY)
@@ -95,7 +96,7 @@ struct iphdr {
        __be16  frag_off;
        __u8    ttl;
        __u8    protocol;
-        __u16   check;
+        __be16  check;
        __be32  saddr;
        __be32  daddr;
        /*The options start here. */
@@ -104,22 +105,22 @@ struct iphdr {
 struct ip_auth_hdr {
        __u8  nexthdr;
        __u8  hdrlen;           /* This one is measured in 32 bit units! */
-        __u16 reserved;
+        __be16 reserved;
-        __u32 spi;
+        __be32 spi;
-        __u32 seq_no;           /* Sequence number */
+        __be32 seq_no;          /* Sequence number */
        __u8  auth_data[0];     /* Variable len but >=4. Mind the 64 bit alignment! */
 };
 struct ip_esp_hdr {
-        __u32 spi;
+        __be32 spi;
-        __u32 seq_no;           /* Sequence number */
+        __be32 seq_no;          /* Sequence number */
        __u8  enc_data[0];      /* Variable len but >=8. Mind the 64 bit alignment! */
 };
 struct ip_comp_hdr {
        __u8 nexthdr;
        __u8 flags;
-        __u16 cpi;
+        __be16 cpi;
 };
 #endif  /* _LINUX_IP_H */
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index d09fbeabf1dc..796ca009fd46 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -148,6 +148,13 @@ struct ipmi_lan_addr
 #define IPMI_BMC_CHANNEL  0xf
 #define IPMI_NUM_CHANNELS 0x10
+/*
+ * Used to signify an "all channel" bitmask.  This is more than the
+ * actual number of channels because this is used in userland and
+ * will cover us if the number of channels is extended.
+ */
+#define IPMI_CHAN_ALL     (~0)
 /*
 * A raw IPMI message without any addressing.  This covers both
@@ -350,18 +357,21 @@ int ipmi_request_supply_msgs(ipmi_user_t          user,
 /*
 * When commands come in to the SMS, the user can register to receive
- * them.  Only one user can be listening on a specific netfn/cmd pair
+ * them.  Only one user can be listening on a specific netfn/cmd/chan tuple
 * at a time, you will get an EBUSY error if the command is already
 * registered.  If a command is received that does not have a user
 * registered, the driver will automatically return the proper
- * error.
+ * error.  Channels are specified as a bitfield, use IPMI_CHAN_ALL to
+ * mean all channels.
 */
 int ipmi_register_for_cmd(ipmi_user_t   user,
                          unsigned char netfn,
-                          unsigned char cmd);
+                          unsigned char cmd,
+                          unsigned int  chans);
 int ipmi_unregister_for_cmd(ipmi_user_t   user,
                            unsigned char netfn,
-                            unsigned char cmd);
+                            unsigned char cmd,
+                            unsigned int  chans);
 /*
 * Allow run-to-completion mode to be set for the interface of
@@ -571,6 +581,36 @@ struct ipmi_cmdspec
 #define IPMICTL_UNREGISTER_FOR_CMD      _IOR(IPMI_IOC_MAGIC, 15,        \
                                             struct ipmi_cmdspec)
+/*
+ * Register to get commands from other entities on specific channels.
+ * This way, you can only listen on specific channels, or have messages
+ * from some channels go to one place and other channels to someplace
+ * else.  The chans field is a bitmask, (1 << channel) for each channel.
+ * It may be IPMI_CHAN_ALL for all channels.
+ */
+struct ipmi_cmdspec_chans
+{
+        unsigned int netfn;
+        unsigned int cmd;
+        unsigned int chans;
+};
+/*
+ * Register to receive a specific command on specific channels.  error values:
+ *   - EFAULT - an address supplied was invalid.
+ *   - EBUSY - One of the netfn/cmd/chans supplied was already in use.
+ *   - ENOMEM - could not allocate memory for the entry.
+ */
+#define IPMICTL_REGISTER_FOR_CMD_CHANS  _IOR(IPMI_IOC_MAGIC, 28,        \
+                                             struct ipmi_cmdspec_chans)
+/*
+ * Unregister some netfn/cmd/chans.  error values:
+ *  - EFAULT - an address supplied was invalid.
+ *  - ENOENT - None of the netfn/cmd/chans were found registered for this user.
+ */
+#define IPMICTL_UNREGISTER_FOR_CMD_CHANS _IOR(IPMI_IOC_MAGIC, 29,       \
+                                             struct ipmi_cmdspec_chans)
 /* 
 * Set whether this interface receives events.  Note that the first
 * user registered for events will get all pending events for the
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 297853c841b4..4f435c59de06 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -29,6 +29,7 @@ struct in6_ifreq {
 #define IPV6_SRCRT_STRICT       0x01    /* this hop must be a neighbor  */
 #define IPV6_SRCRT_TYPE_0       0       /* IPv6 type 0 Routing Header   */
+#define IPV6_SRCRT_TYPE_2       2       /* IPv6 type 2 Routing Header   */
 /*
 *      routing header
@@ -73,25 +74,47 @@ struct rt0_hdr {
 #define rt0_type                rt_hdr.type
 };
+/*
+ *      routing header type 2
+ */
+struct rt2_hdr {
+        struct ipv6_rt_hdr      rt_hdr;
+        __u32                   reserved;
+        struct in6_addr         addr;
+#define rt2_type                rt_hdr.type
+};
+/*
+ *      home address option in destination options header
+ */
+struct ipv6_destopt_hao {
+        __u8                    type;
+        __u8                    length;
+        struct in6_addr         addr;
+} __attribute__ ((__packed__));
 struct ipv6_auth_hdr {
        __u8  nexthdr;
        __u8  hdrlen;           /* This one is measured in 32 bit units! */
-        __u16 reserved;
+        __be16 reserved;
-        __u32 spi;
+        __be32 spi;
-        __u32 seq_no;           /* Sequence number */
+        __be32 seq_no;           /* Sequence number */
        __u8  auth_data[0];     /* Length variable but >=4. Mind the 64 bit alignment! */
 };
 struct ipv6_esp_hdr {
-        __u32 spi;
+        __be32 spi;
-        __u32 seq_no;           /* Sequence number */
+        __be32 seq_no;           /* Sequence number */
        __u8  enc_data[0];      /* Length variable but >=8. Mind the 64 bit alignment! */
 };
 struct ipv6_comp_hdr {
        __u8 nexthdr;
        __u8 flags;
-        __u16 cpi;
+        __be16 cpi;
 };
 /*
@@ -113,7 +136,7 @@ struct ipv6hdr {
 #endif
        __u8                    flow_lbl[3];
-        __u16                   payload_len;
+        __be16                  payload_len;
        __u8                    nexthdr;
        __u8                    hop_limit;
@@ -153,6 +176,7 @@ struct ipv6_devconf {
        __s32           accept_ra_rt_info_max_plen;
 #endif
 #endif
+        __s32           proxy_ndp;
        void            *sysctl;
 };
@@ -180,6 +204,7 @@ enum {
        DEVCONF_ACCEPT_RA_RTR_PREF,
        DEVCONF_RTR_PROBE_INTERVAL,
        DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
+        DEVCONF_PROXY_NDP,
        DEVCONF_MAX
 };
@@ -206,6 +231,9 @@ struct inet6_skb_parm {
        __u16                   lastopt;
        __u32                   nhoff;
        __u16                   flags;
+#ifdef CONFIG_IPV6_MIP6
+        __u16                   dsthao;
+#endif
 #define IP6SKB_XFRM_TRANSFORMED 1
 };
@@ -242,6 +270,9 @@ struct ipv6_pinfo {
        struct in6_addr         rcv_saddr;
        struct in6_addr         daddr;
        struct in6_addr         *daddr_cache;
+#ifdef CONFIG_IPV6_SUBTREES
+        struct in6_addr         *saddr_cache;
+#endif
        __u32                   flow_label;
        __u32                   frag_size;
@@ -430,7 +461,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk)
 #define INET6_MATCH(__sk, __hash, __saddr, __daddr, __ports, __dif)\
        (((__sk)->sk_hash == (__hash))                          && \
-         ((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports))   && \
+         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      && \
         ((__sk)->sk_family             == AF_INET6)            && \
         ipv6_addr_equal(&inet6_sk(__sk)->daddr, (__saddr))     && \
         ipv6_addr_equal(&inet6_sk(__sk)->rcv_saddr, (__daddr)) && \
diff --git a/include/linux/irq.h b/include/linux/irq.h
index fbf6d901e9c2..48d3cb3b6a47 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -320,7 +320,9 @@ handle_irq_name(void fastcall (*handle)(unsigned int, struct irq_desc *,
 * Monolithic do_IRQ implementation.
 * (is an explicit fastcall, because i386 4KSTACKS calls it from assembly)
 */
+#ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ
 extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs);
+#endif
 /*
 * Architectures call this to let the generic IRQ layer
@@ -332,10 +334,14 @@ static inline void generic_handle_irq(unsigned int irq, struct pt_regs *regs)
 {
        struct irq_desc *desc = irq_desc + irq;
+#ifdef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ
+        desc->handle_irq(irq, desc, regs);
+#else
        if (likely(desc->handle_irq))
                desc->handle_irq(irq, desc, regs);
        else
                __do_IRQ(irq, regs);
+#endif
 }
 /* Handling of unhandled and spurious interrupts: */
diff --git a/include/linux/iso_fs.h b/include/linux/iso_fs.h
index 47967878bfef..4688ac4284e2 100644
--- a/include/linux/iso_fs.h
+++ b/include/linux/iso_fs.h
@@ -2,6 +2,8 @@
 #define _ISOFS_FS_H
 #include <linux/types.h>
+#include <linux/magic.h>
 /*
 * The isofs filesystem constants/structures
 */
@@ -160,6 +162,4 @@ struct iso_directory_record {
 #define ISOFS_BUFFER_SIZE(INODE) ((INODE)->i_sb->s_blocksize)
 #define ISOFS_BUFFER_BITS(INODE) ((INODE)->i_sb->s_blocksize_bits)
-#define ISOFS_SUPER_MAGIC 0x9660
+#endif /* _ISOFS_FS_H */
-#endif
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index a04c154c5207..fe89444b1c6f 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -1,6 +1,6 @@
 /*
 * linux/include/linux/jbd.h
- * 
+ *
 * Written by Stephen C. Tweedie <sct@redhat.com>
 *
 * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved
@@ -64,7 +64,7 @@ extern int journal_enable_debug;
                if ((n) <= journal_enable_debug) {                      \
                        printk (KERN_DEBUG "(%s, %d): %s: ",            \
                                __FILE__, __LINE__, __FUNCTION__);      \
-                        printk (f, ## a);                               \
+                        printk (f, ## a);                               \
                }                                                       \
        } while (0)
 #else
@@ -97,8 +97,8 @@ extern void jbd_slab_free(void *ptr, size_t size);
 * number of outstanding buffers possible at any time.  When the
 * operation completes, any buffer credits not used are credited back to
 * the transaction, so that at all times we know how many buffers the
- * outstanding updates on a transaction might possibly touch. 
+ * outstanding updates on a transaction might possibly touch.
- * 
+ *
 * This is an opaque datatype.
 **/
 typedef struct handle_s         handle_t;       /* Atomic operation type */
@@ -108,7 +108,7 @@ typedef struct handle_s		handle_t;	/* Atomic operation type */
 * typedef journal_t - The journal_t maintains all of the journaling state information for a single filesystem.
 *
 * journal_t is linked to from the fs superblock structure.
- * 
+ *
 * We use the journal_t to keep track of all outstanding transaction
 * activity on the filesystem, and to manage the state of the log
 * writing process.
@@ -128,7 +128,7 @@ typedef struct journal_s	journal_t;	/* Journal control structure */
 * On-disk structures
 */
-/* 
+/*
 * Descriptor block types:
 */
@@ -149,8 +149,8 @@ typedef struct journal_header_s
 } journal_header_t;
-/* 
+/*
- * The block tag: used to describe a single buffer in the journal 
+ * The block tag: used to describe a single buffer in the journal
 */
 typedef struct journal_block_tag_s
 {
@@ -158,9 +158,9 @@ typedef struct journal_block_tag_s
        __be32          t_flags;        /* See below */
 } journal_block_tag_t;
-/* 
+/*
 * The revoke descriptor: used on disk to describe a series of blocks to
- * be revoked from the log 
+ * be revoked from the log
 */
 typedef struct journal_revoke_header_s
 {
@@ -201,9 +201,9 @@ typedef struct journal_superblock_s
 /* 0x0024 */
        /* Remaining fields are only valid in a version-2 superblock */
-        __be32  s_feature_compat;       /* compatible feature set */
+        __be32  s_feature_compat;       /* compatible feature set */
-        __be32  s_feature_incompat;     /* incompatible feature set */
+        __be32  s_feature_incompat;     /* incompatible feature set */
-        __be32  s_feature_ro_compat;    /* readonly-compatible feature set */
+        __be32  s_feature_ro_compat;    /* readonly-compatible feature set */
 /* 0x0030 */
        __u8    s_uuid[16];             /* 128-bit uuid for journal */
@@ -374,10 +374,10 @@ struct jbd_revoke_table_s;
 **/
 /* Docbook can't yet cope with the bit fields, but will leave the documentation
- * in so it can be fixed later. 
+ * in so it can be fixed later.
 */
-struct handle_s 
+struct handle_s
 {
        /* Which compound transaction is this update a part of? */
        transaction_t           *h_transaction;
@@ -435,7 +435,7 @@ struct handle_s
 *
 */
-struct transaction_s 
+struct transaction_s
 {
        /* Pointer to the journal for this transaction. [no locking] */
        journal_t               *t_journal;
@@ -455,7 +455,7 @@ struct transaction_s
                T_RUNDOWN,
                T_FLUSH,
                T_COMMIT,
-                T_FINISHED 
+                T_FINISHED
        }                       t_state;
        /*
@@ -569,7 +569,7 @@ struct transaction_s
 *     journal_t.
 * @j_flags:  General journaling state flags
 * @j_errno:  Is there an outstanding uncleared error on the journal (from a
- *     prior abort)? 
+ *     prior abort)?
 * @j_sb_buffer: First part of superblock buffer
 * @j_superblock: Second part of superblock buffer
 * @j_format_version: Version of the superblock format
@@ -583,7 +583,7 @@ struct transaction_s
 * @j_wait_transaction_locked: Wait queue for waiting for a locked transaction
 *  to start committing, or for a barrier lock to be released
 * @j_wait_logspace: Wait queue for waiting for checkpointing to complete
- * @j_wait_done_commit: Wait queue for waiting for commit to complete 
+ * @j_wait_done_commit: Wait queue for waiting for commit to complete
 * @j_wait_checkpoint:  Wait queue to trigger checkpointing
 * @j_wait_commit: Wait queue to trigger commit
 * @j_wait_updates: Wait queue to wait for updates to complete
@@ -592,7 +592,7 @@ struct transaction_s
 * @j_tail: Journal tail - identifies the oldest still-used block in the
 *  journal.
 * @j_free: Journal free - how many free blocks are there in the journal?
- * @j_first: The block number of the first usable block 
+ * @j_first: The block number of the first usable block
 * @j_last: The block number one beyond the last usable block
 * @j_dev: Device where we store the journal
 * @j_blocksize: blocksize for the location where we store the journal.
@@ -604,12 +604,12 @@ struct transaction_s
 * @j_list_lock: Protects the buffer lists and internal buffer state.
 * @j_inode: Optional inode where we store the journal.  If present, all journal
 *     block numbers are mapped into this inode via bmap().
- * @j_tail_sequence:  Sequence number of the oldest transaction in the log 
+ * @j_tail_sequence:  Sequence number of the oldest transaction in the log
 * @j_transaction_sequence: Sequence number of the next transaction to grant
 * @j_commit_sequence: Sequence number of the most recently committed
 *  transaction
 * @j_commit_request: Sequence number of the most recent transaction wanting
- *     commit 
+ *     commit
 * @j_uuid: Uuid of client object.
 * @j_task: Pointer to the current commit thread for this journal
 * @j_max_transaction_buffers:  Maximum number of metadata buffers to allow in a
@@ -699,7 +699,7 @@ struct journal_s
        wait_queue_head_t       j_wait_updates;
        /* Semaphore for locking against concurrent checkpoints */
-        struct mutex            j_checkpoint_mutex;
+        struct mutex            j_checkpoint_mutex;
        /*
         * Journal head: identifies the first unused block in the journal.
@@ -732,7 +732,7 @@ struct journal_s
         */
        struct block_device     *j_dev;
        int                     j_blocksize;
-        unsigned int            j_blk_offset;
+        unsigned long           j_blk_offset;
        /*
         * Device which holds the client fs.  For internal journal this will be
@@ -823,8 +823,8 @@ struct journal_s
        void *j_private;
 };
-/* 
+/*
- * Journal flag definitions 
+ * Journal flag definitions
 */
 #define JFS_UNMOUNT     0x001   /* Journal thread is being destroyed */
 #define JFS_ABORT       0x002   /* Journaling has been aborted for errors. */
@@ -833,7 +833,7 @@ struct journal_s
 #define JFS_LOADED      0x010   /* The journal superblock has been loaded */
 #define JFS_BARRIER     0x020   /* Use IDE barriers */
-/* 
+/*
 * Function declarations for the journaling transaction and buffer
 * management
 */
@@ -862,11 +862,11 @@ int __journal_remove_checkpoint(struct journal_head *);
 void __journal_insert_checkpoint(struct journal_head *, transaction_t *);
 /* Buffer IO */
-extern int 
+extern int
 journal_write_metadata_buffer(transaction_t       *transaction,
                              struct journal_head  *jh_in,
                              struct journal_head **jh_out,
-                              int                  blocknr);
+                              unsigned long        blocknr);
 /* Transaction locking */
 extern void             __wait_on_journal (journal_t *);
@@ -890,7 +890,7 @@ static inline handle_t *journal_current_handle(void)
 /* The journaling code user interface:
 *
 * Create and destroy handles
- * Register buffer modifications against the current transaction. 
+ * Register buffer modifications against the current transaction.
 */
 extern handle_t *journal_start(journal_t *, int nblocks);
@@ -917,11 +917,11 @@ extern journal_t * journal_init_dev(struct block_device *bdev,
                                int start, int len, int bsize);
 extern journal_t * journal_init_inode (struct inode *);
 extern int         journal_update_format (journal_t *);
-extern int         journal_check_used_features 
+extern int         journal_check_used_features
                   (journal_t *, unsigned long, unsigned long, unsigned long);
-extern int         journal_check_available_features 
+extern int         journal_check_available_features
                   (journal_t *, unsigned long, unsigned long, unsigned long);
-extern int         journal_set_features 
+extern int         journal_set_features
                   (journal_t *, unsigned long, unsigned long, unsigned long);
 extern int         journal_create     (journal_t *);
 extern int         journal_load       (journal_t *journal);
@@ -977,7 +977,6 @@ extern void	   journal_write_revoke_records(journal_t *, transaction_t *);
 extern int      journal_set_revoke(journal_t *, unsigned long, tid_t);
 extern int      journal_test_revoke(journal_t *, unsigned long, tid_t);
 extern void     journal_clear_revoke(journal_t *);
-extern void     journal_brelse_array(struct buffer_head *b[], int n);
 extern void     journal_switch_revoke_table(journal_t *journal);
 /*
@@ -1015,7 +1014,7 @@ do {								           \
 * bit, when set, indicates that we have had a fatal error somewhere,
 * either inside the journaling layer or indicated to us by the client
 * (eg. ext3), and that we and should not commit any further
- * transactions.  
+ * transactions.
 */
 static inline int is_journal_aborted(journal_t *journal)
@@ -1082,7 +1081,7 @@ static inline int jbd_space_needed(journal_t *journal)
 #define BJ_Reserved     7       /* Buffer is reserved for access by journal */
 #define BJ_Locked       8       /* Locked for I/O during commit */
 #define BJ_Types        9
- 
 extern int jbd_blocks_per_page(struct inode *inode);
 #ifdef __KERNEL__
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h
index c9c760700bc3..840631fa5ff1 100644
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@ -15,12 +15,12 @@
 #ifndef __LINUX_JFFS2_H__
 #define __LINUX_JFFS2_H__
+#include <linux/magic.h>
 /* You must include something which defines the C99 uintXX_t types. 
   We don't do it from here because this file is used in too many
   different environments. */
-#define JFFS2_SUPER_MAGIC 0x72b6
 /* Values we may expect to find in the 'magic' field */
 #define JFFS2_OLD_MAGIC_BITMASK 0x1984
 #define JFFS2_MAGIC_BITMASK 0x1985
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 329ebcffa106..c8d5f207c3d4 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -115,6 +115,21 @@ static inline u64 get_jiffies_64(void)
         ((long)(a) - (long)(b) >= 0))
 #define time_before_eq(a,b)     time_after_eq(b,a)
+/* Same as above, but does so with platform independent 64bit types.
+ * These must be used when utilizing jiffies_64 (i.e. return value of
+ * get_jiffies_64() */
+#define time_after64(a,b)       \
+        (typecheck(__u64, a) && \
+         typecheck(__u64, b) && \
+         ((__s64)(b) - (__s64)(a) < 0))
+#define time_before64(a,b)      time_after64(b,a)
+#define time_after_eq64(a,b)    \
+        (typecheck(__u64, a) && \
+         typecheck(__u64, b) && \
+         ((__s64)(a) - (__s64)(b) >= 0))
+#define time_before_eq64(a,b)   time_after_eq64(b,a)
 /*
 * Have the 32 bit jiffies value wrap 5 minutes after boot
 * so jiffies wrap bugs show up earlier.
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 851aa1bcfc1a..4d00988dad03 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -31,8 +31,9 @@ extern const char linux_banner[];
 #define STACK_MAGIC     0xdeadbeef
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#define ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
+#define ALIGN(x,a) (((x)+(a)-1UL)&~((a)-1UL))
 #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
 #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
 #define KERN_EMERG      "<0>"   /* system is unusable                   */
@@ -186,6 +187,7 @@ extern void bust_spinlocks(int yes);
 extern int oops_in_progress;            /* If set, an oops, panic(), BUG() or die() is in progress */
 extern int panic_timeout;
 extern int panic_on_oops;
+extern int panic_on_unrecovered_nmi;
 extern int tainted;
 extern const char *print_tainted(void);
 extern void add_taint(unsigned);
@@ -348,4 +350,11 @@ struct sysinfo {
 /* Trap pasters of __FUNCTION__ at compile-time */
 #define __FUNCTION__ (__func__)
+/* This helps us to avoid #ifdef CONFIG_NUMA */
+#ifdef CONFIG_NUMA
+#define NUMA_BUILD 1
+#else
+#define NUMA_BUILD 0
+#endif
 #endif
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 0db22a1ab474..10f505c8431d 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -47,4 +47,8 @@ call_usermodehelper(char *path, char **argv, char **envp, int wait)
 extern void usermodehelper_init(void);
+struct file;
+extern int call_usermodehelper_pipe(char *path, char *argv[], char *envp[],
+                                    struct file **filp);
 #endif /* __LINUX_KMOD_H__ */
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 2d229327959e..bcd9cd173c2c 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -20,6 +20,7 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/sysfs.h>
+#include <linux/compiler.h>
 #include <linux/spinlock.h>
 #include <linux/rwsem.h>
 #include <linux/kref.h>
@@ -71,12 +72,12 @@ static inline const char * kobject_name(const struct kobject * kobj)
 extern void kobject_init(struct kobject *);
 extern void kobject_cleanup(struct kobject *);
-extern int kobject_add(struct kobject *);
+extern int __must_check kobject_add(struct kobject *);
 extern void kobject_del(struct kobject *);
-extern int kobject_rename(struct kobject *, const char *new_name);
+extern int __must_check kobject_rename(struct kobject *, const char *new_name);
-extern int kobject_register(struct kobject *);
+extern int __must_check kobject_register(struct kobject *);
 extern void kobject_unregister(struct kobject *);
 extern struct kobject * kobject_get(struct kobject *);
@@ -128,8 +129,8 @@ struct kset {
 extern void kset_init(struct kset * k);
-extern int kset_add(struct kset * k);
+extern int __must_check kset_add(struct kset * k);
-extern int kset_register(struct kset * k);
+extern int __must_check kset_register(struct kset * k);
 extern void kset_unregister(struct kset * k);
 static inline struct kset * to_kset(struct kobject * kobj)
@@ -239,7 +240,7 @@ extern struct subsystem hypervisor_subsys;
        (obj)->subsys.kset.kobj.kset = &(_subsys).kset
 extern void subsystem_init(struct subsystem *);
-extern int subsystem_register(struct subsystem *);
+extern int __must_check subsystem_register(struct subsystem *);
 extern void subsystem_unregister(struct subsystem *);
 static inline struct subsystem * subsys_get(struct subsystem * s)
@@ -258,7 +259,8 @@ struct subsys_attribute {
        ssize_t (*store)(struct subsystem *, const char *, size_t); 
 };
-extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
+extern int __must_check subsys_create_file(struct subsystem * ,
+                                        struct subsys_attribute *);
 #if defined(CONFIG_HOTPLUG)
 void kobject_uevent(struct kobject *kobj, enum kobject_action action);
diff --git a/include/linux/latency.h b/include/linux/latency.h
new file mode 100644
index 000000000000..c08b52bb55b0
--- /dev/null
+++ b/include/linux/latency.h
@@ -0,0 +1,25 @@
+/*
+ * latency.h: Explicit system-wide latency-expectation infrastructure
+ *
+ * (C) Copyright 2006 Intel Corporation
+ * Author: Arjan van de Ven <arjan@linux.intel.com>
+ *
+ */
+#ifndef _INCLUDE_GUARD_LATENCY_H_
+#define _INCLUDE_GUARD_LATENCY_H_
+#include <linux/notifier.h>
+void set_acceptable_latency(char *identifier, int usecs);
+void modify_acceptable_latency(char *identifier, int usecs);
+void remove_acceptable_latency(char *identifier);
+void synchronize_acceptable_latency(void);
+int system_latency_constraint(void);
+int register_latency_notifier(struct notifier_block * nb);
+int unregister_latency_notifier(struct notifier_block * nb);
+#define INFINITE_LATENCY 1000000
+#endif
diff --git a/include/linux/leds.h b/include/linux/leds.h
index dc23c7c639f3..88afceffb7cb 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -12,6 +12,9 @@
 #ifndef __LINUX_LEDS_H_INCLUDED
 #define __LINUX_LEDS_H_INCLUDED
+#include <linux/list.h>
+#include <linux/spinlock.h>
 struct device;
 struct class_device;
 /*
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 66c3100c2b94..d6a3d4b345fc 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -37,6 +37,16 @@
 #include <scsi/scsi_host.h>
 /*
+ * Define if arch has non-standard setup.  This is a _PCI_ standard
+ * not a legacy or ISA standard.
+ */
+#ifdef CONFIG_ATA_NONSTANDARD
+#include <asm/libata-portmap.h>
+#else
+#include <asm-generic/libata-portmap.h>
+#endif
+/*
 * compile-time options: to be removed as soon as all the drivers are
 * converted to the new debugging mechanism
 */
@@ -44,7 +54,7 @@
 #undef ATA_VERBOSE_DEBUG        /* yet more debugging output */
 #undef ATA_IRQ_TRAP             /* define to ack screaming irqs */
 #undef ATA_NDEBUG               /* define to disable quick runtime checks */
-#undef ATA_ENABLE_PATA          /* define to enable PATA support in some
+#define ATA_ENABLE_PATA         /* define to enable PATA support in some
                                 * low-level drivers */
@@ -112,8 +122,6 @@ enum {
        /* tag ATA_MAX_QUEUE - 1 is reserved for internal commands */
        ATA_MAX_QUEUE           = 32,
        ATA_TAG_INTERNAL        = ATA_MAX_QUEUE - 1,
-        ATA_MAX_SECTORS         = 200,  /* FIXME */
-        ATA_MAX_SECTORS_LBA48   = 65535,
        ATA_MAX_BUS             = 2,
        ATA_DEF_BUSY_WAIT       = 10000,
        ATA_SHORT_PAUSE         = (HZ >> 6) + 1,
@@ -197,8 +205,8 @@ enum {
        ATA_QCFLAG_EH_SCHEDULED = (1 << 18), /* EH scheduled (obsolete) */
        /* host set flags */
-        ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host_set only */
+        ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host only */
-        
        /* various lengths of time */
        ATA_TMOUT_BOOT          = 30 * HZ,      /* heuristic */
        ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* heuristic */
@@ -225,8 +233,8 @@ enum {
        /* encoding various smaller bitmaps into a single
         * unsigned int bitmap
         */
-        ATA_BITS_PIO            = 5,
+        ATA_BITS_PIO            = 7,
-        ATA_BITS_MWDMA          = 3,
+        ATA_BITS_MWDMA          = 5,
        ATA_BITS_UDMA           = 8,
        ATA_SHIFT_PIO           = 0,
@@ -289,6 +297,11 @@ enum {
         * most devices.
         */
        ATA_SPINUP_WAIT         = 8000,
+        
+        /* Horkage types. May be set by libata or controller on drives
+           (some horkage may be drive/controller pair dependant */
+        ATA_HORKAGE_DIAGNOSTIC  = (1 << 0),     /* Failed boot diag */
 };
 enum hsm_task_states {
@@ -350,23 +363,32 @@ struct ata_probe_ent {
        struct scsi_host_template *sht;
        struct ata_ioports      port[ATA_MAX_PORTS];
        unsigned int            n_ports;
-        unsigned int            hard_port_no;
+        unsigned int            dummy_port_mask;
        unsigned int            pio_mask;
        unsigned int            mwdma_mask;
        unsigned int            udma_mask;
-        unsigned int            legacy_mode;
        unsigned long           irq;
+        unsigned long           irq2;
        unsigned int            irq_flags;
-        unsigned long           host_flags;
+        unsigned long           port_flags;
-        unsigned long           host_set_flags;
+        unsigned long           _host_flags;
        void __iomem            *mmio_base;
        void                    *private_data;
+        /* port_info for the secondary port.  Together with irq2, it's
+         * used to implement non-uniform secondary port.  Currently,
+         * the only user is ata_piix combined mode.  This workaround
+         * will be removed together with ata_probe_ent when init model
+         * is updated.
+         */
+        const struct ata_port_info *pinfo2;
 };
-struct ata_host_set {
+struct ata_host {
        spinlock_t              lock;
        struct device           *dev;
        unsigned long           irq;
+        unsigned long           irq2;
        void __iomem            *mmio_base;
        unsigned int            n_ports;
        void                    *private_data;
@@ -374,7 +396,6 @@ struct ata_host_set {
        unsigned long           flags;
        int                     simplex_claimed;        /* Keep seperate in case we
                                                           ever need to do this locked */
-        struct ata_host_set     *next;          /* for legacy mode */
        struct ata_port         *ports[0];
 };
@@ -420,7 +441,7 @@ struct ata_queued_cmd {
        void                    *private_data;
 };
-struct ata_host_stats {
+struct ata_port_stats {
        unsigned long           unhandled_irq;
        unsigned long           idle_irq;
        unsigned long           rw_reqbuf;
@@ -468,6 +489,7 @@ struct ata_device {
        /* error history */
        struct ata_ering        ering;
+        unsigned int            horkage;        /* List of broken features */
 };
 /* Offset into struct ata_device.  Fields above it are maintained
@@ -498,14 +520,13 @@ struct ata_eh_context {
 };
 struct ata_port {
-        struct Scsi_Host        *host;  /* our co-allocated scsi host */
+        struct Scsi_Host        *scsi_host; /* our co-allocated scsi host */
        const struct ata_port_operations *ops;
        spinlock_t              *lock;
        unsigned long           flags;  /* ATA_FLAG_xxx */
        unsigned int            pflags; /* ATA_PFLAG_xxx */
        unsigned int            id;     /* unique id req'd by scsi midlyr */
        unsigned int            port_no; /* unique port #; from zero */
-        unsigned int            hard_port_no;   /* hardware port #; from zero */
        struct ata_prd          *prd;    /* our SG list */
        dma_addr_t              prd_dma; /* and its DMA mapping */
@@ -524,7 +545,7 @@ struct ata_port {
        unsigned int            hw_sata_spd_limit;
        unsigned int            sata_spd_limit; /* SATA PHY speed limit */
-        /* record runtime error info, protected by host_set lock */
+        /* record runtime error info, protected by host lock */
        struct ata_eh_info      eh_info;
        /* EH context owned by EH */
        struct ata_eh_context   eh_context;
@@ -538,8 +559,8 @@ struct ata_port {
        unsigned int            active_tag;
        u32                     sactive;
-        struct ata_host_stats   stats;
+        struct ata_port_stats   stats;
-        struct ata_host_set     *host_set;
+        struct ata_host         *host;
        struct device           *dev;
        struct work_struct      port_task;
@@ -615,7 +636,7 @@ struct ata_port_operations {
        int (*port_start) (struct ata_port *ap);
        void (*port_stop) (struct ata_port *ap);
-        void (*host_stop) (struct ata_host_set *host_set);
+        void (*host_stop) (struct ata_host *host);
        void (*bmdma_stop) (struct ata_queued_cmd *qc);
        u8   (*bmdma_status) (struct ata_port *ap);
@@ -623,7 +644,7 @@ struct ata_port_operations {
 struct ata_port_info {
        struct scsi_host_template       *sht;
-        unsigned long           host_flags;
+        unsigned long           flags;
        unsigned long           pio_mask;
        unsigned long           mwdma_mask;
        unsigned long           udma_mask;
@@ -649,6 +670,8 @@ extern const unsigned long sata_deb_timing_normal[];
 extern const unsigned long sata_deb_timing_hotplug[];
 extern const unsigned long sata_deb_timing_long[];
+extern const struct ata_port_operations ata_dummy_port_ops;
 static inline const unsigned long *
 sata_ehc_deb_timing(struct ata_eh_context *ehc)
 {
@@ -658,6 +681,11 @@ sata_ehc_deb_timing(struct ata_eh_context *ehc)
                return sata_deb_timing_normal;
 }
+static inline int ata_port_is_dummy(struct ata_port *ap)
+{
+        return ap->ops == &ata_dummy_port_ops;
+}
 extern void ata_port_probe(struct ata_port *);
 extern void __sata_phy_reset(struct ata_port *ap);
 extern void sata_phy_reset(struct ata_port *ap);
@@ -676,19 +704,30 @@ extern void ata_std_ports(struct ata_ioports *ioaddr);
 extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                             unsigned int n_ports);
 extern void ata_pci_remove_one (struct pci_dev *pdev);
-extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t state);
+extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
 extern void ata_pci_device_do_resume(struct pci_dev *pdev);
-extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state);
+extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
 extern int ata_pci_device_resume(struct pci_dev *pdev);
 extern int ata_pci_clear_simplex(struct pci_dev *pdev);
 #endif /* CONFIG_PCI */
 extern int ata_device_add(const struct ata_probe_ent *ent);
 extern void ata_port_detach(struct ata_port *ap);
-extern void ata_host_set_remove(struct ata_host_set *host_set);
+extern void ata_host_init(struct ata_host *, struct device *,
+                          unsigned long, const struct ata_port_operations *);
+extern void ata_host_remove(struct ata_host *host);
 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_release(struct Scsi_Host *host);
+extern void ata_sas_port_destroy(struct ata_port *);
+extern struct ata_port *ata_sas_port_alloc(struct ata_host *,
+                                           struct ata_port_info *, struct Scsi_Host *);
+extern int ata_sas_port_init(struct ata_port *);
+extern int ata_sas_port_start(struct ata_port *ap);
+extern void ata_sas_port_stop(struct ata_port *ap);
+extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);
+extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),
+                            struct ata_port *ap);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
 extern int sata_scr_valid(struct ata_port *ap);
 extern int sata_scr_read(struct ata_port *ap, int reg, u32 *val);
@@ -697,10 +736,9 @@ extern int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val);
 extern int ata_port_online(struct ata_port *ap);
 extern int ata_port_offline(struct ata_port *ap);
 extern int ata_scsi_device_resume(struct scsi_device *);
-extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state);
+extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t mesg);
-extern int ata_host_set_suspend(struct ata_host_set *host_set,
+extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);
-                                pm_message_t mesg);
+extern void ata_host_resume(struct ata_host *host);
-extern void ata_host_set_resume(struct ata_host_set *host_set);
 extern int ata_ratelimit(void);
 extern unsigned int ata_busy_sleep(struct ata_port *ap,
                                   unsigned long timeout_pat,
@@ -725,7 +763,7 @@ extern u8 ata_altstatus(struct ata_port *ap);
 extern void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf);
 extern int ata_port_start (struct ata_port *ap);
 extern void ata_port_stop (struct ata_port *ap);
-extern void ata_host_stop (struct ata_host_set *host_set);
+extern void ata_host_stop (struct ata_host *host);
 extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs);
 extern void ata_mmio_data_xfer(struct ata_device *adev, unsigned char *buf,
                               unsigned int buflen, int write_data);
@@ -811,7 +849,7 @@ struct pci_bits {
        unsigned long           val;
 };
-extern void ata_pci_host_stop (struct ata_host_set *host_set);
+extern void ata_pci_host_stop (struct ata_host *host);
 extern struct ata_probe_ent *
 ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int portmask);
 extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits);
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 932021f872d5..6c9873f88287 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -35,9 +35,13 @@
 #endif
 #define KPROBE_ENTRY(name) \
-  .section .kprobes.text, "ax"; \
+  .pushsection .kprobes.text, "ax"; \
  ENTRY(name)
+#define KPROBE_END(name) \
+  END(name);             \
+  .popsection
 #ifndef END
 #define END(name) \
  .size name, .-name
diff --git a/include/linux/list.h b/include/linux/list.h
index 65a5b5ceda49..a9c90287c0ff 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -39,6 +39,7 @@ static inline void INIT_LIST_HEAD(struct list_head *list)
 * This is only for internal list manipulation where we know
 * the prev/next entries already!
 */
+#ifndef CONFIG_DEBUG_LIST
 static inline void __list_add(struct list_head *new,
                              struct list_head *prev,
                              struct list_head *next)
@@ -48,6 +49,11 @@ static inline void __list_add(struct list_head *new,
        new->prev = prev;
        prev->next = new;
 }
+#else
+extern void __list_add(struct list_head *new,
+                              struct list_head *prev,
+                              struct list_head *next);
+#endif
 /**
 * list_add - add a new entry
@@ -57,10 +63,15 @@ static inline void __list_add(struct list_head *new,
 * Insert a new entry after the specified head.
 * This is good for implementing stacks.
 */
+#ifndef CONFIG_DEBUG_LIST
 static inline void list_add(struct list_head *new, struct list_head *head)
 {
        __list_add(new, head, head->next);
 }
+#else
+extern void list_add(struct list_head *new, struct list_head *head);
+#endif
 /**
 * list_add_tail - add a new entry
@@ -153,12 +164,16 @@ static inline void __list_del(struct list_head * prev, struct list_head * next)
 * Note: list_empty on entry does not return true after this, the entry is
 * in an undefined state.
 */
+#ifndef CONFIG_DEBUG_LIST
 static inline void list_del(struct list_head *entry)
 {
        __list_del(entry->prev, entry->next);
        entry->next = LIST_POISON1;
        entry->prev = LIST_POISON2;
 }
+#else
+extern void list_del(struct list_head *entry);
+#endif
 /**
 * list_del_rcu - deletes entry from list without re-initialization
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index c040a8c969aa..1314ca0f29be 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -8,13 +8,13 @@
 #ifndef __LINUX_LOCKDEP_H
 #define __LINUX_LOCKDEP_H
+#ifdef CONFIG_LOCKDEP
 #include <linux/linkage.h>
 #include <linux/list.h>
 #include <linux/debug_locks.h>
 #include <linux/stacktrace.h>
-#ifdef CONFIG_LOCKDEP
 /*
 * Lock-class usage-state bits:
 */
diff --git a/include/linux/loop.h b/include/linux/loop.h
index e76c7611d6cc..191a595055f0 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -59,10 +59,9 @@ struct loop_device {
        struct bio              *lo_bio;
        struct bio              *lo_biotail;
        int                     lo_state;
-        struct completion       lo_done;
-        struct completion       lo_bh_done;
        struct mutex            lo_ctl_mutex;
-        int                     lo_pending;
+        struct task_struct      *lo_thread;
+        wait_queue_head_t       lo_event;
        request_queue_t         *lo_queue;
 };
diff --git a/include/linux/magic.h b/include/linux/magic.h
new file mode 100644
index 000000000000..22036dd2ba36
--- /dev/null
+++ b/include/linux/magic.h
@@ -0,0 +1,37 @@
+#ifndef __LINUX_MAGIC_H__
+#define __LINUX_MAGIC_H__
+#define ADFS_SUPER_MAGIC        0xadf5
+#define AFFS_SUPER_MAGIC        0xadff
+#define AUTOFS_SUPER_MAGIC      0x0187
+#define CODA_SUPER_MAGIC        0x73757245
+#define EFS_SUPER_MAGIC         0x414A53
+#define EXT2_SUPER_MAGIC        0xEF53
+#define EXT3_SUPER_MAGIC        0xEF53
+#define HPFS_SUPER_MAGIC        0xf995e849
+#define ISOFS_SUPER_MAGIC       0x9660
+#define JFFS2_SUPER_MAGIC       0x72b6
+#define MINIX_SUPER_MAGIC       0x137F          /* original minix fs */
+#define MINIX_SUPER_MAGIC2      0x138F          /* minix fs, 30 char names */
+#define MINIX2_SUPER_MAGIC      0x2468          /* minix V2 fs */
+#define MINIX2_SUPER_MAGIC2     0x2478          /* minix V2 fs, 30 char names */
+#define MSDOS_SUPER_MAGIC       0x4d44          /* MD */
+#define NCP_SUPER_MAGIC         0x564c          /* Guess, what 0x564c is :-) */
+#define NFS_SUPER_MAGIC         0x6969
+#define OPENPROM_SUPER_MAGIC    0x9fa1
+#define PROC_SUPER_MAGIC        0x9fa0
+#define QNX4_SUPER_MAGIC        0x002f          /* qnx4 fs detection */
+#define REISERFS_SUPER_MAGIC    0x52654973      /* used by gcc */
+                                        /* used by file system utilities that
+                                           look at the superblock, etc.  */
+#define REISERFS_SUPER_MAGIC_STRING     "ReIsErFs"
+#define REISER2FS_SUPER_MAGIC_STRING    "ReIsEr2Fs"
+#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
+#define SMB_SUPER_MAGIC         0x517B
+#define USBDEVICE_SUPER_MAGIC   0x9fa2
+#endif /* __LINUX_MAGIC_H__ */
diff --git a/include/linux/memory.h b/include/linux/memory.h
index 8f04143ca363..654ef5544878 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -57,7 +57,7 @@ struct memory_block {
 struct notifier_block;
 struct mem_section;
-#ifndef CONFIG_MEMORY_HOTPLUG
+#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE
 static inline int memory_dev_init(void)
 {
        return 0;
@@ -78,7 +78,7 @@ extern int remove_memory_block(unsigned long, struct mem_section *, int);
 #define CONFIG_MEM_BLOCK_SIZE   (PAGES_PER_SECTION<<PAGE_SHIFT)
-#endif /* CONFIG_MEMORY_HOTPLUG */
+#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
 #define hotplug_memory_notifier(fn, pri) {                      \
        static struct notifier_block fn##_mem_nb =              \
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 218501cfaeb9..7b54666cea8e 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -172,5 +172,7 @@ static inline int __remove_pages(struct zone *zone, unsigned long start_pfn,
 extern int add_memory(int nid, u64 start, u64 size);
 extern int arch_add_memory(int nid, u64 start, u64 size);
 extern int remove_memory(u64 start, u64 size);
+extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
+                                                                int nr_pages);
 #endif /* __LINUX_MEMORY_HOTPLUG_H */
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 72440f0a443d..09f0f575ddff 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -162,9 +162,9 @@ extern struct zonelist *huge_zonelist(struct vm_area_struct *vma,
                unsigned long addr);
 extern unsigned slab_node(struct mempolicy *policy);
-extern int policy_zone;
+extern enum zone_type policy_zone;
-static inline void check_highest_zone(int k)
+static inline void check_highest_zone(enum zone_type k)
 {
        if (k > policy_zone)
                policy_zone = k;
diff --git a/include/linux/minix_fs.h b/include/linux/minix_fs.h
index 1ecc3cc8cef5..916e8f72c63d 100644
--- a/include/linux/minix_fs.h
+++ b/include/linux/minix_fs.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_MINIX_FS_H
 #define _LINUX_MINIX_FS_H
+#include <linux/magic.h>
 /*
 * The minix filesystem constants/structures
 */
@@ -19,10 +21,6 @@
 #define MINIX_I_MAP_SLOTS       8
 #define MINIX_Z_MAP_SLOTS       64
-#define MINIX_SUPER_MAGIC       0x137F          /* original minix fs */
-#define MINIX_SUPER_MAGIC2      0x138F          /* minix fs, 30 char names */
-#define MINIX2_SUPER_MAGIC      0x2468          /* minix V2 fs */
-#define MINIX2_SUPER_MAGIC2     0x2478          /* minix V2 fs, 30 char names */
 #define MINIX_VALID_FS          0x0001          /* Clean fs. */
 #define MINIX_ERROR_FS          0x0002          /* fs has errors. */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index f0b135cd86da..b7966ab8cb6a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -15,6 +15,8 @@
 #include <linux/fs.h>
 #include <linux/mutex.h>
 #include <linux/debug_locks.h>
+#include <linux/backing-dev.h>
+#include <linux/mm_types.h>
 struct mempolicy;
 struct anon_vma;
@@ -197,6 +199,7 @@ struct vm_operations_struct {
        void (*open)(struct vm_area_struct * area);
        void (*close)(struct vm_area_struct * area);
        struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int *type);
+        unsigned long (*nopfn)(struct vm_area_struct * area, unsigned long address);
        int (*populate)(struct vm_area_struct * area, unsigned long address, unsigned long len, pgprot_t prot, unsigned long pgoff, int nonblock);
        /* notification that a previously read-only page is about to become
@@ -214,61 +217,6 @@ struct vm_operations_struct {
 struct mmu_gather;
 struct inode;
-/*
- * Each physical page in the system has a struct page associated with
- * it to keep track of whatever it is we are using the page for at the
- * moment. Note that we have no way to track which tasks are using
- * a page.
- */
-struct page {
-        unsigned long flags;            /* Atomic flags, some possibly
-                                         * updated asynchronously */
-        atomic_t _count;                /* Usage count, see below. */
-        atomic_t _mapcount;             /* Count of ptes mapped in mms,
-                                         * to show when page is mapped
-                                         * & limit reverse map searches.
-                                         */
-        union {
-            struct {
-                unsigned long private;          /* Mapping-private opaque data:
-                                                 * usually used for buffer_heads
-                                                 * if PagePrivate set; used for
-                                                 * swp_entry_t if PageSwapCache;
-                                                 * indicates order in the buddy
-                                                 * system if PG_buddy is set.
-                                                 */
-                struct address_space *mapping;  /* If low bit clear, points to
-                                                 * inode address_space, or NULL.
-                                                 * If page mapped as anonymous
-                                                 * memory, low bit is set, and
-                                                 * it points to anon_vma object:
-                                                 * see PAGE_MAPPING_ANON below.
-                                                 */
-            };
-#if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
-            spinlock_t ptl;
-#endif
-        };
-        pgoff_t index;                  /* Our offset within mapping. */
-        struct list_head lru;           /* Pageout list, eg. active_list
-                                         * protected by zone->lru_lock !
-                                         */
-        /*
-         * On machines where all RAM is mapped into kernel address space,
-         * we can simply calculate the virtual address. On machines with
-         * highmem some memory is mapped into kernel virtual memory
-         * dynamically, so we need a place to store that address.
-         * Note that this field could be 16 bits on x86 ... ;)
-         *
-         * Architectures with slow multiplication can define
-         * WANT_PAGE_VIRTUAL in asm/page.h
-         */
-#if defined(WANT_PAGE_VIRTUAL)
-        void *virtual;                  /* Kernel virtual address (NULL if
-                                           not kmapped, ie. highmem) */
-#endif /* WANT_PAGE_VIRTUAL */
-};
 #define page_private(page)              ((page)->private)
 #define set_page_private(page, v)       ((page)->private = (v))
@@ -278,6 +226,12 @@ struct page {
 */
 #include <linux/page-flags.h>
+#ifdef CONFIG_DEBUG_VM
+#define VM_BUG_ON(cond) BUG_ON(cond)
+#else
+#define VM_BUG_ON(condition) do { } while(0)
+#endif
 /*
 * Methods to modify the page usage count.
 *
@@ -292,12 +246,11 @@ struct page {
 */
 /*
- * Drop a ref, return true if the logical refcount fell to zero (the page has
+ * Drop a ref, return true if the refcount fell to zero (the page has no users)
- * no users)
 */
 static inline int put_page_testzero(struct page *page)
 {
-        BUG_ON(atomic_read(&page->_count) == 0);
+        VM_BUG_ON(atomic_read(&page->_count) == 0);
        return atomic_dec_and_test(&page->_count);
 }
@@ -307,11 +260,10 @@ static inline int put_page_testzero(struct page *page)
 */
 static inline int get_page_unless_zero(struct page *page)
 {
+        VM_BUG_ON(PageCompound(page));
        return atomic_inc_not_zero(&page->_count);
 }
-extern void FASTCALL(__page_cache_release(struct page *));
 static inline int page_count(struct page *page)
 {
        if (unlikely(PageCompound(page)))
@@ -323,6 +275,7 @@ static inline void get_page(struct page *page)
 {
        if (unlikely(PageCompound(page)))
                page = (struct page *)page_private(page);
+        VM_BUG_ON(atomic_read(&page->_count) == 0);
        atomic_inc(&page->_count);
 }
@@ -349,43 +302,55 @@ void split_page(struct page *page, unsigned int order);
 * For the non-reserved pages, page_count(page) denotes a reference count.
 *   page_count() == 0 means the page is free. page->lru is then used for
 *   freelist management in the buddy allocator.
- *   page_count() == 1 means the page is used for exactly one purpose
+ *   page_count() > 0  means the page has been allocated.
- *   (e.g. a private data page of one process).
+ *
+ * Pages are allocated by the slab allocator in order to provide memory
+ * to kmalloc and kmem_cache_alloc. In this case, the management of the
+ * page, and the fields in 'struct page' are the responsibility of mm/slab.c
+ * unless a particular usage is carefully commented. (the responsibility of
+ * freeing the kmalloc memory is the caller's, of course).
 *
- * A page may be used for kmalloc() or anyone else who does a
+ * A page may be used by anyone else who does a __get_free_page().
- * __get_free_page(). In this case the page_count() is at least 1, and
+ * In this case, page_count still tracks the references, and should only
- * all other fields are unused but should be 0 or NULL. The
+ * be used through the normal accessor functions. The top bits of page->flags
- * management of this page is the responsibility of the one who uses
+ * and page->virtual store page management information, but all other fields
- * it.
+ * are unused and could be used privately, carefully. The management of this
+ * page is the responsibility of the one who allocated it, and those who have
+ * subsequently been given references to it.
 *
- * The other pages (we may call them "process pages") are completely
+ * The other pages (we may call them "pagecache pages") are completely
 * managed by the Linux memory manager: I/O, buffers, swapping etc.
 * The following discussion applies only to them.
 *
- * A page may belong to an inode's memory mapping. In this case,
+ * A pagecache page contains an opaque `private' member, which belongs to the
- * page->mapping is the pointer to the inode, and page->index is the
+ * page's address_space. Usually, this is the address of a circular list of
- * file offset of the page, in units of PAGE_CACHE_SIZE.
+ * the page's disk buffers. PG_private must be set to tell the VM to call
+ * into the filesystem to release these pages.
 *
- * A page contains an opaque `private' member, which belongs to the
+ * A page may belong to an inode's memory mapping. In this case, page->mapping
- * page's address_space.  Usually, this is the address of a circular
+ * is the pointer to the inode, and page->index is the file offset of the page,
- * list of the page's disk buffers.
+ * in units of PAGE_CACHE_SIZE.
 *
- * For pages belonging to inodes, the page_count() is the number of
+ * If pagecache pages are not associated with an inode, they are said to be
- * attaches, plus 1 if `private' contains something, plus one for
+ * anonymous pages. These may become associated with the swapcache, and in that
- * the page cache itself.
+ * case PG_swapcache is set, and page->private is an offset into the swapcache.
 *
- * Instead of keeping dirty/clean pages in per address-space lists, we instead
+ * In either case (swapcache or inode backed), the pagecache itself holds one
- * now tag pages as dirty/under writeback in the radix tree.
+ * reference to the page. Setting PG_private should also increment the
+ * refcount. The each user mapping also has a reference to the page.
 *
- * There is also a per-mapping radix tree mapping index to the page
+ * The pagecache pages are stored in a per-mapping radix tree, which is
- * in memory if present. The tree is rooted at mapping->root.  
+ * rooted at mapping->page_tree, and indexed by offset.
+ * Where 2.4 and early 2.6 kernels kept dirty/clean pages in per-address_space
+ * lists, we instead now tag pages as dirty/writeback in the radix tree.
 *
- * All process pages can do I/O:
+ * All pagecache pages may be subject to I/O:
 * - inode pages may need to be read from disk,
 * - inode pages which have been modified and are MAP_SHARED may need
- *   to be written to disk,
+ *   to be written back to the inode on disk,
- * - private pages which have been modified may need to be swapped out
+ * - anonymous pages (including MAP_PRIVATE file mappings) which have been
- *   to swap space and (later) to be read back into memory.
+ *   modified may need to be swapped out to swap space and (later) to be read
+ *   back into memory.
 */
 /*
@@ -463,7 +428,7 @@ void split_page(struct page *page, unsigned int order);
 #define SECTIONS_MASK           ((1UL << SECTIONS_WIDTH) - 1)
 #define ZONETABLE_MASK          ((1UL << ZONETABLE_SHIFT) - 1)
-static inline unsigned long page_zonenum(struct page *page)
+static inline enum zone_type page_zonenum(struct page *page)
 {
        return (page->flags >> ZONES_PGSHIFT) & ZONES_MASK;
 }
@@ -480,23 +445,33 @@ static inline struct zone *page_zone(struct page *page)
        return zone_table[page_zone_id(page)];
 }
+static inline unsigned long zone_to_nid(struct zone *zone)
+{
+#ifdef CONFIG_NUMA
+        return zone->node;
+#else
+        return 0;
+#endif
+}
 static inline unsigned long page_to_nid(struct page *page)
 {
        if (FLAGS_HAS_NODE)
                return (page->flags >> NODES_PGSHIFT) & NODES_MASK;
        else
-                return page_zone(page)->zone_pgdat->node_id;
+                return zone_to_nid(page_zone(page));
 }
 static inline unsigned long page_to_section(struct page *page)
 {
        return (page->flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK;
 }
-static inline void set_page_zone(struct page *page, unsigned long zone)
+static inline void set_page_zone(struct page *page, enum zone_type zone)
 {
        page->flags &= ~(ZONES_MASK << ZONES_PGSHIFT);
        page->flags |= (zone & ZONES_MASK) << ZONES_PGSHIFT;
 }
 static inline void set_page_node(struct page *page, unsigned long node)
 {
        page->flags &= ~(NODES_MASK << NODES_PGSHIFT);
@@ -508,7 +483,7 @@ static inline void set_page_section(struct page *page, unsigned long section)
        page->flags |= (section & SECTIONS_MASK) << SECTIONS_PGSHIFT;
 }
-static inline void set_page_links(struct page *page, unsigned long zone,
+static inline void set_page_links(struct page *page, enum zone_type zone,
        unsigned long node, unsigned long pfn)
 {
        set_page_zone(page, zone);
@@ -521,11 +496,6 @@ static inline void set_page_links(struct page *page, unsigned long zone,
 */
 #include <linux/vmstat.h>
-#ifndef CONFIG_DISCONTIGMEM
-/* The array of struct pages - for discontigmem use pgdat->lmem_map */
-extern struct page *mem_map;
-#endif
 static __always_inline void *lowmem_page_address(struct page *page)
 {
        return __va(page_to_pfn(page) << PAGE_SHIFT);
@@ -625,6 +595,12 @@ static inline int page_mapped(struct page *page)
 #define NOPAGE_OOM      ((struct page *) (-1))
 /*
+ * Error return values for the *_nopfn functions
+ */
+#define NOPFN_SIGBUS    ((unsigned long) -1)
+#define NOPFN_OOM       ((unsigned long) -2)
+/*
 * Different kinds of faults, as returned by handle_mm_fault().
 * Used to decide whether a process gets delivered SIGBUS or
 * just gets major/minor fault counters bumped up.
@@ -767,7 +743,9 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long
                int len, int write, int force, struct page **pages, struct vm_area_struct **vmas);
 void print_bad_pte(struct vm_area_struct *, pte_t, unsigned long);
-int __set_page_dirty_buffers(struct page *page);
+extern int try_to_release_page(struct page * page, gfp_t gfp_mask);
+extern void do_invalidatepage(struct page *page, unsigned long offset);
 int __set_page_dirty_nobuffers(struct page *page);
 int redirty_page_for_writepage(struct writeback_control *wbc,
                                struct page *page);
@@ -802,6 +780,39 @@ struct shrinker;
 extern struct shrinker *set_shrinker(int, shrinker_t);
 extern void remove_shrinker(struct shrinker *shrinker);
+/*
+ * Some shared mappigns will want the pages marked read-only
+ * to track write events. If so, we'll downgrade vm_page_prot
+ * to the private version (using protection_map[] without the
+ * VM_SHARED bit).
+ */
+static inline int vma_wants_writenotify(struct vm_area_struct *vma)
+{
+        unsigned int vm_flags = vma->vm_flags;
+        /* If it was private or non-writable, the write bit is already clear */
+        if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
+                return 0;
+        /* The backer wishes to know when pages are first written to? */
+        if (vma->vm_ops && vma->vm_ops->page_mkwrite)
+                return 1;
+        /* The open routine did something to the protections already? */
+        if (pgprot_val(vma->vm_page_prot) !=
+            pgprot_val(protection_map[vm_flags &
+                    (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]))
+                return 0;
+        /* Specialty mapping? */
+        if (vm_flags & (VM_PFNMAP|VM_INSERTPAGE))
+                return 0;
+        /* Can the mapping track the dirty pages? */
+        return vma->vm_file && vma->vm_file->f_mapping &&
+                mapping_cap_account_dirty(vma->vm_file->f_mapping);
+}
 extern pte_t *FASTCALL(get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl));
 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
@@ -879,12 +890,64 @@ extern void free_area_init(unsigned long * zones_size);
 extern void free_area_init_node(int nid, pg_data_t *pgdat,
        unsigned long * zones_size, unsigned long zone_start_pfn, 
        unsigned long *zholes_size);
+#ifdef CONFIG_ARCH_POPULATES_NODE_MAP
+/*
+ * With CONFIG_ARCH_POPULATES_NODE_MAP set, an architecture may initialise its
+ * zones, allocate the backing mem_map and account for memory holes in a more
+ * architecture independent manner. This is a substitute for creating the
+ * zone_sizes[] and zholes_size[] arrays and passing them to
+ * free_area_init_node()
+ *
+ * An architecture is expected to register range of page frames backed by
+ * physical memory with add_active_range() before calling
+ * free_area_init_nodes() passing in the PFN each zone ends at. At a basic
+ * usage, an architecture is expected to do something like
+ *
+ * unsigned long max_zone_pfns[MAX_NR_ZONES] = {max_dma, max_normal_pfn,
+ *                                                       max_highmem_pfn};
+ * for_each_valid_physical_page_range()
+ *      add_active_range(node_id, start_pfn, end_pfn)
+ * free_area_init_nodes(max_zone_pfns);
+ *
+ * If the architecture guarantees that there are no holes in the ranges
+ * registered with add_active_range(), free_bootmem_active_regions()
+ * will call free_bootmem_node() for each registered physical page range.
+ * Similarly sparse_memory_present_with_active_regions() calls
+ * memory_present() for each range when SPARSEMEM is enabled.
+ *
+ * See mm/page_alloc.c for more information on each function exposed by
+ * CONFIG_ARCH_POPULATES_NODE_MAP
+ */
+extern void free_area_init_nodes(unsigned long *max_zone_pfn);
+extern void add_active_range(unsigned int nid, unsigned long start_pfn,
+                                        unsigned long end_pfn);
+extern void shrink_active_range(unsigned int nid, unsigned long old_end_pfn,
+                                                unsigned long new_end_pfn);
+extern void push_node_boundaries(unsigned int nid, unsigned long start_pfn,
+                                        unsigned long end_pfn);
+extern void remove_all_active_ranges(void);
+extern unsigned long absent_pages_in_range(unsigned long start_pfn,
+                                                unsigned long end_pfn);
+extern void get_pfn_range_for_nid(unsigned int nid,
+                        unsigned long *start_pfn, unsigned long *end_pfn);
+extern unsigned long find_min_pfn_with_active_regions(void);
+extern unsigned long find_max_pfn_with_active_regions(void);
+extern void free_bootmem_with_active_regions(int nid,
+                                                unsigned long max_low_pfn);
+extern void sparse_memory_present_with_active_regions(int nid);
+#ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
+extern int early_pfn_to_nid(unsigned long pfn);
+#endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */
+#endif /* CONFIG_ARCH_POPULATES_NODE_MAP */
+extern void set_dma_reserve(unsigned long new_dma_reserve);
 extern void memmap_init_zone(unsigned long, int, unsigned long, unsigned long);
 extern void setup_per_zone_pages_min(void);
 extern void mem_init(void);
 extern void show_mem(void);
 extern void si_meminfo(struct sysinfo * val);
 extern void si_meminfo_node(struct sysinfo *val, int nid);
+extern void zonetable_add(struct zone *zone, int nid, enum zone_type zid,
+                                        unsigned long pfn, unsigned long size);
 #ifdef CONFIG_NUMA
 extern void setup_per_cpu_pageset(void);
@@ -1013,6 +1076,7 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
        return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 }
+pgprot_t vm_get_page_prot(unsigned long vm_flags);
 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
 struct page *vmalloc_to_page(void *addr);
 unsigned long vmalloc_to_pfn(void *addr);
@@ -1071,7 +1135,7 @@ void drop_slab(void);
 extern int randomize_va_space;
 #endif
-const char *arch_vma_name(struct vm_area_struct *vma);
+__attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma);
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
new file mode 100644
index 000000000000..c3852fd4a1cc
--- /dev/null
+++ b/include/linux/mm_types.h
@@ -0,0 +1,67 @@
+#ifndef _LINUX_MM_TYPES_H
+#define _LINUX_MM_TYPES_H
+#include <linux/types.h>
+#include <linux/threads.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+struct address_space;
+/*
+ * Each physical page in the system has a struct page associated with
+ * it to keep track of whatever it is we are using the page for at the
+ * moment. Note that we have no way to track which tasks are using
+ * a page, though if it is a pagecache page, rmap structures can tell us
+ * who is mapping it.
+ */
+struct page {
+        unsigned long flags;            /* Atomic flags, some possibly
+                                         * updated asynchronously */
+        atomic_t _count;                /* Usage count, see below. */
+        atomic_t _mapcount;             /* Count of ptes mapped in mms,
+                                         * to show when page is mapped
+                                         * & limit reverse map searches.
+                                         */
+        union {
+            struct {
+                unsigned long private;          /* Mapping-private opaque data:
+                                                 * usually used for buffer_heads
+                                                 * if PagePrivate set; used for
+                                                 * swp_entry_t if PageSwapCache;
+                                                 * indicates order in the buddy
+                                                 * system if PG_buddy is set.
+                                                 */
+                struct address_space *mapping;  /* If low bit clear, points to
+                                                 * inode address_space, or NULL.
+                                                 * If page mapped as anonymous
+                                                 * memory, low bit is set, and
+                                                 * it points to anon_vma object:
+                                                 * see PAGE_MAPPING_ANON below.
+                                                 */
+            };
+#if NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
+            spinlock_t ptl;
+#endif
+        };
+        pgoff_t index;                  /* Our offset within mapping. */
+        struct list_head lru;           /* Pageout list, eg. active_list
+                                         * protected by zone->lru_lock !
+                                         */
+        /*
+         * On machines where all RAM is mapped into kernel address space,
+         * we can simply calculate the virtual address. On machines with
+         * highmem some memory is mapped into kernel virtual memory
+         * dynamically, so we need a place to store that address.
+         * Note that this field could be 16 bits on x86 ... ;)
+         *
+         * Architectures with slow multiplication can define
+         * WANT_PAGE_VIRTUAL in asm/page.h
+         */
+#if defined(WANT_PAGE_VIRTUAL)
+        void *virtual;                  /* Kernel virtual address (NULL if
+                                           not kmapped, ie. highmem) */
+#endif /* WANT_PAGE_VIRTUAL */
+};
+#endif /* _LINUX_MM_TYPES_H */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index ba095aebedff..587264a58d56 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -85,6 +85,8 @@ struct mmc_host {
        unsigned long           caps;           /* Host capabilities */
 #define MMC_CAP_4_BIT_DATA      (1 << 0)        /* Can the host do 4 bit transfers */
+#define MMC_CAP_MULTIWRITE      (1 << 1)        /* Can accurately report bytes sent to card on error */
+#define MMC_CAP_BYTEBLOCK       (1 << 2)        /* Can do non-log2 block sizes */
        /* host specific block data */
        unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 627e2c08ce41..a3594dfd6963 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -68,7 +68,6 @@ struct mmc_command {
 struct mmc_data {
        unsigned int            timeout_ns;     /* data timeout (in ns, max 80ms) */
        unsigned int            timeout_clks;   /* data timeout (in clocks) */
-        unsigned int            blksz_bits;     /* data block size */
        unsigned int            blksz;          /* data block size */
        unsigned int            blocks;         /* number of blocks */
        unsigned int            error;          /* data error */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index f45163c528e8..59855b8718a0 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -51,12 +51,14 @@ enum zone_stat_item {
        NR_FILE_MAPPED, /* pagecache pages mapped into pagetables.
                           only modified from process context */
        NR_FILE_PAGES,
-        NR_SLAB,        /* Pages used by slab allocator */
+        NR_SLAB_RECLAIMABLE,
+        NR_SLAB_UNRECLAIMABLE,
        NR_PAGETABLE,   /* used for pagetables */
        NR_FILE_DIRTY,
        NR_WRITEBACK,
        NR_UNSTABLE_NFS,        /* NFS unstable pages */
        NR_BOUNCE,
+        NR_VMSCAN_WRITE,
 #ifdef CONFIG_NUMA
        NUMA_HIT,               /* allocated in intended node */
        NUMA_MISS,              /* allocated in non intended node */
@@ -88,53 +90,68 @@ struct per_cpu_pageset {
 #define zone_pcp(__z, __cpu) (&(__z)->pageset[(__cpu)])
 #endif
-#define ZONE_DMA                0
+enum zone_type {
-#define ZONE_DMA32              1
+        /*
-#define ZONE_NORMAL             2
+         * ZONE_DMA is used when there are devices that are not able
-#define ZONE_HIGHMEM            3
+         * to do DMA to all of addressable memory (ZONE_NORMAL). Then we
+         * carve out the portion of memory that is needed for these devices.
-#define MAX_NR_ZONES            4       /* Sync this with ZONES_SHIFT */
+         * The range is arch specific.
-#define ZONES_SHIFT             2       /* ceil(log2(MAX_NR_ZONES)) */
+         *
+         * Some examples
+         *
+         * Architecture         Limit
+         * ---------------------------
+         * parisc, ia64, sparc  <4G
+         * s390                 <2G
+         * arm26                <48M
+         * arm                  Various
+         * alpha                Unlimited or 0-16MB.
+         *
+         * i386, x86_64 and multiple other arches
+         *                      <16M.
+         */
+        ZONE_DMA,
+#ifdef CONFIG_ZONE_DMA32
+        /*
+         * x86_64 needs two ZONE_DMAs because it supports devices that are
+         * only able to do DMA to the lower 16M but also 32 bit devices that
+         * can only do DMA areas below 4G.
+         */
+        ZONE_DMA32,
+#endif
+        /*
+         * Normal addressable memory is in ZONE_NORMAL. DMA operations can be
+         * performed on pages in ZONE_NORMAL if the DMA devices support
+         * transfers to all addressable memory.
+         */
+        ZONE_NORMAL,
+#ifdef CONFIG_HIGHMEM
+        /*
+         * A memory area that is only addressable by the kernel through
+         * mapping portions into its own address space. This is for example
+         * used by i386 to allow the kernel to address the memory beyond
+         * 900MB. The kernel will set up special mappings (page
+         * table entries on i386) for each page that the kernel needs to
+         * access.
+         */
+        ZONE_HIGHMEM,
+#endif
+        MAX_NR_ZONES
+};
 /*
 * When a memory allocation must conform to specific limitations (such
 * as being suitable for DMA) the caller will pass in hints to the
 * allocator in the gfp_mask, in the zone modifier bits.  These bits
 * are used to select a priority ordered list of memory zones which
- * match the requested limits.  GFP_ZONEMASK defines which bits within
+ * match the requested limits. See gfp_zone() in include/linux/gfp.h
- * the gfp_mask should be considered as zone modifiers.  Each valid
- * combination of the zone modifier bits has a corresponding list
- * of zones (in node_zonelists).  Thus for two zone modifiers there
- * will be a maximum of 4 (2 ** 2) zonelists, for 3 modifiers there will
- * be 8 (2 ** 3) zonelists.  GFP_ZONETYPES defines the number of possible
- * combinations of zone modifiers in "zone modifier space".
- *
- * As an optimisation any zone modifier bits which are only valid when
- * no other zone modifier bits are set (loners) should be placed in
- * the highest order bits of this field.  This allows us to reduce the
- * extent of the zonelists thus saving space.  For example in the case
- * of three zone modifier bits, we could require up to eight zonelists.
- * If the left most zone modifier is a "loner" then the highest valid
- * zonelist would be four allowing us to allocate only five zonelists.
- * Use the first form for GFP_ZONETYPES when the left most bit is not
- * a "loner", otherwise use the second.
- *
- * NOTE! Make sure this matches the zones in <linux/gfp.h>
 */
-#define GFP_ZONEMASK    0x07
-/* #define GFP_ZONETYPES       (GFP_ZONEMASK + 1) */           /* Non-loner */
-#define GFP_ZONETYPES  ((GFP_ZONEMASK + 1) / 2 + 1)            /* Loner */
-/*
+#if !defined(CONFIG_ZONE_DMA32) && !defined(CONFIG_HIGHMEM)
- * On machines where it is needed (eg PCs) we divide physical memory
+#define ZONES_SHIFT 1
- * into multiple physical zones. On a 32bit PC we have 4 zones:
+#else
- *
+#define ZONES_SHIFT 2
- * ZONE_DMA       < 16 MB       ISA DMA capable memory
+#endif
- * ZONE_DMA32        0 MB       Empty
- * ZONE_NORMAL  16-896 MB       direct mapped by the kernel
- * ZONE_HIGHMEM  > 896 MB       only page cache and user processes
- */
 struct zone {
        /* Fields commonly accessed by the page allocator */
@@ -151,10 +168,12 @@ struct zone {
        unsigned long           lowmem_reserve[MAX_NR_ZONES];
 #ifdef CONFIG_NUMA
+        int node;
        /*
         * zone reclaim becomes active if more unmapped pages exist.
         */
-        unsigned long           min_unmapped_ratio;
+        unsigned long           min_unmapped_pages;
+        unsigned long           min_slab_pages;
        struct per_cpu_pageset  *pageset[NR_CPUS];
 #else
        struct per_cpu_pageset  pageset[NR_CPUS];
@@ -266,7 +285,6 @@ struct zone {
        char                    *name;
 } ____cacheline_internodealigned_in_smp;
 /*
 * The "priority" of VM scanning is how much of the queues we will scan in one
 * go. A value of 12 for DEF_PRIORITY implies that we will scan 1/4096th of the
@@ -289,6 +307,18 @@ struct zonelist {
        struct zone *zones[MAX_NUMNODES * MAX_NR_ZONES + 1]; // NULL delimited
 };
+#ifdef CONFIG_ARCH_POPULATES_NODE_MAP
+struct node_active_region {
+        unsigned long start_pfn;
+        unsigned long end_pfn;
+        int nid;
+};
+#endif /* CONFIG_ARCH_POPULATES_NODE_MAP */
+#ifndef CONFIG_DISCONTIGMEM
+/* The array of struct pages - for discontigmem use pgdat->lmem_map */
+extern struct page *mem_map;
+#endif
 /*
 * The pg_data_t structure is used in machines with CONFIG_DISCONTIGMEM
@@ -304,7 +334,7 @@ struct zonelist {
 struct bootmem_data;
 typedef struct pglist_data {
        struct zone node_zones[MAX_NR_ZONES];
-        struct zonelist node_zonelists[GFP_ZONETYPES];
+        struct zonelist node_zonelists[MAX_NR_ZONES];
        int nr_zones;
 #ifdef CONFIG_FLAT_NODE_MEM_MAP
        struct page *node_mem_map;
@@ -373,12 +403,16 @@ static inline int populated_zone(struct zone *zone)
        return (!!zone->present_pages);
 }
-static inline int is_highmem_idx(int idx)
+static inline int is_highmem_idx(enum zone_type idx)
 {
+#ifdef CONFIG_HIGHMEM
        return (idx == ZONE_HIGHMEM);
+#else
+        return 0;
+#endif
 }
-static inline int is_normal_idx(int idx)
+static inline int is_normal_idx(enum zone_type idx)
 {
        return (idx == ZONE_NORMAL);
 }
@@ -391,7 +425,11 @@ static inline int is_normal_idx(int idx)
 */
 static inline int is_highmem(struct zone *zone)
 {
+#ifdef CONFIG_HIGHMEM
        return zone == zone->zone_pgdat->node_zones + ZONE_HIGHMEM;
+#else
+        return 0;
+#endif
 }
 static inline int is_normal(struct zone *zone)
@@ -401,7 +439,11 @@ static inline int is_normal(struct zone *zone)
 static inline int is_dma32(struct zone *zone)
 {
+#ifdef CONFIG_ZONE_DMA32
        return zone == zone->zone_pgdat->node_zones + ZONE_DMA32;
+#else
+        return 0;
+#endif
 }
 static inline int is_dma(struct zone *zone)
@@ -421,6 +463,8 @@ int percpu_pagelist_fraction_sysctl_handler(struct ctl_table *, int, struct file
                                        void __user *, size_t *, loff_t *);
 int sysctl_min_unmapped_ratio_sysctl_handler(struct ctl_table *, int,
                        struct file *, void __user *, size_t *, loff_t *);
+int sysctl_min_slab_ratio_sysctl_handler(struct ctl_table *, int,
+                        struct file *, void __user *, size_t *, loff_t *);
 #include <linux/topology.h>
 /* Returns the number of the current Node. */
@@ -488,7 +532,8 @@ extern struct zone *next_zone(struct zone *zone);
 #endif
-#ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
+#if !defined(CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID) && \
+        !defined(CONFIG_ARCH_POPULATES_NODE_MAP)
 #define early_pfn_to_nid(nid)  (0UL)
 #endif
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index f6977708585c..e0c393cc7240 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -148,6 +148,17 @@ struct ccw_device_id {
 #define CCW_DEVICE_ID_MATCH_DEVICE_TYPE         0x04
 #define CCW_DEVICE_ID_MATCH_DEVICE_MODEL        0x08
+/* s390 AP bus devices */
+struct ap_device_id {
+        __u16 match_flags;      /* which fields to match against */
+        __u8 dev_type;          /* device type */
+        __u8 pad1;
+        __u32 pad2;
+        kernel_ulong_t driver_info;
+};
+#define AP_DEVICE_ID_MATCH_DEVICE_TYPE          0x01
 #define PNP_ID_LEN      8
 #define PNP_MAX_DEVICES 8
@@ -297,4 +308,16 @@ struct input_device_id {
        kernel_ulong_t driver_info;
 };
+/* EISA */
+#define EISA_SIG_LEN   8
+/* The EISA signature, in ASCII form, null terminated */
+struct eisa_device_id {
+        char          sig[EISA_SIG_LEN];
+        kernel_ulong_t driver_data;
+};
+#define EISA_DEVICE_MODALIAS_FMT "eisa:s%s"
 #endif /* LINUX_MOD_DEVICETABLE_H */
diff --git a/include/linux/module.h b/include/linux/module.h
index 0dfb794c52d3..2c599175c583 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -156,6 +156,11 @@ extern struct module __this_module;
 */
 #define MODULE_VERSION(_version) MODULE_INFO(version, _version)
+/* Optional firmware file (or files) needed by the module
+ * format is simply firmware file name.  Multiple firmware
+ * files require multiple MODULE_FIRMWARE() specifiers */
+#define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)
 /* Given an address, look for it in the exception tables */
 const struct exception_table_entry *search_exception_tables(unsigned long add);
@@ -227,17 +232,17 @@ enum module_state
 };
 /* Similar stuff for section attributes. */
-#define MODULE_SECT_NAME_LEN 32
 struct module_sect_attr
 {
        struct module_attribute mattr;
-        char name[MODULE_SECT_NAME_LEN];
+        char *name;
        unsigned long address;
 };
 struct module_sect_attrs
 {
        struct attribute_group grp;
+        int nsections;
        struct module_sect_attr attrs[0];
 };
diff --git a/include/linux/mpage.h b/include/linux/mpage.h
index 3ca880463c47..cc5fb75af78a 100644
--- a/include/linux/mpage.h
+++ b/include/linux/mpage.h
@@ -9,6 +9,7 @@
 * (And no, it doesn't do the #ifdef __MPAGE_H thing, and it doesn't do
 * nested includes.  Get it right in the .c file).
 */
+#ifdef CONFIG_BLOCK
 struct writeback_control;
 typedef int (writepage_t)(struct page *page, struct writeback_control *wbc);
@@ -21,8 +22,4 @@ int mpage_writepages(struct address_space *mapping,
 int mpage_writepage(struct page *page, get_block_t *get_block,
                struct writeback_control *wbc);
-static inline int
+#endif
-generic_writepages(struct address_space *mapping, struct writeback_control *wbc)
-{
-        return mpage_writepages(mapping, wbc, NULL);
-}
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index e05d54a90743..7da2cee8e132 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -142,7 +142,7 @@ struct vif_device
        unsigned long   rate_limit;             /* Traffic shaping (NI)         */
        unsigned char   threshold;              /* TTL threshold                */
        unsigned short  flags;                  /* Control flags                */
-        __u32           local,remote;           /* Addresses(remote for tunnels)*/
+        __be32          local,remote;           /* Addresses(remote for tunnels)*/
        int             link;                   /* Physical interface index     */
 };
@@ -151,8 +151,8 @@ struct vif_device
 struct mfc_cache 
 {
        struct mfc_cache *next;                 /* Next entry on cache line     */
-        __u32 mfc_mcastgrp;                     /* Group the entry belongs to   */
+        __be32 mfc_mcastgrp;                    /* Group the entry belongs to   */
-        __u32 mfc_origin;                       /* Source of packet             */
+        __be32 mfc_origin;                      /* Source of packet             */
        vifi_t mfc_parent;                      /* Source interface             */
        int mfc_flags;                          /* Flags on line                */
@@ -179,9 +179,9 @@ struct mfc_cache
 #define MFC_LINES               64
 #ifdef __BIG_ENDIAN
-#define MFC_HASH(a,b)   ((((a)>>24)^((b)>>26))&(MFC_LINES-1))
+#define MFC_HASH(a,b)   (((((__force u32)(__be32)a)>>24)^(((__force u32)(__be32)b)>>26))&(MFC_LINES-1))
 #else
-#define MFC_HASH(a,b)   (((a)^((b)>>2))&(MFC_LINES-1))
+#define MFC_HASH(a,b)   ((((__force u32)(__be32)a)^(((__force u32)(__be32)b)>>2))&(MFC_LINES-1))
 #endif          
 #endif
@@ -213,8 +213,8 @@ struct pimreghdr
 {
        __u8    type;
        __u8    reserved;
-        __u16   csum;
+        __be16  csum;
-        __u32   flags;
+        __be32  flags;
 };
 extern int pim_rcv_v1(struct sk_buff *);
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index d9035c73e5d1..ce6c85815cbd 100644
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_MSDOS_FS_H
 #define _LINUX_MSDOS_FS_H
+#include <linux/magic.h>
 /*
 * The MS-DOS filesystem constants/structures
 */
@@ -18,8 +20,6 @@
 #define CT_LE_L(v)      cpu_to_le32(v)
-#define MSDOS_SUPER_MAGIC 0x4d44 /* MD */
 #define MSDOS_ROOT_INO  1       /* == MINIX_ROOT_INO */
 #define MSDOS_DIR_BITS  5       /* log2(sizeof(struct msdos_dir_entry)) */
@@ -204,6 +204,7 @@ struct fat_mount_options {
                 unicode_xlate:1, /* create escape sequences for unhandled Unicode */
                 numtail:1,       /* Does first alias have a numeric '~1' type tail? */
                 atari:1,         /* Use Atari GEMDOS variation of MS-DOS fs */
+                 flush:1,         /* write things quickly */
                 nocase:1;        /* Does this need case conversion? 0=need case conversion*/
 };
@@ -412,6 +413,8 @@ extern int fat_sync_inode(struct inode *inode);
 extern int fat_fill_super(struct super_block *sb, void *data, int silent,
                        struct inode_operations *fs_dir_inode_ops, int isvfat);
+extern int fat_flush_inodes(struct super_block *sb, struct inode *i1,
+                            struct inode *i2);
 /* fat/misc.c */
 extern void fat_fs_panic(struct super_block *s, const char *fmt, ...);
 extern void fat_clusters_flush(struct super_block *sb);
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 45511a5918d3..f5f19606effb 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_NAMEI_H
 #define _LINUX_NAMEI_H
+#include <linux/dcache.h>
 #include <linux/linkage.h>
 struct vfsmount;
@@ -54,6 +55,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 #define LOOKUP_OPEN             (0x0100)
 #define LOOKUP_CREATE           (0x0200)
 #define LOOKUP_ACCESS           (0x0400)
+#define LOOKUP_CHDIR            (0x0800)
 extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *));
 extern int FASTCALL(__user_walk_fd(int dfd, const char __user *, unsigned, struct nameidata *));
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h
index b208f0cd556b..0ea7f89e613c 100644
--- a/include/linux/ncp_fs.h
+++ b/include/linux/ncp_fs.h
@@ -11,6 +11,7 @@
 #include <linux/fs.h>
 #include <linux/in.h>
 #include <linux/types.h>
+#include <linux/magic.h>
 #include <linux/ipx.h>
 #include <linux/ncp_no.h>
@@ -185,10 +186,6 @@ struct ncp_entry_info {
        __u8                    file_handle[6];
 };
-/* Guess, what 0x564c is :-) */
-#define NCP_SUPER_MAGIC  0x564c
 static inline struct ncp_server *NCP_SBP(struct super_block *sb)
 {
        return sb->s_fs_info;
@@ -215,6 +212,7 @@ void ncp_date_unix2dos(int unix_date, __le16 * time, __le16 * date);
 /* linux/fs/ncpfs/ioctl.c */
 int ncp_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
+long ncp_compat_ioctl(struct file *, unsigned int, unsigned long);
 /* linux/fs/ncpfs/sock.c */
 int ncp_request2(struct ncp_server *server, int function,
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
new file mode 100644
index 000000000000..bd3bbf668cdb
--- /dev/null
+++ b/include/linux/neighbour.h
@@ -0,0 +1,159 @@
+#ifndef __LINUX_NEIGHBOUR_H
+#define __LINUX_NEIGHBOUR_H
+#include <linux/netlink.h>
+struct ndmsg
+{
+        __u8            ndm_family;
+        __u8            ndm_pad1;
+        __u16           ndm_pad2;
+        __s32           ndm_ifindex;
+        __u16           ndm_state;
+        __u8            ndm_flags;
+        __u8            ndm_type;
+};
+enum
+{
+        NDA_UNSPEC,
+        NDA_DST,
+        NDA_LLADDR,
+        NDA_CACHEINFO,
+        NDA_PROBES,
+        __NDA_MAX
+};
+#define NDA_MAX (__NDA_MAX - 1)
+/*
+ *      Neighbor Cache Entry Flags
+ */
+#define NTF_PROXY       0x08    /* == ATF_PUBL */
+#define NTF_ROUTER      0x80
+/*
+ *      Neighbor Cache Entry States.
+ */
+#define NUD_INCOMPLETE  0x01
+#define NUD_REACHABLE   0x02
+#define NUD_STALE       0x04
+#define NUD_DELAY       0x08
+#define NUD_PROBE       0x10
+#define NUD_FAILED      0x20
+/* Dummy states */
+#define NUD_NOARP       0x40
+#define NUD_PERMANENT   0x80
+#define NUD_NONE        0x00
+/* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change
+   and make no address resolution or NUD.
+   NUD_PERMANENT is also cannot be deleted by garbage collectors.
+ */
+struct nda_cacheinfo
+{
+        __u32           ndm_confirmed;
+        __u32           ndm_used;
+        __u32           ndm_updated;
+        __u32           ndm_refcnt;
+};
+/*****************************************************************
+ *              Neighbour tables specific messages.
+ *
+ * To retrieve the neighbour tables send RTM_GETNEIGHTBL with the
+ * NLM_F_DUMP flag set. Every neighbour table configuration is
+ * spread over multiple messages to avoid running into message
+ * size limits on systems with many interfaces. The first message
+ * in the sequence transports all not device specific data such as
+ * statistics, configuration, and the default parameter set.
+ * This message is followed by 0..n messages carrying device
+ * specific parameter sets.
+ * Although the ordering should be sufficient, NDTA_NAME can be
+ * used to identify sequences. The initial message can be identified
+ * by checking for NDTA_CONFIG. The device specific messages do
+ * not contain this TLV but have NDTPA_IFINDEX set to the
+ * corresponding interface index.
+ *
+ * To change neighbour table attributes, send RTM_SETNEIGHTBL
+ * with NDTA_NAME set. Changeable attribute include NDTA_THRESH[1-3],
+ * NDTA_GC_INTERVAL, and all TLVs in NDTA_PARMS unless marked
+ * otherwise. Device specific parameter sets can be changed by
+ * setting NDTPA_IFINDEX to the interface index of the corresponding
+ * device.
+ ****/
+struct ndt_stats
+{
+        __u64           ndts_allocs;
+        __u64           ndts_destroys;
+        __u64           ndts_hash_grows;
+        __u64           ndts_res_failed;
+        __u64           ndts_lookups;
+        __u64           ndts_hits;
+        __u64           ndts_rcv_probes_mcast;
+        __u64           ndts_rcv_probes_ucast;
+        __u64           ndts_periodic_gc_runs;
+        __u64           ndts_forced_gc_runs;
+};
+enum {
+        NDTPA_UNSPEC,
+        NDTPA_IFINDEX,                  /* u32, unchangeable */
+        NDTPA_REFCNT,                   /* u32, read-only */
+        NDTPA_REACHABLE_TIME,           /* u64, read-only, msecs */
+        NDTPA_BASE_REACHABLE_TIME,      /* u64, msecs */
+        NDTPA_RETRANS_TIME,             /* u64, msecs */
+        NDTPA_GC_STALETIME,             /* u64, msecs */
+        NDTPA_DELAY_PROBE_TIME,         /* u64, msecs */
+        NDTPA_QUEUE_LEN,                /* u32 */
+        NDTPA_APP_PROBES,               /* u32 */
+        NDTPA_UCAST_PROBES,             /* u32 */
+        NDTPA_MCAST_PROBES,             /* u32 */
+        NDTPA_ANYCAST_DELAY,            /* u64, msecs */
+        NDTPA_PROXY_DELAY,              /* u64, msecs */
+        NDTPA_PROXY_QLEN,               /* u32 */
+        NDTPA_LOCKTIME,                 /* u64, msecs */
+        __NDTPA_MAX
+};
+#define NDTPA_MAX (__NDTPA_MAX - 1)
+struct ndtmsg
+{
+        __u8            ndtm_family;
+        __u8            ndtm_pad1;
+        __u16           ndtm_pad2;
+};
+struct ndt_config
+{
+        __u16           ndtc_key_len;
+        __u16           ndtc_entry_size;
+        __u32           ndtc_entries;
+        __u32           ndtc_last_flush;        /* delta to now in msecs */
+        __u32           ndtc_last_rand;         /* delta to now in msecs */
+        __u32           ndtc_hash_rnd;
+        __u32           ndtc_hash_mask;
+        __u32           ndtc_hash_chain_gc;
+        __u32           ndtc_proxy_qlen;
+};
+enum {
+        NDTA_UNSPEC,
+        NDTA_NAME,                      /* char *, unchangeable */
+        NDTA_THRESH1,                   /* u32 */
+        NDTA_THRESH2,                   /* u32 */
+        NDTA_THRESH3,                   /* u32 */
+        NDTA_CONFIG,                    /* struct ndt_config, read-only */
+        NDTA_PARMS,                     /* nested TLV NDTPA_* */
+        NDTA_STATS,                     /* struct ndt_stats, read-only */
+        NDTA_GC_INTERVAL,               /* u64, msecs */
+        __NDTA_MAX
+};
+#define NDTA_MAX (__NDTA_MAX - 1)
+#endif
diff --git a/include/linux/net.h b/include/linux/net.h
index b20c53c74413..c257f716e00f 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -169,11 +169,6 @@ struct proto_ops {
 struct net_proto_family {
        int             family;
        int             (*create)(struct socket *sock, int protocol);
-        /* These are counters for the number of different methods of
-           each we support */
-        short           authentication;
-        short           encryption;
-        short           encrypt_net;
        struct module   *owner;
 };
@@ -181,8 +176,8 @@ struct iovec;
 struct kvec;
 extern int           sock_wake_async(struct socket *sk, int how, int band);
-extern int           sock_register(struct net_proto_family *fam);
+extern int           sock_register(const struct net_proto_family *fam);
-extern int           sock_unregister(int family);
+extern void          sock_unregister(int family);
 extern int           sock_create(int family, int type, int proto,
                                 struct socket **res);
 extern int           sock_create_kern(int family, int type, int proto,
@@ -208,6 +203,25 @@ extern int   	     kernel_recvmsg(struct socket *sock, struct msghdr *msg,
                                    struct kvec *vec, size_t num,
                                    size_t len, int flags);
+extern int kernel_bind(struct socket *sock, struct sockaddr *addr,
+                       int addrlen);
+extern int kernel_listen(struct socket *sock, int backlog);
+extern int kernel_accept(struct socket *sock, struct socket **newsock,
+                         int flags);
+extern int kernel_connect(struct socket *sock, struct sockaddr *addr,
+                          int addrlen, int flags);
+extern int kernel_getsockname(struct socket *sock, struct sockaddr *addr,
+                              int *addrlen);
+extern int kernel_getpeername(struct socket *sock, struct sockaddr *addr,
+                              int *addrlen);
+extern int kernel_getsockopt(struct socket *sock, int level, int optname,
+                             char *optval, int *optlen);
+extern int kernel_setsockopt(struct socket *sock, int level, int optname,
+                             char *optval, int optlen);
+extern int kernel_sendpage(struct socket *sock, struct page *page, int offset,
+                           size_t size, int flags);
+extern int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);
 #ifndef CONFIG_SMP
 #define SOCKOPS_WRAPPED(name) name
 #define SOCKOPS_WRAP(name, fam)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 50a4719512ed..9264139bd8df 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -187,7 +187,7 @@ struct hh_cache
 {
        struct hh_cache *hh_next;       /* Next entry                        */
        atomic_t        hh_refcnt;      /* number of users                   */
-        unsigned short  hh_type;        /* protocol identifier, f.e ETH_P_IP
+        __be16          hh_type;        /* protocol identifier, f.e ETH_P_IP
                                         *  NOTE:  For VLANs, this will be the
                                         *  encapuslated type. --BLG
                                         */
@@ -334,7 +334,6 @@ struct net_device
        struct net_device_stats* (*get_stats)(struct net_device *dev);
-        struct iw_statistics*   (*get_wireless_stats)(struct net_device *dev);
        /* List of functions to handle Wireless Extensions (instead of ioctl).
         * See <net/iw_handler.h> for details. Jean II */
@@ -342,7 +341,7 @@ struct net_device
        /* Instance data managed by the core of Wireless Extensions. */
        struct iw_public_data * wireless_data;
-        struct ethtool_ops *ethtool_ops;
+        const struct ethtool_ops *ethtool_ops;
        /*
         * This marks the end of the "visible" part of the structure. All
@@ -976,7 +975,7 @@ extern void		dev_mcast_init(void);
 extern int              netdev_max_backlog;
 extern int              weight_p;
 extern int              netdev_set_master(struct net_device *dev, struct net_device *master);
-extern int skb_checksum_help(struct sk_buff *skb, int inward);
+extern int skb_checksum_help(struct sk_buff *skb);
 extern struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features);
 #ifdef CONFIG_BUG
 extern void netdev_rx_csum_fault(struct net_device *dev);
@@ -1012,11 +1011,12 @@ static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
 {
        return skb_is_gso(skb) &&
               (!skb_gso_ok(skb, dev->features) ||
-                unlikely(skb->ip_summed != CHECKSUM_HW));
+                unlikely(skb->ip_summed != CHECKSUM_PARTIAL));
 }
 /* On bonding slaves other than the currently active slave, suppress
- * duplicates except for 802.3ad ETH_P_SLOW and alb non-mcast/bcast.
+ * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and
+ * ARP on active-backup slaves with arp_validate enabled.
 */
 static inline int skb_bond_should_drop(struct sk_buff *skb)
 {
@@ -1025,6 +1025,10 @@ static inline int skb_bond_should_drop(struct sk_buff *skb)
        if (master &&
            (dev->priv_flags & IFF_SLAVE_INACTIVE)) {
+                if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&
+                    skb->protocol == __constant_htons(ETH_P_ARP))
+                        return 0;
                if (master->priv_flags & IFF_MASTER_ALB) {
                        if (skb->pkt_type != PACKET_BROADCAST &&
                            skb->pkt_type != PACKET_MULTICAST)
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 10168e26a846..b7e67d1d4382 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -282,6 +282,12 @@ extern void nf_invalidate_cache(int pf);
   Returns true or false. */
 extern int skb_make_writable(struct sk_buff **pskb, unsigned int writable_len);
+extern u_int16_t nf_csum_update(u_int32_t oldval, u_int32_t newval,
+                                u_int32_t csum);
+extern u_int16_t nf_proto_csum_update(struct sk_buff *skb,
+                                      u_int32_t oldval, u_int32_t newval,
+                                      u_int16_t csum, int pseudohdr);
 struct nf_afinfo {
        unsigned short  family;
        unsigned int    (*checksum)(struct sk_buff *skb, unsigned int hook,
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 1d3a14e2da6e..312bd2ffee33 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -1,11 +1,40 @@
-header-y := nf_conntrack_sctp.h nf_conntrack_tuple_common.h             \
+header-y += nf_conntrack_sctp.h
-            nfnetlink_conntrack.h nfnetlink_log.h nfnetlink_queue.h     \
+header-y += nf_conntrack_tuple_common.h
-            xt_CLASSIFY.h xt_comment.h xt_connbytes.h xt_connmark.h     \
+header-y += nfnetlink_conntrack.h
-            xt_CONNMARK.h xt_conntrack.h xt_dccp.h xt_esp.h             \
+header-y += nfnetlink_log.h
-            xt_helper.h xt_length.h xt_limit.h xt_mac.h xt_mark.h       \
+header-y += nfnetlink_queue.h
-            xt_MARK.h xt_multiport.h xt_NFQUEUE.h xt_pkttype.h          \
+header-y += xt_CLASSIFY.h
-            xt_policy.h xt_realm.h xt_sctp.h xt_state.h xt_string.h     \
+header-y += xt_comment.h
-            xt_tcpmss.h xt_tcpudp.h xt_SECMARK.h xt_CONNSECMARK.h
+header-y += xt_connbytes.h
+header-y += xt_connmark.h
+header-y += xt_CONNMARK.h
+header-y += xt_conntrack.h
+header-y += xt_dccp.h
+header-y += xt_dscp.h
+header-y += xt_DSCP.h
+header-y += xt_esp.h
+header-y += xt_helper.h
+header-y += xt_length.h
+header-y += xt_limit.h
+header-y += xt_mac.h
+header-y += xt_mark.h
+header-y += xt_MARK.h
+header-y += xt_multiport.h
+header-y += xt_NFQUEUE.h
+header-y += xt_pkttype.h
+header-y += xt_policy.h
+header-y += xt_realm.h
+header-y += xt_sctp.h
+header-y += xt_state.h
+header-y += xt_string.h
+header-y += xt_tcpmss.h
+header-y += xt_tcpudp.h
+header-y += xt_SECMARK.h
+header-y += xt_CONNSECMARK.h
-unifdef-y := nf_conntrack_common.h nf_conntrack_ftp.h           \
+unifdef-y += nf_conntrack_common.h
-        nf_conntrack_tcp.h nfnetlink.h x_tables.h xt_physdev.h
+unifdef-y += nf_conntrack_ftp.h
+unifdef-y += nf_conntrack_tcp.h
+unifdef-y += nfnetlink.h
+unifdef-y += x_tables.h
+unifdef-y += xt_physdev.h
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index d2e4bd7a7a14..9e0dae07861e 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
@@ -125,6 +125,10 @@ enum ip_conntrack_events
        /* Counter highest bit has been set */
        IPCT_COUNTER_FILLING_BIT = 11,
        IPCT_COUNTER_FILLING = (1 << IPCT_COUNTER_FILLING_BIT),
+        /* Mark is set */
+        IPCT_MARK_BIT = 12,
+        IPCT_MARK = (1 << IPCT_MARK_BIT),
 };
 enum ip_conntrack_expect_events {
diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h
index b2feeffde384..6b01ba297727 100644
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.h
@@ -49,6 +49,7 @@ struct ip_ct_tcp
        u_int32_t       last_seq;       /* Last sequence number seen in dir */
        u_int32_t       last_ack;       /* Last sequence number seen in opposite dir */
        u_int32_t       last_end;       /* Last seq + len */
+        u_int16_t       last_win;       /* Last window advertisement seen in dir */
 };
 #endif /* __KERNEL__ */
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 9f5b12cf489b..6d8e3e5a80e9 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -43,7 +43,7 @@ struct nfattr
        u_int16_t nfa_len;
        u_int16_t nfa_type;     /* we use 15 bits for the type, and the highest
                                 * bit to indicate whether the payload is nested */
-} __attribute__ ((packed));
+};
 /* FIXME: Apart from NFNL_NFA_NESTED shamelessly copy and pasted from
 * rtnetlink.h, it's time to put this in a generic file */
@@ -79,7 +79,7 @@ struct nfgenmsg {
        u_int8_t  nfgen_family;         /* AF_xxx */
        u_int8_t  version;              /* nfnetlink version */
        u_int16_t res_id;               /* resource id */
-} __attribute__ ((packed));
+};
 #define NFNETLINK_V0    0
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
index a7497c7436df..87b92f8b988f 100644
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
@@ -19,18 +19,18 @@ struct nfulnl_msg_packet_hdr {
        u_int16_t       hw_protocol;    /* hw protocol (network order) */
        u_int8_t        hook;           /* netfilter hook */
        u_int8_t        _pad;
-} __attribute__ ((packed));
+};
 struct nfulnl_msg_packet_hw {
        u_int16_t       hw_addrlen;
        u_int16_t       _pad;
        u_int8_t        hw_addr[8];
-} __attribute__ ((packed));
+};
 struct nfulnl_msg_packet_timestamp {
        aligned_u64     sec;
        aligned_u64     usec;
-} __attribute__ ((packed));
+};
 #define NFULNL_PREFIXLEN        30      /* just like old log target */
diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h
index 9e774373244c..36af0360b56d 100644
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux/netfilter/nfnetlink_queue.h
@@ -22,12 +22,12 @@ struct nfqnl_msg_packet_hw {
        u_int16_t       hw_addrlen;
        u_int16_t       _pad;
        u_int8_t        hw_addr[8];
-} __attribute__ ((packed));
+};
 struct nfqnl_msg_packet_timestamp {
        aligned_u64     sec;
        aligned_u64     usec;
-} __attribute__ ((packed));
+};
 enum nfqnl_attr_type {
        NFQA_UNSPEC,
@@ -49,7 +49,7 @@ enum nfqnl_attr_type {
 struct nfqnl_msg_verdict_hdr {
        u_int32_t verdict;
        u_int32_t id;
-} __attribute__ ((packed));
+};
 enum nfqnl_msg_config_cmds {
@@ -64,7 +64,7 @@ struct nfqnl_msg_config_cmd {
        u_int8_t        command;        /* nfqnl_msg_config_cmds */
        u_int8_t        _pad;
        u_int16_t       pf;             /* AF_xxx for PF_[UN]BIND */
-} __attribute__ ((packed));
+};
 enum nfqnl_config_mode {
        NFQNL_COPY_NONE,
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 48cc32d83f77..04319a76103a 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -138,16 +138,6 @@ struct xt_counters_info
 #include <linux/netdevice.h>
-#define ASSERT_READ_LOCK(x)
-#define ASSERT_WRITE_LOCK(x)
-#include <linux/netfilter_ipv4/listhelp.h>
-#ifdef CONFIG_COMPAT
-#define COMPAT_TO_USER          1
-#define COMPAT_FROM_USER        -1
-#define COMPAT_CALC_SIZE        0
-#endif
 struct xt_match
 {
        struct list_head list;
@@ -174,21 +164,24 @@ struct xt_match
                          const void *ip,
                          const struct xt_match *match,
                          void *matchinfo,
-                          unsigned int matchinfosize,
                          unsigned int hook_mask);
        /* Called when entry of this type deleted. */
-        void (*destroy)(const struct xt_match *match, void *matchinfo,
+        void (*destroy)(const struct xt_match *match, void *matchinfo);
-                        unsigned int matchinfosize);
        /* Called when userspace align differs from kernel space one */
-        int (*compat)(void *match, void **dstptr, int *size, int convert);
+        void (*compat_from_user)(void *dst, void *src);
+        int (*compat_to_user)(void __user *dst, void *src);
        /* Set this to THIS_MODULE if you are a module, otherwise NULL */
        struct module *me;
+        /* Free to use by each match */
+        unsigned long data;
        char *table;
        unsigned int matchsize;
+        unsigned int compatsize;
        unsigned int hooks;
        unsigned short proto;
@@ -211,8 +204,7 @@ struct xt_target
                               const struct net_device *out,
                               unsigned int hooknum,
                               const struct xt_target *target,
-                               const void *targinfo,
+                               const void *targinfo);
-                               void *userdata);
        /* Called when user tries to insert an entry of this type:
           hook_mask is a bitmask of hooks from which it can be
@@ -222,21 +214,21 @@ struct xt_target
                          const void *entry,
                          const struct xt_target *target,
                          void *targinfo,
-                          unsigned int targinfosize,
                          unsigned int hook_mask);
        /* Called when entry of this type deleted. */
-        void (*destroy)(const struct xt_target *target, void *targinfo,
+        void (*destroy)(const struct xt_target *target, void *targinfo);
-                        unsigned int targinfosize);
        /* Called when userspace align differs from kernel space one */
-        int (*compat)(void *target, void **dstptr, int *size, int convert);
+        void (*compat_from_user)(void *dst, void *src);
+        int (*compat_to_user)(void __user *dst, void *src);
        /* Set this to THIS_MODULE if you are a module, otherwise NULL */
        struct module *me;
        char *table;
        unsigned int targetsize;
+        unsigned int compatsize;
        unsigned int hooks;
        unsigned short proto;
@@ -290,8 +282,13 @@ struct xt_table_info
 extern int xt_register_target(struct xt_target *target);
 extern void xt_unregister_target(struct xt_target *target);
+extern int xt_register_targets(struct xt_target *target, unsigned int n);
+extern void xt_unregister_targets(struct xt_target *target, unsigned int n);
 extern int xt_register_match(struct xt_match *target);
 extern void xt_unregister_match(struct xt_match *target);
+extern int xt_register_matches(struct xt_match *match, unsigned int n);
+extern void xt_unregister_matches(struct xt_match *match, unsigned int n);
 extern int xt_check_match(const struct xt_match *match, unsigned short family,
                          unsigned int size, const char *table, unsigned int hook,
@@ -388,9 +385,18 @@ struct compat_xt_counters_info
 extern void xt_compat_lock(int af);
 extern void xt_compat_unlock(int af);
-extern int xt_compat_match(void *match, void **dstptr, int *size, int convert);
-extern int xt_compat_target(void *target, void **dstptr, int *size,
+extern int xt_compat_match_offset(struct xt_match *match);
-                int convert);
+extern void xt_compat_match_from_user(struct xt_entry_match *m,
+                                      void **dstptr, int *size);
+extern int xt_compat_match_to_user(struct xt_entry_match *m,
+                                   void __user **dstptr, int *size);
+extern int xt_compat_target_offset(struct xt_target *target);
+extern void xt_compat_target_from_user(struct xt_entry_target *t,
+                                       void **dstptr, int *size);
+extern int xt_compat_target_to_user(struct xt_entry_target *t,
+                                    void __user **dstptr, int *size);
 #endif /* CONFIG_COMPAT */
 #endif /* __KERNEL__ */
diff --git a/include/linux/netfilter/xt_DSCP.h b/include/linux/netfilter/xt_DSCP.h
new file mode 100644
index 000000000000..3c7c963997bd
--- /dev/null
+++ b/include/linux/netfilter/xt_DSCP.h
@@ -0,0 +1,20 @@
+/* x_tables module for setting the IPv4/IPv6 DSCP field
+ *
+ * (C) 2002 Harald Welte <laforge@gnumonks.org>
+ * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
+ * This software is distributed under GNU GPL v2, 1991
+ *
+ * See RFC2474 for a description of the DSCP field within the IP Header.
+ *
+ * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
+*/
+#ifndef _XT_DSCP_TARGET_H
+#define _XT_DSCP_TARGET_H
+#include <linux/netfilter/xt_dscp.h>
+/* target info */
+struct xt_DSCP_info {
+        u_int8_t dscp;
+};
+#endif /* _XT_DSCP_TARGET_H */
diff --git a/include/linux/netfilter/xt_dscp.h b/include/linux/netfilter/xt_dscp.h
new file mode 100644
index 000000000000..1da61e6acaf7
--- /dev/null
+++ b/include/linux/netfilter/xt_dscp.h
@@ -0,0 +1,23 @@
+/* x_tables module for matching the IPv4/IPv6 DSCP field
+ *
+ * (C) 2002 Harald Welte <laforge@gnumonks.org>
+ * This software is distributed under GNU GPL v2, 1991
+ *
+ * See RFC2474 for a description of the DSCP field within the IP Header.
+ *
+ * xt_dscp.h,v 1.3 2002/08/05 19:00:21 laforge Exp
+*/
+#ifndef _XT_DSCP_H
+#define _XT_DSCP_H
+#define XT_DSCP_MASK    0xfc    /* 11111100 */
+#define XT_DSCP_SHIFT   2
+#define XT_DSCP_MAX     0x3f    /* 00111111 */
+/* match info */
+struct xt_dscp_info {
+        u_int8_t dscp;
+        u_int8_t invert;
+};
+#endif /* _XT_DSCP_H */
diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild
index 198ec5e7b17d..4f13dfcb92ea 100644
--- a/include/linux/netfilter_arp/Kbuild
+++ b/include/linux/netfilter_arp/Kbuild
@@ -1,2 +1,3 @@
-header-y := arpt_mangle.h
+header-y += arpt_mangle.h
-unifdef-y := arp_tables.h
+unifdef-y += arp_tables.h
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index 62cc27daca4e..44e39b61d9e7 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -46,11 +46,11 @@ struct arpt_arp {
        struct arpt_devaddr_info tgt_devaddr;
        /* ARP operation code. */
-        u_int16_t arpop, arpop_mask;
+        __be16 arpop, arpop_mask;
        /* ARP hardware address and protocol address format. */
-        u_int16_t arhrd, arhrd_mask;
+        __be16 arhrd, arhrd_mask;
-        u_int16_t arpro, arpro_mask;
+        __be16 arpro, arpro_mask;
        /* The protocol address length is only accepted if it is 4
         * so there is no use in offering a way to do filtering on it.
@@ -248,8 +248,7 @@ extern unsigned int arpt_do_table(struct sk_buff **pskb,
                                  unsigned int hook,
                                  const struct net_device *in,
                                  const struct net_device *out,
-                                  struct arpt_table *table,
+                                  struct arpt_table *table);
-                                  void *userdata);
 #define ARPT_ALIGN(s) (((s) + (__alignof__(struct arpt_entry)-1)) & ~(__alignof__(struct arpt_entry)-1))
 #endif /*__KERNEL__*/
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index 427c67ff89e9..9a4dd11af86e 100644
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -5,9 +5,8 @@
 */
 #include <linux/netfilter.h>
-#if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER)
 #include <linux/if_ether.h>
-#endif
+#include <linux/if_vlan.h>
 /* Bridge Hooks */
 /* After promisc drops, checksum checks. */
@@ -47,40 +46,20 @@ enum nf_br_hook_priorities {
 /* Only used in br_forward.c */
-static inline
+extern int nf_bridge_copy_header(struct sk_buff *skb);
-int nf_bridge_maybe_copy_header(struct sk_buff *skb)
+static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb)
 {
-        int err;
+        if (skb->nf_bridge)
+                return nf_bridge_copy_header(skb);
-        if (skb->nf_bridge) {
+        return 0;
-                if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-                        err = skb_cow(skb, 18);
-                        if (err)
-                                return err;
-                        memcpy(skb->data - 18, skb->nf_bridge->data, 18);
-                        skb_push(skb, 4);
-                } else {
-                        err = skb_cow(skb, 16);
-                        if (err)
-                                return err;
-                        memcpy(skb->data - 16, skb->nf_bridge->data, 16);
-                }
-        }
-        return 0;
 }
 /* This is called by the IP fragmenting code and it ensures there is
 * enough room for the encapsulating header (if there is one). */
-static inline
+static inline int nf_bridge_pad(const struct sk_buff *skb)
-int nf_bridge_pad(struct sk_buff *skb)
 {
-        if (skb->protocol == __constant_htons(ETH_P_IP))
+        return (skb->nf_bridge && skb->protocol == htons(ETH_P_8021Q))
-                return 0;
+                ? VLAN_HLEN : 0;
-        if (skb->nf_bridge) {
-                if (skb->protocol == __constant_htons(ETH_P_8021Q))
-                        return 4;
-        }
-        return 0;
 }
 struct bridge_skb_cb {
@@ -90,6 +69,9 @@ struct bridge_skb_cb {
 };
 extern int brnf_deferred_hooks;
+#else
+#define nf_bridge_maybe_copy_header(skb)        (0)
+#define nf_bridge_pad(skb)                      (0)
 #endif /* CONFIG_BRIDGE_NETFILTER */
 #endif /* __KERNEL__ */
diff --git a/include/linux/netfilter_bridge/Kbuild b/include/linux/netfilter_bridge/Kbuild
index 5b1aba6abbad..76ff4c47d8c4 100644
--- a/include/linux/netfilter_bridge/Kbuild
+++ b/include/linux/netfilter_bridge/Kbuild
@@ -1,4 +1,17 @@
-header-y += ebt_among.h ebt_arp.h ebt_arpreply.h ebt_ip.h ebt_limit.h   \
+header-y += ebt_among.h
-        ebt_log.h ebt_mark_m.h ebt_mark_t.h ebt_nat.h ebt_pkttype.h     \
+header-y += ebt_arp.h
-        ebt_redirect.h ebt_stp.h ebt_ulog.h ebt_vlan.h
+header-y += ebt_arpreply.h
-unifdef-y := ebtables.h ebt_802_3.h
+header-y += ebt_ip.h
+header-y += ebt_limit.h
+header-y += ebt_log.h
+header-y += ebt_mark_m.h
+header-y += ebt_mark_t.h
+header-y += ebt_nat.h
+header-y += ebt_pkttype.h
+header-y += ebt_redirect.h
+header-y += ebt_stp.h
+header-y += ebt_ulog.h
+header-y += ebt_vlan.h
+unifdef-y += ebtables.h
+unifdef-y += ebt_802_3.h
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index 04e4d2721689..591c1a809c00 100644
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -1,21 +1,63 @@
+header-y += ip_conntrack_helper.h
+header-y += ip_conntrack_helper_h323_asn1.h
+header-y += ip_conntrack_helper_h323_types.h
+header-y += ip_conntrack_protocol.h
+header-y += ip_conntrack_sctp.h
+header-y += ip_conntrack_tcp.h
+header-y += ip_conntrack_tftp.h
+header-y += ip_nat_pptp.h
+header-y += ipt_addrtype.h
+header-y += ipt_ah.h
+header-y += ipt_CLASSIFY.h
+header-y += ipt_CLUSTERIP.h
+header-y += ipt_comment.h
+header-y += ipt_connbytes.h
+header-y += ipt_connmark.h
+header-y += ipt_CONNMARK.h
+header-y += ipt_conntrack.h
+header-y += ipt_dccp.h
+header-y += ipt_dscp.h
+header-y += ipt_DSCP.h
+header-y += ipt_ecn.h
+header-y += ipt_ECN.h
+header-y += ipt_esp.h
+header-y += ipt_hashlimit.h
+header-y += ipt_helper.h
+header-y += ipt_iprange.h
+header-y += ipt_length.h
+header-y += ipt_limit.h
+header-y += ipt_LOG.h
+header-y += ipt_mac.h
+header-y += ipt_mark.h
+header-y += ipt_MARK.h
+header-y += ipt_multiport.h
+header-y += ipt_NFQUEUE.h
+header-y += ipt_owner.h
+header-y += ipt_physdev.h
+header-y += ipt_pkttype.h
+header-y += ipt_policy.h
+header-y += ipt_realm.h
+header-y += ipt_recent.h
+header-y += ipt_REJECT.h
+header-y += ipt_SAME.h
+header-y += ipt_sctp.h
+header-y += ipt_state.h
+header-y += ipt_string.h
+header-y += ipt_tcpmss.h
+header-y += ipt_TCPMSS.h
+header-y += ipt_tos.h
+header-y += ipt_TOS.h
+header-y += ipt_ttl.h
+header-y += ipt_TTL.h
+header-y += ipt_ULOG.h
-header-y := ip_conntrack_helper.h ip_conntrack_helper_h323_asn1.h       \
+unifdef-y += ip_conntrack.h
-            ip_conntrack_helper_h323_types.h ip_conntrack_protocol.h    \
+unifdef-y += ip_conntrack_h323.h
-            ip_conntrack_sctp.h ip_conntrack_tcp.h ip_conntrack_tftp.h  \
+unifdef-y += ip_conntrack_irc.h
-            ip_nat_pptp.h ipt_addrtype.h ipt_ah.h       \
+unifdef-y += ip_conntrack_pptp.h
-            ipt_CLASSIFY.h ipt_CLUSTERIP.h ipt_comment.h                \
+unifdef-y += ip_conntrack_proto_gre.h
-            ipt_connbytes.h ipt_connmark.h ipt_CONNMARK.h               \
+unifdef-y += ip_conntrack_tuple.h
-            ipt_conntrack.h ipt_dccp.h ipt_dscp.h ipt_DSCP.h ipt_ecn.h  \
+unifdef-y += ip_nat.h
-            ipt_ECN.h ipt_esp.h ipt_hashlimit.h ipt_helper.h            \
+unifdef-y += ip_nat_rule.h
-            ipt_iprange.h ipt_length.h ipt_limit.h ipt_LOG.h ipt_mac.h  \
+unifdef-y += ip_queue.h
-            ipt_mark.h ipt_MARK.h ipt_multiport.h ipt_NFQUEUE.h         \
+unifdef-y += ip_tables.h
-            ipt_owner.h ipt_physdev.h ipt_pkttype.h ipt_policy.h        \
-            ipt_realm.h ipt_recent.h ipt_REJECT.h ipt_SAME.h            \
-            ipt_sctp.h ipt_state.h ipt_string.h ipt_tcpmss.h            \
-            ipt_TCPMSS.h ipt_tos.h ipt_TOS.h ipt_ttl.h ipt_TTL.h        \
-            ipt_ULOG.h
-unifdef-y := ip_conntrack.h ip_conntrack_h323.h ip_conntrack_irc.h      \
-        ip_conntrack_pptp.h ip_conntrack_proto_gre.h                    \
-        ip_conntrack_tuple.h ip_nat.h ip_nat_rule.h ip_queue.h          \
-        ip_tables.h
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index 51dbec1892c8..64e868034c4a 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -157,7 +157,7 @@ struct ip_conntrack_expect
        unsigned int flags;
 #ifdef CONFIG_IP_NF_NAT_NEEDED
-        u_int32_t saved_ip;
+        __be32 saved_ip;
        /* This is the original per-proto part, used to map the
         * expected connection the way the recipient expects. */
        union ip_conntrack_manip_proto saved_proto;
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_h323.h b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
index 3cbff7379002..943cc6a4871d 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_h323.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
@@ -30,7 +30,7 @@ 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);
+                         __be32 * 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,
@@ -38,11 +38,11 @@ extern void ip_conntrack_q931_expect(struct ip_conntrack *new,
 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);
+                                  __be32 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);
+                                  __be32 ip, u_int16_t port);
 extern int (*set_sig_addr_hook) (struct sk_buff ** pskb,
                                 struct ip_conntrack * ct,
                                 enum ip_conntrack_info ctinfo,
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper.h b/include/linux/netfilter_ipv4/ip_conntrack_helper.h
index 8d69279ccfe4..77fe868d36ff 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_helper.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper.h
@@ -25,6 +25,8 @@ struct ip_conntrack_helper
                    struct ip_conntrack *ct,
                    enum ip_conntrack_info conntrackinfo);
+        void (*destroy)(struct ip_conntrack *ct);
        int (*to_nfattr)(struct sk_buff *skb, const struct ip_conntrack *ct);
 };
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
index 816144c75de0..2644b1faddd6 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
@@ -31,8 +31,8 @@ struct ip_ct_pptp_master {
        /* everything below is going to be per-expectation in newnat,
         * since there could be more than one call within one session */
        enum pptp_ctrlcall_state cstate;        /* call state */
-        u_int16_t pac_call_id;                  /* call id of PAC, host byte order */
+        __be16 pac_call_id;                     /* call id of PAC, host byte order */
-        u_int16_t pns_call_id;                  /* call id of PNS, host byte order */
+        __be16 pns_call_id;                     /* call id of PNS, host byte order */
        /* in pre-2.6.11 this used to be per-expect. Now it is per-conntrack
         * and therefore imposes a fixed limit on the number of maps */
@@ -42,8 +42,8 @@ struct ip_ct_pptp_master {
 /* conntrack_expect private member */
 struct ip_ct_pptp_expect {
        enum pptp_ctrlcall_state cstate;        /* call state */
-        u_int16_t pac_call_id;                  /* call id of PAC */
+        __be16 pac_call_id;                     /* call id of PAC */
-        u_int16_t pns_call_id;                  /* call id of PNS */
+        __be16 pns_call_id;                     /* call id of PNS */
 };
@@ -107,8 +107,7 @@ struct PptpControlHeader {
 struct PptpStartSessionRequest {
        __be16  protocolVersion;
-        __u8    reserved1;
+        __u16   reserved1;
-        __u8    reserved2;
        __be32  framingCapability;
        __be32  bearerCapability;
        __be16  maxChannels;
@@ -143,6 +142,8 @@ struct PptpStartSessionReply {
 struct PptpStopSessionRequest {
        __u8    reason;
+        __u8    reserved1;
+        __u16   reserved2;
 };
 /* PptpStopSessionResultCode */
@@ -152,6 +153,7 @@ struct PptpStopSessionRequest {
 struct PptpStopSessionReply {
        __u8    resultCode;
        __u8    generalErrorCode;
+        __u16   reserved1;
 };
 struct PptpEchoRequest {
@@ -188,9 +190,8 @@ struct PptpOutCallRequest {
        __be32  framingType;
        __be16  packetWindow;
        __be16  packetProcDelay;
-        __u16   reserved1;
        __be16  phoneNumberLength;
-        __u16   reserved2;
+        __u16   reserved1;
        __u8    phoneNumber[64];
        __u8    subAddress[64];
 };
@@ -285,19 +286,19 @@ struct PptpSetLinkInfo {
 };
 union pptp_ctrl_union {
-                struct PptpStartSessionRequest  sreq;
+        struct PptpStartSessionRequest  sreq;
-                struct PptpStartSessionReply    srep;
+        struct PptpStartSessionReply    srep;
-                struct PptpStopSessionRequest   streq;
+        struct PptpStopSessionRequest   streq;
-                struct PptpStopSessionReply     strep;
+        struct PptpStopSessionReply     strep;
-                struct PptpOutCallRequest       ocreq;
+        struct PptpOutCallRequest       ocreq;
-                struct PptpOutCallReply         ocack;
+        struct PptpOutCallReply         ocack;
-                struct PptpInCallRequest        icreq;
+        struct PptpInCallRequest        icreq;
-                struct PptpInCallReply          icack;
+        struct PptpInCallReply          icack;
-                struct PptpInCallConnected      iccon;
+        struct PptpInCallConnected      iccon;
-                struct PptpClearCallRequest     clrreq;
+        struct PptpClearCallRequest     clrreq;
-                struct PptpCallDisconnectNotify disc;
+        struct PptpCallDisconnectNotify disc;
-                struct PptpWanErrorNotify       wanerr;
+        struct PptpWanErrorNotify       wanerr;
-                struct PptpSetLinkInfo          setlink;
+        struct PptpSetLinkInfo          setlink;
 };
 extern int
@@ -314,7 +315,7 @@ extern int
                          struct PptpControlHeader *ctlh,
                          union pptp_ctrl_union *pptpReq);
-extern int
+extern void
 (*ip_nat_pptp_hook_exp_gre)(struct ip_conntrack_expect *exp_orig,
                            struct ip_conntrack_expect *exp_reply);
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
index 8d090ef82f5f..1d853aa873eb 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
@@ -49,18 +49,18 @@ struct gre_hdr {
 #else
 #error "Adjust your <asm/byteorder.h> defines"
 #endif
-        __u16   protocol;
+        __be16  protocol;
 };
 /* modified GRE header for PPTP */
 struct gre_hdr_pptp {
-        __u8  flags;            /* bitfield */
+        __u8   flags;           /* bitfield */
-        __u8  version;          /* should be GRE_VERSION_PPTP */
+        __u8   version;         /* should be GRE_VERSION_PPTP */
-        __u16 protocol;         /* should be GRE_PROTOCOL_PPTP */
+        __be16 protocol;        /* should be GRE_PROTOCOL_PPTP */
-        __u16 payload_len;      /* size of ppp payload, not inc. gre header */
+        __be16 payload_len;     /* size of ppp payload, not inc. gre header */
-        __u16 call_id;          /* peer's call_id for this session */
+        __be16 call_id;         /* peer's call_id for this session */
-        __u32 seq;              /* sequence number.  Present if S==1 */
+        __be32 seq;             /* sequence number.  Present if S==1 */
-        __u32 ack;              /* seq number of highest packet recieved by */
+        __be32 ack;             /* seq number of highest packet recieved by */
                                /*  sender in this session */
 };
@@ -92,13 +92,13 @@ void ip_ct_gre_keymap_destroy(struct ip_conntrack *ct);
 /* get pointer to gre key, if present */
-static inline u_int32_t *gre_key(struct gre_hdr *greh)
+static inline __be32 *gre_key(struct gre_hdr *greh)
 {
        if (!greh->key)
                return NULL;
        if (greh->csum || greh->routing)
-                return (u_int32_t *) (greh+sizeof(*greh)+4);
+                return (__be32 *) (greh+sizeof(*greh)+4);
-        return (u_int32_t *) (greh+sizeof(*greh));
+        return (__be32 *) (greh+sizeof(*greh));
 }
 /* get pointer ot gre csum, if present */
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
index 2fdabdb4c0ef..c228bde74c33 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
@@ -23,13 +23,13 @@ union ip_conntrack_manip_proto
                __be16 port;
        } tcp;
        struct {
-                u_int16_t port;
+                __be16 port;
        } udp;
        struct {
-                u_int16_t id;
+                __be16 id;
        } icmp;
        struct {
-                u_int16_t port;
+                __be16 port;
        } sctp;
        struct {
                __be16 key;     /* key is 32bit, pptp only uses 16 */
@@ -39,7 +39,7 @@ union ip_conntrack_manip_proto
 /* The manipulable part of the tuple. */
 struct ip_conntrack_manip
 {
-        u_int32_t ip;
+        __be32 ip;
        union ip_conntrack_manip_proto u;
 };
@@ -50,22 +50,22 @@ struct ip_conntrack_tuple
        /* These are the parts of the tuple which are fixed. */
        struct {
-                u_int32_t ip;
+                __be32 ip;
                union {
                        /* Add other protocols here. */
                        u_int16_t all;
                        struct {
-                                u_int16_t port;
+                                __be16 port;
                        } tcp;
                        struct {
-                                u_int16_t port;
+                                __be16 port;
                        } udp;
                        struct {
                                u_int8_t type, code;
                        } icmp;
                        struct {
-                                u_int16_t port;
+                                __be16 port;
                        } sctp;
                        struct {
                                __be16 key;     /* key is 32bit, 
diff --git a/include/linux/netfilter_ipv4/ip_nat.h b/include/linux/netfilter_ipv4/ip_nat.h
index e9f5ed1d9f68..bdf553620ca1 100644
--- a/include/linux/netfilter_ipv4/ip_nat.h
+++ b/include/linux/netfilter_ipv4/ip_nat.h
@@ -33,7 +33,7 @@ struct ip_nat_range
        unsigned int flags;
        /* Inclusive: network order. */
-        u_int32_t min_ip, max_ip;
+        __be32 min_ip, max_ip;
        /* Inclusive: network order */
        union ip_conntrack_manip_proto min, max;
@@ -72,10 +72,6 @@ extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack,
 extern int ip_nat_used_tuple(const struct ip_conntrack_tuple *tuple,
                             const struct ip_conntrack *ignored_conntrack);
-/* Calculate relative checksum. */
-extern u_int16_t ip_nat_cheat_check(u_int32_t oldvalinv,
-                                    u_int32_t newval,
-                                    u_int16_t oldcheck);
 #else  /* !__KERNEL__: iptables wants this to compile. */
 #define ip_nat_multi_range ip_nat_multi_range_compat
 #endif /*__KERNEL__*/
diff --git a/include/linux/netfilter_ipv4/ip_nat_core.h b/include/linux/netfilter_ipv4/ip_nat_core.h
index 30db23f06b03..60566f9fd7b3 100644
--- a/include/linux/netfilter_ipv4/ip_nat_core.h
+++ b/include/linux/netfilter_ipv4/ip_nat_core.h
@@ -11,8 +11,8 @@ extern unsigned int ip_nat_packet(struct ip_conntrack *ct,
                               unsigned int hooknum,
                               struct sk_buff **pskb);
-extern int ip_nat_icmp_reply_translation(struct sk_buff **pskb,
+extern int ip_nat_icmp_reply_translation(struct ip_conntrack *ct,
-                                         struct ip_conntrack *ct,
+                                         enum ip_conntrack_info ctinfo,
-                                         enum ip_nat_manip_type manip,
+                                         unsigned int hooknum,
-                                         enum ip_conntrack_dir dir);
+                                         struct sk_buff **pskb);
 #endif /* _IP_NAT_CORE_H */
diff --git a/include/linux/netfilter_ipv4/ip_nat_pptp.h b/include/linux/netfilter_ipv4/ip_nat_pptp.h
index eaf66c2e8f93..36668bf0f373 100644
--- a/include/linux/netfilter_ipv4/ip_nat_pptp.h
+++ b/include/linux/netfilter_ipv4/ip_nat_pptp.h
@@ -4,8 +4,8 @@
 /* conntrack private data */
 struct ip_nat_pptp {
-        u_int16_t pns_call_id;          /* NAT'ed PNS call id */
+        __be16 pns_call_id;             /* NAT'ed PNS call id */
-        u_int16_t pac_call_id;          /* NAT'ed PAC call id */
+        __be16 pac_call_id;             /* NAT'ed PAC call id */
 };
 #endif /* _NAT_PPTP_H */
diff --git a/include/linux/netfilter_ipv4/ip_queue.h b/include/linux/netfilter_ipv4/ip_queue.h
index aa08d68c4841..a03507f465f8 100644
--- a/include/linux/netfilter_ipv4/ip_queue.h
+++ b/include/linux/netfilter_ipv4/ip_queue.h
@@ -26,7 +26,7 @@ typedef struct ipq_packet_msg {
        unsigned int hook;              /* Netfilter hook we rode in on */
        char indev_name[IFNAMSIZ];      /* Name of incoming interface */
        char outdev_name[IFNAMSIZ];     /* Name of outgoing interface */
-        unsigned short hw_protocol;     /* Hardware protocol (network order) */
+        __be16 hw_protocol;             /* Hardware protocol (network order) */
        unsigned short hw_type;         /* Hardware type */
        unsigned char hw_addrlen;       /* Hardware address length */
        unsigned char hw_addr[8];       /* Hardware address */
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index c0dac16e1902..a536bbdef145 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -312,8 +312,7 @@ extern unsigned int ipt_do_table(struct sk_buff **pskb,
                                 unsigned int hook,
                                 const struct net_device *in,
                                 const struct net_device *out,
-                                 struct ipt_table *table,
+                                 struct ipt_table *table);
-                                 void *userdata);
 #define IPT_ALIGN(s) XT_ALIGN(s)
diff --git a/include/linux/netfilter_ipv4/ipt_DSCP.h b/include/linux/netfilter_ipv4/ipt_DSCP.h
index b30f510b5bef..3491e524d5ea 100644
--- a/include/linux/netfilter_ipv4/ipt_DSCP.h
+++ b/include/linux/netfilter_ipv4/ipt_DSCP.h
@@ -11,10 +11,8 @@
 #ifndef _IPT_DSCP_TARGET_H
 #define _IPT_DSCP_TARGET_H
 #include <linux/netfilter_ipv4/ipt_dscp.h>
+#include <linux/netfilter/xt_DSCP.h>
-/* target info */
+#define ipt_DSCP_info xt_DSCP_info
-struct ipt_DSCP_info {
-        u_int8_t dscp;
-};
 #endif /* _IPT_DSCP_TARGET_H */
diff --git a/include/linux/netfilter_ipv4/ipt_dscp.h b/include/linux/netfilter_ipv4/ipt_dscp.h
index 2fa6dfe92894..4b82ca912b0e 100644
--- a/include/linux/netfilter_ipv4/ipt_dscp.h
+++ b/include/linux/netfilter_ipv4/ipt_dscp.h
@@ -10,14 +10,12 @@
 #ifndef _IPT_DSCP_H
 #define _IPT_DSCP_H
-#define IPT_DSCP_MASK   0xfc    /* 11111100 */
+#include <linux/netfilter/xt_dscp.h>
-#define IPT_DSCP_SHIFT  2
-#define IPT_DSCP_MAX    0x3f    /* 00111111 */
-/* match info */
+#define IPT_DSCP_MASK   XT_DSCP_MASK
-struct ipt_dscp_info {
+#define IPT_DSCP_SHIFT  XT_DSCP_SHIFT
-        u_int8_t dscp;
+#define IPT_DSCP_MAX    XT_DSCP_MAX
-        u_int8_t invert;
-};
+#define ipt_dscp_info   xt_dscp_info
 #endif /* _IPT_DSCP_H */
diff --git a/include/linux/netfilter_ipv4/ipt_iprange.h b/include/linux/netfilter_ipv4/ipt_iprange.h
index 3ecb3bd63676..34ab0fb736e2 100644
--- a/include/linux/netfilter_ipv4/ipt_iprange.h
+++ b/include/linux/netfilter_ipv4/ipt_iprange.h
@@ -8,7 +8,7 @@
 struct ipt_iprange {
        /* Inclusive: network order. */
-        u_int32_t min_ip, max_ip;
+        __be32 min_ip, max_ip;
 };
 struct ipt_iprange_info
diff --git a/include/linux/netfilter_ipv4/listhelp.h b/include/linux/netfilter_ipv4/listhelp.h
deleted file mode 100644
index 5d92cf044d91..000000000000
--- a/include/linux/netfilter_ipv4/listhelp.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef _LISTHELP_H
-#define _LISTHELP_H
-#include <linux/list.h>
-/* Header to do more comprehensive job than linux/list.h; assume list
-   is first entry in structure. */
-/* Return pointer to first true entry, if any, or NULL.  A macro
-   required to allow inlining of cmpfn. */
-#define LIST_FIND(head, cmpfn, type, args...)           \
-({                                                      \
-        const struct list_head *__i, *__j = NULL;       \
-                                                        \
-        ASSERT_READ_LOCK(head);                         \
-        list_for_each(__i, (head))                      \
-                if (cmpfn((const type)__i , ## args)) { \
-                        __j = __i;                      \
-                        break;                          \
-                }                                       \
-        (type)__j;                                      \
-})
-#define LIST_FIND_W(head, cmpfn, type, args...)         \
-({                                                      \
-        const struct list_head *__i, *__j = NULL;       \
-                                                        \
-        ASSERT_WRITE_LOCK(head);                        \
-        list_for_each(__i, (head))                      \
-                if (cmpfn((type)__i , ## args)) {       \
-                        __j = __i;                      \
-                        break;                          \
-                }                                       \
-        (type)__j;                                      \
-})
-/* Just like LIST_FIND but we search backwards */
-#define LIST_FIND_B(head, cmpfn, type, args...)         \
-({                                                      \
-        const struct list_head *__i, *__j = NULL;       \
-                                                        \
-        ASSERT_READ_LOCK(head);                         \
-        list_for_each_prev(__i, (head))                 \
-                if (cmpfn((const type)__i , ## args)) { \
-                        __j = __i;                      \
-                        break;                          \
-                }                                       \
-        (type)__j;                                      \
-})
-static inline int
-__list_cmp_same(const void *p1, const void *p2) { return p1 == p2; }
-/* Is this entry in the list? */
-static inline int
-list_inlist(struct list_head *head, const void *entry)
-{
-        return LIST_FIND(head, __list_cmp_same, void *, entry) != NULL;
-}
-/* Delete from list. */
-#ifdef CONFIG_NETFILTER_DEBUG
-#define LIST_DELETE(head, oldentry)                                     \
-do {                                                                    \
-        ASSERT_WRITE_LOCK(head);                                        \
-        if (!list_inlist(head, oldentry))                               \
-                printk("LIST_DELETE: %s:%u `%s'(%p) not in %s.\n",      \
-                       __FILE__, __LINE__, #oldentry, oldentry, #head); \
-        else list_del((struct list_head *)oldentry);                    \
-} while(0)
-#else
-#define LIST_DELETE(head, oldentry) list_del((struct list_head *)oldentry)
-#endif
-/* Append. */
-static inline void
-list_append(struct list_head *head, void *new)
-{
-        ASSERT_WRITE_LOCK(head);
-        list_add((new), (head)->prev);
-}
-/* Prepend. */
-static inline void
-list_prepend(struct list_head *head, void *new)
-{
-        ASSERT_WRITE_LOCK(head);
-        list_add(new, head);
-}
-/* Insert according to ordering function; insert before first true. */
-#define LIST_INSERT(head, new, cmpfn)                           \
-do {                                                            \
-        struct list_head *__i;                                  \
-        ASSERT_WRITE_LOCK(head);                                \
-        list_for_each(__i, (head))                              \
-                if ((new), (typeof (new))__i)                   \
-                        break;                                  \
-        list_add((struct list_head *)(new), __i->prev);         \
-} while(0)
-/* If the field after the list_head is a nul-terminated string, you
-   can use these functions. */
-static inline int __list_cmp_name(const void *i, const char *name)
-{
-        return strcmp(name, i+sizeof(struct list_head)) == 0;
-}
-/* Returns false if same name already in list, otherwise does insert. */
-static inline int
-list_named_insert(struct list_head *head, void *new)
-{
-        if (LIST_FIND(head, __list_cmp_name, void *,
-                      new + sizeof(struct list_head)))
-                return 0;
-        list_prepend(head, new);
-        return 1;
-}
-/* Find this named element in the list. */
-#define list_named_find(head, name)                     \
-LIST_FIND(head, __list_cmp_name, void *, name)
-#endif /*_LISTHELP_H*/
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index 52a7b9e76428..d97e268cdfe5 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -73,6 +73,7 @@ enum nf_ip6_hook_priorities {
 };
 #ifdef CONFIG_NETFILTER
+extern int ip6_route_me_harder(struct sk_buff *skb);
 extern unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
                                    unsigned int dataoff, u_int8_t protocol);
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
index 913ddbf55b4b..9dd978d149ff 100644
--- a/include/linux/netfilter_ipv6/Kbuild
+++ b/include/linux/netfilter_ipv6/Kbuild
@@ -1,6 +1,21 @@
-header-y += ip6t_HL.h ip6t_LOG.h ip6t_MARK.h ip6t_REJECT.h ip6t_ah.h    \
+header-y += ip6t_HL.h
-        ip6t_esp.h ip6t_frag.h ip6t_hl.h ip6t_ipv6header.h              \
+header-y += ip6t_LOG.h
-        ip6t_length.h ip6t_limit.h ip6t_mac.h ip6t_mark.h               \
+header-y += ip6t_MARK.h
-        ip6t_multiport.h ip6t_opts.h ip6t_owner.h ip6t_policy.h         \
+header-y += ip6t_REJECT.h
-        ip6t_physdev.h ip6t_rt.h
+header-y += ip6t_ah.h
-unifdef-y := ip6_tables.h
+header-y += ip6t_esp.h
+header-y += ip6t_frag.h
+header-y += ip6t_hl.h
+header-y += ip6t_ipv6header.h
+header-y += ip6t_length.h
+header-y += ip6t_limit.h
+header-y += ip6t_mac.h
+header-y += ip6t_mark.h
+header-y += ip6t_multiport.h
+header-y += ip6t_opts.h
+header-y += ip6t_owner.h
+header-y += ip6t_policy.h
+header-y += ip6t_physdev.h
+header-y += ip6t_rt.h
+unifdef-y += ip6_tables.h
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index d0d5d1ee4be3..d7a8e9c0dad0 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -300,8 +300,7 @@ extern unsigned int ip6t_do_table(struct sk_buff **pskb,
                                  unsigned int hook,
                                  const struct net_device *in,
                                  const struct net_device *out,
-                                  struct ip6t_table *table,
+                                  struct ip6t_table *table);
-                                  void *userdata);
 /* Check for an extension */
 extern int ip6t_ext_hdr(u8 nexthdr);
diff --git a/include/linux/netfilter_logging.h b/include/linux/netfilter_logging.h
deleted file mode 100644
index 562bb6aad4e1..000000000000
--- a/include/linux/netfilter_logging.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Internal logging interface, which relies on the real 
-   LOG target modules */
-#ifndef __LINUX_NETFILTER_LOGGING_H
-#define __LINUX_NETFILTER_LOGGING_H
-#ifdef __KERNEL__
-#include <asm/atomic.h>
-struct nf_logging_t {
-        void (*nf_log_packet)(struct sk_buff **pskb,
-                              unsigned int hooknum,
-                              const struct net_device *in,
-                              const struct net_device *out,
-                              const char *prefix);
-        void (*nf_log)(char *pfh, size_t len,
-                       const char *prefix);
-};
-extern void nf_log_register(int pf, const struct nf_logging_t *logging);
-extern void nf_log_unregister(int pf, const struct nf_logging_t *logging);
-extern void nf_log_packet(int pf,
-                          struct sk_buff **pskb,
-                          unsigned int hooknum,
-                          const struct net_device *in,
-                          const struct net_device *out,
-                          const char *fmt, ...);
-extern void nf_log(int pf,
-                   char *pfh, size_t len,
-                   const char *fmt, ...);
-#endif /*__KERNEL__*/
-#endif /*__LINUX_NETFILTER_LOGGING_H*/
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 855b44668caa..66411622e06e 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -21,6 +21,8 @@
 #define NETLINK_DNRTMSG         14      /* DECnet routing messages */
 #define NETLINK_KOBJECT_UEVENT  15      /* Kernel messages to userspace */
 #define NETLINK_GENERIC         16
+/* leave room for NETLINK_DM (DM Events) */
+#define NETLINK_SCSITRANSPORT   18      /* SCSI Transports */
 #define MAX_LINKS 32            
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 6c2066caeaab..76ff54846ada 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -9,6 +9,8 @@
 #ifndef _LINUX_NFS_FS_H
 #define _LINUX_NFS_FS_H
+#include <linux/magic.h>
 /*
 * Enable debugging support for nfs client.
 * Requires RPC_DEBUG.
@@ -22,11 +24,6 @@
 #define NFS_MAX_TCP_TIMEOUT     (600*HZ)
 /*
- * superblock magic number for NFS
- */
-#define NFS_SUPER_MAGIC                 0x6969
-/*
 * When flushing a cluster of dirty pages, there can be different
 * strategies:
 */
@@ -42,6 +39,7 @@
 #include <linux/in.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
+#include <linux/rbtree.h>
 #include <linux/rwsem.h>
 #include <linux/wait.h>
@@ -69,6 +67,8 @@
 * NFSv3/v4 Access mode cache entry
 */
 struct nfs_access_entry {
+        struct rb_node          rb_node;
+        struct list_head        lru;
        unsigned long           jiffies;
        struct rpc_cred *       cred;
        int                     mask;
@@ -145,7 +145,9 @@ struct nfs_inode {
         */
        atomic_t                data_updates;
-        struct nfs_access_entry cache_access;
+        struct rb_root          access_cache;
+        struct list_head        access_cache_entry_lru;
+        struct list_head        access_cache_inode_lru;
 #ifdef CONFIG_NFS_V3_ACL
        struct posix_acl        *acl_access;
        struct posix_acl        *acl_default;
@@ -199,6 +201,7 @@ struct nfs_inode {
 #define NFS_INO_REVALIDATING    (0)             /* revalidating attrs */
 #define NFS_INO_ADVISE_RDPLUS   (1)             /* advise readdirplus */
 #define NFS_INO_STALE           (2)             /* possible stale inode */
+#define NFS_INO_ACL_LRU_SET     (3)             /* Inode is on the LRU list */
 static inline struct nfs_inode *NFS_I(struct inode *inode)
 {
@@ -209,8 +212,7 @@ static inline struct nfs_inode *NFS_I(struct inode *inode)
 #define NFS_FH(inode)                   (&NFS_I(inode)->fh)
 #define NFS_SERVER(inode)               (NFS_SB(inode->i_sb))
 #define NFS_CLIENT(inode)               (NFS_SERVER(inode)->client)
-#define NFS_PROTO(inode)                (NFS_SERVER(inode)->rpc_ops)
+#define NFS_PROTO(inode)                (NFS_SERVER(inode)->nfs_client->rpc_ops)
-#define NFS_ADDR(inode)                 (RPC_PEERADDR(NFS_CLIENT(inode)))
 #define NFS_COOKIEVERF(inode)           (NFS_I(inode)->cookieverf)
 #define NFS_READTIME(inode)             (NFS_I(inode)->read_cache_jiffies)
 #define NFS_CHANGE_ATTR(inode)          (NFS_I(inode)->change_attr)
@@ -297,6 +299,7 @@ extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 extern int nfs_permission(struct inode *, int, struct nameidata *);
 extern int nfs_access_get_cached(struct inode *, struct rpc_cred *, struct nfs_access_entry *);
 extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *);
+extern void nfs_access_zap_cache(struct inode *inode);
 extern int nfs_open(struct inode *, struct file *);
 extern int nfs_release(struct inode *, struct file *);
 extern int nfs_attribute_timeout(struct inode *inode);
@@ -312,10 +315,6 @@ extern void nfs_end_data_update(struct inode *);
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
 extern void put_nfs_open_context(struct nfs_open_context *ctx);
 extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode);
-extern struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,
-                                        const struct dentry *dentry,
-                                        struct nfs_fh *fh,
-                                        struct nfs_fattr *fattr);
 /* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */
 extern u32 root_nfs_parse_addr(char *name); /*__init*/
@@ -368,10 +367,12 @@ extern int nfs3_removexattr (struct dentry *, const char *name);
 */
 extern ssize_t nfs_direct_IO(int, struct kiocb *, const struct iovec *, loff_t,
                        unsigned long);
-extern ssize_t nfs_file_direct_read(struct kiocb *iocb, char __user *buf,
+extern ssize_t nfs_file_direct_read(struct kiocb *iocb,
-                        size_t count, loff_t pos);
+                        const struct iovec *iov, unsigned long nr_segs,
-extern ssize_t nfs_file_direct_write(struct kiocb *iocb, const char __user *buf,
+                        loff_t pos);
-                        size_t count, loff_t pos);
+extern ssize_t nfs_file_direct_write(struct kiocb *iocb,
+                        const struct iovec *iov, unsigned long nr_segs,
+                        loff_t pos);
 /*
 * linux/fs/nfs/dir.c
@@ -579,6 +580,7 @@ extern void * nfs_root_data(void);
 #define NFSDBG_FILE             0x0040
 #define NFSDBG_ROOT             0x0080
 #define NFSDBG_CALLBACK         0x0100
+#define NFSDBG_CLIENT           0x0200
 #define NFSDBG_ALL              0xFFFF
 #ifdef __KERNEL__
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 6b4a13c79474..7ccfc7ef0a83 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -7,13 +7,79 @@
 struct nfs_iostats;
 /*
+ * The nfs_client identifies our client state to the server.
+ */
+struct nfs_client {
+        atomic_t                cl_count;
+        int                     cl_cons_state;  /* current construction state (-ve: init error) */
+#define NFS_CS_READY            0               /* ready to be used */
+#define NFS_CS_INITING          1               /* busy initialising */
+        int                     cl_nfsversion;  /* NFS protocol version */
+        unsigned long           cl_res_state;   /* NFS resources state */
+#define NFS_CS_RPCIOD           0               /* - rpciod started */
+#define NFS_CS_CALLBACK         1               /* - callback started */
+#define NFS_CS_IDMAP            2               /* - idmap started */
+#define NFS_CS_RENEWD           3               /* - renewd started */
+        struct sockaddr_in      cl_addr;        /* server identifier */
+        char *                  cl_hostname;    /* hostname of server */
+        struct list_head        cl_share_link;  /* link in global client list */
+        struct list_head        cl_superblocks; /* List of nfs_server structs */
+        struct rpc_clnt *       cl_rpcclient;
+        const struct nfs_rpc_ops *rpc_ops;      /* NFS protocol vector */
+        unsigned long           retrans_timeo;  /* retransmit timeout */
+        unsigned int            retrans_count;  /* number of retransmit tries */
+#ifdef CONFIG_NFS_V4
+        u64                     cl_clientid;    /* constant */
+        nfs4_verifier           cl_confirm;
+        unsigned long           cl_state;
+        u32                     cl_lockowner_id;
+        /*
+         * The following rwsem ensures exclusive access to the server
+         * while we recover the state following a lease expiration.
+         */
+        struct rw_semaphore     cl_sem;
+        struct list_head        cl_delegations;
+        struct list_head        cl_state_owners;
+        struct list_head        cl_unused;
+        int                     cl_nunused;
+        spinlock_t              cl_lock;
+        unsigned long           cl_lease_time;
+        unsigned long           cl_last_renewal;
+        struct work_struct      cl_renewd;
+        struct rpc_wait_queue   cl_rpcwaitq;
+        /* used for the setclientid verifier */
+        struct timespec         cl_boot_time;
+        /* idmapper */
+        struct idmap *          cl_idmap;
+        /* Our own IP address, as a null-terminated string.
+         * This is used to generate the clientid, and the callback address.
+         */
+        char                    cl_ipaddr[16];
+        unsigned char           cl_id_uniquifier;
+#endif
+};
+/*
 * NFS client parameters stored in the superblock.
 */
 struct nfs_server {
+        struct nfs_client *     nfs_client;     /* shared client and NFS4 state */
+        struct list_head        client_link;    /* List of other nfs_server structs
+                                                 * that share the same client
+                                                 */
+        struct list_head        master_link;    /* link in master servers list */
        struct rpc_clnt *       client;         /* RPC client handle */
-        struct rpc_clnt *       client_sys;     /* 2nd handle for FSINFO */
        struct rpc_clnt *       client_acl;     /* ACL RPC client handle */
-        struct nfs_rpc_ops *    rpc_ops;        /* NFS protocol vector */
        struct nfs_iostats *    io_stats;       /* I/O statistics */
        struct backing_dev_info backing_dev_info;
        int                     flags;          /* various flags */
@@ -29,24 +95,14 @@ struct nfs_server {
        unsigned int            acregmax;
        unsigned int            acdirmin;
        unsigned int            acdirmax;
-        unsigned long           retrans_timeo;  /* retransmit timeout */
-        unsigned int            retrans_count;  /* number of retransmit tries */
        unsigned int            namelen;
-        char *                  hostname;       /* remote hostname */
-        struct nfs_fh           fh;
-        struct sockaddr_in      addr;
        struct nfs_fsid         fsid;
+        __u64                   maxfilesize;    /* maximum file size */
        unsigned long           mount_time;     /* when this fs was mounted */
+        dev_t                   s_dev;          /* superblock dev numbers */
 #ifdef CONFIG_NFS_V4
-        /* Our own IP address, as a null-terminated string.
-         * This is used to generate the clientid, and the callback address.
-         */
-        char                    ip_addr[16];
-        char *                  mnt_path;
-        struct nfs4_client *    nfs4_state;     /* all NFSv4 state starts here */
-        struct list_head        nfs4_siblings;  /* List of other nfs_server structs
-                                                 * that share the same clientid
-                                                 */
        u32                     attr_bitmask[2];/* V4 bitmask representing the set
                                                   of attributes supported on this
                                                   filesystem */
@@ -54,6 +110,7 @@ struct nfs_server {
                                                   that are supported on this
                                                   filesystem */
 #endif
+        void (*destroy)(struct nfs_server *);
 };
 /* Server capabilities */
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 102e56094296..15a9f3b7289a 100644
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
@@ -62,15 +62,15 @@ struct idmap_msg {
 #ifdef __KERNEL__
 /* Forward declaration to make this header independent of others */
-struct nfs4_client;
+struct nfs_client;
-void nfs_idmap_new(struct nfs4_client *);
+int nfs_idmap_new(struct nfs_client *);
-void nfs_idmap_delete(struct nfs4_client *);
+void nfs_idmap_delete(struct nfs_client *);
-int nfs_map_name_to_uid(struct nfs4_client *, const char *, size_t, __u32 *);
+int nfs_map_name_to_uid(struct nfs_client *, const char *, size_t, __u32 *);
-int nfs_map_group_to_gid(struct nfs4_client *, const char *, size_t, __u32 *);
+int nfs_map_group_to_gid(struct nfs_client *, const char *, size_t, __u32 *);
-int nfs_map_uid_to_name(struct nfs4_client *, __u32, char *);
+int nfs_map_uid_to_name(struct nfs_client *, __u32, char *);
-int nfs_map_gid_to_group(struct nfs4_client *, __u32, char *);
+int nfs_map_gid_to_group(struct nfs_client *, __u32, char *);
 extern unsigned int nfs_idmap_cache_timeout;
 #endif /* __KERNEL__ */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 41e5a19199e9..dc5397d9d23c 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1,7 +1,6 @@
 #ifndef _LINUX_NFS_XDR_H
 #define _LINUX_NFS_XDR_H
-#include <linux/sunrpc/xprt.h>
 #include <linux/nfsacl.h>
 /*
@@ -359,8 +358,8 @@ struct nfs_symlinkargs {
        struct nfs_fh *         fromfh;
        const char *            fromname;
        unsigned int            fromlen;
-        const char *            topath;
+        struct page **          pages;
-        unsigned int            tolen;
+        unsigned int            pathlen;
        struct iattr *          sattr;
 };
@@ -435,8 +434,8 @@ struct nfs3_symlinkargs {
        struct nfs_fh *         fromfh;
        const char *            fromname;
        unsigned int            fromlen;
-        const char *            topath;
+        struct page **          pages;
-        unsigned int            tolen;
+        unsigned int            pathlen;
        struct iattr *          sattr;
 };
@@ -534,7 +533,10 @@ struct nfs4_accessres {
 struct nfs4_create_arg {
        u32                             ftype;
        union {
-                struct qstr *           symlink;    /* NF4LNK */
+                struct {
+                        struct page **  pages;
+                        unsigned int    len;
+                } symlink;   /* NF4LNK */
                struct {
                        u32             specdata1;
                        u32             specdata2;
@@ -770,6 +772,9 @@ struct nfs_rpc_ops {
        int     (*getroot) (struct nfs_server *, struct nfs_fh *,
                            struct nfs_fsinfo *);
+        int     (*lookupfh)(struct nfs_server *, struct nfs_fh *,
+                            struct qstr *, struct nfs_fh *,
+                            struct nfs_fattr *);
        int     (*getattr) (struct nfs_server *, struct nfs_fh *,
                            struct nfs_fattr *);
        int     (*setattr) (struct dentry *, struct nfs_fattr *,
@@ -791,9 +796,8 @@ struct nfs_rpc_ops {
        int     (*rename)  (struct inode *, struct qstr *,
                            struct inode *, struct qstr *);
        int     (*link)    (struct inode *, struct inode *, struct qstr *);
-        int     (*symlink) (struct inode *, struct qstr *, struct qstr *,
+        int     (*symlink) (struct inode *, struct dentry *, struct page *,
-                            struct iattr *, struct nfs_fh *,
+                            unsigned int, struct iattr *);
-                            struct nfs_fattr *);
        int     (*mkdir)   (struct inode *, struct dentry *, struct iattr *);
        int     (*rmdir)   (struct inode *, struct qstr *);
        int     (*readdir) (struct dentry *, struct rpc_cred *,
@@ -806,6 +810,7 @@ struct nfs_rpc_ops {
                            struct nfs_fsinfo *);
        int     (*pathconf) (struct nfs_server *, struct nfs_fh *,
                             struct nfs_pathconf *);
+        int     (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
        u32 *   (*decode_dirent)(u32 *, struct nfs_entry *, int plus);
        void    (*read_setup)   (struct nfs_read_data *);
        int     (*read_done)  (struct rpc_task *, struct nfs_read_data *);
@@ -829,9 +834,9 @@ struct nfs_rpc_ops {
 /*
 * Function vectors etc. for the NFS client
 */
-extern struct nfs_rpc_ops       nfs_v2_clientops;
+extern const struct nfs_rpc_ops nfs_v2_clientops;
-extern struct nfs_rpc_ops       nfs_v3_clientops;
+extern const struct nfs_rpc_ops nfs_v3_clientops;
-extern struct nfs_rpc_ops       nfs_v4_clientops;
+extern const struct nfs_rpc_ops nfs_v4_clientops;
 extern struct rpc_version       nfs_version2;
 extern struct rpc_version       nfs_version3;
 extern struct rpc_version       nfs_version4;
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
index c8c545665885..d9c5455808e5 100644
--- a/include/linux/nfsd/Kbuild
+++ b/include/linux/nfsd/Kbuild
@@ -1,2 +1,7 @@
-unifdef-y := const.h export.h stats.h syscall.h nfsfh.h debug.h auth.h
+unifdef-y += const.h
+unifdef-y += export.h
+unifdef-y += stats.h
+unifdef-y += syscall.h
+unifdef-y += nfsfh.h
+unifdef-y += debug.h
+unifdef-y += auth.h
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h
index f9edcd2ff3c8..31a3cb617ce0 100644
--- a/include/linux/nfsd/nfsfh.h
+++ b/include/linux/nfsd/nfsfh.h
@@ -269,14 +269,8 @@ fill_post_wcc(struct svc_fh *fhp)
        fhp->fh_post_uid        = inode->i_uid;
        fhp->fh_post_gid        = inode->i_gid;
        fhp->fh_post_size       = inode->i_size;
-        if (inode->i_blksize) {
+        fhp->fh_post_blksize    = BLOCK_SIZE;
-                fhp->fh_post_blksize    = inode->i_blksize;
+        fhp->fh_post_blocks     = inode->i_blocks;
-                fhp->fh_post_blocks     = inode->i_blocks;
-        } else {
-                fhp->fh_post_blksize    = BLOCK_SIZE;
-                /* how much do we care for accuracy with MinixFS? */
-                fhp->fh_post_blocks     = (inode->i_size+511) >> 9;
-        }
        fhp->fh_post_rdev[0]    = htonl((u32)imajor(inode));
        fhp->fh_post_rdev[1]    = htonl((u32)iminor(inode));
        fhp->fh_post_atime      = inode->i_atime;
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index c8f4d2f627d7..e16904e28c3a 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -4,6 +4,7 @@
 #ifndef LINUX_NMI_H
 #define LINUX_NMI_H
+#include <linux/sched.h>
 #include <asm/irq.h>
 /**
@@ -16,7 +17,7 @@
 #ifdef ARCH_HAS_NMI_WATCHDOG
 extern void touch_nmi_watchdog(void);
 #else
-# define touch_nmi_watchdog() do { } while(0)
+# define touch_nmi_watchdog() touch_softlockup_watchdog()
 #endif
 #endif
diff --git a/include/linux/openprom_fs.h b/include/linux/openprom_fs.h
deleted file mode 100644
index a837aab8217e..000000000000
--- a/include/linux/openprom_fs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _LINUX_OPENPROM_FS_H
-#define _LINUX_OPENPROM_FS_H
-/*
- * The openprom filesystem constants/structures
- */
-#define OPENPROM_SUPER_MAGIC 0x9fa1
-#endif /* _LINUX_OPENPROM_FS_H */
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 5748642e9f36..4830a3bedfb2 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -13,24 +13,25 @@
 * PG_reserved is set for special pages, which can never be swapped out. Some
 * of them might not even exist (eg empty_bad_page)...
 *
- * The PG_private bitflag is set if page->private contains a valid value.
+ * The PG_private bitflag is set on pagecache pages if they contain filesystem
+ * specific data (which is normally at page->private). It can be used by
+ * private allocations for its own usage.
 *
- * During disk I/O, PG_locked is used. This bit is set before I/O and
+ * During initiation of disk I/O, PG_locked is set. This bit is set before I/O
- * reset when I/O completes. page_waitqueue(page) is a wait queue of all tasks
+ * and cleared when writeback _starts_ or when read _completes_. PG_writeback
- * waiting for the I/O on this page to complete.
+ * is set before writeback starts and cleared when it finishes.
+ *
+ * PG_locked also pins a page in pagecache, and blocks truncation of the file
+ * while it is held.
+ *
+ * page_waitqueue(page) is a wait queue of all tasks waiting for the page
+ * to become unlocked.
 *
 * PG_uptodate tells whether the page's contents is valid.  When a read
 * completes, the page becomes uptodate, unless a disk I/O error happened.
 *
- * For choosing which pages to swap out, inode pages carry a PG_referenced bit,
+ * PG_referenced, PG_reclaim are used for page reclaim for anonymous and
- * which is set any time the system accesses that page through the (mapping,
+ * file-backed pagecache (see mm/vmscan.c).
- * index) hash table.  This referenced bit, together with the referenced bit
- * in the page tables, is used to manipulate page->age and move the page across
- * the active, inactive_dirty and inactive_clean lists.
- *
- * Note that the referenced bit, the page->lru list_head and the active,
- * inactive_dirty and inactive_clean lists are protected by the
- * zone->lru_lock, and *NOT* by the usual PG_locked bit!
 *
 * PG_error is set to indicate that an I/O error occurred on this page.
 *
@@ -42,6 +43,10 @@
 * space, they need to be kmapped separately for doing IO on the pages.  The
 * struct page (these bits with information) are always mapped into kernel
 * address space...
+ *
+ * PG_buddy is set to indicate that the page is free and in the buddy system
+ * (see mm/page_alloc.c).
+ *
 */
 /*
@@ -74,7 +79,7 @@
 #define PG_checked               8      /* kill me in 2.5.<early>. */
 #define PG_arch_1                9
 #define PG_reserved             10
-#define PG_private              11      /* Has something at ->private */
+#define PG_private              11      /* If pagecache, has fs-private data */
 #define PG_writeback            12      /* Page is under writeback */
 #define PG_nosave               13      /* Used for system suspend/resume */
@@ -83,7 +88,7 @@
 #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_nosave_free          18      /* Used for system suspend/resume */
 #define PG_buddy                19      /* Page is free, on buddy lists */
@@ -123,12 +128,11 @@
 #define PageUptodate(page)      test_bit(PG_uptodate, &(page)->flags)
 #ifdef CONFIG_S390
-#define SetPageUptodate(_page) \
+static inline void SetPageUptodate(struct page *page)
-        do {                                                                  \
+{
-                struct page *__page = (_page);                                \
+        if (!test_and_set_bit(PG_uptodate, &page->flags))
-                if (!test_and_set_bit(PG_uptodate, &__page->flags))           \
+                page_test_and_clear_dirty(page);
-                        page_test_and_clear_dirty(_page);                     \
+}
-        } while (0)
 #else
 #define SetPageUptodate(page)   set_bit(PG_uptodate, &(page)->flags)
 #endif
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 0a2f5d27f60e..64f950925151 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -130,14 +130,29 @@ static inline pgoff_t linear_page_index(struct vm_area_struct *vma,
 }
 extern void FASTCALL(__lock_page(struct page *page));
+extern void FASTCALL(__lock_page_nosync(struct page *page));
 extern void FASTCALL(unlock_page(struct page *page));
+/*
+ * lock_page may only be called if we have the page's inode pinned.
+ */
 static inline void lock_page(struct page *page)
 {
        might_sleep();
        if (TestSetPageLocked(page))
                __lock_page(page);
 }
+/*
+ * lock_page_nosync should only be used if we can't pin the page's inode.
+ * Doesn't play quite so well with block device plugging.
+ */
+static inline void lock_page_nosync(struct page *page)
+{
+        might_sleep();
+        if (TestSetPageLocked(page))
+                __lock_page_nosync(page);
+}
        
 /*
 * This is exported only for wait_on_page_locked/wait_on_page_writeback.
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8565b81d7fbc..4431ce4e1e6f 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -49,6 +49,7 @@
 #include <linux/types.h>
 #include <linux/ioport.h>
 #include <linux/list.h>
+#include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/device.h>
@@ -346,6 +347,8 @@ struct pci_driver {
        int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);   /* New device inserted */
        void (*remove) (struct pci_dev *dev);   /* Device removed (NULL if not a hot-plug capable driver) */
        int  (*suspend) (struct pci_dev *dev, pm_message_t state);      /* Device suspended */
+        int  (*suspend_late) (struct pci_dev *dev, pm_message_t state);
+        int  (*resume_early) (struct pci_dev *dev);
        int  (*resume) (struct pci_dev *dev);                   /* Device woken up */
        int  (*enable_wake) (struct pci_dev *dev, pci_power_t state, int enable);   /* Enable wake event */
        void (*shutdown) (struct pci_dev *dev);
@@ -353,6 +356,8 @@ struct pci_driver {
        struct pci_error_handlers *err_handler;
        struct device_driver    driver;
        struct pci_dynids dynids;
+        int multithread_probe;
 };
 #define to_pci_driver(drv) container_of(drv,struct pci_driver, driver)
@@ -401,7 +406,7 @@ extern struct list_head pci_root_buses;	/* list of all known PCI buses */
 extern struct list_head pci_devices;    /* list of all devices */
 void pcibios_fixup_bus(struct pci_bus *);
-int pcibios_enable_device(struct pci_dev *, int mask);
+int __must_check pcibios_enable_device(struct pci_dev *, int mask);
 char *pcibios_setup (char *str);
 /* Used only when drivers/pci/setup.c is used */
@@ -428,7 +433,7 @@ int pci_scan_slot(struct pci_bus *bus, int devfn);
 struct pci_dev * pci_scan_single_device(struct pci_bus *bus, int devfn);
 void pci_device_add(struct pci_dev *dev, struct pci_bus *bus);
 unsigned int pci_scan_child_bus(struct pci_bus *bus);
-void pci_bus_add_device(struct pci_dev *dev);
+int __must_check pci_bus_add_device(struct pci_dev *dev);
 void pci_read_bridge_bases(struct pci_bus *child);
 struct resource *pci_find_parent_resource(const struct pci_dev *dev, struct resource *res);
 int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge);
@@ -436,6 +441,7 @@ extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
 extern void pci_dev_put(struct pci_dev *dev);
 extern void pci_remove_bus(struct pci_bus *b);
 extern void pci_remove_bus_device(struct pci_dev *dev);
+extern void pci_stop_bus_device(struct pci_dev *dev);
 void pci_setup_cardbus(struct pci_bus *bus);
 /* Generic PCI functions exported to card drivers */
@@ -488,19 +494,19 @@ static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val
        return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val);
 }
-int pci_enable_device(struct pci_dev *dev);
+int __must_check pci_enable_device(struct pci_dev *dev);
-int pci_enable_device_bars(struct pci_dev *dev, int mask);
+int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
 void pci_disable_device(struct pci_dev *dev);
 void pci_set_master(struct pci_dev *dev);
 #define HAVE_PCI_SET_MWI
-int pci_set_mwi(struct pci_dev *dev);
+int __must_check pci_set_mwi(struct pci_dev *dev);
 void pci_clear_mwi(struct pci_dev *dev);
 void pci_intx(struct pci_dev *dev, int enable);
 int pci_set_dma_mask(struct pci_dev *dev, u64 mask);
 int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask);
 void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno);
-int pci_assign_resource(struct pci_dev *dev, int i);
+int __must_check pci_assign_resource(struct pci_dev *dev, int i);
-int pci_assign_resource_fixed(struct pci_dev *dev, int i);
+int __must_check pci_assign_resource_fixed(struct pci_dev *dev, int i);
 void pci_restore_bars(struct pci_dev *dev);
 /* ROM control related routines */
@@ -526,23 +532,24 @@ void pdev_sort_resources(struct pci_dev *, struct resource_list *);
 void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
                    int (*)(struct pci_dev *, u8, u8));
 #define HAVE_PCI_REQ_REGIONS    2
-int pci_request_regions(struct pci_dev *, const char *);
+int __must_check pci_request_regions(struct pci_dev *, const char *);
 void pci_release_regions(struct pci_dev *);
-int pci_request_region(struct pci_dev *, int, const char *);
+int __must_check pci_request_region(struct pci_dev *, int, const char *);
 void pci_release_region(struct pci_dev *, int);
 /* drivers/pci/bus.c */
-int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
+int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
-                           resource_size_t size, resource_size_t align,
+                        struct resource *res, resource_size_t size,
-                           resource_size_t min, unsigned int type_mask,
+                        resource_size_t align, resource_size_t min,
-                           void (*alignf)(void *, struct resource *,
+                        unsigned int type_mask,
-                                          resource_size_t, resource_size_t),
+                        void (*alignf)(void *, struct resource *,
-                           void *alignf_data);
+                                resource_size_t, resource_size_t),
+                        void *alignf_data);
 void pci_enable_bridges(struct pci_bus *bus);
 /* Proper probing supporting hot-pluggable devices */
-int __pci_register_driver(struct pci_driver *, struct module *);
+int __must_check __pci_register_driver(struct pci_driver *, struct module *);
-static inline int pci_register_driver(struct pci_driver *driver)
+static inline int __must_check pci_register_driver(struct pci_driver *driver)
 {
        return __pci_register_driver(driver, THIS_MODULE);
 }
@@ -780,12 +787,13 @@ enum pci_fixup_pass {
 void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);
 extern int pci_pci_problems;
-#define PCIPCI_FAIL             1
+#define PCIPCI_FAIL             1       /* No PCI PCI DMA */
 #define PCIPCI_TRITON           2
 #define PCIPCI_NATOMA           4
 #define PCIPCI_VIAETBF          8
 #define PCIPCI_VSFX             16
-#define PCIPCI_ALIMAGIK         32
+#define PCIPCI_ALIMAGIK         32      /* Need low latency setting */
+#define PCIAGP_FAIL             64      /* No PCI to AGP DMA */
 #endif /* __KERNEL__ */
 #endif /* LINUX_PCI_H */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 7a249155ee4e..c9ffbc3843d5 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -479,6 +479,7 @@
 #define PCI_VENDOR_ID_AMD               0x1022
 #define PCI_DEVICE_ID_AMD_K8_NB         0x1100
+#define PCI_DEVICE_ID_AMD_K8_NB_MISC    0x1103
 #define PCI_DEVICE_ID_AMD_LANCE         0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME    0x2001
 #define PCI_DEVICE_ID_AMD_SCSI          0x2020
@@ -506,6 +507,7 @@
 #define PCI_DEVICE_ID_AMD_8151_0        0x7454
 #define PCI_DEVICE_ID_AMD_8131_BRIDGE   0x7450
 #define PCI_DEVICE_ID_AMD_8131_APIC     0x7451
+#define PCI_DEVICE_ID_AMD_8132_BRIDGE   0x7458
 #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
 #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
 #define PCI_DEVICE_ID_AMD_CS5536_AUDIO  0x2093
@@ -1411,6 +1413,7 @@
 #define PCI_DEVICE_ID_SERVERWORKS_LE      0x0009
 #define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017
 #define PCI_DEVICE_ID_SERVERWORKS_EPB     0x0103
+#define PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE   0x0132
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4    0x0200
 #define PCI_DEVICE_ID_SERVERWORKS_CSB5    0x0201
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6    0x0203
@@ -1482,9 +1485,6 @@
 #define PCI_DEVICE_ID_MARVELL_GT64260   0x6430
 #define PCI_DEVICE_ID_MARVELL_MV64360   0x6460
 #define PCI_DEVICE_ID_MARVELL_MV64460   0x6480
-#define PCI_DEVICE_ID_MARVELL_GT96100   0x9652
-#define PCI_DEVICE_ID_MARVELL_GT96100A  0x9653
 #define PCI_VENDOR_ID_V3                0x11b0
 #define PCI_DEVICE_ID_V3_V960           0x0001
@@ -1905,6 +1905,7 @@
 #define PCI_DEVICE_ID_TIGON3_5705_2     0x1654
 #define PCI_DEVICE_ID_TIGON3_5720       0x1658
 #define PCI_DEVICE_ID_TIGON3_5721       0x1659
+#define PCI_DEVICE_ID_TIGON3_5722       0x165a
 #define PCI_DEVICE_ID_TIGON3_5705M      0x165d
 #define PCI_DEVICE_ID_TIGON3_5705M_2    0x165e
 #define PCI_DEVICE_ID_TIGON3_5714       0x1668
@@ -1914,6 +1915,7 @@
 #define PCI_DEVICE_ID_TIGON3_5705F      0x166e
 #define PCI_DEVICE_ID_TIGON3_5754M      0x1672
 #define PCI_DEVICE_ID_TIGON3_5755M      0x1673
+#define PCI_DEVICE_ID_TIGON3_5756       0x1674
 #define PCI_DEVICE_ID_TIGON3_5750       0x1676
 #define PCI_DEVICE_ID_TIGON3_5751       0x1677
 #define PCI_DEVICE_ID_TIGON3_5715       0x1678
@@ -1943,6 +1945,8 @@
 #define PCI_DEVICE_ID_TIGON3_5901       0x170d
 #define PCI_DEVICE_ID_BCM4401B1         0x170c
 #define PCI_DEVICE_ID_TIGON3_5901_2     0x170e
+#define PCI_DEVICE_ID_TIGON3_5906       0x1712
+#define PCI_DEVICE_ID_TIGON3_5906M      0x1713
 #define PCI_DEVICE_ID_BCM4401           0x4401
 #define PCI_DEVICE_ID_BCM4401B0         0x4402
@@ -2010,6 +2014,23 @@
 #define PCI_DEVICE_ID_ALTIMA_AC9100     0x03ea
 #define PCI_DEVICE_ID_ALTIMA_AC1003     0x03eb
+#define PCI_VENDOR_ID_ARECA             0x17d3
+#define PCI_DEVICE_ID_ARECA_1110        0x1110
+#define PCI_DEVICE_ID_ARECA_1120        0x1120
+#define PCI_DEVICE_ID_ARECA_1130        0x1130
+#define PCI_DEVICE_ID_ARECA_1160        0x1160
+#define PCI_DEVICE_ID_ARECA_1170        0x1170
+#define PCI_DEVICE_ID_ARECA_1210        0x1210
+#define PCI_DEVICE_ID_ARECA_1220        0x1220
+#define PCI_DEVICE_ID_ARECA_1230        0x1230
+#define PCI_DEVICE_ID_ARECA_1260        0x1260
+#define PCI_DEVICE_ID_ARECA_1270        0x1270
+#define PCI_DEVICE_ID_ARECA_1280        0x1280
+#define PCI_DEVICE_ID_ARECA_1380        0x1380
+#define PCI_DEVICE_ID_ARECA_1381        0x1381
+#define PCI_DEVICE_ID_ARECA_1680        0x1680
+#define PCI_DEVICE_ID_ARECA_1681        0x1681
 #define PCI_VENDOR_ID_S2IO              0x17d5
 #define PCI_DEVICE_ID_S2IO_WIN          0x5731
 #define PCI_DEVICE_ID_S2IO_UNI          0x5831
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index 96930cb5927c..7d0e26cba420 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -196,7 +196,7 @@
 #define  PCI_CAP_ID_MSI         0x05    /* Message Signalled Interrupts */
 #define  PCI_CAP_ID_CHSWP       0x06    /* CompactPCI HotSwap */
 #define  PCI_CAP_ID_PCIX        0x07    /* PCI-X */
-#define  PCI_CAP_ID_HT_IRQCONF  0x08    /* HyperTransport IRQ Configuration */
+#define  PCI_CAP_ID_HT          0x08    /* HyperTransport */
 #define  PCI_CAP_ID_VNDR        0x09    /* Vendor specific capability */
 #define  PCI_CAP_ID_SHPC        0x0C    /* PCI Standard Hot-Plug Controller */
 #define  PCI_CAP_ID_EXP         0x10    /* PCI Express */
diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h
index b44e01a70914..6cd91e3f9820 100644
--- a/include/linux/pcieport_if.h
+++ b/include/linux/pcieport_if.h
@@ -62,6 +62,12 @@ struct pcie_port_service_driver {
        int (*suspend) (struct pcie_device *dev, pm_message_t state);
        int (*resume) (struct pcie_device *dev);
+        /* Service Error Recovery Handler */
+        struct pci_error_handlers *err_handler;
+        /* Link Reset Capability - AER service driver specific */
+        pci_ers_result_t (*reset_link) (struct pci_dev *dev);
        const struct pcie_port_service_id *id_table;
        struct device_driver driver;
 };
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index cb9039a21f2a..46ec72fa2c84 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -1,9 +1,12 @@
 #ifndef __LINUX_PERCPU_H
 #define __LINUX_PERCPU_H
 #include <linux/spinlock.h> /* For preempt_disable() */
 #include <linux/slab.h> /* For kmalloc() */
 #include <linux/smp.h>
 #include <linux/string.h> /* For memset() */
+#include <linux/cpumask.h>
 #include <asm/percpu.h>
 /* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
@@ -11,8 +14,14 @@
 #define PERCPU_ENOUGH_ROOM 32768
 #endif
-/* Must be an lvalue. */
+/*
-#define get_cpu_var(var) (*({ preempt_disable(); &__get_cpu_var(var); }))
+ * Must be an lvalue. Since @var must be a simple identifier,
+ * we force a syntax error here if it isn't.
+ */
+#define get_cpu_var(var) (*({                           \
+        extern int simple_indentifier_##var(void);      \
+        preempt_disable();                              \
+        &__get_cpu_var(var); }))
 #define put_cpu_var(var) preempt_enable()
 #ifdef CONFIG_SMP
@@ -21,39 +30,77 @@ struct percpu_data {
        void *ptrs[NR_CPUS];
 };
+#define __percpu_disguise(pdata) (struct percpu_data *)~(unsigned long)(pdata)
 /* 
- * Use this to get to a cpu's version of the per-cpu object allocated using
+ * Use this to get to a cpu's version of the per-cpu object dynamically
- * alloc_percpu.  Non-atomic access to the current CPU's version should
+ * allocated. Non-atomic access to the current CPU's version should
 * probably be combined with get_cpu()/put_cpu().
 */ 
-#define per_cpu_ptr(ptr, cpu)                   \
+#define percpu_ptr(ptr, cpu)                              \
-({                                              \
+({                                                        \
-        struct percpu_data *__p = (struct percpu_data *)~(unsigned long)(ptr); \
+        struct percpu_data *__p = __percpu_disguise(ptr); \
-        (__typeof__(ptr))__p->ptrs[(cpu)];      \
+        (__typeof__(ptr))__p->ptrs[(cpu)];                \
 })
-extern void *__alloc_percpu(size_t size);
+extern void *percpu_populate(void *__pdata, size_t size, gfp_t gfp, int cpu);
-extern void free_percpu(const void *);
+extern void percpu_depopulate(void *__pdata, int cpu);
+extern int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
+                                  cpumask_t *mask);
+extern void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask);
+extern void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask);
+extern void percpu_free(void *__pdata);
 #else /* CONFIG_SMP */
-#define per_cpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); })
+#define percpu_ptr(ptr, cpu) ({ (void)(cpu); (ptr); })
+static inline void percpu_depopulate(void *__pdata, int cpu)
+{
+}
+static inline void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask)
+{
+}
-static inline void *__alloc_percpu(size_t size)
+static inline void *percpu_populate(void *__pdata, size_t size, gfp_t gfp,
+                                    int cpu)
 {
-        void *ret = kmalloc(size, GFP_KERNEL);
+        return percpu_ptr(__pdata, cpu);
-        if (ret)
-                memset(ret, 0, size);
-        return ret;
 }
-static inline void free_percpu(const void *ptr)
-{       
+static inline int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
-        kfree(ptr);
+                                         cpumask_t *mask)
+{
+        return 0;
+}
+static __always_inline void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask)
+{
+        return kzalloc(size, gfp);
+}
+static inline void percpu_free(void *__pdata)
+{
+        kfree(__pdata);
 }
 #endif /* CONFIG_SMP */
-/* Simple wrapper for the common case: zeros memory. */
+#define percpu_populate_mask(__pdata, size, gfp, mask) \
-#define alloc_percpu(type)      ((type *)(__alloc_percpu(sizeof(type))))
+        __percpu_populate_mask((__pdata), (size), (gfp), &(mask))
+#define percpu_depopulate_mask(__pdata, mask) \
+        __percpu_depopulate_mask((__pdata), &(mask))
+#define percpu_alloc_mask(size, gfp, mask) \
+        __percpu_alloc_mask((size), (gfp), &(mask))
+#define percpu_alloc(size, gfp) percpu_alloc_mask((size), (gfp), cpu_online_map)
+/* (legacy) interface for use without CPU hotplug handling */
+#define __alloc_percpu(size)    percpu_alloc_mask((size), GFP_KERNEL, \
+                                                  cpu_possible_map)
+#define alloc_percpu(type)      (type *)__alloc_percpu(sizeof(type))
+#define free_percpu(ptr)        percpu_free((ptr))
+#define per_cpu_ptr(ptr, cpu)   percpu_ptr((ptr), (cpu))
 #endif /* __LINUX_PERCPU_H */
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 29960b03bef7..93da7e2d9f30 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -76,6 +76,8 @@ extern int FASTCALL(attach_pid(struct task_struct *task,
                                enum pid_type type, int nr));
 extern void FASTCALL(detach_pid(struct task_struct *task, enum pid_type));
+extern void FASTCALL(transfer_pid(struct task_struct *old,
+                                  struct task_struct *new, enum pid_type));
 /*
 * look up a PID in the hash table. Must be called with the tasklist_lock
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index bd2c5a2bbbf5..c3f01b3085a4 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -305,6 +305,7 @@ enum
        TCA_FW_POLICE,
        TCA_FW_INDEV, /*  used by CONFIG_NET_CLS_IND */
        TCA_FW_ACT, /* used by CONFIG_NET_CLS_ACT */
+        TCA_FW_MASK,
        __TCA_FW_MAX
 };
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 782090c68932..29cd6dee13db 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -49,6 +49,8 @@ struct platform_driver {
        int (*remove)(struct platform_device *);
        void (*shutdown)(struct platform_device *);
        int (*suspend)(struct platform_device *, pm_message_t state);
+        int (*suspend_late)(struct platform_device *, pm_message_t state);
+        int (*resume_early)(struct platform_device *);
        int (*resume)(struct platform_device *);
        struct device_driver driver;
 };
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 658c1b93d5bb..6b27e07aef19 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -142,29 +142,61 @@ typedef struct pm_message {
 } pm_message_t;
 /*
- * There are 4 important states driver can be in:
+ * Several driver power state transitions are externally visible, affecting
- * ON     -- driver is working
+ * the state of pending I/O queues and (for drivers that touch hardware)
- * FREEZE -- stop operations and apply whatever policy is applicable to a
+ * interrupts, wakeups, DMA, and other hardware state.  There may also be
- *           suspended driver of that class, freeze queues for block like IDE
+ * internal transitions to various low power modes, which are transparent
- *           does, drop packets for ethernet, etc... stop DMA engine too etc...
+ * to the rest of the driver stack (such as a driver that's ON gating off
- *           so a consistent image can be saved; but do not power any hardware
+ * clocks which are not in active use).
- *           down.
- * SUSPEND - like FREEZE, but hardware is doing as much powersaving as
- *           possible. Roughly pci D3.
 *
- * Unfortunately, current drivers only recognize numeric values 0 (ON) and 3
+ * One transition is triggered by resume(), after a suspend() call; the
- * (SUSPEND).  We'll need to fix the drivers. So yes, putting 3 to all different
+ * message is implicit:
- * defines is intentional, and will go away as soon as drivers are fixed.  Also
+ *
- * note that typedef is neccessary, we'll probably want to switch to
+ * ON           Driver starts working again, responding to hardware events
- *   typedef struct pm_message_t { int event; int flags; } pm_message_t
+ *              and software requests.  The hardware may have gone through
- * or something similar soon.
+ *              a power-off reset, or it may have maintained state from the
+ *              previous suspend() which the driver will rely on while
+ *              resuming.  On most platforms, there are no restrictions on
+ *              availability of resources like clocks during resume().
+ *
+ * Other transitions are triggered by messages sent using suspend().  All
+ * these transitions quiesce the driver, so that I/O queues are inactive.
+ * That commonly entails turning off IRQs and DMA; there may be rules
+ * about how to quiesce that are specific to the bus or the device's type.
+ * (For example, network drivers mark the link state.)  Other details may
+ * differ according to the message:
+ *
+ * SUSPEND      Quiesce, enter a low power device state appropriate for
+ *              the upcoming system state (such as PCI_D3hot), and enable
+ *              wakeup events as appropriate.
+ *
+ * FREEZE       Quiesce operations so that a consistent image can be saved;
+ *              but do NOT otherwise enter a low power device state, and do
+ *              NOT emit system wakeup events.
+ *
+ * PRETHAW      Quiesce as if for FREEZE; additionally, prepare for restoring
+ *              the system from a snapshot taken after an earlier FREEZE.
+ *              Some drivers will need to reset their hardware state instead
+ *              of preserving it, to ensure that it's never mistaken for the
+ *              state which that earlier snapshot had set up.
+ *
+ * A minimally power-aware driver treats all messages as SUSPEND, fully
+ * reinitializes its device during resume() -- whether or not it was reset
+ * during the suspend/resume cycle -- and can't issue wakeup events.
+ *
+ * More power-aware drivers may also use low power states at runtime as
+ * well as during system sleep states like PM_SUSPEND_STANDBY.  They may
+ * be able to use wakeup events to exit from runtime low-power states,
+ * or from system low-power states such as standby or suspend-to-RAM.
 */
 #define PM_EVENT_ON 0
 #define PM_EVENT_FREEZE 1
 #define PM_EVENT_SUSPEND 2
+#define PM_EVENT_PRETHAW 3
 #define PMSG_FREEZE     ((struct pm_message){ .event = PM_EVENT_FREEZE, })
+#define PMSG_PRETHAW    ((struct pm_message){ .event = PM_EVENT_PRETHAW, })
 #define PMSG_SUSPEND    ((struct pm_message){ .event = PM_EVENT_SUSPEND, })
 #define PMSG_ON         ((struct pm_message){ .event = PM_EVENT_ON, })
@@ -190,6 +222,7 @@ extern void device_resume(void);
 extern suspend_disk_method_t pm_disk_mode;
 extern int device_suspend(pm_message_t state);
+extern int device_prepare_suspend(pm_message_t state);
 #define device_set_wakeup_enable(dev,val) \
        ((dev)->power.should_wakeup = !!(val))
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 95572c434bc9..a7dd38f30ade 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -72,6 +72,7 @@ struct k_clock {
        int (*timer_create) (struct k_itimer *timer);
        int (*nsleep) (const clockid_t which_clock, int flags,
                       struct timespec *, struct timespec __user *);
+        long (*nsleep_restart) (struct restart_block *restart_block);
        int (*timer_set) (struct k_itimer * timr, int flags,
                          struct itimerspec * new_setting,
                          struct itimerspec * old_setting);
@@ -97,6 +98,7 @@ int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *ts);
 int posix_cpu_timer_create(struct k_itimer *timer);
 int posix_cpu_nsleep(const clockid_t which_clock, int flags,
                     struct timespec *rqtp, struct timespec __user *rmtp);
+long posix_cpu_nsleep_restart(struct restart_block *restart_block);
 int posix_cpu_timer_set(struct k_itimer *timer, int flags,
                        struct itimerspec *new, struct itimerspec *old);
 int posix_cpu_timer_del(struct k_itimer *timer);
@@ -111,4 +113,6 @@ void posix_cpu_timers_exit_group(struct task_struct *task);
 void set_process_cpu_timer(struct task_struct *task, unsigned int clock_idx,
                           cputime_t *newval, cputime_t *oldval);
+long clock_nanosleep_restart(struct restart_block *restart_block);
 #endif
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 17e75783e3a5..57f70bc8b24b 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -4,6 +4,7 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/spinlock.h>
+#include <linux/magic.h>
 #include <asm/atomic.h>
 /*
@@ -24,8 +25,6 @@ enum {
        PROC_ROOT_INO = 1,
 };
-#define PROC_SUPER_MAGIC 0x9fa0
 /*
 * This is not completely implemented yet. The idea is to
 * create an in-memory tree (like the actual /proc filesystem
@@ -269,7 +268,9 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode)
 struct proc_maps_private {
        struct pid *pid;
        struct task_struct *task;
+#ifdef CONFIG_MMU
        struct vm_area_struct *tail_vma;
+#endif
 };
 #endif /* _LINUX_PROC_FS_H */
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 8b2749a259dc..eeb1976ef7bf 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -16,8 +16,8 @@
 #define PTRACE_KILL                8
 #define PTRACE_SINGLESTEP          9
-#define PTRACE_ATTACH           0x10
+#define PTRACE_ATTACH             16
-#define PTRACE_DETACH           0x11
+#define PTRACE_DETACH             17
 #define PTRACE_SYSCALL            24
diff --git a/include/linux/qnx4_fs.h b/include/linux/qnx4_fs.h
index 27f49c85d5d6..0c7ac444fd35 100644
--- a/include/linux/qnx4_fs.h
+++ b/include/linux/qnx4_fs.h
@@ -11,6 +11,7 @@
 #define _LINUX_QNX4_FS_H
 #include <linux/qnxtypes.h>
+#include <linux/magic.h>
 #define QNX4_ROOT_INO 1
@@ -25,7 +26,6 @@
 #define QNX4_I_MAP_SLOTS        8
 #define QNX4_Z_MAP_SLOTS        64
-#define QNX4_SUPER_MAGIC        0x002f  /* qnx4 fs detection */
 #define QNX4_VALID_FS           0x0001  /* Clean fs. */
 #define QNX4_ERROR_FS           0x0002  /* fs has errors. */
 #define QNX4_BLOCK_SIZE         0x200   /* blocksize of 512 bytes */
diff --git a/include/linux/raid/Kbuild b/include/linux/raid/Kbuild
index 73fa27a8d552..2415a64c5e51 100644
--- a/include/linux/raid/Kbuild
+++ b/include/linux/raid/Kbuild
@@ -1 +1,2 @@
-header-y += md_p.h md_u.h
+header-y += md_p.h
+header-y += md_u.h
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h
index eb3e547c8fee..c588709acbbc 100644
--- a/include/linux/raid/md.h
+++ b/include/linux/raid/md.h
@@ -53,6 +53,8 @@
 #include <linux/raid/md_u.h>
 #include <linux/raid/md_k.h>
+#ifdef CONFIG_MD
 /*
 * Different major versions are not compatible.
 * Different minor versions are only downward compatible.
@@ -95,5 +97,6 @@ extern void md_new_event(mddev_t *mddev);
 extern void md_update_sb(mddev_t * mddev);
+#endif /* CONFIG_MD */
 #endif 
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index d28890295852..920b94fe31fa 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -18,6 +18,8 @@
 /* and dm-bio-list.h is not under include/linux because.... ??? */
 #include "../../../drivers/md/dm-bio-list.h"
+#ifdef CONFIG_BLOCK
 #define LEVEL_MULTIPATH         (-4)
 #define LEVEL_LINEAR            (-1)
 #define LEVEL_FAULTY            (-5)
@@ -362,5 +364,6 @@ static inline void safe_put_page(struct page *p)
        if (p) put_page(p);
 }
+#endif /* CONFIG_BLOCK */
 #endif
diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index 00b340ba6612..b160fb18e8d6 100644
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -17,5 +17,6 @@ extern int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma);
 extern const struct file_operations ramfs_file_operations;
 extern struct vm_operations_struct generic_file_vm_ops;
+extern int __init init_rootfs(void);
 #endif
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 8d5382e62c08..344bc3495ddb 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -133,7 +133,7 @@ static inline void rb_set_color(struct rb_node *rb, int color)
 #define rb_entry(ptr, type, member) container_of(ptr, type, member)
 #define RB_EMPTY_ROOT(root)     ((root)->rb_node == NULL)
-#define RB_EMPTY_NODE(node)     (rb_parent(node) != node)
+#define RB_EMPTY_NODE(node)     (rb_parent(node) == node)
 #define RB_CLEAR_NODE(node)     (rb_set_parent(node, node))
 extern void rb_insert_color(struct rb_node *, struct rb_root *);
diff --git a/include/linux/reiserfs_acl.h b/include/linux/reiserfs_acl.h
index 806ec5b06707..fe00f781a622 100644
--- a/include/linux/reiserfs_acl.h
+++ b/include/linux/reiserfs_acl.h
@@ -56,6 +56,16 @@ extern int reiserfs_xattr_posix_acl_init(void) __init;
 extern int reiserfs_xattr_posix_acl_exit(void);
 extern struct reiserfs_xattr_handler posix_acl_default_handler;
 extern struct reiserfs_xattr_handler posix_acl_access_handler;
+static inline void reiserfs_init_acl_access(struct inode *inode)
+{
+        REISERFS_I(inode)->i_acl_access = NULL;
+}
+static inline void reiserfs_init_acl_default(struct inode *inode)
+{
+        REISERFS_I(inode)->i_acl_default = NULL;
+}
 #else
 #define reiserfs_cache_default_acl(inode) 0
@@ -87,4 +97,11 @@ reiserfs_inherit_default_acl(const struct inode *dir, struct dentry *dentry,
        return 0;
 }
+static inline void reiserfs_init_acl_access(struct inode *inode)
+{
+}
+static inline void reiserfs_init_acl_default(struct inode *inode)
+{
+}
 #endif
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index daa2d83cefe8..7bc6bfb86253 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -12,6 +12,8 @@
 #define _LINUX_REISER_FS_H
 #include <linux/types.h>
+#include <linux/magic.h>
 #ifdef __KERNEL__
 #include <linux/slab.h>
 #include <linux/interrupt.h>
@@ -227,14 +229,6 @@ struct reiserfs_super_block {
         ((!is_reiserfs_jr(SB_DISK_SUPER_BLOCK(s)) ? \
         SB_ONDISK_JOURNAL_SIZE(s) + 1 : SB_ONDISK_RESERVED_FOR_JOURNAL(s)))
-                                /* used by gcc */
-#define REISERFS_SUPER_MAGIC 0x52654973
-                                /* used by file system utilities that
-                                   look at the superblock, etc. */
-#define REISERFS_SUPER_MAGIC_STRING "ReIsErFs"
-#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
-#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs"
 int is_reiserfs_3_5(struct reiserfs_super_block *rs);
 int is_reiserfs_3_6(struct reiserfs_super_block *rs);
 int is_reiserfs_jr(struct reiserfs_super_block *rs);
@@ -813,21 +807,19 @@ struct stat_data_v1 {
 #define set_sd_v1_first_direct_byte(sdp,v) \
                                ((sdp)->sd_first_direct_byte = cpu_to_le32(v))
-#include <linux/ext2_fs.h>
 /* inode flags stored in sd_attrs (nee sd_reserved) */
 /* we want common flags to have the same values as in ext2,
   so chattr(1) will work without problems */
-#define REISERFS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
+#define REISERFS_IMMUTABLE_FL FS_IMMUTABLE_FL
-#define REISERFS_APPEND_FL    EXT2_APPEND_FL
+#define REISERFS_APPEND_FL    FS_APPEND_FL
-#define REISERFS_SYNC_FL      EXT2_SYNC_FL
+#define REISERFS_SYNC_FL      FS_SYNC_FL
-#define REISERFS_NOATIME_FL   EXT2_NOATIME_FL
+#define REISERFS_NOATIME_FL   FS_NOATIME_FL
-#define REISERFS_NODUMP_FL    EXT2_NODUMP_FL
+#define REISERFS_NODUMP_FL    FS_NODUMP_FL
-#define REISERFS_SECRM_FL     EXT2_SECRM_FL
+#define REISERFS_SECRM_FL     FS_SECRM_FL
-#define REISERFS_UNRM_FL      EXT2_UNRM_FL
+#define REISERFS_UNRM_FL      FS_UNRM_FL
-#define REISERFS_COMPR_FL     EXT2_COMPR_FL
+#define REISERFS_COMPR_FL     FS_COMPR_FL
-#define REISERFS_NOTAIL_FL    EXT2_NOTAIL_FL
+#define REISERFS_NOTAIL_FL    FS_NOTAIL_FL
 /* persistent flags that file inherits from the parent directory */
 #define REISERFS_INHERIT_MASK ( REISERFS_IMMUTABLE_FL | \
@@ -2081,6 +2073,10 @@ void reiserfs_init_alloc_options(struct super_block *s);
 */
 __le32 reiserfs_choose_packing(struct inode *dir);
+int reiserfs_init_bitmap_cache(struct super_block *sb);
+void reiserfs_free_bitmap_cache(struct super_block *sb);
+void reiserfs_cache_bitmap_metadata(struct super_block *sb, struct buffer_head *bh, struct reiserfs_bitmap_info *info);
+struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb, unsigned int bitmap);
 int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value);
 void reiserfs_free_block(struct reiserfs_transaction_handle *th, struct inode *,
                         b_blocknr_t, int for_unformatted);
@@ -2169,15 +2165,24 @@ __u32 r5_hash(const signed char *msg, int len);
 /* prototypes from ioctl.c */
 int reiserfs_ioctl(struct inode *inode, struct file *filp,
                   unsigned int cmd, unsigned long arg);
+long reiserfs_compat_ioctl(struct file *filp,
+                   unsigned int cmd, unsigned long arg);
 /* ioctl's command */
 #define REISERFS_IOC_UNPACK             _IOW(0xCD,1,long)
 /* define following flags to be the same as in ext2, so that chattr(1),
   lsattr(1) will work with us. */
-#define REISERFS_IOC_GETFLAGS           EXT2_IOC_GETFLAGS
+#define REISERFS_IOC_GETFLAGS           FS_IOC_GETFLAGS
-#define REISERFS_IOC_SETFLAGS           EXT2_IOC_SETFLAGS
+#define REISERFS_IOC_SETFLAGS           FS_IOC_SETFLAGS
-#define REISERFS_IOC_GETVERSION         EXT2_IOC_GETVERSION
+#define REISERFS_IOC_GETVERSION         FS_IOC_GETVERSION
-#define REISERFS_IOC_SETVERSION         EXT2_IOC_SETVERSION
+#define REISERFS_IOC_SETVERSION         FS_IOC_SETVERSION
+/* the 32 bit compat definitions with int argument */
+#define REISERFS_IOC32_UNPACK           _IOW(0xCD, 1, int)
+#define REISERFS_IOC32_GETFLAGS         FS_IOC32_GETFLAGS
+#define REISERFS_IOC32_SETFLAGS         FS_IOC32_SETFLAGS
+#define REISERFS_IOC32_GETVERSION       FS_IOC32_GETVERSION
+#define REISERFS_IOC32_SETVERSION       FS_IOC32_SETVERSION
 /* Locking primitives */
 /* Right now we are still falling back to (un)lock_kernel, but eventually that
diff --git a/include/linux/reiserfs_fs_i.h b/include/linux/reiserfs_fs_i.h
index 149be8d9a0c9..5b3b297aa2c5 100644
--- a/include/linux/reiserfs_fs_i.h
+++ b/include/linux/reiserfs_fs_i.h
@@ -52,10 +52,13 @@ struct reiserfs_inode_info {
         ** flushed */
        unsigned long i_trans_id;
        struct reiserfs_journal_list *i_jl;
+#ifdef CONFIG_REISERFS_FS_POSIX_ACL
        struct posix_acl *i_acl_access;
        struct posix_acl *i_acl_default;
+#endif
+#ifdef CONFIG_REISERFS_FS_XATTR
        struct rw_semaphore xattr_sem;
+#endif
        struct inode vfs_inode;
 };
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 31b4c0bd4fa0..73e0becec086 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -267,7 +267,6 @@ struct reiserfs_bitmap_info {
        // FIXME: Won't work with block sizes > 8K
        __u16 first_zero_hint;
        __u16 free_count;
-        struct buffer_head *bh; /* the actual bitmap */
 };
 struct proc_dir_entry;
@@ -414,6 +413,7 @@ struct reiserfs_sb_info {
 /* Definitions of reiserfs on-disk properties: */
 #define REISERFS_3_5 0
 #define REISERFS_3_6 1
+#define REISERFS_OLD_FORMAT 2
 enum reiserfs_mount_options {
 /* Mount options */
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h
index 5e961035c725..966c35851b2e 100644
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -97,6 +97,11 @@ static inline void reiserfs_mark_inode_private(struct inode *inode)
        inode->i_flags |= S_PRIVATE;
 }
+static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
+{
+        init_rwsem(&REISERFS_I(inode)->xattr_sem);
+}
 #else
 #define is_reiserfs_priv_object(inode) 0
@@ -129,6 +134,9 @@ static inline int reiserfs_xattr_init(struct super_block *sb, int mount_flags)
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL);     /* to be sure */
        return 0;
 };
+static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
+{
+}
 #endif
 #endif                          /* __KERNEL__ */
diff --git a/include/linux/resume-trace.h b/include/linux/resume-trace.h
index a376bd4ade39..81e9299ca148 100644
--- a/include/linux/resume-trace.h
+++ b/include/linux/resume-trace.h
@@ -3,21 +3,25 @@
 #ifdef CONFIG_PM_TRACE
+extern int pm_trace_enabled;
 struct device;
 extern void set_trace_device(struct device *);
 extern void generate_resume_trace(void *tracedata, unsigned int user);
 #define TRACE_DEVICE(dev) set_trace_device(dev)
-#define TRACE_RESUME(user) do {                         \
+#define TRACE_RESUME(user) do {                                 \
-        void *tracedata;                                \
+        if (pm_trace_enabled) {                                 \
-        asm volatile("movl $1f,%0\n"                    \
+                void *tracedata;                                \
-                ".section .tracedata,\"a\"\n"           \
+                asm volatile("movl $1f,%0\n"                    \
-                "1:\t.word %c1\n"                       \
+                        ".section .tracedata,\"a\"\n"           \
-                "\t.long %c2\n"                         \
+                        "1:\t.word %c1\n"                       \
-                ".previous"                             \
+                        "\t.long %c2\n"                         \
-                :"=r" (tracedata)                       \
+                        ".previous"                             \
-                : "i" (__LINE__), "i" (__FILE__));      \
+                        :"=r" (tracedata)                       \
-        generate_resume_trace(tracedata, user);         \
+                        : "i" (__LINE__), "i" (__FILE__));      \
+                generate_resume_trace(tracedata, user);         \
+        }                                                       \
 } while (0)
 #else
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index bf97b0900014..db2c1df4fef9 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -103,6 +103,14 @@ pte_t *page_check_address(struct page *, struct mm_struct *,
 */
 unsigned long page_address_in_vma(struct page *, struct vm_area_struct *);
+/*
+ * Cleans the PTEs of shared mappings.
+ * (and since clean PTEs should also be readonly, write protects them too)
+ *
+ * returns the number of cleaned PTEs.
+ */
+int page_mkclean(struct page *);
 #else   /* !CONFIG_MMU */
 #define anon_vma_init()         do {} while (0)
@@ -112,6 +120,12 @@ unsigned long page_address_in_vma(struct page *, struct vm_area_struct *);
 #define page_referenced(page,l) TestClearPageReferenced(page)
 #define try_to_unmap(page, refs) SWAP_FAIL
+static inline int page_mkclean(struct page *page)
+{
+        return 0;
+}
 #endif  /* CONFIG_MMU */
 /*
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 5371e4e74595..b89f09357054 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -141,7 +141,7 @@ struct rtc_device
        int id;
        char name[RTC_DEVICE_NAME_SIZE];
-        struct rtc_class_ops *ops;
+        const struct rtc_class_ops *ops;
        struct mutex ops_lock;
        struct class_device *rtc_dev;
@@ -172,7 +172,7 @@ struct rtc_device
 extern struct rtc_device *rtc_device_register(const char *name,
                                        struct device *dev,
-                                        struct rtc_class_ops *ops,
+                                        const struct rtc_class_ops *ops,
                                        struct module *owner);
 extern void rtc_device_unregister(struct rtc_device *rdev);
 extern int rtc_interface_register(struct class_interface *intf);
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index facd9ee37b76..3a18addaed4c 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -2,6 +2,7 @@
 #define __LINUX_RTNETLINK_H
 #include <linux/netlink.h>
+#include <linux/if_link.h>
 /****
 *              Routing/neighbour discovery messages.
@@ -238,10 +239,8 @@ enum rt_class_t
        RT_TABLE_DEFAULT=253,
        RT_TABLE_MAIN=254,
        RT_TABLE_LOCAL=255,
-        __RT_TABLE_MAX
+        RT_TABLE_MAX=0xFFFFFFFF
 };
-#define RT_TABLE_MAX (__RT_TABLE_MAX - 1)
 /* Routing message attributes */
@@ -263,6 +262,7 @@ enum rtattr_type_t
        RTA_CACHEINFO,
        RTA_SESSION,
        RTA_MP_ALGO,
+        RTA_TABLE,
        __RTA_MAX
 };
@@ -383,226 +383,6 @@ struct rta_session
        } u;
 };
-/*********************************************************
- *              Interface address.
- ****/
-struct ifaddrmsg
-{
-        unsigned char   ifa_family;
-        unsigned char   ifa_prefixlen;  /* The prefix length            */
-        unsigned char   ifa_flags;      /* Flags                        */
-        unsigned char   ifa_scope;      /* See above                    */
-        int             ifa_index;      /* Link index                   */
-};
-enum
-{
-        IFA_UNSPEC,
-        IFA_ADDRESS,
-        IFA_LOCAL,
-        IFA_LABEL,
-        IFA_BROADCAST,
-        IFA_ANYCAST,
-        IFA_CACHEINFO,
-        IFA_MULTICAST,
-        __IFA_MAX
-};
-#define IFA_MAX (__IFA_MAX - 1)
-/* ifa_flags */
-#define IFA_F_SECONDARY         0x01
-#define IFA_F_TEMPORARY         IFA_F_SECONDARY
-#define IFA_F_DEPRECATED        0x20
-#define IFA_F_TENTATIVE         0x40
-#define IFA_F_PERMANENT         0x80
-struct ifa_cacheinfo
-{
-        __u32   ifa_prefered;
-        __u32   ifa_valid;
-        __u32   cstamp; /* created timestamp, hundredths of seconds */
-        __u32   tstamp; /* updated timestamp, hundredths of seconds */
-};
-#define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
-#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
-/*
-   Important comment:
-   IFA_ADDRESS is prefix address, rather than local interface address.
-   It makes no difference for normally configured broadcast interfaces,
-   but for point-to-point IFA_ADDRESS is DESTINATION address,
-   local address is supplied in IFA_LOCAL attribute.
- */
-/**************************************************************
- *              Neighbour discovery.
- ****/
-struct ndmsg
-{
-        unsigned char   ndm_family;
-        unsigned char   ndm_pad1;
-        unsigned short  ndm_pad2;
-        int             ndm_ifindex;    /* Link index                   */
-        __u16           ndm_state;
-        __u8            ndm_flags;
-        __u8            ndm_type;
-};
-enum
-{
-        NDA_UNSPEC,
-        NDA_DST,
-        NDA_LLADDR,
-        NDA_CACHEINFO,
-        NDA_PROBES,
-        __NDA_MAX
-};
-#define NDA_MAX (__NDA_MAX - 1)
-#define NDA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg))))
-#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg))
-/*
- *      Neighbor Cache Entry Flags
- */
-#define NTF_PROXY       0x08    /* == ATF_PUBL */
-#define NTF_ROUTER      0x80
-/*
- *      Neighbor Cache Entry States.
- */
-#define NUD_INCOMPLETE  0x01
-#define NUD_REACHABLE   0x02
-#define NUD_STALE       0x04
-#define NUD_DELAY       0x08
-#define NUD_PROBE       0x10
-#define NUD_FAILED      0x20
-/* Dummy states */
-#define NUD_NOARP       0x40
-#define NUD_PERMANENT   0x80
-#define NUD_NONE        0x00
-struct nda_cacheinfo
-{
-        __u32           ndm_confirmed;
-        __u32           ndm_used;
-        __u32           ndm_updated;
-        __u32           ndm_refcnt;
-};
-/*****************************************************************
- *              Neighbour tables specific messages.
- *
- * To retrieve the neighbour tables send RTM_GETNEIGHTBL with the
- * NLM_F_DUMP flag set. Every neighbour table configuration is
- * spread over multiple messages to avoid running into message
- * size limits on systems with many interfaces. The first message
- * in the sequence transports all not device specific data such as
- * statistics, configuration, and the default parameter set.
- * This message is followed by 0..n messages carrying device
- * specific parameter sets.
- * Although the ordering should be sufficient, NDTA_NAME can be
- * used to identify sequences. The initial message can be identified
- * by checking for NDTA_CONFIG. The device specific messages do
- * not contain this TLV but have NDTPA_IFINDEX set to the
- * corresponding interface index.
- *
- * To change neighbour table attributes, send RTM_SETNEIGHTBL
- * with NDTA_NAME set. Changeable attribute include NDTA_THRESH[1-3],
- * NDTA_GC_INTERVAL, and all TLVs in NDTA_PARMS unless marked
- * otherwise. Device specific parameter sets can be changed by
- * setting NDTPA_IFINDEX to the interface index of the corresponding
- * device.
- ****/
-struct ndt_stats
-{
-        __u64           ndts_allocs;
-        __u64           ndts_destroys;
-        __u64           ndts_hash_grows;
-        __u64           ndts_res_failed;
-        __u64           ndts_lookups;
-        __u64           ndts_hits;
-        __u64           ndts_rcv_probes_mcast;
-        __u64           ndts_rcv_probes_ucast;
-        __u64           ndts_periodic_gc_runs;
-        __u64           ndts_forced_gc_runs;
-};
-enum {
-        NDTPA_UNSPEC,
-        NDTPA_IFINDEX,                  /* u32, unchangeable */
-        NDTPA_REFCNT,                   /* u32, read-only */
-        NDTPA_REACHABLE_TIME,           /* u64, read-only, msecs */
-        NDTPA_BASE_REACHABLE_TIME,      /* u64, msecs */
-        NDTPA_RETRANS_TIME,             /* u64, msecs */
-        NDTPA_GC_STALETIME,             /* u64, msecs */
-        NDTPA_DELAY_PROBE_TIME,         /* u64, msecs */
-        NDTPA_QUEUE_LEN,                /* u32 */
-        NDTPA_APP_PROBES,               /* u32 */
-        NDTPA_UCAST_PROBES,             /* u32 */
-        NDTPA_MCAST_PROBES,             /* u32 */
-        NDTPA_ANYCAST_DELAY,            /* u64, msecs */
-        NDTPA_PROXY_DELAY,              /* u64, msecs */
-        NDTPA_PROXY_QLEN,               /* u32 */
-        NDTPA_LOCKTIME,                 /* u64, msecs */
-        __NDTPA_MAX
-};
-#define NDTPA_MAX (__NDTPA_MAX - 1)
-struct ndtmsg
-{
-        __u8            ndtm_family;
-        __u8            ndtm_pad1;
-        __u16           ndtm_pad2;
-};
-struct ndt_config
-{
-        __u16           ndtc_key_len;
-        __u16           ndtc_entry_size;
-        __u32           ndtc_entries;
-        __u32           ndtc_last_flush;        /* delta to now in msecs */
-        __u32           ndtc_last_rand;         /* delta to now in msecs */
-        __u32           ndtc_hash_rnd;
-        __u32           ndtc_hash_mask;
-        __u32           ndtc_hash_chain_gc;
-        __u32           ndtc_proxy_qlen;
-};
-enum {
-        NDTA_UNSPEC,
-        NDTA_NAME,                      /* char *, unchangeable */
-        NDTA_THRESH1,                   /* u32 */
-        NDTA_THRESH2,                   /* u32 */
-        NDTA_THRESH3,                   /* u32 */
-        NDTA_CONFIG,                    /* struct ndt_config, read-only */
-        NDTA_PARMS,                     /* nested TLV NDTPA_* */
-        NDTA_STATS,                     /* struct ndt_stats, read-only */
-        NDTA_GC_INTERVAL,               /* u64, msecs */
-        __NDTA_MAX
-};
-#define NDTA_MAX (__NDTA_MAX - 1)
-#define NDTA_RTA(r) ((struct rtattr*)(((char*)(r)) + \
-                     NLMSG_ALIGN(sizeof(struct ndtmsg))))
-#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg))
 /****
 *              General form of address family dependent message.
 ****/
@@ -663,138 +443,6 @@ struct prefix_cacheinfo
        __u32   valid_time;
 };
-/* The struct should be in sync with struct net_device_stats */
-struct rtnl_link_stats
-{
-        __u32   rx_packets;             /* total packets received       */
-        __u32   tx_packets;             /* total packets transmitted    */
-        __u32   rx_bytes;               /* total bytes received         */
-        __u32   tx_bytes;               /* total bytes transmitted      */
-        __u32   rx_errors;              /* bad packets received         */
-        __u32   tx_errors;              /* packet transmit problems     */
-        __u32   rx_dropped;             /* no space in linux buffers    */
-        __u32   tx_dropped;             /* no space available in linux  */
-        __u32   multicast;              /* multicast packets received   */
-        __u32   collisions;
-        /* detailed rx_errors: */
-        __u32   rx_length_errors;
-        __u32   rx_over_errors;         /* receiver ring buff overflow  */
-        __u32   rx_crc_errors;          /* recved pkt with crc error    */
-        __u32   rx_frame_errors;        /* recv'd frame alignment error */
-        __u32   rx_fifo_errors;         /* recv'r fifo overrun          */
-        __u32   rx_missed_errors;       /* receiver missed packet       */
-        /* detailed tx_errors */
-        __u32   tx_aborted_errors;
-        __u32   tx_carrier_errors;
-        __u32   tx_fifo_errors;
-        __u32   tx_heartbeat_errors;
-        __u32   tx_window_errors;
-        
-        /* for cslip etc */
-        __u32   rx_compressed;
-        __u32   tx_compressed;
-};
-/* The struct should be in sync with struct ifmap */
-struct rtnl_link_ifmap
-{
-        __u64   mem_start;
-        __u64   mem_end;
-        __u64   base_addr;
-        __u16   irq;
-        __u8    dma;
-        __u8    port;
-};
-enum
-{
-        IFLA_UNSPEC,
-        IFLA_ADDRESS,
-        IFLA_BROADCAST,
-        IFLA_IFNAME,
-        IFLA_MTU,
-        IFLA_LINK,
-        IFLA_QDISC,
-        IFLA_STATS,
-        IFLA_COST,
-#define IFLA_COST IFLA_COST
-        IFLA_PRIORITY,
-#define IFLA_PRIORITY IFLA_PRIORITY
-        IFLA_MASTER,
-#define IFLA_MASTER IFLA_MASTER
-        IFLA_WIRELESS,          /* Wireless Extension event - see wireless.h */
-#define IFLA_WIRELESS IFLA_WIRELESS
-        IFLA_PROTINFO,          /* Protocol specific information for a link */
-#define IFLA_PROTINFO IFLA_PROTINFO
-        IFLA_TXQLEN,
-#define IFLA_TXQLEN IFLA_TXQLEN
-        IFLA_MAP,
-#define IFLA_MAP IFLA_MAP
-        IFLA_WEIGHT,
-#define IFLA_WEIGHT IFLA_WEIGHT
-        IFLA_OPERSTATE,
-        IFLA_LINKMODE,
-        __IFLA_MAX
-};
-#define IFLA_MAX (__IFLA_MAX - 1)
-#define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
-#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
-/* ifi_flags.
-   IFF_* flags.
-   The only change is:
-   IFF_LOOPBACK, IFF_BROADCAST and IFF_POINTOPOINT are
-   more not changeable by user. They describe link media
-   characteristics and set by device driver.
-   Comments:
-   - Combination IFF_BROADCAST|IFF_POINTOPOINT is invalid
-   - If neither of these three flags are set;
-     the interface is NBMA.
-   - IFF_MULTICAST does not mean anything special:
-   multicasts can be used on all not-NBMA links.
-   IFF_MULTICAST means that this media uses special encapsulation
-   for multicast frames. Apparently, all IFF_POINTOPOINT and
-   IFF_BROADCAST devices are able to use multicasts too.
- */
-/* IFLA_LINK.
-   For usual devices it is equal ifi_index.
-   If it is a "virtual interface" (f.e. tunnel), ifi_link
-   can point to real physical interface (f.e. for bandwidth calculations),
-   or maybe 0, what means, that real media is unknown (usual
-   for IPIP tunnels, when route to endpoint is allowed to change)
- */
-/* Subtype attributes for IFLA_PROTINFO */
-enum
-{
-        IFLA_INET6_UNSPEC,
-        IFLA_INET6_FLAGS,       /* link flags                   */
-        IFLA_INET6_CONF,        /* sysctl parameters            */
-        IFLA_INET6_STATS,       /* statistics                   */
-        IFLA_INET6_MCAST,       /* MC things. What of them?     */
-        IFLA_INET6_CACHEINFO,   /* time values and max reasm size */
-        __IFLA_INET6_MAX
-};
-#define IFLA_INET6_MAX  (__IFLA_INET6_MAX - 1)
-struct ifla_cacheinfo
-{
-        __u32   max_reasm_len;
-        __u32   tstamp;         /* ipv6InterfaceTable updated timestamp */
-        __u32   reachable_time;
-        __u32   retrans_time;
-};
 /*****************************************************************
 *              Traffic control messages.
@@ -885,10 +533,13 @@ enum rtnetlink_groups {
        RTNLGRP_NOP2,
        RTNLGRP_DECnet_ROUTE,
 #define RTNLGRP_DECnet_ROUTE    RTNLGRP_DECnet_ROUTE
-        RTNLGRP_NOP3,
+        RTNLGRP_DECnet_RULE,
+#define RTNLGRP_DECnet_RULE     RTNLGRP_DECnet_RULE
        RTNLGRP_NOP4,
        RTNLGRP_IPV6_PREFIX,
 #define RTNLGRP_IPV6_PREFIX     RTNLGRP_IPV6_PREFIX
+        RTNLGRP_IPV6_RULE,
+#define RTNLGRP_IPV6_RULE       RTNLGRP_IPV6_RULE
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
@@ -923,8 +574,6 @@ extern int rtattr_parse(struct rtattr *tb[], int maxattr, struct rtattr *rta, in
 #define rtattr_parse_nested(tb, max, rta) \
        rtattr_parse((tb), (max), RTA_DATA((rta)), RTA_PAYLOAD((rta)))
-extern struct sock *rtnl;
 struct rtnetlink_link
 {
        int (*doit)(struct sk_buff *, struct nlmsghdr*, void *attr);
@@ -933,6 +582,10 @@ struct rtnetlink_link
 extern struct rtnetlink_link * rtnetlink_links[NPROTO];
 extern int rtnetlink_send(struct sk_buff *skb, u32 pid, u32 group, int echo);
+extern int rtnl_unicast(struct sk_buff *skb, u32 pid);
+extern int rtnl_notify(struct sk_buff *skb, u32 pid, u32 group,
+                       struct nlmsghdr *nlh, gfp_t flags);
+extern void rtnl_set_sk_err(u32 group, int error);
 extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);
 extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const void *data);
@@ -1065,6 +718,13 @@ extern void __rtnl_unlock(void);
        } \
 } while(0)
+static inline u32 rtm_get_table(struct rtattr **rta, u8 table)
+{
+        return RTA_GET_U32(rta[RTA_TABLE-1]);
+rtattr_failure:
+        return table;
+}
 #endif /* __KERNEL__ */
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
index 66ff545552f7..4efbd9c445f5 100644
--- a/include/linux/scatterlist.h
+++ b/include/linux/scatterlist.h
@@ -5,7 +5,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
-static inline void sg_set_buf(struct scatterlist *sg, void *buf,
+static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
                              unsigned int buflen)
 {
        sg->page = virt_to_page(buf);
@@ -13,7 +13,7 @@ static inline void sg_set_buf(struct scatterlist *sg, void *buf,
        sg->length = buflen;
 }
-static inline void sg_init_one(struct scatterlist *sg, void *buf,
+static inline void sg_init_one(struct scatterlist *sg, const void *buf,
                               unsigned int buflen)
 {
        memset(sg, 0, sizeof(*sg));
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 34ed0d99b1bd..7ef899c47c29 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -148,6 +148,7 @@ extern unsigned long weighted_cpuload(const int cpu);
 #define EXIT_DEAD               32
 /* in tsk->state again */
 #define TASK_NONINTERACTIVE     64
+#define TASK_DEAD               128
 #define __set_task_state(tsk, state_value)              \
        do { (tsk)->state = (state_value); } while (0)
@@ -504,8 +505,8 @@ struct signal_struct {
 #define rt_prio(prio)           unlikely((prio) < MAX_RT_PRIO)
 #define rt_task(p)              rt_prio((p)->prio)
 #define batch_task(p)           (unlikely((p)->policy == SCHED_BATCH))
-#define has_rt_policy(p) \
+#define is_rt_policy(p)         ((p) != SCHED_NORMAL && (p) != SCHED_BATCH)
-        unlikely((p)->policy != SCHED_NORMAL && (p)->policy != SCHED_BATCH)
+#define has_rt_policy(p)        unlikely(is_rt_policy((p)->policy))
 /*
 * Some day this will be a full-fledged user tracking system..
@@ -709,7 +710,6 @@ extern unsigned int max_cache_size;
 struct io_context;                      /* See blkdev.h */
-void exit_io_context(void);
 struct cpuset;
 #define NGROUPS_SMALL           32
@@ -784,8 +784,9 @@ struct task_struct {
        struct prio_array *array;
        unsigned short ioprio;
+#ifdef CONFIG_BLK_DEV_IO_TRACE
        unsigned int btrace_seq;
+#endif
        unsigned long sleep_avg;
        unsigned long long timestamp, last_ran;
        unsigned long long sched_time; /* sched_clock time spent running */
@@ -819,6 +820,11 @@ struct task_struct {
        unsigned did_exec:1;
        pid_t pid;
        pid_t tgid;
+#ifdef CONFIG_CC_STACKPROTECTOR
+        /* Canary value for the -fstack-protector gcc feature */
+        unsigned long stack_canary;
+#endif
        /* 
         * pointers to (original) parent process, youngest child, younger sibling,
         * older sibling, respectively.  (p->father can be replaced with 
@@ -865,6 +871,15 @@ struct task_struct {
        struct key *thread_keyring;     /* keyring private to this thread */
        unsigned char jit_keyring;      /* default keyring to attach requested keys to */
 #endif
+        /*
+         * fpu_counter contains the number of consecutive context switches
+         * that the FPU is used. If this is over a threshold, the lazy fpu
+         * saving becomes unlazy to save the trap. This is an unsigned char
+         * so that after 256 times the counter wraps and the behavior turns
+         * lazy again; this to deal with bursty apps that only use FPU for
+         * a short time
+         */
+        unsigned char fpu_counter;
        int oomkilladj; /* OOM kill score adjustment (bit shift). */
        char comm[TASK_COMM_LEN]; /* executable name excluding path
                                     - access with [gs]et_task_comm (which lock
@@ -872,8 +887,10 @@ struct task_struct {
                                     - initialized normally by flush_old_exec */
 /* file system info */
        int link_count, total_link_count;
+#ifdef CONFIG_SYSVIPC
 /* ipc stuff */
        struct sysv_sem sysvsem;
+#endif
 /* CPU-specific state of this task */
        struct thread_struct thread;
 /* filesystem information */
@@ -964,10 +981,10 @@ struct task_struct {
        wait_queue_t *io_wait;
 /* i/o counters(bytes read/written, #syscalls */
        u64 rchar, wchar, syscr, syscw;
-#if defined(CONFIG_BSD_PROCESS_ACCT)
+#if defined(CONFIG_TASK_XACCT)
        u64 acct_rss_mem1;      /* accumulated rss usage */
        u64 acct_vm_mem1;       /* accumulated virtual memory usage */
-        clock_t acct_stimexpd;  /* clock_t-converted stime since last update */
+        cputime_t acct_stimexpd;/* stime since last update */
 #endif
 #ifdef CONFIG_NUMA
        struct mempolicy *mempolicy;
@@ -1016,6 +1033,16 @@ static inline int pid_alive(struct task_struct *p)
        return p->pids[PIDTYPE_PID].pid != NULL;
 }
+/**
+ * is_init - check if a task structure is the first user space
+ *           task the kernel created.
+ * @p: Task structure to be checked.
+ */
+static inline int is_init(struct task_struct *tsk)
+{
+        return tsk->pid == 1;
+}
 extern void free_task(struct task_struct *tsk);
 #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
@@ -1034,7 +1061,6 @@ static inline void put_task_struct(struct task_struct *t)
                                        /* Not implemented yet, only for 486*/
 #define PF_STARTING     0x00000002      /* being created */
 #define PF_EXITING      0x00000004      /* getting shut down */
-#define PF_DEAD         0x00000008      /* Dead */
 #define PF_FORKNOEXEC   0x00000040      /* forked but didn't exec */
 #define PF_SUPERPRIV    0x00000100      /* used super-user privileges */
 #define PF_DUMPCORE     0x00000200      /* dumped core */
@@ -1179,7 +1205,7 @@ extern void switch_uid(struct user_struct *);
 #include <asm/current.h>
-extern void do_timer(struct pt_regs *);
+extern void do_timer(unsigned long ticks);
 extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state));
 extern int FASTCALL(wake_up_process(struct task_struct * tsk));
diff --git a/include/linux/scx200_gpio.h b/include/linux/scx200_gpio.h
index 90dd069cc145..1a82d30c4b17 100644
--- a/include/linux/scx200_gpio.h
+++ b/include/linux/scx200_gpio.h
@@ -4,6 +4,7 @@ u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear);
 extern unsigned scx200_gpio_base;
 extern long scx200_gpio_shadow[2];
+extern struct nsc_gpio_ops scx200_gpio_ops;
 #define scx200_gpio_present() (scx200_gpio_base!=0)
diff --git a/include/linux/security.h b/include/linux/security.h
index 6bc2aad494ff..9b5fea81f55e 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -31,6 +31,8 @@
 #include <linux/msg.h>
 #include <linux/sched.h>
 #include <linux/key.h>
+#include <linux/xfrm.h>
+#include <net/flow.h>
 struct ctl_table;
@@ -88,6 +90,7 @@ extern int cap_netlink_recv(struct sk_buff *skb, int cap);
 struct nfsctl_arg;
 struct sched_param;
 struct swap_info_struct;
+struct request_sock;
 /* bprm_apply_creds unsafe reasons */
 #define LSM_UNSAFE_SHARE        1
@@ -812,9 +815,19 @@ struct swap_info_struct;
 *      which is used to copy security attributes between local stream sockets.
 * @sk_free_security:
 *      Deallocate security structure.
- * @sk_getsid:
+ * @sk_clone_security:
- *      Retrieve the LSM-specific sid for the sock to enable caching of network
+ *      Clone/copy security structure.
+ * @sk_getsecid:
+ *      Retrieve the LSM-specific secid for the sock to enable caching of network
 *      authorizations.
+ * @sock_graft:
+ *      Sets the socket's isec sid to the sock's sid.
+ * @inet_conn_request:
+ *      Sets the openreq's sid to socket's sid with MLS portion taken from peer sid.
+ * @inet_csk_clone:
+ *      Sets the new child socket's sid to the openreq sid.
+ * @req_classify_flow:
+ *      Sets the flow's sid to the openreq sid.
 *
 * Security hooks for XFRM operations.
 *
@@ -823,9 +836,10 @@ struct swap_info_struct;
 *      used by the XFRM system.
 *      @sec_ctx contains the security context information being provided by
 *      the user-level policy update program (e.g., setkey).
- *      Allocate a security structure to the xp->security field.
+ *      @sk refers to the sock from which to derive the security context.
- *      The security field is initialized to NULL when the xfrm_policy is
+ *      Allocate a security structure to the xp->security field; the security
- *      allocated.
+ *      field is initialized to NULL when the xfrm_policy is allocated. Only
+ *      one of sec_ctx or sock can be specified.
 *      Return 0 if operation was successful (memory to allocate, legal context)
 * @xfrm_policy_clone_security:
 *      @old contains an existing xfrm_policy in the SPD.
@@ -844,9 +858,14 @@ struct swap_info_struct;
 *      Database by the XFRM system.
 *      @sec_ctx contains the security context information being provided by
 *      the user-level SA generation program (e.g., setkey or racoon).
- *      Allocate a security structure to the x->security field.  The
+ *      @polsec contains the security context information associated with a xfrm
- *      security field is initialized to NULL when the xfrm_state is
+ *      policy rule from which to take the base context. polsec must be NULL
- *      allocated.
+ *      when sec_ctx is specified.
+ *      @secid contains the secid from which to take the mls portion of the context.
+ *      Allocate a security structure to the x->security field; the security
+ *      field is initialized to NULL when the xfrm_state is allocated. Set the
+ *      context to correspond to either sec_ctx or polsec, with the mls portion
+ *      taken from secid in the latter case.
 *      Return 0 if operation was successful (memory to allocate, legal context).
 * @xfrm_state_free_security:
 *      @x contains the xfrm_state.
@@ -857,13 +876,27 @@ struct swap_info_struct;
 * @xfrm_policy_lookup:
 *      @xp contains the xfrm_policy for which the access control is being
 *      checked.
- *      @sk_sid contains the sock security label that is used to authorize
+ *      @fl_secid contains the flow security label that is used to authorize
 *      access to the policy xp.
 *      @dir contains the direction of the flow (input or output).
- *      Check permission when a sock selects a xfrm_policy for processing
+ *      Check permission when a flow selects a xfrm_policy for processing
 *      XFRMs on a packet.  The hook is called when selecting either a
 *      per-socket policy or a generic xfrm policy.
 *      Return 0 if permission is granted.
+ * @xfrm_state_pol_flow_match:
+ *      @x contains the state to match.
+ *      @xp contains the policy to check for a match.
+ *      @fl contains the flow to check for a match.
+ *      Return 1 if there is a match.
+ * @xfrm_flow_state_match:
+ *      @fl contains the flow key to match.
+ *      @xfrm points to the xfrm_state to match.
+ *      Return 1 if there is a match.
+ * @xfrm_decode_session:
+ *      @skb points to skb to decode.
+ *      @secid points to the flow key secid to set.
+ *      @ckall says if all xfrms used should be checked for same secid.
+ *      Return 0 if ckall is zero or all xfrms used have the same secid.
 *
 * Security hooks affecting all Key Management operations
 *
@@ -1308,8 +1341,8 @@ struct security_operations {
        int (*unix_may_send) (struct socket * sock, struct socket * other);
        int (*socket_create) (int family, int type, int protocol, int kern);
-        void (*socket_post_create) (struct socket * sock, int family,
+        int (*socket_post_create) (struct socket * sock, int family,
-                                    int type, int protocol, int kern);
+                                   int type, int protocol, int kern);
        int (*socket_bind) (struct socket * sock,
                            struct sockaddr * address, int addrlen);
        int (*socket_connect) (struct socket * sock,
@@ -1332,18 +1365,31 @@ struct security_operations {
        int (*socket_getpeersec_dgram) (struct socket *sock, struct sk_buff *skb, u32 *secid);
        int (*sk_alloc_security) (struct sock *sk, int family, gfp_t priority);
        void (*sk_free_security) (struct sock *sk);
-        unsigned int (*sk_getsid) (struct sock *sk, struct flowi *fl, u8 dir);
+        void (*sk_clone_security) (const struct sock *sk, struct sock *newsk);
+        void (*sk_getsecid) (struct sock *sk, u32 *secid);
+        void (*sock_graft)(struct sock* sk, struct socket *parent);
+        int (*inet_conn_request)(struct sock *sk, struct sk_buff *skb,
+                                        struct request_sock *req);
+        void (*inet_csk_clone)(struct sock *newsk, const struct request_sock *req);
+        void (*req_classify_flow)(const struct request_sock *req, struct flowi *fl);
 #endif  /* CONFIG_SECURITY_NETWORK */
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
-        int (*xfrm_policy_alloc_security) (struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx);
+        int (*xfrm_policy_alloc_security) (struct xfrm_policy *xp,
+                        struct xfrm_user_sec_ctx *sec_ctx, struct sock *sk);
        int (*xfrm_policy_clone_security) (struct xfrm_policy *old, struct xfrm_policy *new);
        void (*xfrm_policy_free_security) (struct xfrm_policy *xp);
        int (*xfrm_policy_delete_security) (struct xfrm_policy *xp);
-        int (*xfrm_state_alloc_security) (struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx);
+        int (*xfrm_state_alloc_security) (struct xfrm_state *x,
+                struct xfrm_user_sec_ctx *sec_ctx, struct xfrm_sec_ctx *polsec,
+                u32 secid);
        void (*xfrm_state_free_security) (struct xfrm_state *x);
        int (*xfrm_state_delete_security) (struct xfrm_state *x);
-        int (*xfrm_policy_lookup)(struct xfrm_policy *xp, u32 sk_sid, u8 dir);
+        int (*xfrm_policy_lookup)(struct xfrm_policy *xp, u32 fl_secid, u8 dir);
+        int (*xfrm_state_pol_flow_match)(struct xfrm_state *x,
+                        struct xfrm_policy *xp, struct flowi *fl);
+        int (*xfrm_flow_state_match)(struct flowi *fl, struct xfrm_state *xfrm);
+        int (*xfrm_decode_session)(struct sk_buff *skb, u32 *secid, int ckall);
 #endif  /* CONFIG_SECURITY_NETWORK_XFRM */
        /* key management security hooks */
@@ -1549,6 +1595,7 @@ static inline void security_sb_post_pivotroot (struct nameidata *old_nd,
 static inline int security_inode_alloc (struct inode *inode)
 {
+        inode->i_security = NULL;
        return security_ops->inode_alloc_security (inode);
 }
@@ -2778,13 +2825,13 @@ static inline int security_socket_create (int family, int type,
        return security_ops->socket_create(family, type, protocol, kern);
 }
-static inline void security_socket_post_create(struct socket * sock, 
+static inline int security_socket_post_create(struct socket * sock,
-                                               int family,
+                                              int family,
-                                               int type, 
+                                              int type,
-                                               int protocol, int kern)
+                                              int protocol, int kern)
 {
-        security_ops->socket_post_create(sock, family, type,
+        return security_ops->socket_post_create(sock, family, type,
-                                         protocol, kern);
+                                                protocol, kern);
 }
 static inline int security_socket_bind(struct socket * sock, 
@@ -2885,9 +2932,36 @@ static inline void security_sk_free(struct sock *sk)
        return security_ops->sk_free_security(sk);
 }
-static inline unsigned int security_sk_sid(struct sock *sk, struct flowi *fl, u8 dir)
+static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
+{
+        return security_ops->sk_clone_security(sk, newsk);
+}
+static inline void security_sk_classify_flow(struct sock *sk, struct flowi *fl)
 {
-        return security_ops->sk_getsid(sk, fl, dir);
+        security_ops->sk_getsecid(sk, &fl->secid);
+}
+static inline void security_req_classify_flow(const struct request_sock *req, struct flowi *fl)
+{
+        security_ops->req_classify_flow(req, fl);
+}
+static inline void security_sock_graft(struct sock* sk, struct socket *parent)
+{
+        security_ops->sock_graft(sk, parent);
+}
+static inline int security_inet_conn_request(struct sock *sk,
+                        struct sk_buff *skb, struct request_sock *req)
+{
+        return security_ops->inet_conn_request(sk, skb, req);
+}
+static inline void security_inet_csk_clone(struct sock *newsk,
+                        const struct request_sock *req)
+{
+        security_ops->inet_csk_clone(newsk, req);
 }
 #else   /* CONFIG_SECURITY_NETWORK */
 static inline int security_unix_stream_connect(struct socket * sock,
@@ -2909,11 +2983,12 @@ static inline int security_socket_create (int family, int type,
        return 0;
 }
-static inline void security_socket_post_create(struct socket * sock, 
+static inline int security_socket_post_create(struct socket * sock,
-                                               int family,
+                                              int family,
-                                               int type, 
+                                              int type,
-                                               int protocol, int kern)
+                                              int protocol, int kern)
 {
+        return 0;
 }
 static inline int security_socket_bind(struct socket * sock, 
@@ -3011,16 +3086,43 @@ static inline void security_sk_free(struct sock *sk)
 {
 }
-static inline unsigned int security_sk_sid(struct sock *sk, struct flowi *fl, u8 dir)
+static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
+{
+}
+static inline void security_sk_classify_flow(struct sock *sk, struct flowi *fl)
+{
+}
+static inline void security_req_classify_flow(const struct request_sock *req, struct flowi *fl)
+{
+}
+static inline void security_sock_graft(struct sock* sk, struct socket *parent)
+{
+}
+static inline int security_inet_conn_request(struct sock *sk,
+                        struct sk_buff *skb, struct request_sock *req)
 {
        return 0;
 }
+static inline void security_inet_csk_clone(struct sock *newsk,
+                        const struct request_sock *req)
+{
+}
 #endif  /* CONFIG_SECURITY_NETWORK */
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
 static inline int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx)
 {
-        return security_ops->xfrm_policy_alloc_security(xp, sec_ctx);
+        return security_ops->xfrm_policy_alloc_security(xp, sec_ctx, NULL);
+}
+static inline int security_xfrm_sock_policy_alloc(struct xfrm_policy *xp, struct sock *sk)
+{
+        return security_ops->xfrm_policy_alloc_security(xp, NULL, sk);
 }
 static inline int security_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new)
@@ -3038,9 +3140,18 @@ static inline int security_xfrm_policy_delete(struct xfrm_policy *xp)
        return security_ops->xfrm_policy_delete_security(xp);
 }
-static inline int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
+static inline int security_xfrm_state_alloc(struct xfrm_state *x,
+                        struct xfrm_user_sec_ctx *sec_ctx)
 {
-        return security_ops->xfrm_state_alloc_security(x, sec_ctx);
+        return security_ops->xfrm_state_alloc_security(x, sec_ctx, NULL, 0);
+}
+static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
+                                struct xfrm_sec_ctx *polsec, u32 secid)
+{
+        if (!polsec)
+                return 0;
+        return security_ops->xfrm_state_alloc_security(x, NULL, polsec, secid);
 }
 static inline int security_xfrm_state_delete(struct xfrm_state *x)
@@ -3053,9 +3164,32 @@ static inline void security_xfrm_state_free(struct xfrm_state *x)
        security_ops->xfrm_state_free_security(x);
 }
-static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir)
+static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_secid, u8 dir)
+{
+        return security_ops->xfrm_policy_lookup(xp, fl_secid, dir);
+}
+static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
+                        struct xfrm_policy *xp, struct flowi *fl)
 {
-        return security_ops->xfrm_policy_lookup(xp, sk_sid, dir);
+        return security_ops->xfrm_state_pol_flow_match(x, xp, fl);
+}
+static inline int security_xfrm_flow_state_match(struct flowi *fl, struct xfrm_state *xfrm)
+{
+        return security_ops->xfrm_flow_state_match(fl, xfrm);
+}
+static inline int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid)
+{
+        return security_ops->xfrm_decode_session(skb, secid, 1);
+}
+static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl)
+{
+        int rc = security_ops->xfrm_decode_session(skb, &fl->secid, 0);
+        BUG_ON(rc);
 }
 #else   /* CONFIG_SECURITY_NETWORK_XFRM */
 static inline int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx)
@@ -3063,6 +3197,11 @@ static inline int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm
        return 0;
 }
+static inline int security_xfrm_sock_policy_alloc(struct xfrm_policy *xp, struct sock *sk)
+{
+        return 0;
+}
 static inline int security_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new)
 {
        return 0;
@@ -3077,7 +3216,14 @@ static inline int security_xfrm_policy_delete(struct xfrm_policy *xp)
        return 0;
 }
-static inline int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
+static inline int security_xfrm_state_alloc(struct xfrm_state *x,
+                                        struct xfrm_user_sec_ctx *sec_ctx)
+{
+        return 0;
+}
+static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
+                                        struct xfrm_sec_ctx *polsec, u32 secid)
 {
        return 0;
 }
@@ -3091,10 +3237,32 @@ static inline int security_xfrm_state_delete(struct xfrm_state *x)
        return 0;
 }
-static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid, u8 dir)
+static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_secid, u8 dir)
+{
+        return 0;
+}
+static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
+                        struct xfrm_policy *xp, struct flowi *fl)
+{
+        return 1;
+}
+static inline int security_xfrm_flow_state_match(struct flowi *fl,
+                                struct xfrm_state *xfrm)
+{
+        return 1;
+}
+static inline int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid)
 {
        return 0;
 }
+static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl)
+{
+}
 #endif  /* CONFIG_SECURITY_NETWORK_XFRM */
 #ifdef CONFIG_KEYS
diff --git a/include/linux/selinux.h b/include/linux/selinux.h
index aad4e390d6a5..d1b7ca6c1c57 100644
--- a/include/linux/selinux.h
+++ b/include/linux/selinux.h
@@ -46,7 +46,7 @@ void selinux_audit_rule_free(struct selinux_audit_rule *rule);
 /**
 *      selinux_audit_rule_match - determine if a context ID matches a rule.
- *      @ctxid: the context ID to check
+ *      @sid: the context ID to check
 *      @field: the field this rule refers to
 *      @op: the operater the rule uses
 *      @rule: pointer to the audit rule to check against
@@ -55,7 +55,7 @@ void selinux_audit_rule_free(struct selinux_audit_rule *rule);
 *      Returns 1 if the context id matches the rule, 0 if it does not, and
 *      -errno on failure.
 */
-int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
                             struct selinux_audit_rule *rule,
                             struct audit_context *actx);
@@ -70,18 +70,8 @@ int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
 void selinux_audit_set_callback(int (*callback)(void));
 /**
- *      selinux_task_ctxid - determine a context ID for a process.
+ *     selinux_sid_to_string - map a security context ID to a string
- *      @tsk: the task object
+ *     @sid: security context ID to be converted.
- *      @ctxid: ID value returned via this
- *
- *      On return, ctxid will contain an ID for the context.  This value
- *      should only be used opaquely.
- */
-void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid);
-/**
- *     selinux_ctxid_to_string - map a security context ID to a string
- *     @ctxid: security context ID to be converted.
 *     @ctx: address of context string to be returned
 *     @ctxlen: length of returned context string.
 *
@@ -89,7 +79,7 @@ void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid);
 *     string will be allocated internally, and the caller must call
 *     kfree() on it after use.
 */
-int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen);
+int selinux_sid_to_string(u32 sid, char **ctx, u32 *ctxlen);
 /**
 *     selinux_get_inode_sid - get the inode's security context ID
@@ -154,7 +144,7 @@ static inline void selinux_audit_rule_free(struct selinux_audit_rule *rule)
        return;
 }
-static inline int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+static inline int selinux_audit_rule_match(u32 sid, u32 field, u32 op,
                                           struct selinux_audit_rule *rule,
                                           struct audit_context *actx)
 {
@@ -166,12 +156,7 @@ static inline void selinux_audit_set_callback(int (*callback)(void))
        return;
 }
-static inline void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid)
+static inline int selinux_sid_to_string(u32 sid, char **ctx, u32 *ctxlen)
-{
-        *ctxid = 0;
-}
-static inline int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen)
 {
       *ctx = NULL;
       *ctxlen = 0;
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index c057f0b32318..f3c51899117f 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -19,6 +19,10 @@ struct shmem_inode_info {
        swp_entry_t             i_direct[SHMEM_NR_DIRECT]; /* first blocks */
        struct list_head        swaplist;       /* chain of maybes on swap */
        struct inode            vfs_inode;
+#ifdef CONFIG_TMPFS_POSIX_ACL
+        struct posix_acl        *i_acl;
+        struct posix_acl        *i_default_acl;
+#endif
 };
 struct shmem_sb_info {
@@ -36,4 +40,24 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
        return container_of(inode, struct shmem_inode_info, vfs_inode);
 }
+#ifdef CONFIG_TMPFS_POSIX_ACL
+int shmem_permission(struct inode *, int, struct nameidata *);
+int shmem_acl_init(struct inode *, struct inode *);
+void shmem_acl_destroy_inode(struct inode *);
+extern struct xattr_handler shmem_xattr_acl_access_handler;
+extern struct xattr_handler shmem_xattr_acl_default_handler;
+extern struct generic_acl_operations shmem_acl_ops;
+#else
+static inline int shmem_acl_init(struct inode *inode, struct inode *dir)
+{
+        return 0;
+}
+static inline void shmem_acl_destroy_inode(struct inode *inode)
+{
+}
+#endif  /* CONFIG_TMPFS_POSIX_ACL */
 #endif
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 755e9cddac47..85577a4ffa61 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -34,8 +34,9 @@
 #define HAVE_ALIGNABLE_SKB      /* Ditto 8)                */
 #define CHECKSUM_NONE 0
-#define CHECKSUM_HW 1
+#define CHECKSUM_PARTIAL 1
 #define CHECKSUM_UNNECESSARY 2
+#define CHECKSUM_COMPLETE 3
 #define SKB_DATA_ALIGN(X)       (((X) + (SMP_CACHE_BYTES - 1)) & \
                                 ~(SMP_CACHE_BYTES - 1))
@@ -56,17 +57,17 @@
 *            Apparently with secret goal to sell you new device, when you
 *            will add new protocol to your host. F.e. IPv6. 8)
 *
- *      HW: the most generic way. Device supplied checksum of _all_
+ *      COMPLETE: the most generic way. Device supplied checksum of _all_
 *          the packet as seen by netif_rx in skb->csum.
 *          NOTE: Even if device supports only some protocols, but
- *          is able to produce some skb->csum, it MUST use HW,
+ *          is able to produce some skb->csum, it MUST use COMPLETE,
 *          not UNNECESSARY.
 *
 * B. Checksumming on output.
 *
 *      NONE: skb is checksummed by protocol or csum is not required.
 *
- *      HW: device is required to csum packet as seen by hard_start_xmit
+ *      PARTIAL: device is required to csum packet as seen by hard_start_xmit
 *      from skb->h.raw to the end and to record the checksum
 *      at skb->h.raw+skb->csum.
 *
@@ -1261,14 +1262,14 @@ static inline int skb_linearize_cow(struct sk_buff *skb)
 *      @len: length of data pulled
 *
 *      After doing a pull on a received packet, you need to call this to
- *      update the CHECKSUM_HW checksum, or set ip_summed to CHECKSUM_NONE
+ *      update the CHECKSUM_COMPLETE checksum, or set ip_summed to
- *      so that it can be recomputed from scratch.
+ *      CHECKSUM_NONE so that it can be recomputed from scratch.
 */
 static inline void skb_postpull_rcsum(struct sk_buff *skb,
                                      const void *start, unsigned int len)
 {
-        if (skb->ip_summed == CHECKSUM_HW)
+        if (skb->ip_summed == CHECKSUM_COMPLETE)
                skb->csum = csum_sub(skb->csum, csum_partial(start, len, 0));
 }
@@ -1287,7 +1288,7 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
 {
        if (likely(len >= skb->len))
                return 0;
-        if (skb->ip_summed == CHECKSUM_HW)
+        if (skb->ip_summed == CHECKSUM_COMPLETE)
                skb->ip_summed = CHECKSUM_NONE;
        return __pskb_trim(skb, len);
 }
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 45ad55b70d1c..a96fd9310d55 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -60,14 +60,13 @@ extern void __init kmem_cache_init(void);
 extern kmem_cache_t *kmem_cache_create(const char *, size_t, size_t, unsigned long,
                                       void (*)(void *, kmem_cache_t *, unsigned long),
                                       void (*)(void *, kmem_cache_t *, unsigned long));
-extern int kmem_cache_destroy(kmem_cache_t *);
+extern void kmem_cache_destroy(kmem_cache_t *);
 extern int kmem_cache_shrink(kmem_cache_t *);
 extern void *kmem_cache_alloc(kmem_cache_t *, gfp_t);
 extern void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
 extern void kmem_cache_free(kmem_cache_t *, void *);
 extern unsigned int kmem_cache_size(kmem_cache_t *);
 extern const char *kmem_cache_name(kmem_cache_t *);
-extern kmem_cache_t *kmem_find_general_cachep(size_t size, gfp_t gfpflags);
 /* Size description struct for general caches. */
 struct cache_sizes {
@@ -203,7 +202,30 @@ extern int slab_is_available(void);
 #ifdef CONFIG_NUMA
 extern void *kmem_cache_alloc_node(kmem_cache_t *, gfp_t flags, int node);
-extern void *kmalloc_node(size_t size, gfp_t flags, int node);
+extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
+static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+{
+        if (__builtin_constant_p(size)) {
+                int i = 0;
+#define CACHE(x) \
+                if (size <= x) \
+                        goto found; \
+                else \
+                        i++;
+#include "kmalloc_sizes.h"
+#undef CACHE
+                {
+                        extern void __you_cannot_kmalloc_that_much(void);
+                        __you_cannot_kmalloc_that_much();
+                }
+found:
+                return kmem_cache_alloc_node((flags & GFP_DMA) ?
+                        malloc_sizes[i].cs_dmacachep :
+                        malloc_sizes[i].cs_cachep, flags, node);
+        }
+        return __kmalloc_node(size, flags, node);
+}
 #else
 static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, gfp_t flags, int node)
 {
@@ -223,12 +245,11 @@ extern int FASTCALL(kmem_ptr_validate(kmem_cache_t *cachep, void *ptr));
 /* SLOB allocator routines */
 void kmem_cache_init(void);
-struct kmem_cache *kmem_find_general_cachep(size_t, gfp_t gfpflags);
 struct kmem_cache *kmem_cache_create(const char *c, size_t, size_t,
        unsigned long,
        void (*)(void *, struct kmem_cache *, unsigned long),
        void (*)(void *, struct kmem_cache *, unsigned long));
-int kmem_cache_destroy(struct kmem_cache *c);
+void kmem_cache_destroy(struct kmem_cache *c);
 void *kmem_cache_alloc(struct kmem_cache *c, gfp_t flags);
 void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
 void kmem_cache_free(struct kmem_cache *c, void *b);
@@ -263,8 +284,6 @@ extern kmem_cache_t	*fs_cachep;
 extern kmem_cache_t     *sighand_cachep;
 extern kmem_cache_t     *bio_cachep;
-extern atomic_t slab_reclaim_pages;
 #endif  /* __KERNEL__ */
 #endif  /* _LINUX_SLAB_H */
diff --git a/include/linux/smb.h b/include/linux/smb.h
index b0162208c963..f098dff93f6b 100644
--- a/include/linux/smb.h
+++ b/include/linux/smb.h
@@ -10,6 +10,7 @@
 #define _LINUX_SMB_H
 #include <linux/types.h>
+#include <linux/magic.h>
 enum smb_protocol { 
        SMB_PROTOCOL_NONE, 
@@ -88,7 +89,6 @@ struct smb_fattr {
        struct timespec f_atime;
        struct timespec f_mtime;
        struct timespec f_ctime;
-        unsigned long   f_blksize;
        unsigned long   f_blocks;
        int             f_unix;
 };
@@ -101,8 +101,6 @@ enum smb_conn_state {
        CONN_RETRYING           /* Currently trying to reconnect */
 };
-#define SMB_SUPER_MAGIC               0x517B
 #define SMB_HEADER_LEN   37     /* includes everything up to, but not
                                 * including smb_bcc */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 837e8bce1349..51649987f691 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -53,6 +53,9 @@ extern void smp_cpus_done(unsigned int max_cpus);
 */
 int smp_call_function(void(*func)(void *info), void *info, int retry, int wait);
+int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
+                                int retry, int wait);
 /*
 * Call a function on all processors
 */
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index 4db25d5c7cd1..854aa6b543f1 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -155,42 +155,11 @@ enum
        UDP_MIB_NOPORTS,                        /* NoPorts */
        UDP_MIB_INERRORS,                       /* InErrors */
        UDP_MIB_OUTDATAGRAMS,                   /* OutDatagrams */
+        UDP_MIB_RCVBUFERRORS,                   /* RcvbufErrors */
+        UDP_MIB_SNDBUFERRORS,                   /* SndbufErrors */
        __UDP_MIB_MAX
 };
-/* sctp mib definitions */
-/*
- * draft-ietf-sigtran-sctp-mib-07.txt
- */
-enum
-{
-        SCTP_MIB_NUM = 0,
-        SCTP_MIB_CURRESTAB,                     /* CurrEstab */
-        SCTP_MIB_ACTIVEESTABS,                  /* ActiveEstabs */
-        SCTP_MIB_PASSIVEESTABS,                 /* PassiveEstabs */
-        SCTP_MIB_ABORTEDS,                      /* Aborteds */
-        SCTP_MIB_SHUTDOWNS,                     /* Shutdowns */
-        SCTP_MIB_OUTOFBLUES,                    /* OutOfBlues */
-        SCTP_MIB_CHECKSUMERRORS,                /* ChecksumErrors */
-        SCTP_MIB_OUTCTRLCHUNKS,                 /* OutCtrlChunks */
-        SCTP_MIB_OUTORDERCHUNKS,                /* OutOrderChunks */
-        SCTP_MIB_OUTUNORDERCHUNKS,              /* OutUnorderChunks */
-        SCTP_MIB_INCTRLCHUNKS,                  /* InCtrlChunks */
-        SCTP_MIB_INORDERCHUNKS,                 /* InOrderChunks */
-        SCTP_MIB_INUNORDERCHUNKS,               /* InUnorderChunks */
-        SCTP_MIB_FRAGUSRMSGS,                   /* FragUsrMsgs */
-        SCTP_MIB_REASMUSRMSGS,                  /* ReasmUsrMsgs */
-        SCTP_MIB_OUTSCTPPACKS,                  /* OutSCTPPacks */
-        SCTP_MIB_INSCTPPACKS,                   /* InSCTPPacks */
-        SCTP_MIB_RTOALGORITHM,                  /* RtoAlgorithm */
-        SCTP_MIB_RTOMIN,                        /* RtoMin */
-        SCTP_MIB_RTOMAX,                        /* RtoMax */
-        SCTP_MIB_RTOINITIAL,                    /* RtoInitial */
-        SCTP_MIB_VALCOOKIELIFE,                 /* ValCookieLife */
-        SCTP_MIB_MAXINITRETR,                   /* MaxInitRetr */
-        __SCTP_MIB_MAX
-};
 /* linux mib definitions */
 enum
 {
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 31473db92d3b..b800d2d68b32 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -167,9 +167,9 @@ do {								\
 * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
 * methods are defined as nops in the case they are not required.
 */
-#define spin_trylock(lock)              __cond_lock(_spin_trylock(lock))
+#define spin_trylock(lock)              __cond_lock(lock, _spin_trylock(lock))
-#define read_trylock(lock)              __cond_lock(_read_trylock(lock))
+#define read_trylock(lock)              __cond_lock(lock, _read_trylock(lock))
-#define write_trylock(lock)             __cond_lock(_write_trylock(lock))
+#define write_trylock(lock)             __cond_lock(lock, _write_trylock(lock))
 #define spin_lock(lock)                 _spin_lock(lock)
@@ -236,19 +236,19 @@ do {								\
                                        _write_unlock_irqrestore(lock, flags)
 #define write_unlock_bh(lock)           _write_unlock_bh(lock)
-#define spin_trylock_bh(lock)           __cond_lock(_spin_trylock_bh(lock))
+#define spin_trylock_bh(lock)   __cond_lock(lock, _spin_trylock_bh(lock))
 #define spin_trylock_irq(lock) \
 ({ \
        local_irq_disable(); \
-        _spin_trylock(lock) ? \
+        spin_trylock(lock) ? \
        1 : ({ local_irq_enable(); 0;  }); \
 })
 #define spin_trylock_irqsave(lock, flags) \
 ({ \
        local_irq_save(flags); \
-        _spin_trylock(lock) ? \
+        spin_trylock(lock) ? \
        1 : ({ local_irq_restore(flags); 0; }); \
 })
@@ -264,7 +264,7 @@ do {								\
 */
 extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
 #define atomic_dec_and_lock(atomic, lock) \
-                __cond_lock(_atomic_dec_and_lock(atomic, lock))
+                __cond_lock(lock, _atomic_dec_and_lock(atomic, lock))
 /**
 * spin_can_lock - would spin_trylock() succeed?
diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
index b2c4f8299464..8828b8155e9c 100644
--- a/include/linux/spinlock_api_smp.h
+++ b/include/linux/spinlock_api_smp.h
@@ -19,41 +19,41 @@ int in_lock_functions(unsigned long addr);
 #define assert_spin_locked(x)   BUG_ON(!spin_is_locked(x))
-void __lockfunc _spin_lock(spinlock_t *lock)            __acquires(spinlock_t);
+void __lockfunc _spin_lock(spinlock_t *lock)            __acquires(lock);
 void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass)
-                                                        __acquires(spinlock_t);
+                                                        __acquires(lock);
-void __lockfunc _read_lock(rwlock_t *lock)              __acquires(rwlock_t);
+void __lockfunc _read_lock(rwlock_t *lock)              __acquires(lock);
-void __lockfunc _write_lock(rwlock_t *lock)             __acquires(rwlock_t);
+void __lockfunc _write_lock(rwlock_t *lock)             __acquires(lock);
-void __lockfunc _spin_lock_bh(spinlock_t *lock)         __acquires(spinlock_t);
+void __lockfunc _spin_lock_bh(spinlock_t *lock)         __acquires(lock);
-void __lockfunc _read_lock_bh(rwlock_t *lock)           __acquires(rwlock_t);
+void __lockfunc _read_lock_bh(rwlock_t *lock)           __acquires(lock);
-void __lockfunc _write_lock_bh(rwlock_t *lock)          __acquires(rwlock_t);
+void __lockfunc _write_lock_bh(rwlock_t *lock)          __acquires(lock);
-void __lockfunc _spin_lock_irq(spinlock_t *lock)        __acquires(spinlock_t);
+void __lockfunc _spin_lock_irq(spinlock_t *lock)        __acquires(lock);
-void __lockfunc _read_lock_irq(rwlock_t *lock)          __acquires(rwlock_t);
+void __lockfunc _read_lock_irq(rwlock_t *lock)          __acquires(lock);
-void __lockfunc _write_lock_irq(rwlock_t *lock)         __acquires(rwlock_t);
+void __lockfunc _write_lock_irq(rwlock_t *lock)         __acquires(lock);
 unsigned long __lockfunc _spin_lock_irqsave(spinlock_t *lock)
-                                                        __acquires(spinlock_t);
+                                                        __acquires(lock);
 unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)
-                                                        __acquires(rwlock_t);
+                                                        __acquires(lock);
 unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)
-                                                        __acquires(rwlock_t);
+                                                        __acquires(lock);
 int __lockfunc _spin_trylock(spinlock_t *lock);
 int __lockfunc _read_trylock(rwlock_t *lock);
 int __lockfunc _write_trylock(rwlock_t *lock);
 int __lockfunc _spin_trylock_bh(spinlock_t *lock);
-void __lockfunc _spin_unlock(spinlock_t *lock)          __releases(spinlock_t);
+void __lockfunc _spin_unlock(spinlock_t *lock)          __releases(lock);
-void __lockfunc _read_unlock(rwlock_t *lock)            __releases(rwlock_t);
+void __lockfunc _read_unlock(rwlock_t *lock)            __releases(lock);
-void __lockfunc _write_unlock(rwlock_t *lock)           __releases(rwlock_t);
+void __lockfunc _write_unlock(rwlock_t *lock)           __releases(lock);
-void __lockfunc _spin_unlock_bh(spinlock_t *lock)       __releases(spinlock_t);
+void __lockfunc _spin_unlock_bh(spinlock_t *lock)       __releases(lock);
-void __lockfunc _read_unlock_bh(rwlock_t *lock)         __releases(rwlock_t);
+void __lockfunc _read_unlock_bh(rwlock_t *lock)         __releases(lock);
-void __lockfunc _write_unlock_bh(rwlock_t *lock)        __releases(rwlock_t);
+void __lockfunc _write_unlock_bh(rwlock_t *lock)        __releases(lock);
-void __lockfunc _spin_unlock_irq(spinlock_t *lock)      __releases(spinlock_t);
+void __lockfunc _spin_unlock_irq(spinlock_t *lock)      __releases(lock);
-void __lockfunc _read_unlock_irq(rwlock_t *lock)        __releases(rwlock_t);
+void __lockfunc _read_unlock_irq(rwlock_t *lock)        __releases(lock);
-void __lockfunc _write_unlock_irq(rwlock_t *lock)       __releases(rwlock_t);
+void __lockfunc _write_unlock_irq(rwlock_t *lock)       __releases(lock);
 void __lockfunc _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags)
-                                                        __releases(spinlock_t);
+                                                        __releases(lock);
 void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
-                                                        __releases(rwlock_t);
+                                                        __releases(lock);
 void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
-                                                        __releases(rwlock_t);
+                                                        __releases(lock);
 #endif /* __LINUX_SPINLOCK_API_SMP_H */
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h
index 9cc81e572224..50e2b01e517c 100644
--- a/include/linux/stacktrace.h
+++ b/include/linux/stacktrace.h
@@ -5,15 +5,16 @@
 struct stack_trace {
        unsigned int nr_entries, max_entries;
        unsigned long *entries;
+        int skip;       /* input argument: How many entries to skip */
+        int all_contexts; /* input argument: if true do than one stack */
 };
 extern void save_stack_trace(struct stack_trace *trace,
-                             struct task_struct *task, int all_contexts,
+                             struct task_struct *task);
-                             unsigned int skip);
 extern void print_stack_trace(struct stack_trace *trace, int spaces);
 #else
-# define save_stack_trace(trace, task, all, skip)       do { } while (0)
+# define save_stack_trace(trace, task)                  do { } while (0)
 # define print_stack_trace(trace)                       do { } while (0)
 #endif
diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index b3a2cadf90f2..6a40c76bdcf1 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -10,11 +10,19 @@
 #define NULL ((void *)0)
 #endif
+#ifdef __KERNEL__
+enum {
+        false   = 0,
+        true    = 1
+};
 #undef offsetof
 #ifdef __compiler_offsetof
 #define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
 #else
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/string.h b/include/linux/string.h
index e4c755860316..4f69ef9e6eb5 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -99,6 +99,7 @@ extern void * memchr(const void *,int,__kernel_size_t);
 #endif
 extern char *kstrdup(const char *s, gfp_t gfp);
+extern void *kmemdup(const void *src, size_t len, gfp_t gfp);
 #ifdef __cplusplus
 }
diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild
index 0d1d768a27bf..fb438f158eee 100644
--- a/include/linux/sunrpc/Kbuild
+++ b/include/linux/sunrpc/Kbuild
@@ -1 +1 @@
-unifdef-y := debug.h
+unifdef-y += debug.h
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index a6de332e57d4..862c0d8c8381 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -109,13 +109,13 @@ struct rpc_credops {
        void                    (*crdestroy)(struct rpc_cred *);
        int                     (*crmatch)(struct auth_cred *, struct rpc_cred *, int);
-        u32 *                   (*crmarshal)(struct rpc_task *, u32 *);
+        __be32 *                (*crmarshal)(struct rpc_task *, __be32 *);
        int                     (*crrefresh)(struct rpc_task *);
-        u32 *                   (*crvalidate)(struct rpc_task *, u32 *);
+        __be32 *                (*crvalidate)(struct rpc_task *, __be32 *);
        int                     (*crwrap_req)(struct rpc_task *, kxdrproc_t,
-                                                void *, u32 *, void *);
+                                                void *, __be32 *, void *);
        int                     (*crunwrap_resp)(struct rpc_task *, kxdrproc_t,
-                                                void *, u32 *, void *);
+                                                void *, __be32 *, void *);
 };
 extern struct rpc_authops       authunix_ops;
@@ -134,10 +134,10 @@ struct rpc_cred *	rpcauth_bindcred(struct rpc_task *);
 void                    rpcauth_holdcred(struct rpc_task *);
 void                    put_rpccred(struct rpc_cred *);
 void                    rpcauth_unbindcred(struct rpc_task *);
-u32 *                   rpcauth_marshcred(struct rpc_task *, u32 *);
+__be32 *                rpcauth_marshcred(struct rpc_task *, __be32 *);
-u32 *                   rpcauth_checkverf(struct rpc_task *, u32 *);
+__be32 *                rpcauth_checkverf(struct rpc_task *, __be32 *);
-int                     rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp, u32 *data, void *obj);
+int                     rpcauth_wrap_req(struct rpc_task *task, kxdrproc_t encode, void *rqstp, __be32 *data, void *obj);
-int                     rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, u32 *data, void *obj);
+int                     rpcauth_unwrap_resp(struct rpc_task *task, kxdrproc_t decode, void *rqstp, __be32 *data, void *obj);
 int                     rpcauth_refreshcred(struct rpc_task *);
 void                    rpcauth_invalcred(struct rpc_task *);
 int                     rpcauth_uptodatecred(struct rpc_task *);
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 8fe9f35eba31..f6d1d646ce05 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -18,18 +18,6 @@
 #include <linux/sunrpc/timer.h>
 #include <asm/signal.h>
-/*
- * This defines an RPC port mapping
- */
-struct rpc_portmap {
-        __u32                   pm_prog;
-        __u32                   pm_vers;
-        __u32                   pm_prot;
-        __u16                   pm_port;
-        unsigned char           pm_binding : 1; /* doing a getport() */
-        struct rpc_wait_queue   pm_bindwait;    /* waiting on getport() */
-};
 struct rpc_inode;
 /*
@@ -40,7 +28,9 @@ struct rpc_clnt {
        atomic_t                cl_users;       /* number of references */
        struct rpc_xprt *       cl_xprt;        /* transport */
        struct rpc_procinfo *   cl_procinfo;    /* procedure info */
-        u32                     cl_maxproc;     /* max procedure number */
+        u32                     cl_prog,        /* RPC program number */
+                                cl_vers,        /* RPC version number */
+                                cl_maxproc;     /* max procedure number */
        char *                  cl_server;      /* server machine name */
        char *                  cl_protname;    /* protocol name */
@@ -55,7 +45,6 @@ struct rpc_clnt {
                                cl_dead     : 1;/* abandoned */
        struct rpc_rtt *        cl_rtt;         /* RTO estimator data */
-        struct rpc_portmap *    cl_pmap;        /* port mapping */
        int                     cl_nodelen;     /* nodename length */
        char                    cl_nodename[UNX_MAXNODENAME];
@@ -64,14 +53,8 @@ struct rpc_clnt {
        struct dentry *         cl_dentry;      /* inode */
        struct rpc_clnt *       cl_parent;      /* Points to parent of clones */
        struct rpc_rtt          cl_rtt_default;
-        struct rpc_portmap      cl_pmap_default;
        char                    cl_inline_name[32];
 };
-#define cl_timeout              cl_xprt->timeout
-#define cl_prog                 cl_pmap->pm_prog
-#define cl_vers                 cl_pmap->pm_vers
-#define cl_port                 cl_pmap->pm_port
-#define cl_prot                 cl_pmap->pm_prot
 /*
 * General RPC program info
@@ -106,24 +89,36 @@ struct rpc_procinfo {
        char *                  p_name;         /* name of procedure */
 };
-#define RPC_CONGESTED(clnt)     (RPCXPRT_CONGESTED((clnt)->cl_xprt))
-#define RPC_PEERADDR(clnt)      (&(clnt)->cl_xprt->addr)
 #ifdef __KERNEL__
-struct rpc_clnt *rpc_create_client(struct rpc_xprt *xprt, char *servname,
+struct rpc_create_args {
-                                struct rpc_program *info,
+        int                     protocol;
-                                u32 version, rpc_authflavor_t authflavor);
+        struct sockaddr         *address;
-struct rpc_clnt *rpc_new_client(struct rpc_xprt *xprt, char *servname,
+        size_t                  addrsize;
-                                struct rpc_program *info,
+        struct rpc_timeout      *timeout;
-                                u32 version, rpc_authflavor_t authflavor);
+        char                    *servername;
+        struct rpc_program      *program;
+        u32                     version;
+        rpc_authflavor_t        authflavor;
+        unsigned long           flags;
+};
+/* Values for "flags" field */
+#define RPC_CLNT_CREATE_HARDRTRY        (1UL << 0)
+#define RPC_CLNT_CREATE_INTR            (1UL << 1)
+#define RPC_CLNT_CREATE_AUTOBIND        (1UL << 2)
+#define RPC_CLNT_CREATE_ONESHOT         (1UL << 3)
+#define RPC_CLNT_CREATE_NONPRIVPORT     (1UL << 4)
+#define RPC_CLNT_CREATE_NOPING          (1UL << 5)
+struct rpc_clnt *rpc_create(struct rpc_create_args *args);
 struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *,
                                struct rpc_program *, int);
 struct rpc_clnt *rpc_clone_client(struct rpc_clnt *);
 int             rpc_shutdown_client(struct rpc_clnt *);
 int             rpc_destroy_client(struct rpc_clnt *);
 void            rpc_release_client(struct rpc_clnt *);
-void            rpc_getport(struct rpc_task *, struct rpc_clnt *);
+void            rpc_getport(struct rpc_task *);
 int             rpc_register(u32, u32, int, unsigned short, int *);
 void            rpc_call_setup(struct rpc_task *, struct rpc_message *, int);
@@ -140,6 +135,8 @@ void		rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int);
 size_t          rpc_max_payload(struct rpc_clnt *);
 void            rpc_force_rebind(struct rpc_clnt *);
 int             rpc_ping(struct rpc_clnt *clnt, int flags);
+size_t          rpc_peeraddr(struct rpc_clnt *, struct sockaddr *, size_t);
+char *          rpc_peeraddr2str(struct rpc_clnt *, enum rpc_display_format_t);
 /*
 * Helper function for NFSroot support
diff --git a/include/linux/sunrpc/gss_krb5.h b/include/linux/sunrpc/gss_krb5.h
index 1279280d7196..e30ba201910a 100644
--- a/include/linux/sunrpc/gss_krb5.h
+++ b/include/linux/sunrpc/gss_krb5.h
@@ -46,8 +46,8 @@ struct krb5_ctx {
        unsigned char           seed[16];
        int                     signalg;
        int                     sealalg;
-        struct crypto_tfm       *enc;
+        struct crypto_blkcipher *enc;
-        struct crypto_tfm       *seq;
+        struct crypto_blkcipher *seq;
        s32                     endtime;
        u32                     seq_send;
        struct xdr_netobj       mech_used;
@@ -136,26 +136,27 @@ gss_unwrap_kerberos(struct gss_ctx *ctx_id, int offset,
 u32
-krb5_encrypt(struct crypto_tfm * key,
+krb5_encrypt(struct crypto_blkcipher *key,
             void *iv, void *in, void *out, int length);
 u32
-krb5_decrypt(struct crypto_tfm * key,
+krb5_decrypt(struct crypto_blkcipher *key,
             void *iv, void *in, void *out, int length); 
 int
-gss_encrypt_xdr_buf(struct crypto_tfm *tfm, struct xdr_buf *outbuf, int offset,
+gss_encrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *outbuf,
-                struct page **pages);
+                    int offset, struct page **pages);
 int
-gss_decrypt_xdr_buf(struct crypto_tfm *tfm, struct xdr_buf *inbuf, int offset);
+gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *inbuf,
+                    int offset);
 s32
-krb5_make_seq_num(struct crypto_tfm * key,
+krb5_make_seq_num(struct crypto_blkcipher *key,
                int direction,
                s32 seqnum, unsigned char *cksum, unsigned char *buf);
 s32
-krb5_get_seq_num(struct crypto_tfm * key,
+krb5_get_seq_num(struct crypto_blkcipher *key,
               unsigned char *cksum,
               unsigned char *buf, int *direction, s32 * seqnum);
diff --git a/include/linux/sunrpc/gss_spkm3.h b/include/linux/sunrpc/gss_spkm3.h
index 336e218c2782..2cf3fbb40b4f 100644
--- a/include/linux/sunrpc/gss_spkm3.h
+++ b/include/linux/sunrpc/gss_spkm3.h
@@ -19,9 +19,9 @@ struct spkm3_ctx {
        unsigned int            req_flags ;
        struct xdr_netobj       share_key;
        int                     conf_alg;
-        struct crypto_tfm*      derived_conf_key;
+        struct crypto_blkcipher *derived_conf_key;
        int                     intg_alg;
-        struct crypto_tfm*      derived_integ_key;
+        struct crypto_blkcipher *derived_integ_key;
        int                     keyestb_alg;   /* alg used to get share_key */
        int                     owf_alg;   /* one way function */
 };
diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_prot.h
index f43f237360ae..d9f5934ac9fe 100644
--- a/include/linux/sunrpc/msg_prot.h
+++ b/include/linux/sunrpc/msg_prot.h
@@ -95,7 +95,7 @@ enum rpc_auth_stat {
 * 2GB.
 */
-typedef u32     rpc_fraghdr;
+typedef __be32  rpc_fraghdr;
 #define RPC_LAST_STREAM_FRAGMENT        (1U << 31)
 #define RPC_FRAGMENT_SIZE_MASK          (~RPC_LAST_STREAM_FRAGMENT)
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index a481472c9484..a2eb9b4a9de3 100644
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -43,7 +43,7 @@ extern int rpc_queue_upcall(struct inode *, struct rpc_pipe_msg *);
 extern struct dentry *rpc_mkdir(char *, struct rpc_clnt *);
 extern int rpc_rmdir(struct dentry *);
-extern struct dentry *rpc_mkpipe(char *, void *, struct rpc_pipe_ops *, int flags);
+extern struct dentry *rpc_mkpipe(struct dentry *, const char *, void *, struct rpc_pipe_ops *, int flags);
 extern int rpc_unlink(struct dentry *);
 extern struct vfsmount *rpc_get_mount(void);
 extern void rpc_put_mount(void);
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 82a91bb22362..f399c138f79d 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -127,7 +127,6 @@ struct rpc_call_ops {
 */
 #define RPC_TASK_ASYNC          0x0001          /* is an async task */
 #define RPC_TASK_SWAPPER        0x0002          /* is swapping in/out */
-#define RPC_TASK_CHILD          0x0008          /* is child of other task */
 #define RPC_CALL_MAJORSEEN      0x0020          /* major timeout seen */
 #define RPC_TASK_ROOTCREDS      0x0040          /* force root creds */
 #define RPC_TASK_DYNAMIC        0x0080          /* task was kmalloc'ed */
@@ -136,7 +135,6 @@ struct rpc_call_ops {
 #define RPC_TASK_NOINTR         0x0400          /* uninterruptible task */
 #define RPC_IS_ASYNC(t)         ((t)->tk_flags & RPC_TASK_ASYNC)
-#define RPC_IS_CHILD(t)         ((t)->tk_flags & RPC_TASK_CHILD)
 #define RPC_IS_SWAPPER(t)       ((t)->tk_flags & RPC_TASK_SWAPPER)
 #define RPC_DO_ROOTOVERRIDE(t)  ((t)->tk_flags & RPC_TASK_ROOTCREDS)
 #define RPC_ASSASSINATED(t)     ((t)->tk_flags & RPC_TASK_KILLED)
@@ -253,7 +251,6 @@ struct rpc_task *rpc_new_task(struct rpc_clnt *, int flags,
                                const struct rpc_call_ops *ops, void *data);
 struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags,
                                const struct rpc_call_ops *ops, void *data);
-struct rpc_task *rpc_new_child(struct rpc_clnt *, struct rpc_task *parent);
 void            rpc_init_task(struct rpc_task *task, struct rpc_clnt *clnt,
                                int flags, const struct rpc_call_ops *ops,
                                void *data);
@@ -261,8 +258,6 @@ void		rpc_release_task(struct rpc_task *);
 void            rpc_exit_task(struct rpc_task *);
 void            rpc_killall_tasks(struct rpc_clnt *);
 int             rpc_execute(struct rpc_task *);
-void            rpc_run_child(struct rpc_task *parent, struct rpc_task *child,
-                                        rpc_action action);
 void            rpc_init_priority_wait_queue(struct rpc_wait_queue *, const char *);
 void            rpc_init_wait_queue(struct rpc_wait_queue *, const char *);
 void            rpc_sleep_on(struct rpc_wait_queue *, struct rpc_task *,
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 7b27c09b5604..73140ee5c638 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -78,28 +78,45 @@ struct svc_serv {
 */
 #define RPCSVC_MAXPAGES         ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2)
-static inline u32 svc_getu32(struct kvec *iov)
+static inline u32 svc_getnl(struct kvec *iov)
 {
-        u32 val, *vp;
+        __be32 val, *vp;
        vp = iov->iov_base;
        val = *vp++;
        iov->iov_base = (void*)vp;
-        iov->iov_len -= sizeof(u32);
+        iov->iov_len -= sizeof(__be32);
+        return ntohl(val);
+}
+static inline void svc_putnl(struct kvec *iov, u32 val)
+{
+        __be32 *vp = iov->iov_base + iov->iov_len;
+        *vp = htonl(val);
+        iov->iov_len += sizeof(__be32);
+}
+static inline __be32 svc_getu32(struct kvec *iov)
+{
+        __be32 val, *vp;
+        vp = iov->iov_base;
+        val = *vp++;
+        iov->iov_base = (void*)vp;
+        iov->iov_len -= sizeof(__be32);
        return val;
 }
 static inline void svc_ungetu32(struct kvec *iov)
 {
-        u32 *vp = (u32 *)iov->iov_base;
+        __be32 *vp = (__be32 *)iov->iov_base;
        iov->iov_base = (void *)(vp - 1);
        iov->iov_len += sizeof(*vp);
 }
-static inline void svc_putu32(struct kvec *iov, u32 val)
+static inline void svc_putu32(struct kvec *iov, __be32 val)
 {
-        u32 *vp = iov->iov_base + iov->iov_len;
+        __be32 *vp = iov->iov_base + iov->iov_len;
        *vp = val;
-        iov->iov_len += sizeof(u32);
+        iov->iov_len += sizeof(__be32);
 }
        
@@ -130,7 +147,7 @@ struct svc_rqst {
        short                   rq_arghi;       /* pages available in argument page list */
        short                   rq_resused;     /* pages used for result */
-        u32                     rq_xid;         /* transmission id */
+        __be32                  rq_xid;         /* transmission id */
        u32                     rq_prog;        /* program number */
        u32                     rq_vers;        /* program version */
        u32                     rq_proc;        /* procedure number */
@@ -139,7 +156,7 @@ struct svc_rqst {
                                rq_secure  : 1; /* secure port */
-        __u32                   rq_daddr;       /* dest addr of request - reply from here */
+        __be32                  rq_daddr;       /* dest addr of request - reply from here */
        void *                  rq_argp;        /* decoded arguments */
        void *                  rq_resp;        /* xdr'd results */
@@ -169,7 +186,7 @@ struct svc_rqst {
 * Check buffer bounds after decoding arguments
 */
 static inline int
-xdr_argsize_check(struct svc_rqst *rqstp, u32 *p)
+xdr_argsize_check(struct svc_rqst *rqstp, __be32 *p)
 {
        char *cp = (char *)p;
        struct kvec *vec = &rqstp->rq_arg.head[0];
@@ -178,7 +195,7 @@ xdr_argsize_check(struct svc_rqst *rqstp, u32 *p)
 }
 static inline int
-xdr_ressize_check(struct svc_rqst *rqstp, u32 *p)
+xdr_ressize_check(struct svc_rqst *rqstp, __be32 *p)
 {
        struct kvec *vec = &rqstp->rq_res.head[0];
        char *cp = (char*)p;
@@ -249,10 +266,10 @@ struct svc_deferred_req {
        u32                     prot;   /* protocol (UDP or TCP) */
        struct sockaddr_in      addr;
        struct svc_sock         *svsk;  /* where reply must go */
-        u32                     daddr;  /* where reply must come from */
+        __be32                  daddr;  /* where reply must come from */
        struct cache_deferred_req handle;
        int                     argslen;
-        u32                     args[0];
+        __be32                  args[0];
 };
 /*
@@ -284,7 +301,7 @@ struct svc_version {
         * A return value of 0 means drop the request. 
         * vs_dispatch == NULL means use default dispatcher.
         */
-        int                     (*vs_dispatch)(struct svc_rqst *, u32 *);
+        int                     (*vs_dispatch)(struct svc_rqst *, __be32 *);
 };
 /*
diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
index 2fe2087edd66..a6601650deeb 100644
--- a/include/linux/sunrpc/svcauth.h
+++ b/include/linux/sunrpc/svcauth.h
@@ -95,7 +95,7 @@ struct auth_ops {
        char *  name;
        struct module *owner;
        int     flavour;
-        int     (*accept)(struct svc_rqst *rq, u32 *authp);
+        int     (*accept)(struct svc_rqst *rq, __be32 *authp);
        int     (*release)(struct svc_rqst *rq);
        void    (*domain_release)(struct auth_domain *);
        int     (*set_client)(struct svc_rqst *rq);
@@ -112,7 +112,7 @@ struct auth_ops {
 #define SVC_COMPLETE    9
-extern int      svc_authenticate(struct svc_rqst *rqstp, u32 *authp);
+extern int      svc_authenticate(struct svc_rqst *rqstp, __be32 *authp);
 extern int      svc_authorise(struct svc_rqst *rqstp);
 extern int      svc_set_client(struct svc_rqst *rqstp);
 extern int      svc_auth_register(rpc_authflavor_t flavor, struct auth_ops *aops);
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index e6d3d349506c..953723b09bc6 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -32,7 +32,7 @@ struct xdr_netobj {
 * side) or svc_rqst pointer (server side).
 * Encode functions always assume there's enough room in the buffer.
 */
-typedef int     (*kxdrproc_t)(void *rqstp, u32 *data, void *obj);
+typedef int     (*kxdrproc_t)(void *rqstp, __be32 *data, void *obj);
 /*
 * Basic structure for transmission/reception of a client XDR message.
@@ -88,19 +88,19 @@ struct xdr_buf {
 /*
 * Miscellaneous XDR helper functions
 */
-u32 *   xdr_encode_opaque_fixed(u32 *p, const void *ptr, unsigned int len);
+__be32 *xdr_encode_opaque_fixed(__be32 *p, const void *ptr, unsigned int len);
-u32 *   xdr_encode_opaque(u32 *p, const void *ptr, unsigned int len);
+__be32 *xdr_encode_opaque(__be32 *p, const void *ptr, unsigned int len);
-u32 *   xdr_encode_string(u32 *p, const char *s);
+__be32 *xdr_encode_string(__be32 *p, const char *s);
-u32 *   xdr_decode_string_inplace(u32 *p, char **sp, int *lenp, int maxlen);
+__be32 *xdr_decode_string_inplace(__be32 *p, char **sp, int *lenp, int maxlen);
-u32 *   xdr_encode_netobj(u32 *p, const struct xdr_netobj *);
+__be32 *xdr_encode_netobj(__be32 *p, const struct xdr_netobj *);
-u32 *   xdr_decode_netobj(u32 *p, struct xdr_netobj *);
+__be32 *xdr_decode_netobj(__be32 *p, struct xdr_netobj *);
 void    xdr_encode_pages(struct xdr_buf *, struct page **, unsigned int,
                         unsigned int);
 void    xdr_inline_pages(struct xdr_buf *, unsigned int,
                         struct page **, unsigned int, unsigned int);
-static inline u32 *xdr_encode_array(u32 *p, const void *s, unsigned int len)
+static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int len)
 {
        return xdr_encode_opaque(p, s, len);
 }
@@ -108,16 +108,16 @@ static inline u32 *xdr_encode_array(u32 *p, const void *s, unsigned int len)
 /*
 * Decode 64bit quantities (NFSv3 support)
 */
-static inline u32 *
+static inline __be32 *
-xdr_encode_hyper(u32 *p, __u64 val)
+xdr_encode_hyper(__be32 *p, __u64 val)
 {
        *p++ = htonl(val >> 32);
        *p++ = htonl(val & 0xFFFFFFFF);
        return p;
 }
-static inline u32 *
+static inline __be32 *
-xdr_decode_hyper(u32 *p, __u64 *valp)
+xdr_decode_hyper(__be32 *p, __u64 *valp)
 {
        *valp  = ((__u64) ntohl(*p++)) << 32;
        *valp |= ntohl(*p++);
@@ -128,7 +128,7 @@ xdr_decode_hyper(u32 *p, __u64 *valp)
 * Adjust kvec to reflect end of xdr'ed data (RPC client XDR)
 */
 static inline int
-xdr_adjust_iovec(struct kvec *iov, u32 *p)
+xdr_adjust_iovec(struct kvec *iov, __be32 *p)
 {
        return iov->iov_len = ((u8 *) p - (u8 *) iov->iov_base);
 }
@@ -180,19 +180,19 @@ extern int xdr_encode_array2(struct xdr_buf *buf, unsigned int base,
 * Provide some simple tools for XDR buffer overflow-checking etc.
 */
 struct xdr_stream {
-        uint32_t *p;            /* start of available buffer */
+        __be32 *p;              /* start of available buffer */
        struct xdr_buf *buf;    /* XDR buffer to read/write */
-        uint32_t *end;          /* end of available buffer space */
+        __be32 *end;            /* end of available buffer space */
        struct kvec *iov;       /* pointer to the current kvec */
 };
-extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p);
+extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p);
-extern uint32_t *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);
+extern __be32 *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);
 extern void xdr_write_pages(struct xdr_stream *xdr, struct page **pages,
                unsigned int base, unsigned int len);
-extern void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p);
+extern void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p);
-extern uint32_t *xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes);
+extern __be32 *xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes);
 extern void xdr_read_pages(struct xdr_stream *xdr, unsigned int len);
 extern void xdr_enter_page(struct xdr_stream *xdr, unsigned int len);
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 3a0cca255b76..6cf626580752 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -12,6 +12,7 @@
 #include <linux/uio.h>
 #include <linux/socket.h>
 #include <linux/in.h>
+#include <linux/kref.h>
 #include <linux/sunrpc/sched.h>
 #include <linux/sunrpc/xdr.h>
@@ -51,6 +52,14 @@ struct rpc_timeout {
        unsigned char           to_exponential;
 };
+enum rpc_display_format_t {
+        RPC_DISPLAY_ADDR = 0,
+        RPC_DISPLAY_PORT,
+        RPC_DISPLAY_PROTO,
+        RPC_DISPLAY_ALL,
+        RPC_DISPLAY_MAX,
+};
 struct rpc_task;
 struct rpc_xprt;
 struct seq_file;
@@ -70,7 +79,7 @@ struct rpc_rqst {
         * This is the private part
         */
        struct rpc_task *       rq_task;        /* RPC task data */
-        __u32                   rq_xid;         /* request XID */
+        __be32                  rq_xid;         /* request XID */
        int                     rq_cong;        /* has incremented xprt->cong */
        int                     rq_received;    /* receive completed */
        u32                     rq_seqno;       /* gss seq no. used on req. */
@@ -103,8 +112,10 @@ struct rpc_rqst {
 struct rpc_xprt_ops {
        void            (*set_buffer_size)(struct rpc_xprt *xprt, size_t sndsize, size_t rcvsize);
+        char *          (*print_addr)(struct rpc_xprt *xprt, enum rpc_display_format_t format);
        int             (*reserve_xprt)(struct rpc_task *task);
        void            (*release_xprt)(struct rpc_xprt *xprt, struct rpc_task *task);
+        void            (*rpcbind)(struct rpc_task *task);
        void            (*set_port)(struct rpc_xprt *xprt, unsigned short port);
        void            (*connect)(struct rpc_task *task);
        void *          (*buf_alloc)(struct rpc_task *task, size_t size);
@@ -119,12 +130,14 @@ struct rpc_xprt_ops {
 };
 struct rpc_xprt {
+        struct kref             kref;           /* Reference count */
        struct rpc_xprt_ops *   ops;            /* transport methods */
        struct socket *         sock;           /* BSD socket layer */
        struct sock *           inet;           /* INET layer */
        struct rpc_timeout      timeout;        /* timeout parms */
-        struct sockaddr_in      addr;           /* server address */
+        struct sockaddr_storage addr;           /* server address */
+        size_t                  addrlen;        /* size of server address */
        int                     prot;           /* IP protocol */
        unsigned long           cong;           /* current congestion */
@@ -138,6 +151,7 @@ struct rpc_xprt {
        unsigned int            tsh_size;       /* size of transport specific
                                                   header */
+        struct rpc_wait_queue   binding;        /* requests waiting on rpcbind */
        struct rpc_wait_queue   sending;        /* requests waiting to send */
        struct rpc_wait_queue   resend;         /* requests waiting to resend */
        struct rpc_wait_queue   pending;        /* requests in flight */
@@ -157,9 +171,9 @@ struct rpc_xprt {
        /*
         * State of TCP reply receive stuff
         */
-        u32                     tcp_recm,       /* Fragment header */
+        __be32                  tcp_recm,       /* Fragment header */
-                                tcp_xid,        /* Current XID */
+                                tcp_xid;        /* Current XID */
-                                tcp_reclen,     /* fragment length */
+        u32                     tcp_reclen,     /* fragment length */
                                tcp_offset;     /* fragment offset */
        unsigned long           tcp_copied,     /* copied to request */
                                tcp_flags;
@@ -205,6 +219,8 @@ struct rpc_xprt {
        void                    (*old_data_ready)(struct sock *, int);
        void                    (*old_state_change)(struct sock *);
        void                    (*old_write_space)(struct sock *);
+        char *                  address_strings[RPC_DISPLAY_MAX];
 };
 #define XPRT_LAST_FRAG          (1 << 0)
@@ -217,12 +233,12 @@ struct rpc_xprt {
 /*
 * Transport operations used by ULPs
 */
-struct rpc_xprt *       xprt_create_proto(int proto, struct sockaddr_in *addr, struct rpc_timeout *to);
 void                    xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long incr);
 /*
 * Generic internal transport functions
 */
+struct rpc_xprt *       xprt_create_transport(int proto, struct sockaddr *addr, size_t size, struct rpc_timeout *toparms);
 void                    xprt_connect(struct rpc_task *task);
 void                    xprt_reserve(struct rpc_task *task);
 int                     xprt_reserve_xprt(struct rpc_task *task);
@@ -234,9 +250,10 @@ int			xprt_adjust_timeout(struct rpc_rqst *req);
 void                    xprt_release_xprt(struct rpc_xprt *xprt, struct rpc_task *task);
 void                    xprt_release_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task);
 void                    xprt_release(struct rpc_task *task);
-int                     xprt_destroy(struct rpc_xprt *xprt);
+struct rpc_xprt *       xprt_get(struct rpc_xprt *xprt);
+void                    xprt_put(struct rpc_xprt *xprt);
-static inline u32 *xprt_skip_transport_header(struct rpc_xprt *xprt, u32 *p)
+static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p)
 {
        return p + xprt->tsh_size;
 }
@@ -251,7 +268,7 @@ void			xprt_wait_for_buffer_space(struct rpc_task *task);
 void                    xprt_write_space(struct rpc_xprt *xprt);
 void                    xprt_update_rtt(struct rpc_task *task);
 void                    xprt_adjust_cwnd(struct rpc_task *task, int result);
-struct rpc_rqst *       xprt_lookup_rqst(struct rpc_xprt *xprt, u32 xid);
+struct rpc_rqst *       xprt_lookup_rqst(struct rpc_xprt *xprt, __be32 xid);
 void                    xprt_complete_rqst(struct rpc_task *task, int copied);
 void                    xprt_release_rqst_cong(struct rpc_task *task);
 void                    xprt_disconnect(struct rpc_xprt *xprt);
@@ -269,6 +286,8 @@ int			xs_setup_tcp(struct rpc_xprt *xprt, struct rpc_timeout *to);
 #define XPRT_CONNECTED          (1)
 #define XPRT_CONNECTING         (2)
 #define XPRT_CLOSE_WAIT         (3)
+#define XPRT_BOUND              (4)
+#define XPRT_BINDING            (5)
 static inline void xprt_set_connected(struct rpc_xprt *xprt)
 {
@@ -312,6 +331,33 @@ static inline int xprt_test_and_set_connecting(struct rpc_xprt *xprt)
        return test_and_set_bit(XPRT_CONNECTING, &xprt->state);
 }
+static inline void xprt_set_bound(struct rpc_xprt *xprt)
+{
+        test_and_set_bit(XPRT_BOUND, &xprt->state);
+}
+static inline int xprt_bound(struct rpc_xprt *xprt)
+{
+        return test_bit(XPRT_BOUND, &xprt->state);
+}
+static inline void xprt_clear_bound(struct rpc_xprt *xprt)
+{
+        clear_bit(XPRT_BOUND, &xprt->state);
+}
+static inline void xprt_clear_binding(struct rpc_xprt *xprt)
+{
+        smp_mb__before_clear_bit();
+        clear_bit(XPRT_BINDING, &xprt->state);
+        smp_mb__after_clear_bit();
+}
+static inline int xprt_test_and_set_binding(struct rpc_xprt *xprt)
+{
+        return test_and_set_bit(XPRT_BINDING, &xprt->state);
+}
 #endif /* __KERNEL__*/
 #endif /* _LINUX_SUNRPC_XPRT_H */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 96e31aa64cc7..b1237f16ecde 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -10,29 +10,11 @@
 #include <linux/pm.h>
 /* page backup entry */
-typedef struct pbe {
+struct pbe {
        unsigned long address;          /* address of the copy */
        unsigned long orig_address;     /* original address of page */
        struct pbe *next;
-} suspend_pagedir_t;
+};
-#define for_each_pbe(pbe, pblist) \
-        for (pbe = pblist ; pbe ; pbe = pbe->next)
-#define PBES_PER_PAGE      (PAGE_SIZE/sizeof(struct pbe))
-#define PB_PAGE_SKIP       (PBES_PER_PAGE-1)
-#define for_each_pb_page(pbe, pblist) \
-        for (pbe = pblist ; pbe ; pbe = (pbe+PB_PAGE_SKIP)->next)
-#define SWAP_FILENAME_MAXLENGTH 32
-extern dev_t swsusp_resume_device;
-   
-/* mm/vmscan.c */
-extern int shrink_mem(void);
 /* mm/page_alloc.c */
 extern void drain_local_pages(void);
@@ -53,18 +35,10 @@ static inline void pm_restore_console(void) {}
 static inline int software_suspend(void)
 {
        printk("Warning: fake suspend called\n");
-        return -EPERM;
+        return -ENOSYS;
 }
 #endif /* CONFIG_PM */
-#ifdef CONFIG_SUSPEND_SMP
-extern void disable_nonboot_cpus(void);
-extern void enable_nonboot_cpus(void);
-#else
-static inline void disable_nonboot_cpus(void) {}
-static inline void enable_nonboot_cpus(void) {}
-#endif
 void save_processor_state(void);
 void restore_processor_state(void);
 struct saved_context;
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 5e59184c9096..e7c36ba2a2db 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -10,6 +10,10 @@
 #include <asm/atomic.h>
 #include <asm/page.h>
+struct notifier_block;
+struct bio;
 #define SWAP_FLAG_PREFER        0x8000  /* set if swap priority specified */
 #define SWAP_FLAG_PRIO_MASK     0x7fff
 #define SWAP_FLAG_PRIO_SHIFT    0
@@ -156,13 +160,14 @@ struct swap_list_t {
 /* linux/mm/oom_kill.c */
 extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order);
+extern int register_oom_notifier(struct notifier_block *nb);
+extern int unregister_oom_notifier(struct notifier_block *nb);
 /* linux/mm/memory.c */
 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);
@@ -190,6 +195,7 @@ extern long vm_total_pages;
 #ifdef CONFIG_NUMA
 extern int zone_reclaim_mode;
 extern int sysctl_min_unmapped_ratio;
+extern int sysctl_min_slab_ratio;
 extern int zone_reclaim(struct zone *, gfp_t, unsigned int);
 #else
 #define zone_reclaim_mode 0
@@ -212,7 +218,9 @@ extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct file *, struct page *);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
-extern int rw_swap_page_sync(int, swp_entry_t, struct page *);
+extern int rw_swap_page_sync(int rw, swp_entry_t entry, struct page *page,
+                                struct bio **bio_chain);
+extern int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err);
 /* linux/mm/swap_state.c */
 extern struct address_space swapper_space;
diff --git a/include/linux/synclink.h b/include/linux/synclink.h
index 0577f5284cbc..c8b042667af1 100644
--- a/include/linux/synclink.h
+++ b/include/linux/synclink.h
@@ -1,7 +1,7 @@
 /*
 * SyncLink Multiprotocol Serial Adapter Driver
 *
- * $Id: synclink.h,v 3.13 2006/05/23 18:25:06 paulkf Exp $
+ * $Id: synclink.h,v 3.14 2006/07/17 20:15:43 paulkf Exp $
 *
 * Copyright (C) 1998-2000 by Microgate Corporation
 *
@@ -124,6 +124,8 @@
 #define MGSL_MODE_ASYNC         1
 #define MGSL_MODE_HDLC          2
+#define MGSL_MODE_MONOSYNC      3
+#define MGSL_MODE_BISYNC        4
 #define MGSL_MODE_RAW           6
 #define MGSL_BUS_TYPE_ISA       1
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 008f04c56737..2d1c3d5c83ac 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -53,6 +53,7 @@ struct mq_attr;
 struct compat_stat;
 struct compat_timeval;
 struct robust_list_head;
+struct getcpu_cache;
 #include <linux/types.h>
 #include <linux/aio_abi.h>
@@ -596,5 +597,6 @@ asmlinkage long sys_get_robust_list(int pid,
                                    size_t __user *len_ptr);
 asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
                                    size_t len);
+asmlinkage long sys_getcpu(unsigned __user *cpu, unsigned __user *node, struct getcpu_cache __user *cache);
 #endif
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index e4b1a4d4dcf3..1b24bd45e080 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -150,6 +150,8 @@ enum
        KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
        KERN_COMPAT_LOG=73,     /* int: print compat layer  messages */
        KERN_MAX_LOCK_DEPTH=74,
+        KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
+        KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
 };
@@ -191,6 +193,7 @@ enum
        VM_MIN_UNMAPPED=32,     /* Set min percent of unmapped pages */
        VM_PANIC_ON_OOM=33,     /* panic at out-of-memory */
        VM_VDSO_ENABLED=34,     /* map VDSO into new processes? */
+        VM_MIN_SLAB=35,          /* Percent pages ignored by zone reclaim */
 };
@@ -411,6 +414,10 @@ enum
        NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS=115,
        NET_TCP_DMA_COPYBREAK=116,
        NET_TCP_SLOW_START_AFTER_IDLE=117,
+        NET_CIPSOV4_CACHE_ENABLE=118,
+        NET_CIPSOV4_CACHE_BUCKET_SIZE=119,
+        NET_CIPSOV4_RBM_OPTFMT=120,
+        NET_CIPSOV4_RBM_STRICTVALID=121,
 };
 enum {
@@ -552,6 +559,7 @@ enum {
        NET_IPV6_ACCEPT_RA_RTR_PREF=20,
        NET_IPV6_RTR_PROBE_INTERVAL=21,
        NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
+        NET_IPV6_PROXY_NDP=23,
        __NET_IPV6_MAX
 };
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 1ea5d3cda6ae..6d5c43d31dec 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -10,6 +10,7 @@
 #ifndef _SYSFS_H_
 #define _SYSFS_H_
+#include <linux/compiler.h>
 #include <asm/atomic.h>
 struct kobject;
@@ -86,40 +87,44 @@ struct sysfs_dirent {
 #ifdef CONFIG_SYSFS
-extern int
+extern int __must_check
 sysfs_create_dir(struct kobject *);
 extern void
 sysfs_remove_dir(struct kobject *);
-extern int
+extern int __must_check
 sysfs_rename_dir(struct kobject *, const char *new_name);
-extern int
+extern int __must_check
 sysfs_create_file(struct kobject *, const struct attribute *);
-extern int
+extern int __must_check
 sysfs_update_file(struct kobject *, const struct attribute *);
-extern int
+extern int __must_check
 sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode);
 extern void
 sysfs_remove_file(struct kobject *, const struct attribute *);
-extern int
+extern int __must_check
 sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name);
 extern void
 sysfs_remove_link(struct kobject *, const char * name);
-int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr);
+int __must_check sysfs_create_bin_file(struct kobject *kobj,
-int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr);
+                                        struct bin_attribute *attr);
+void sysfs_remove_bin_file(struct kobject *kobj, struct bin_attribute *attr);
-int sysfs_create_group(struct kobject *, const struct attribute_group *);
+int __must_check 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);
+extern int __must_check sysfs_init(void);
 #else /* CONFIG_SYSFS */
 static inline int sysfs_create_dir(struct kobject * k)
@@ -191,6 +196,11 @@ static inline void sysfs_notify(struct kobject * k, char *dir, char *attr)
 {
 }
+static inline int __must_check sysfs_init(void)
+{
+        return 0;
+}
 #endif /* CONFIG_SYSFS */
 #endif /* _SYSFS_H_ */
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
index 4812ff60561c..e657e523b9bf 100644
--- a/include/linux/sysrq.h
+++ b/include/linux/sysrq.h
@@ -11,6 +11,8 @@
 *      based upon discusions in irc://irc.openprojects.net/#kernelnewbies
 */
+#ifndef _LINUX_SYSRQ_H
+#define _LINUX_SYSRQ_H
 struct pt_regs;
 struct tty_struct;
@@ -57,3 +59,5 @@ static inline int __reterr(void)
 #define unregister_sysrq_key(ig,nore) __reterr()
 #endif
+#endif /* _LINUX_SYSRQ_H */
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index f1cb6cddd19d..45248806ae9c 100644
--- a/include/linux/taskstats.h
+++ b/include/linux/taskstats.h
@@ -2,6 +2,7 @@
 *
 * Copyright (C) Shailabh Nagar, IBM Corp. 2006
 *           (C) Balbir Singh,   IBM Corp. 2006
+ *           (C) Jay Lan,        SGI, 2006
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of version 2.1 of the GNU Lesser General Public License
@@ -29,16 +30,25 @@
 *      c) add new fields after version comment; maintain 64-bit alignment
 */
-#define TASKSTATS_VERSION       1
+#define TASKSTATS_VERSION       2
+#define TS_COMM_LEN             32      /* should be >= TASK_COMM_LEN
+                                         * in linux/sched.h */
 struct taskstats {
-        /* Version 1 */
+        /* The version number of this struct. This field is always set to
+         * TAKSTATS_VERSION, which is defined in <linux/taskstats.h>.
+         * Each time the struct is changed, the value should be incremented.
+         */
        __u16   version;
-        __u16   padding[3];     /* Userspace should not interpret the padding
+        __u32   ac_exitcode;            /* Exit status */
-                                 * field which can be replaced by useful
-                                 * fields if struct taskstats is extended.
+        /* The accounting flags of a task as defined in <linux/acct.h>
-                                 */
+         * Defined values are AFORK, ASU, ACOMPAT, ACORE, and AXSIG.
+         */
+        __u8    ac_flag;                /* Record flags */
+        __u8    ac_nice;                /* task_nice */
        /* Delay accounting fields start
         *
@@ -88,6 +98,48 @@ struct taskstats {
        __u64   cpu_run_virtual_total;
        /* Delay accounting fields end */
        /* version 1 ends here */
+        /* Basic Accounting Fields start */
+        char    ac_comm[TS_COMM_LEN];   /* Command name */
+        __u8    ac_sched;               /* Scheduling discipline */
+        __u8    ac_pad[3];
+        __u32   ac_uid;                 /* User ID */
+        __u32   ac_gid;                 /* Group ID */
+        __u32   ac_pid;                 /* Process ID */
+        __u32   ac_ppid;                /* Parent process ID */
+        __u32   ac_btime;               /* Begin time [sec since 1970] */
+        __u64   ac_etime;               /* Elapsed time [usec] */
+        __u64   ac_utime;               /* User CPU time [usec] */
+        __u64   ac_stime;               /* SYstem CPU time [usec] */
+        __u64   ac_minflt;              /* Minor Page Fault Count */
+        __u64   ac_majflt;              /* Major Page Fault Count */
+        /* Basic Accounting Fields end */
+        /* Extended accounting fields start */
+        /* Accumulated RSS usage in duration of a task, in MBytes-usecs.
+         * The current rss usage is added to this counter every time
+         * a tick is charged to a task's system time. So, at the end we
+         * will have memory usage multiplied by system time. Thus an
+         * average usage per system time unit can be calculated.
+         */
+        __u64   coremem;                /* accumulated RSS usage in MB-usec */
+        /* Accumulated virtual memory usage in duration of a task.
+         * Same as acct_rss_mem1 above except that we keep track of VM usage.
+         */
+        __u64   virtmem;                /* accumulated VM  usage in MB-usec */
+        /* High watermark of RSS and virtual memory usage in duration of
+         * a task, in KBytes.
+         */
+        __u64   hiwater_rss;            /* High-watermark of RSS usage, in KB */
+        __u64   hiwater_vm;             /* High-water VM usage, in KB */
+        /* The following four fields are I/O statistics of a task. */
+        __u64   read_char;              /* bytes read */
+        __u64   write_char;             /* bytes written */
+        __u64   read_syscalls;          /* read syscalls */
+        __u64   write_syscalls;         /* write syscalls */
+        /* Extended accounting fields end */
 };
diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild
index 5251a505b2f1..78dfbac36375 100644
--- a/include/linux/tc_act/Kbuild
+++ b/include/linux/tc_act/Kbuild
@@ -1 +1,4 @@
-header-y += tc_gact.h tc_ipt.h tc_mirred.h tc_pedit.h
+header-y += tc_gact.h
+header-y += tc_ipt.h
+header-y += tc_mirred.h
+header-y += tc_pedit.h
diff --git a/include/linux/tc_ematch/Kbuild b/include/linux/tc_ematch/Kbuild
index 381e93018df6..4a58a1c32a00 100644
--- a/include/linux/tc_ematch/Kbuild
+++ b/include/linux/tc_ematch/Kbuild
@@ -1 +1,4 @@
-headers-y := tc_em_cmp.h tc_em_meta.h tc_em_nbyte.h tc_em_text.h
+header-y += tc_em_cmp.h
+header-y += tc_em_meta.h
+header-y += tc_em_nbyte.h
+header-y += tc_em_text.h
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 8ebf497907f8..0e058a2d1c6d 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -21,10 +21,10 @@
 #include <asm/byteorder.h>
 struct tcphdr {
-        __u16   source;
+        __be16  source;
-        __u16   dest;
+        __be16  dest;
-        __u32   seq;
+        __be32  seq;
-        __u32   ack_seq;
+        __be32  ack_seq;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
        __u16   res1:4,
                doff:4,
@@ -50,9 +50,9 @@ struct tcphdr {
 #else
 #error  "Adjust your <asm/byteorder.h> defines"
 #endif  
-        __u16   window;
+        __be16  window;
-        __u16   check;
+        __be16  check;
-        __u16   urg_ptr;
+        __be16  urg_ptr;
 };
 /*
@@ -62,7 +62,7 @@ struct tcphdr {
 */
 union tcp_word_hdr { 
        struct tcphdr hdr;
-        __u32             words[5];
+        __be32            words[5];
 }; 
 #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3]) 
@@ -166,6 +166,11 @@ struct tcp_info
 #include <net/inet_timewait_sock.h>
 /* This defines a selective acknowledgement block. */
+struct tcp_sack_block_wire {
+        __be32  start_seq;
+        __be32  end_seq;
+};
 struct tcp_sack_block {
        __u32   start_seq;
        __u32   end_seq;
@@ -211,7 +216,7 @@ struct tcp_sock {
 *      Header prediction flags
 *      0x5?10 << 16 + snd_wnd in net byte order
 */
-        __u32   pred_flags;
+        __be32  pred_flags;
 /*
 *      RFC793 variables by their proper names. This means you can
diff --git a/include/linux/timex.h b/include/linux/timex.h
index d543d3871e38..049dfe4a11f2 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -69,34 +69,28 @@
 * zero to MAXTC, the PLL will converge in 15 minutes to 16 hours,
 * respectively.
 */
-#define SHIFT_KG 6              /* phase factor (shift) */
+#define SHIFT_PLL       4       /* PLL frequency factor (shift) */
-#define SHIFT_KF 16             /* PLL frequency factor (shift) */
+#define SHIFT_FLL       2       /* FLL frequency factor (shift) */
-#define SHIFT_KH 2              /* FLL frequency factor (shift) */
+#define MAXTC           10      /* maximum time constant (shift) */
-#define MAXTC 6                 /* maximum time constant (shift) */
 /*
- * The SHIFT_SCALE define establishes the decimal point of the time_phase
+ * The SHIFT_UPDATE define establishes the decimal point of the
- * variable which serves as an extension to the low-order bits of the
+ * time_offset variable which represents the current offset with
- * system clock variable. The SHIFT_UPDATE define establishes the decimal
+ * respect to standard time.
- * point of the time_offset variable which represents the current offset
- * with respect to standard time. The FINENSEC define represents 1 nsec in
- * scaled units.
 *
 * SHIFT_USEC defines the scaling (shift) of the time_freq and
 * time_tolerance variables, which represent the current frequency
 * offset and maximum frequency tolerance.
- *
- * FINENSEC is 1 ns in SHIFT_UPDATE units of the time_phase variable.
 */
-#define SHIFT_SCALE 22          /* phase scale (shift) */
+#define SHIFT_UPDATE (SHIFT_HZ + 1) /* time offset scale (shift) */
-#define SHIFT_UPDATE (SHIFT_KG + MAXTC) /* time offset scale (shift) */
 #define SHIFT_USEC 16           /* frequency offset scale (shift) */
-#define FINENSEC (1L << (SHIFT_SCALE - 10)) /* ~1 ns in phase units */
+#define SHIFT_NSEC 12           /* kernel frequency offset scale */
 #define MAXPHASE 512000L        /* max phase error (us) */
 #define MAXFREQ (512L << SHIFT_USEC)  /* max frequency error (ppm) */
-#define MINSEC 16L              /* min interval between updates (s) */
+#define MAXFREQ_NSEC (512000L << SHIFT_NSEC) /* max frequency error (ppb) */
-#define MAXSEC 1200L            /* max interval between updates (s) */
+#define MINSEC 256              /* min interval between updates (s) */
+#define MAXSEC 2048             /* max interval between updates (s) */
 #define NTP_PHASE_LIMIT (MAXPHASE << 5) /* beyond max. dispersion */
 /*
@@ -204,33 +198,15 @@ extern int tickadj;			/* amount of adjustment per tick */
 /*
 * phase-lock loop variables
 */
-extern int time_state;          /* clock status */
 extern int time_status;         /* clock synchronization status bits */
-extern long time_offset;        /* time adjustment (us) */
-extern long time_constant;      /* pll time constant */
-extern long time_tolerance;     /* frequency tolerance (ppm) */
-extern long time_precision;     /* clock precision (us) */
 extern long time_maxerror;      /* maximum error */
 extern long time_esterror;      /* estimated error */
 extern long time_freq;          /* frequency offset (scaled ppm) */
-extern long time_reftime;       /* time at last adjustment (s) */
 extern long time_adjust;        /* The amount of adjtime left */
-extern long time_next_adjust;   /* Value for time_adjust at next tick */
-/**
+extern void ntp_clear(void);
- * ntp_clear - Clears the NTP state variables
- *
- * Must be called while holding a write on the xtime_lock
- */
-static inline void ntp_clear(void)
-{
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
-}
 /**
 * ntp_synced - Returns 1 if the NTP status is not UNSYNC
@@ -294,11 +270,15 @@ extern void register_time_interpolator(struct time_interpolator *);
 extern void unregister_time_interpolator(struct time_interpolator *);
 extern void time_interpolator_reset(void);
 extern unsigned long time_interpolator_get_offset(void);
+extern void time_interpolator_update(long delta_nsec);
 #else /* !CONFIG_TIME_INTERPOLATION */
-static inline void
+static inline void time_interpolator_reset(void)
-time_interpolator_reset(void)
+{
+}
+static inline void time_interpolator_update(long delta_nsec)
 {
 }
@@ -309,6 +289,8 @@ time_interpolator_reset(void)
 /* Returns how long ticks are at present, in ns / 2^(SHIFT_SCALE-10). */
 extern u64 current_tick_length(void);
+extern void second_overflow(void);
+extern void update_ntp_one_tick(void);
 extern int do_adjtimex(struct timex *);
 #endif /* KERNEL */
diff --git a/include/linux/trdevice.h b/include/linux/trdevice.h
index 99e02ef54c47..bfc84a7aecc5 100644
--- a/include/linux/trdevice.h
+++ b/include/linux/trdevice.h
@@ -28,7 +28,7 @@
 #include <linux/if_tr.h>
 #ifdef __KERNEL__
-extern unsigned short   tr_type_trans(struct sk_buff *skb, struct net_device *dev);
+extern __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev);
 extern void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
 extern struct net_device *alloc_trdev(int sizeof_priv);
diff --git a/include/linux/tsacct_kern.h b/include/linux/tsacct_kern.h
new file mode 100644
index 000000000000..7e50ac795b0b
--- /dev/null
+++ b/include/linux/tsacct_kern.h
@@ -0,0 +1,34 @@
+/*
+ * tsacct_kern.h - kernel header for system accounting over taskstats interface
+ *
+ * Copyright (C) Jay Lan        SGI
+ */
+#ifndef _LINUX_TSACCT_KERN_H
+#define _LINUX_TSACCT_KERN_H
+#include <linux/taskstats.h>
+#ifdef CONFIG_TASKSTATS
+extern void bacct_add_tsk(struct taskstats *stats, struct task_struct *tsk);
+#else
+static inline void bacct_add_tsk(struct taskstats *stats, struct task_struct *tsk)
+{}
+#endif /* CONFIG_TASKSTATS */
+#ifdef CONFIG_TASK_XACCT
+extern void xacct_add_tsk(struct taskstats *stats, struct task_struct *p);
+extern void acct_update_integrals(struct task_struct *tsk);
+extern void acct_clear_integrals(struct task_struct *tsk);
+#else
+static inline void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
+{}
+static inline void acct_update_integrals(struct task_struct *tsk)
+{}
+static inline void acct_clear_integrals(struct task_struct *tsk)
+{}
+#endif /* CONFIG_TASK_XACCT */
+#endif
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 04827ca65781..44091c0db0b4 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -174,7 +174,7 @@ struct tty_struct {
        struct tty_driver *driver;
        int index;
        struct tty_ldisc ldisc;
-        struct semaphore termios_sem;
+        struct mutex termios_mutex;
        struct termios *termios, *termios_locked;
        char name[64];
        int pgrp;
@@ -190,7 +190,6 @@ struct tty_struct {
        struct tty_struct *link;
        struct fasync_struct *fasync;
        struct tty_bufhead buf;
-        int max_flip_cnt;
        int alt_speed;          /* For magic substitution of 38400 bps */
        wait_queue_head_t write_wait;
        wait_queue_head_t read_wait;
@@ -308,6 +307,9 @@ extern void tty_ldisc_put(int);
 extern void tty_wakeup(struct tty_struct *tty);
 extern void tty_ldisc_flush(struct tty_struct *tty);
+extern int tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+                     unsigned long arg);
 extern struct mutex tty_mutex;
 /* n_tty.c */
diff --git a/include/linux/types.h b/include/linux/types.h
index 3f235660a3cd..406d4ae57631 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -33,6 +33,8 @@ typedef __kernel_clockid_t	clockid_t;
 typedef __kernel_mqd_t          mqd_t;
 #ifdef __KERNEL__
+typedef _Bool                   bool;
 typedef __kernel_uid32_t        uid_t;
 typedef __kernel_gid32_t        gid_t;
 typedef __kernel_uid16_t        uid16_t;
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index 391e7ed1eb3f..a48d7f11c7be 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -19,4 +19,26 @@ static inline unsigned long __copy_from_user_nocache(void *to,
 #endif          /* ARCH_HAS_NOCACHE_UACCESS */
+/**
+ * probe_kernel_address(): safely attempt to read from a location
+ * @addr: address to read from - its type is type typeof(retval)*
+ * @retval: read into this variable
+ *
+ * Safely read from address @addr into variable @revtal.  If a kernel fault
+ * happens, handle that and return -EFAULT.
+ * We ensure that the __get_user() is executed in atomic context so that
+ * do_page_fault() doesn't attempt to take mmap_sem.  This makes
+ * probe_kernel_address() suitable for use within regions where the caller
+ * already holds mmap_sem, or other locks which nest inside mmap_sem.
+ */
+#define probe_kernel_address(addr, retval)              \
+        ({                                              \
+                long ret;                               \
+                                                        \
+                inc_preempt_count();                    \
+                ret = __get_user(retval, addr);         \
+                dec_preempt_count();                    \
+                ret;                                    \
+        })
 #endif          /* __LINUX_UACCESS_H__ */
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 90223f057d50..014b41d1e308 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -20,10 +20,10 @@
 #include <linux/types.h>
 struct udphdr {
-        __u16   source;
+        __be16  source;
-        __u16   dest;
+        __be16  dest;
-        __u16   len;
+        __be16  len;
-        __u16   check;
+        __be16  check;
 };
 /* UDP socket options */
diff --git a/include/linux/unwind.h b/include/linux/unwind.h
index ce48e2cd37a2..73e1751d03dd 100644
--- a/include/linux/unwind.h
+++ b/include/linux/unwind.h
@@ -12,8 +12,6 @@
 * is not much point in implementing the full Dwarf2 unwind API.
 */
-#include <linux/config.h>
 struct module;
 #ifdef CONFIG_STACK_UNWIND
diff --git a/include/linux/usb.h b/include/linux/usb.h
index d2bd0c8e0154..190cc1b78fe2 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -19,6 +19,7 @@
 #include <linux/fs.h>           /* for struct file_operations */
 #include <linux/completion.h>   /* for struct completion */
 #include <linux/sched.h>        /* for current && schedule_timeout */
+#include <linux/mutex.h>        /* for struct mutex */
 struct usb_device;
 struct usb_driver;
@@ -102,8 +103,13 @@ enum usb_interface_condition {
 *      number from the USB core by calling usb_register_dev().
 * @condition: binding state of the interface: not bound, binding
 *      (in probe()), bound to a driver, or unbinding (in disconnect())
+ * @is_active: flag set when the interface is bound and not suspended.
+ * @needs_remote_wakeup: flag set when the driver requires remote-wakeup
+ *      capability during autosuspend.
 * @dev: driver model's view of this device
 * @class_dev: driver model's class view of this device.
+ * @pm_usage_cnt: PM usage counter for this interface; autosuspend is not
+ *      allowed unless the counter is 0.
 *
 * USB device drivers attach to interfaces on a physical device.  Each
 * interface encapsulates a single high level function, such as feeding
@@ -142,8 +148,12 @@ struct usb_interface {
        int minor;                      /* minor number this interface is
                                         * bound to */
        enum usb_interface_condition condition;         /* state of binding */
+        unsigned is_active:1;           /* the interface is not suspended */
+        unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */
        struct device dev;              /* interface specific device info */
        struct class_device *class_dev;
+        int pm_usage_cnt;               /* usage counter for autosuspend */
 };
 #define to_usb_interface(d) container_of(d, struct usb_interface, dev)
 #define interface_to_usbdev(intf) \
@@ -254,8 +264,6 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size,
 /* ----------------------------------------------------------------------- */
-struct usb_operations;
 /* USB device number allocation bitmap */
 struct usb_devmap {
        unsigned long devicemap[128 / (8*sizeof(unsigned long))];
@@ -268,6 +276,7 @@ struct usb_bus {
        struct device *controller;      /* host/master side hardware */
        int busnum;                     /* Bus number (in order of reg) */
        char *bus_name;                 /* stable id (PCI slot_name etc) */
+        u8 uses_dma;                    /* Does the host controller use DMA? */
        u8 otg_port;                    /* 0, or number of OTG/HNP port */
        unsigned is_b_host:1;           /* true during some HNP roleswitches */
        unsigned b_hnp_enable:1;        /* OTG: did A-Host enable HNP? */
@@ -276,10 +285,8 @@ struct usb_bus {
                                         * round-robin allocation */
        struct usb_devmap devmap;       /* device address allocation map */
-        struct usb_operations *op;      /* Operations (specific to the HC) */
        struct usb_device *root_hub;    /* Root hub */
        struct list_head bus_list;      /* list of busses */
-        void *hcpriv;                   /* Host Controller private data */
        int bandwidth_allocated;        /* on this bus: how much of the time
                                         * reserved for periodic (intr/iso)
@@ -294,8 +301,6 @@ struct usb_bus {
        struct dentry *usbfs_dentry;    /* usbfs dentry entry for the bus */
        struct class_device *class_dev; /* class device for this bus */
-        struct kref kref;               /* reference counting for this bus */
-        void (*release)(struct usb_bus *bus);
 #if defined(CONFIG_USB_MON)
        struct mon_bus *mon_bus;        /* non-null when associated */
@@ -350,6 +355,7 @@ struct usb_device {
        unsigned short bus_mA;          /* Current available from the bus */
        u8 portnum;                     /* Parent port number (origin 1) */
+        u8 level;                       /* Number of USB hub ancestors */
        int have_langid;                /* whether string_langid is valid */
        int string_langid;              /* language ID for strings */
@@ -373,6 +379,15 @@ struct usb_device {
        int maxchild;                   /* Number of ports if hub */
        struct usb_device *children[USB_MAXCHILDREN];
+        int pm_usage_cnt;               /* usage counter for autosuspend */
+#ifdef CONFIG_PM
+        struct work_struct autosuspend; /* for delayed autosuspends */
+        struct mutex pm_mutex;          /* protects PM operations */
+        unsigned auto_pm:1;             /* autosuspend/resume in progress */
+        unsigned do_remote_wakeup:1;    /* remote wakeup should be enabled */
+#endif
 };
 #define to_usb_device(d) container_of(d, struct usb_device, dev)
@@ -384,7 +399,7 @@ extern void usb_put_dev(struct usb_device *dev);
 #define usb_unlock_device(udev)         up(&(udev)->dev.sem)
 #define usb_trylock_device(udev)        down_trylock(&(udev)->dev.sem)
 extern int usb_lock_device_for_reset(struct usb_device *udev,
-                struct usb_interface *iface);
+                                     const struct usb_interface *iface);
 /* USB port reset for device reinitialization */
 extern int usb_reset_device(struct usb_device *dev);
@@ -393,6 +408,17 @@ extern int usb_reset_composite_device(struct usb_device *dev,
 extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);
+/* USB autosuspend and autoresume */
+#ifdef CONFIG_USB_SUSPEND
+extern int usb_autopm_get_interface(struct usb_interface *intf);
+extern void usb_autopm_put_interface(struct usb_interface *intf);
+#else
+#define usb_autopm_get_interface(intf)          0
+#define usb_autopm_put_interface(intf)          do {} while (0)
+#endif
 /*-------------------------------------------------------------------------*/
 /* for drivers using iso endpoints */
@@ -423,10 +449,10 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
 extern struct usb_interface *usb_find_interface(struct usb_driver *drv,
                int minor);
-extern struct usb_interface *usb_ifnum_to_if(struct usb_device *dev,
+extern struct usb_interface *usb_ifnum_to_if(const struct usb_device *dev,
                unsigned ifnum);
 extern struct usb_host_interface *usb_altnum_to_altsetting(
-                struct usb_interface *intf, unsigned int altnum);
+                const struct usb_interface *intf, unsigned int altnum);
 /**
@@ -464,6 +490,20 @@ static inline int usb_make_path (struct usb_device *dev, char *buf,
 /*-------------------------------------------------------------------------*/
+extern int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *epd);
+extern int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor *epd);
+/*-------------------------------------------------------------------------*/
 #define USB_DEVICE_ID_MATCH_DEVICE \
                (USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT)
 #define USB_DEVICE_ID_MATCH_DEV_RANGE \
@@ -540,7 +580,17 @@ struct usb_dynids {
 };
 /**
- * struct usb_driver - identifies USB driver to usbcore
+ * struct usbdrv_wrap - wrapper for driver-model structure
+ * @driver: The driver-model core driver structure.
+ * @for_devices: Non-zero for device drivers, 0 for interface drivers.
+ */
+struct usbdrv_wrap {
+        struct device_driver driver;
+        int for_devices;
+};
+/**
+ * struct usb_driver - identifies USB interface driver to usbcore
 * @name: The driver name should be unique among USB drivers,
 *      and should normally be the same as the module name.
 * @probe: Called to see if the driver is willing to manage a particular
@@ -567,12 +617,14 @@ struct usb_dynids {
 *      or your driver's probe function will never get called.
 * @dynids: used internally to hold the list of dynamically added device
 *      ids for this driver.
- * @driver: the driver model core driver structure.
+ * @drvwrap: Driver-model core structure wrapper.
 * @no_dynamic_id: if set to 1, the USB core will not allow dynamic ids to be
 *      added to this driver by preventing the sysfs file from being created.
+ * @supports_autosuspend: if set to 0, the USB core will not allow autosuspend
+ *      for interfaces bound to this driver.
 *
- * USB drivers must provide a name, probe() and disconnect() methods,
+ * USB interface drivers must provide a name, probe() and disconnect()
- * and an id_table.  Other driver fields are optional.
+ * methods, and an id_table.  Other driver fields are optional.
 *
 * The id_table is used in hotplugging.  It holds a set of descriptors,
 * and specialized data may be associated with each entry.  That table
@@ -606,10 +658,44 @@ struct usb_driver {
        const struct usb_device_id *id_table;
        struct usb_dynids dynids;
-        struct device_driver driver;
+        struct usbdrv_wrap drvwrap;
        unsigned int no_dynamic_id:1;
+        unsigned int supports_autosuspend:1;
 };
-#define to_usb_driver(d) container_of(d, struct usb_driver, driver)
+#define to_usb_driver(d) container_of(d, struct usb_driver, drvwrap.driver)
+/**
+ * struct usb_device_driver - identifies USB device driver to usbcore
+ * @name: The driver name should be unique among USB drivers,
+ *      and should normally be the same as the module name.
+ * @probe: Called to see if the driver is willing to manage a particular
+ *      device.  If it is, probe returns zero and uses dev_set_drvdata()
+ *      to associate driver-specific data with the device.  If unwilling
+ *      to manage the device, return a negative errno value.
+ * @disconnect: Called when the device is no longer accessible, usually
+ *      because it has been (or is being) disconnected or the driver's
+ *      module is being unloaded.
+ * @suspend: Called when the device is going to be suspended by the system.
+ * @resume: Called when the device is being resumed by the system.
+ * @drvwrap: Driver-model core structure wrapper.
+ * @supports_autosuspend: if set to 0, the USB core will not allow autosuspend
+ *      for devices bound to this driver.
+ *
+ * USB drivers must provide all the fields listed above except drvwrap.
+ */
+struct usb_device_driver {
+        const char *name;
+        int (*probe) (struct usb_device *udev);
+        void (*disconnect) (struct usb_device *udev);
+        int (*suspend) (struct usb_device *udev, pm_message_t message);
+        int (*resume) (struct usb_device *udev);
+        struct usbdrv_wrap drvwrap;
+        unsigned int supports_autosuspend:1;
+};
+#define to_usb_device_driver(d) container_of(d, struct usb_device_driver, \
+                drvwrap.driver)
 extern struct bus_type usb_bus_type;
@@ -633,13 +719,17 @@ struct usb_class_driver {
 * use these in module_init()/module_exit()
 * and don't forget MODULE_DEVICE_TABLE(usb, ...)
 */
-int usb_register_driver(struct usb_driver *, struct module *);
+extern int usb_register_driver(struct usb_driver *, struct module *);
 static inline int usb_register(struct usb_driver *driver)
 {
        return usb_register_driver(driver, THIS_MODULE);
 }
 extern void usb_deregister(struct usb_driver *);
+extern int usb_register_device_driver(struct usb_device_driver *,
+                        struct module *);
+extern void usb_deregister_device_driver(struct usb_device_driver *);
 extern int usb_register_dev(struct usb_interface *intf,
                            struct usb_class_driver *class_driver);
 extern void usb_deregister_dev(struct usb_interface *intf,
@@ -885,7 +975,7 @@ struct urb
 * @setup_packet: pointer to the setup_packet buffer
 * @transfer_buffer: pointer to the transfer buffer
 * @buffer_length: length of the transfer buffer
- * @complete: pointer to the usb_complete_t function
+ * @complete_fn: pointer to the usb_complete_t function
 * @context: what to set the urb context to.
 *
 * Initializes a control urb with the proper information needed to submit
@@ -897,7 +987,7 @@ static inline void usb_fill_control_urb (struct urb *urb,
                                         unsigned char *setup_packet,
                                         void *transfer_buffer,
                                         int buffer_length,
-                                         usb_complete_t complete,
+                                         usb_complete_t complete_fn,
                                         void *context)
 {
        spin_lock_init(&urb->lock);
@@ -906,7 +996,7 @@ static inline void usb_fill_control_urb (struct urb *urb,
        urb->setup_packet = setup_packet;
        urb->transfer_buffer = transfer_buffer;
        urb->transfer_buffer_length = buffer_length;
-        urb->complete = complete;
+        urb->complete = complete_fn;
        urb->context = context;
 }
@@ -917,7 +1007,7 @@ static inline void usb_fill_control_urb (struct urb *urb,
 * @pipe: the endpoint pipe
 * @transfer_buffer: pointer to the transfer buffer
 * @buffer_length: length of the transfer buffer
- * @complete: pointer to the usb_complete_t function
+ * @complete_fn: pointer to the usb_complete_t function
 * @context: what to set the urb context to.
 *
 * Initializes a bulk urb with the proper information needed to submit it
@@ -928,7 +1018,7 @@ static inline void usb_fill_bulk_urb (struct urb *urb,
                                      unsigned int pipe,
                                      void *transfer_buffer,
                                      int buffer_length,
-                                      usb_complete_t complete,
+                                      usb_complete_t complete_fn,
                                      void *context)
 {
        spin_lock_init(&urb->lock);
@@ -936,7 +1026,7 @@ static inline void usb_fill_bulk_urb (struct urb *urb,
        urb->pipe = pipe;
        urb->transfer_buffer = transfer_buffer;
        urb->transfer_buffer_length = buffer_length;
-        urb->complete = complete;
+        urb->complete = complete_fn;
        urb->context = context;
 }
@@ -947,7 +1037,7 @@ static inline void usb_fill_bulk_urb (struct urb *urb,
 * @pipe: the endpoint pipe
 * @transfer_buffer: pointer to the transfer buffer
 * @buffer_length: length of the transfer buffer
- * @complete: pointer to the usb_complete_t function
+ * @complete_fn: pointer to the usb_complete_t function
 * @context: what to set the urb context to.
 * @interval: what to set the urb interval to, encoded like
 *      the endpoint descriptor's bInterval value.
@@ -963,7 +1053,7 @@ static inline void usb_fill_int_urb (struct urb *urb,
                                     unsigned int pipe,
                                     void *transfer_buffer,
                                     int buffer_length,
-                                     usb_complete_t complete,
+                                     usb_complete_t complete_fn,
                                     void *context,
                                     int interval)
 {
@@ -972,7 +1062,7 @@ static inline void usb_fill_int_urb (struct urb *urb,
        urb->pipe = pipe;
        urb->transfer_buffer = transfer_buffer;
        urb->transfer_buffer_length = buffer_length;
-        urb->complete = complete;
+        urb->complete = complete_fn;
        urb->context = context;
        if (dev->speed == USB_SPEED_HIGH)
                urb->interval = 1 << (interval - 1);
@@ -990,7 +1080,6 @@ extern int usb_submit_urb(struct urb *urb, gfp_t mem_flags);
 extern int usb_unlink_urb(struct urb *urb);
 extern void usb_kill_urb(struct urb *urb);
-#define HAVE_USB_BUFFERS
 void *usb_buffer_alloc (struct usb_device *dev, size_t size,
        gfp_t mem_flags, dma_addr_t *dma);
 void usb_buffer_free (struct usb_device *dev, size_t size,
@@ -1003,14 +1092,14 @@ void usb_buffer_unmap (struct urb *urb);
 #endif
 struct scatterlist;
-int usb_buffer_map_sg (struct usb_device *dev, unsigned pipe,
+int usb_buffer_map_sg(const struct usb_device *dev, unsigned pipe,
-                struct scatterlist *sg, int nents);
+                      struct scatterlist *sg, int nents);
 #if 0
-void usb_buffer_dmasync_sg (struct usb_device *dev, unsigned pipe,
+void usb_buffer_dmasync_sg(const struct usb_device *dev, unsigned pipe,
-                struct scatterlist *sg, int n_hw_ents);
+                           struct scatterlist *sg, int n_hw_ents);
 #endif
-void usb_buffer_unmap_sg (struct usb_device *dev, unsigned pipe,
+void usb_buffer_unmap_sg(const struct usb_device *dev, unsigned pipe,
-                struct scatterlist *sg, int n_hw_ents);
+                         struct scatterlist *sg, int n_hw_ents);
 /*-------------------------------------------------------------------*
 *                         SYNCHRONOUS CALL SUPPORT                  *
@@ -1038,6 +1127,9 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe);
 extern int usb_reset_configuration(struct usb_device *dev);
 extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate);
+/* this request isn't really synchronous, but it belongs with the others */
+extern int usb_driver_set_configuration(struct usb_device *udev, int config);
 /*
 * timeouts, in milliseconds, used for sending/receiving control messages
 * they typically complete within a few frames (msec) after they're issued
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
new file mode 100644
index 000000000000..6bd235994dc2
--- /dev/null
+++ b/include/linux/usb/audio.h
@@ -0,0 +1,53 @@
+/*
+ * <linux/usb/audio.h> -- USB Audio definitions.
+ *
+ * Copyright (C) 2006 Thumtronics Pty Ltd.
+ * Developed for Thumtronics by Grey Innovation
+ * Ben Williamson <ben.williamson@greyinnovation.com>
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * License ("GPL") version 2, as published by the Free Software Foundation.
+ *
+ * This file holds USB constants and structures defined
+ * by the USB Device Class Definition for Audio Devices.
+ * Comments below reference relevant sections of that document:
+ *
+ * http://www.usb.org/developers/devclass_docs/audio10.pdf
+ */
+#ifndef __LINUX_USB_AUDIO_H
+#define __LINUX_USB_AUDIO_H
+#include <linux/types.h>
+/* A.2 Audio Interface Subclass Codes */
+#define USB_SUBCLASS_AUDIOCONTROL       0x01
+#define USB_SUBCLASS_AUDIOSTREAMING     0x02
+#define USB_SUBCLASS_MIDISTREAMING      0x03
+/* 4.3.2  Class-Specific AC Interface Descriptor */
+struct usb_ac_header_descriptor {
+        __u8  bLength;                  // 8+n
+        __u8  bDescriptorType;          // USB_DT_CS_INTERFACE
+        __u8  bDescriptorSubtype;       // USB_MS_HEADER
+        __le16 bcdADC;                  // 0x0100
+        __le16 wTotalLength;            // includes Unit and Terminal desc.
+        __u8  bInCollection;            // n
+        __u8  baInterfaceNr[];          // [n]
+} __attribute__ ((packed));
+#define USB_DT_AC_HEADER_SIZE(n)        (8+(n))
+/* As above, but more useful for defining your own descriptors: */
+#define DECLARE_USB_AC_HEADER_DESCRIPTOR(n)                     \
+struct usb_ac_header_descriptor_##n {                           \
+        __u8  bLength;                                          \
+        __u8  bDescriptorType;                                  \
+        __u8  bDescriptorSubtype;                               \
+        __le16 bcdADC;                                          \
+        __le16 wTotalLength;                                    \
+        __u8  bInCollection;                                    \
+        __u8  baInterfaceNr[n];                                 \
+} __attribute__ ((packed))
+#endif
diff --git a/include/linux/usb/midi.h b/include/linux/usb/midi.h
new file mode 100644
index 000000000000..11a97d5ffd34
--- /dev/null
+++ b/include/linux/usb/midi.h
@@ -0,0 +1,112 @@
+/*
+ * <linux/usb/midi.h> -- USB MIDI definitions.
+ *
+ * Copyright (C) 2006 Thumtronics Pty Ltd.
+ * Developed for Thumtronics by Grey Innovation
+ * Ben Williamson <ben.williamson@greyinnovation.com>
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * License ("GPL") version 2, as published by the Free Software Foundation.
+ *
+ * This file holds USB constants and structures defined
+ * by the USB Device Class Definition for MIDI Devices.
+ * Comments below reference relevant sections of that document:
+ *
+ * http://www.usb.org/developers/devclass_docs/midi10.pdf
+ */
+#ifndef __LINUX_USB_MIDI_H
+#define __LINUX_USB_MIDI_H
+#include <linux/types.h>
+/* A.1  MS Class-Specific Interface Descriptor Subtypes */
+#define USB_MS_HEADER           0x01
+#define USB_MS_MIDI_IN_JACK     0x02
+#define USB_MS_MIDI_OUT_JACK    0x03
+#define USB_MS_ELEMENT          0x04
+/* A.2  MS Class-Specific Endpoint Descriptor Subtypes */
+#define USB_MS_GENERAL          0x01
+/* A.3  MS MIDI IN and OUT Jack Types */
+#define USB_MS_EMBEDDED         0x01
+#define USB_MS_EXTERNAL         0x02
+/* 6.1.2.1  Class-Specific MS Interface Header Descriptor */
+struct usb_ms_header_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u8  bDescriptorSubtype;
+        __le16 bcdMSC;
+        __le16 wTotalLength;
+} __attribute__ ((packed));
+#define USB_DT_MS_HEADER_SIZE   7
+/* 6.1.2.2  MIDI IN Jack Descriptor */
+struct usb_midi_in_jack_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;          // USB_DT_CS_INTERFACE
+        __u8  bDescriptorSubtype;       // USB_MS_MIDI_IN_JACK
+        __u8  bJackType;                // USB_MS_EMBEDDED/EXTERNAL
+        __u8  bJackID;
+        __u8  iJack;
+} __attribute__ ((packed));
+#define USB_DT_MIDI_IN_SIZE     6
+struct usb_midi_source_pin {
+        __u8  baSourceID;
+        __u8  baSourcePin;
+} __attribute__ ((packed));
+/* 6.1.2.3  MIDI OUT Jack Descriptor */
+struct usb_midi_out_jack_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;          // USB_DT_CS_INTERFACE
+        __u8  bDescriptorSubtype;       // USB_MS_MIDI_OUT_JACK
+        __u8  bJackType;                // USB_MS_EMBEDDED/EXTERNAL
+        __u8  bJackID;
+        __u8  bNrInputPins;             // p
+        struct usb_midi_source_pin pins[]; // [p]
+        /*__u8  iJack;  -- ommitted due to variable-sized pins[] */
+} __attribute__ ((packed));
+#define USB_DT_MIDI_OUT_SIZE(p) (7 + 2 * (p))
+/* As above, but more useful for defining your own descriptors: */
+#define DECLARE_USB_MIDI_OUT_JACK_DESCRIPTOR(p)                 \
+struct usb_midi_out_jack_descriptor_##p {                       \
+        __u8  bLength;                                          \
+        __u8  bDescriptorType;                                  \
+        __u8  bDescriptorSubtype;                               \
+        __u8  bJackType;                                        \
+        __u8  bJackID;                                          \
+        __u8  bNrInputPins;                                     \
+        struct usb_midi_source_pin pins[p];                     \
+        __u8  iJack;                                            \
+} __attribute__ ((packed))
+/* 6.2.2  Class-Specific MS Bulk Data Endpoint Descriptor */
+struct usb_ms_endpoint_descriptor {
+        __u8  bLength;                  // 4+n
+        __u8  bDescriptorType;          // USB_DT_CS_ENDPOINT
+        __u8  bDescriptorSubtype;       // USB_MS_GENERAL
+        __u8  bNumEmbMIDIJack;          // n
+        __u8  baAssocJackID[];          // [n]
+} __attribute__ ((packed));
+#define USB_DT_MS_ENDPOINT_SIZE(n)      (4 + (n))
+/* As above, but more useful for defining your own descriptors: */
+#define DECLARE_USB_MS_ENDPOINT_DESCRIPTOR(n)                   \
+struct usb_ms_endpoint_descriptor_##n {                         \
+        __u8  bLength;                                          \
+        __u8  bDescriptorType;                                  \
+        __u8  bDescriptorSubtype;                               \
+        __u8  bNumEmbMIDIJack;                                  \
+        __u8  baAssocJackID[n];                                 \
+} __attribute__ ((packed))
+#endif
diff --git a/include/linux/usb_otg.h b/include/linux/usb/otg.h
index f827f6e203c2..9897f7a818c5 100644
--- a/include/linux/usb_otg.h
+++ b/include/linux/usb/otg.h
@@ -1,4 +1,4 @@
-// include/linux/usb_otg.h 
+// include/linux/usb/otg.h
 /*
 * These APIs may be used between USB controllers.  USB device drivers
@@ -52,7 +52,7 @@ struct otg_transceiver {
        u16                     port_change;
        /* bind/unbind the host controller */
-        int     (*set_host)(struct otg_transceiver *otg,
+        int     (*set_host)(struct otg_transceiver *otg,
                                struct usb_bus *host);
        /* bind/unbind the peripheral controller */
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h
index e7fc5fed5b98..2ae76fe52ff7 100644
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -108,6 +108,9 @@ enum { US_DO_ALL_FLAGS };
 #ifdef CONFIG_USB_STORAGE_ALAUDA
 #define US_PR_ALAUDA    0xf4            /* Alauda chipsets */
 #endif
+#ifdef CONFIG_USB_STORAGE_KARMA
+#define US_PR_KARMA     0xf5            /* Rio Karma */
+#endif
 #define US_PR_DEVICE    0xff            /* Use device's value */
diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h
index 7b7aadb69092..617d8a1c59ae 100644
--- a/include/linux/usbdevice_fs.h
+++ b/include/linux/usbdevice_fs.h
@@ -32,11 +32,10 @@
 #define _LINUX_USBDEVICE_FS_H
 #include <linux/types.h>
+#include <linux/magic.h>
 /* --------------------------------------------------------------------- */
-#define USBDEVICE_SUPER_MAGIC 0x9fa2
 /* usbdevfs ioctl codes */
 struct usbdevfs_ctrltransfer {
diff --git a/include/linux/utime.h b/include/linux/utime.h
index c6bf27b7897e..640be6a1959e 100644
--- a/include/linux/utime.h
+++ b/include/linux/utime.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_UTIME_H
 #define _LINUX_UTIME_H
+#include <linux/types.h>
 struct utimbuf {
        time_t actime;
        time_t modtime;
diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
index 46919f9f5eb3..4d0909e53595 100644
--- a/include/linux/vermagic.h
+++ b/include/linux/vermagic.h
@@ -24,5 +24,5 @@
 #define VERMAGIC_STRING                                                 \
        UTS_RELEASE " "                                                 \
        MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT                     \
-        MODULE_VERMAGIC_MODULE_UNLOAD MODULE_ARCH_VERMAGIC              \
+        MODULE_VERMAGIC_MODULE_UNLOAD MODULE_ARCH_VERMAGIC
-        "gcc-" __stringify(__GNUC__) "." __stringify(__GNUC_MINOR__)
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index e3715d774197..44c59da26ed2 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1135,7 +1135,8 @@ struct v4l2_sliced_vbi_cap
                                 (equals frame lines 313-336 for 625 line video
                                  standards, 263-286 for 525 line standards) */
        __u16   service_lines[2][24];
-        __u32   reserved[4];    /* must be 0 */
+        enum v4l2_buf_type type;
+        __u32   reserved[3];    /* must be 0 */
 };
 struct v4l2_sliced_vbi_data
@@ -1242,7 +1243,7 @@ struct v4l2_streamparm
 #define VIDIOC_G_PRIORITY       _IOR  ('V', 67, enum v4l2_priority)
 #define VIDIOC_S_PRIORITY       _IOW  ('V', 68, enum v4l2_priority)
 #if 1
-#define VIDIOC_G_SLICED_VBI_CAP _IOR  ('V', 69, struct v4l2_sliced_vbi_cap)
+#define VIDIOC_G_SLICED_VBI_CAP _IOWR ('V', 69, struct v4l2_sliced_vbi_cap)
 #endif
 #define VIDIOC_LOG_STATUS       _IO   ('V', 70)
 #define VIDIOC_G_EXT_CTRLS      _IOWR ('V', 71, struct v4l2_ext_controls)
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 71b6363caaaf..ce5f1482e6be 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -44,8 +44,6 @@ extern void *vmalloc_32_user(unsigned long size);
 extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
 extern void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask,
                                pgprot_t prot);
-extern void *__vmalloc_node(unsigned long size, gfp_t gfp_mask,
-                                pgprot_t prot, int node);
 extern void vfree(void *addr);
 extern void *vmap(struct page **pages, unsigned int count,
@@ -64,7 +62,6 @@ extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
 extern struct vm_struct *get_vm_area_node(unsigned long size,
                                        unsigned long flags, int node);
 extern struct vm_struct *remove_vm_area(void *addr);
-extern struct vm_struct *__remove_vm_area(void *addr);
 extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
                        struct page ***pages);
 extern void unmap_vm_area(struct vm_struct *area);
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 2d9b1b60798a..c89df55f6e03 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -3,7 +3,6 @@
 #include <linux/types.h>
 #include <linux/percpu.h>
-#include <linux/config.h>
 #include <linux/mmzone.h>
 #include <asm/atomic.h>
@@ -18,7 +17,19 @@
 * generated will simply be the increment of a global address.
 */
-#define FOR_ALL_ZONES(x) x##_DMA, x##_DMA32, x##_NORMAL, x##_HIGH
+#ifdef CONFIG_ZONE_DMA32
+#define DMA32_ZONE(xx) xx##_DMA32,
+#else
+#define DMA32_ZONE(xx)
+#endif
+#ifdef CONFIG_HIGHMEM
+#define HIGHMEM_ZONE(xx) , xx##_HIGH
+#else
+#define HIGHMEM_ZONE(xx)
+#endif
+#define FOR_ALL_ZONES(xx) xx##_DMA, DMA32_ZONE(xx) xx##_NORMAL HIGHMEM_ZONE(xx)
 enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
                FOR_ALL_ZONES(PGALLOC),
@@ -124,12 +135,10 @@ static inline unsigned long node_page_state(int node,
        struct zone *zones = NODE_DATA(node)->node_zones;
        return
-#ifndef CONFIG_DMA_IS_NORMAL
+#ifdef CONFIG_ZONE_DMA32
-#if !defined(CONFIG_DMA_IS_DMA32) && BITS_PER_LONG >= 64
                zone_page_state(&zones[ZONE_DMA32], item) +
 #endif
                zone_page_state(&zones[ZONE_NORMAL], item) +
-#endif
 #ifdef CONFIG_HIGHMEM
                zone_page_state(&zones[ZONE_HIGHMEM], item) +
 #endif
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index 918a29763aea..1009d3fe1fc2 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -33,7 +33,8 @@ extern int fg_console, last_console, want_console;
 int vc_allocate(unsigned int console);
 int vc_cons_allocated(unsigned int console);
 int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines);
-void vc_disallocate(unsigned int console);
+int vc_lock_resize(struct vc_data *vc, unsigned int cols, unsigned int lines);
+void vc_deallocate(unsigned int console);
 void reset_palette(struct vc_data *vc);
 void do_blank_screen(int entering_gfx);
 void do_unblank_screen(int leaving_gfx);
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index 13588564b42b..a50a0130fd9e 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -1,7 +1,7 @@
 /*
 * This file define a set of standard wireless extensions
 *
- * Version :    20      17.2.06
+ * Version :    21      14.3.06
 *
 * Authors :    Jean Tourrilhes - HPL - <jt@hpl.hp.com>
 * Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved.
@@ -69,9 +69,14 @@
 /***************************** INCLUDES *****************************/
+/* This header is used in user-space, therefore need to be sanitised
+ * for that purpose. Those includes are usually not compatible with glibc.
+ * To know which includes to use in user-space, check iwlib.h. */
+#ifdef __KERNEL__
 #include <linux/types.h>                /* for "caddr_t" et al          */
 #include <linux/socket.h>               /* for "struct sockaddr" et al  */
 #include <linux/if.h>                   /* for IFNAMSIZ and co... */
+#endif  /* __KERNEL__ */
 /***************************** VERSION *****************************/
 /*
@@ -80,7 +85,7 @@
 * (there is some stuff that will be added in the future...)
 * I just plan to increment with each new version.
 */
-#define WIRELESS_EXT    20
+#define WIRELESS_EXT    21
 /*
 * Changes :
@@ -208,6 +213,14 @@
 * V19 to V20
 * ----------
 *      - RtNetlink requests support (SET/GET)
+ *
+ * V20 to V21
+ * ----------
+ *      - Remove (struct net_device *)->get_wireless_stats()
+ *      - Change length in ESSID and NICK to strlen() instead of strlen()+1
+ *      - Add IW_RETRY_SHORT/IW_RETRY_LONG retry modifiers
+ *      - Power/Retry relative values no longer * 100000
+ *      - Add explicit flag to tell stats are in 802.11k RCPI : IW_QUAL_RCPI
 */
 /**************************** CONSTANTS ****************************/
@@ -448,6 +461,7 @@
 #define IW_QUAL_QUAL_INVALID    0x10    /* Driver doesn't provide value */
 #define IW_QUAL_LEVEL_INVALID   0x20
 #define IW_QUAL_NOISE_INVALID   0x40
+#define IW_QUAL_RCPI            0x80    /* Level + Noise are 802.11k RCPI */
 #define IW_QUAL_ALL_INVALID     0x70
 /* Frequency flags */
@@ -500,10 +514,12 @@
 #define IW_RETRY_TYPE           0xF000  /* Type of parameter */
 #define IW_RETRY_LIMIT          0x1000  /* Maximum number of retries*/
 #define IW_RETRY_LIFETIME       0x2000  /* Maximum duration of retries in us */
-#define IW_RETRY_MODIFIER       0x000F  /* Modify a parameter */
+#define IW_RETRY_MODIFIER       0x00FF  /* Modify a parameter */
 #define IW_RETRY_MIN            0x0001  /* Value is a minimum  */
 #define IW_RETRY_MAX            0x0002  /* Value is a maximum */
 #define IW_RETRY_RELATIVE       0x0004  /* Value is not in seconds/ms/us */
+#define IW_RETRY_SHORT          0x0010  /* Value is for short packets  */
+#define IW_RETRY_LONG           0x0020  /* Value is for long packets */
 /* Scanning request flags */
 #define IW_SCAN_DEFAULT         0x0000  /* Default scan of the driver */
@@ -1017,7 +1033,7 @@ struct	iw_range
        /* Note : this frequency list doesn't need to fit channel numbers,
         * because each entry contain its channel index */
-        __u32           enc_capa; /* IW_ENC_CAPA_* bit field */
+        __u32           enc_capa;       /* IW_ENC_CAPA_* bit field */
 };
 /*
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 9e38b566d0e7..4f4d98addb44 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -85,6 +85,7 @@ int wakeup_pdflush(long nr_pages);
 void laptop_io_completion(void);
 void laptop_sync_completion(void);
 void throttle_vm_writeout(void);
+void writeback_congestion_end(void);
 /* These are exported to sysctl. */
 extern int dirty_background_ratio;
@@ -110,11 +111,15 @@ balance_dirty_pages_ratelimited(struct address_space *mapping)
 }
 int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0);
+extern int generic_writepages(struct address_space *mapping,
+                              struct writeback_control *wbc);
 int do_writepages(struct address_space *mapping, struct writeback_control *wbc);
 int sync_page_range(struct inode *inode, struct address_space *mapping,
                        loff_t pos, loff_t count);
 int sync_page_range_nolock(struct inode *inode, struct address_space *mapping,
                           loff_t pos, loff_t count);
+void set_page_dirty_balance(struct page *page);
+void writeback_set_ratelimit(void);
 /* pdflush.c */
 extern int nr_pdflush_threads;  /* Global so it can be exported to sysctl
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 46a15c7a1a13..430afd058269 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -12,8 +12,8 @@
 */
 typedef union
 {
-        __u32           a4;
+        __be32          a4;
-        __u32           a6[4];
+        __be32          a6[4];
 } xfrm_address_t;
 /* Ident of a specific xfrm_state. It is used on input to lookup
@@ -23,7 +23,7 @@ typedef union
 struct xfrm_id
 {
        xfrm_address_t  daddr;
-        __u32           spi;
+        __be32          spi;
        __u8            proto;
 };
@@ -49,10 +49,10 @@ struct xfrm_selector
 {
        xfrm_address_t  daddr;
        xfrm_address_t  saddr;
-        __u16   dport;
+        __be16  dport;
-        __u16   dport_mask;
+        __be16  dport_mask;
-        __u16   sport;
+        __be16  sport;
-        __u16   sport_mask;
+        __be16  sport_mask;
        __u16   family;
        __u8    prefixlen_d;
        __u8    prefixlen_s;
@@ -104,6 +104,13 @@ struct xfrm_stats {
 enum
 {
+        XFRM_POLICY_TYPE_MAIN   = 0,
+        XFRM_POLICY_TYPE_SUB    = 1,
+        XFRM_POLICY_TYPE_MAX    = 2
+};
+enum
+{
        XFRM_POLICY_IN  = 0,
        XFRM_POLICY_OUT = 1,
        XFRM_POLICY_FWD = 2,
@@ -120,7 +127,9 @@ enum
 #define XFRM_MODE_TRANSPORT 0
 #define XFRM_MODE_TUNNEL 1
-#define XFRM_MODE_MAX 2
+#define XFRM_MODE_ROUTEOPTIMIZATION 2
+#define XFRM_MODE_IN_TRIGGER 3
+#define XFRM_MODE_MAX 4
 /* Netlink configuration messages.  */
 enum {
@@ -164,6 +173,10 @@ enum {
 #define XFRM_MSG_NEWAE XFRM_MSG_NEWAE
        XFRM_MSG_GETAE,
 #define XFRM_MSG_GETAE XFRM_MSG_GETAE
+        XFRM_MSG_REPORT,
+#define XFRM_MSG_REPORT XFRM_MSG_REPORT
        __XFRM_MSG_MAX
 };
 #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -217,6 +230,12 @@ enum xfrm_ae_ftype_t {
 #define XFRM_AE_MAX (__XFRM_AE_MAX - 1)
 };
+struct xfrm_userpolicy_type {
+        __u8            type;
+        __u16           reserved1;
+        __u8            reserved2;
+};
 /* Netlink message attributes.  */
 enum xfrm_attr_type_t {
        XFRMA_UNSPEC,
@@ -232,6 +251,10 @@ enum xfrm_attr_type_t {
        XFRMA_REPLAY_VAL,
        XFRMA_REPLAY_THRESH,
        XFRMA_ETIMER_THRESH,
+        XFRMA_SRCADDR,          /* xfrm_address_t */
+        XFRMA_COADDR,           /* xfrm_address_t */
+        XFRMA_LASTUSED,
+        XFRMA_POLICY_TYPE,      /* struct xfrm_userpolicy_type */
        __XFRMA_MAX
 #define XFRMA_MAX (__XFRMA_MAX - 1)
@@ -247,17 +270,18 @@ struct xfrm_usersa_info {
        __u32                           seq;
        __u32                           reqid;
        __u16                           family;
-        __u8                            mode; /* 0=transport,1=tunnel */
+        __u8                            mode;           /* XFRM_MODE_xxx */
        __u8                            replay_window;
        __u8                            flags;
 #define XFRM_STATE_NOECN        1
 #define XFRM_STATE_DECAP_DSCP   2
 #define XFRM_STATE_NOPMTUDISC   4
+#define XFRM_STATE_WILDRECV     8
 };
 struct xfrm_usersa_id {
        xfrm_address_t                  daddr;
-        __u32                           spi;
+        __be32                          spi;
        __u16                           family;
        __u8                            proto;
 };
@@ -319,12 +343,18 @@ struct xfrm_usersa_flush {
        __u8                            proto;
 };
+struct xfrm_user_report {
+        __u8                            proto;
+        struct xfrm_selector            sel;
+};
 #ifndef __KERNEL__
 /* backwards compatibility for userspace */
 #define XFRMGRP_ACQUIRE         1
 #define XFRMGRP_EXPIRE          2
 #define XFRMGRP_SA              4
 #define XFRMGRP_POLICY          8
+#define XFRMGRP_REPORT          0x10
 #endif
 enum xfrm_nlgroups {
@@ -340,6 +370,8 @@ enum xfrm_nlgroups {
 #define XFRMNLGRP_POLICY        XFRMNLGRP_POLICY
        XFRMNLGRP_AEVENTS,
 #define XFRMNLGRP_AEVENTS       XFRMNLGRP_AEVENTS
+        XFRMNLGRP_REPORT,
+#define XFRMNLGRP_REPORT        XFRMNLGRP_REPORT
        __XFRMNLGRP_MAX
 };
 #define XFRMNLGRP_MAX   (__XFRMNLGRP_MAX - 1)
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 7bab09b0ed45..8f58406533c6 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -90,6 +90,8 @@ extern IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_pinnacle_color[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_npgtech[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_norwood[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_proteus_2309[IR_KEYTAB_SIZE];
 #endif
diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
index 3c43b95f4c0d..37dad07a8439 100644
--- a/include/media/tuner-types.h
+++ b/include/media/tuner-types.h
@@ -72,6 +72,9 @@ struct tuner_params {
        unsigned int port2_invert_for_secam_lc:1;
        /* Some cards require PORT1 to be 1 for mono Radio FM and 0 for stereo. */
        unsigned int port1_set_for_fm_mono:1;
+        /* Select 18% (or according to datasheet 0%) L standard PLL gating,
+           vs the driver default of 36%. */
+        unsigned int default_pll_gating_18:1;
        /* Default tda9887 TOP value in dB for the low band. Default is 0.
           Range: -16:+15 */
        signed int default_top_low:5;
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 2f7b00b08e88..3116e750132f 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -144,6 +144,7 @@ extern int tuner_debug;
 #define TDA9887_DEEMPHASIS_50           (2<<16)
 #define TDA9887_DEEMPHASIS_75           (3<<16)
 #define TDA9887_AUTOMUTE                (1<<18)
+#define TDA9887_GATING_18               (1<<19)
 #ifdef __KERNEL__
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 5564db13c0d5..aecc946980a3 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -121,10 +121,17 @@ enum v4l2_chip_ident {
        /* general idents: reserved range 0-49 */
        V4L2_IDENT_UNKNOWN = 0,
-        /* module saa7115: reserved range 100-149 */
+        /* module saa7110: just ident= 100 */
+        V4L2_IDENT_SAA7110 = 100,
+        /* module saa7111: just ident= 101 */
+        V4L2_IDENT_SAA7111 = 101,
+        /* module saa7115: reserved range 102-149 */
        V4L2_IDENT_SAA7113 = 103,
        V4L2_IDENT_SAA7114 = 104,
        V4L2_IDENT_SAA7115 = 105,
+        V4L2_IDENT_SAA7118 = 108,
        /* module saa7127: reserved range 150-199 */
        V4L2_IDENT_SAA7127 = 157,
@@ -166,11 +173,12 @@ enum v4l2_chip_ident {
 #define VIDIOC_INT_S_STANDBY         _IOW('d', 94, u32)
 /* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */
-#define VIDIOC_INT_S_REGISTER           _IOR ('d', 100, struct v4l2_register)
+#define VIDIOC_INT_S_REGISTER           _IOW ('d', 100, struct v4l2_register)
 #define VIDIOC_INT_G_REGISTER           _IOWR('d', 101, struct v4l2_register)
-/* Reset the I2C chip */
+/* Generic reset command. The argument selects which subsystems to reset.
-#define VIDIOC_INT_RESET                _IO  ('d', 102)
+   Passing 0 will always reset the whole chip. */
+#define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
 /* Set the frequency (in Hz) of the audio clock output.
   Used to slave an audio processor to the video decoder, ensuring that audio
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 810462f8a374..6a11d772700f 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -9,7 +9,8 @@
 #ifndef _V4L2_DEV_H
 #define _V4L2_DEV_H
-#define OBSOLETE_OWNER 1 /* to be removed soon */
+#define OBSOLETE_OWNER   1 /* to be removed soon */
+#define OBSOLETE_DEVDATA 1 /* to be removed soon */
 #include <linux/poll.h>
 #include <linux/fs.h>
@@ -338,10 +339,8 @@ extern int video_usercopy(struct inode *inode, struct file *file,
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 #include <linux/mm.h>
-extern struct video_device* video_devdata(struct file*);
 #define to_video_device(cd) container_of(cd, struct video_device, class_dev)
-static inline int
+static inline int __must_check
 video_device_create_file(struct video_device *vfd,
                         struct class_device_attribute *attr)
 {
@@ -370,9 +369,14 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
 {
        dev->priv = data;
 }
 #endif
+#ifdef OBSOLETE_DEVDATA /* to be removed soon */
+/* Obsolete stuff - Still needed for radio devices and obsolete drivers */
+extern struct video_device* video_devdata(struct file*);
 extern int video_exclusive_open(struct inode *inode, struct file *file);
 extern int video_exclusive_release(struct inode *inode, struct file *file);
+#endif
 #endif /* _V4L2_DEV_H */
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
index f2f210fc1ef2..e0fe92b03a4e 100644
--- a/include/mtd/Kbuild
+++ b/include/mtd/Kbuild
@@ -1 +1,5 @@
-header-y := inftl-user.h jffs2-user.h mtd-abi.h mtd-user.h nftl-user.h
+header-y += inftl-user.h
+header-y += jffs2-user.h
+header-y += mtd-abi.h
+header-y += mtd-user.h
+header-y += nftl-user.h
diff --git a/include/net/act_api.h b/include/net/act_api.h
index 11e9eaf79f5a..8b06c2f3657f 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -8,70 +8,110 @@
 #include <net/sch_generic.h>
 #include <net/pkt_sched.h>
-#define tca_gen(name) \
+struct tcf_common {
-struct tcf_##name *next; \
+        struct tcf_common               *tcfc_next;
-        u32 index; \
+        u32                             tcfc_index;
-        int refcnt; \
+        int                             tcfc_refcnt;
-        int bindcnt; \
+        int                             tcfc_bindcnt;
-        u32 capab; \
+        u32                             tcfc_capab;
-        int action; \
+        int                             tcfc_action;
-        struct tcf_t tm; \
+        struct tcf_t                    tcfc_tm;
-        struct gnet_stats_basic bstats; \
+        struct gnet_stats_basic         tcfc_bstats;
-        struct gnet_stats_queue qstats; \
+        struct gnet_stats_queue         tcfc_qstats;
-        struct gnet_stats_rate_est rate_est; \
+        struct gnet_stats_rate_est      tcfc_rate_est;
-        spinlock_t *stats_lock; \
+        spinlock_t                      *tcfc_stats_lock;
-        spinlock_t lock
+        spinlock_t                      tcfc_lock;
+};
-struct tcf_police
+#define tcf_next        common.tcfc_next
-{
+#define tcf_index       common.tcfc_index
-        tca_gen(police);
+#define tcf_refcnt      common.tcfc_refcnt
-        int             result;
+#define tcf_bindcnt     common.tcfc_bindcnt
-        u32             ewma_rate;
+#define tcf_capab       common.tcfc_capab
-        u32             burst;
+#define tcf_action      common.tcfc_action
-        u32             mtu;
+#define tcf_tm          common.tcfc_tm
-        u32             toks;
+#define tcf_bstats      common.tcfc_bstats
-        u32             ptoks;
+#define tcf_qstats      common.tcfc_qstats
-        psched_time_t   t_c;
+#define tcf_rate_est    common.tcfc_rate_est
-        struct qdisc_rate_table *R_tab;
+#define tcf_stats_lock  common.tcfc_stats_lock
-        struct qdisc_rate_table *P_tab;
+#define tcf_lock        common.tcfc_lock
+struct tcf_police {
+        struct tcf_common       common;
+        int                     tcfp_result;
+        u32                     tcfp_ewma_rate;
+        u32                     tcfp_burst;
+        u32                     tcfp_mtu;
+        u32                     tcfp_toks;
+        u32                     tcfp_ptoks;
+        psched_time_t           tcfp_t_c;
+        struct qdisc_rate_table *tcfp_R_tab;
+        struct qdisc_rate_table *tcfp_P_tab;
 };
+#define to_police(pc)   \
+        container_of(pc, struct tcf_police, common)
+struct tcf_hashinfo {
+        struct tcf_common       **htab;
+        unsigned int            hmask;
+        rwlock_t                *lock;
+};
+static inline unsigned int tcf_hash(u32 index, unsigned int hmask)
+{
+        return index & hmask;
+}
 #ifdef CONFIG_NET_CLS_ACT
 #define ACT_P_CREATED 1
 #define ACT_P_DELETED 1
-struct tcf_act_hdr
+struct tcf_act_hdr {
-{
+        struct tcf_common       common;
-        tca_gen(act_hdr);
 };
-struct tc_action
+struct tc_action {
-{
+        void                    *priv;
-        void *priv;
+        struct tc_action_ops    *ops;
-        struct tc_action_ops *ops;
+        __u32                   type; /* for backward compat(TCA_OLD_COMPAT) */
-        __u32   type;   /* for backward compat(TCA_OLD_COMPAT) */
+        __u32                   order;
-        __u32   order; 
+        struct tc_action        *next;
-        struct tc_action *next;
 };
 #define TCA_CAP_NONE 0
-struct tc_action_ops
+struct tc_action_ops {
-{
        struct tc_action_ops *next;
+        struct tcf_hashinfo *hinfo;
        char    kind[IFNAMSIZ];
        __u32   type; /* TBD to match kind */
        __u32   capab;  /* capabilities includes 4 bit version */
        struct module           *owner;
        int     (*act)(struct sk_buff *, struct tc_action *, struct tcf_result *);
        int     (*get_stats)(struct sk_buff *, struct tc_action *);
-        int     (*dump)(struct sk_buff *, struct tc_action *,int , int);
+        int     (*dump)(struct sk_buff *, struct tc_action *, int, int);
        int     (*cleanup)(struct tc_action *, int bind);
-        int     (*lookup)(struct tc_action *, u32 );
+        int     (*lookup)(struct tc_action *, u32);
-        int     (*init)(struct rtattr *,struct rtattr *,struct tc_action *, int , int );
+        int     (*init)(struct rtattr *, struct rtattr *, struct tc_action *, int , int);
-        int     (*walk)(struct sk_buff *, struct netlink_callback *, int , struct tc_action *);
+        int     (*walk)(struct sk_buff *, struct netlink_callback *, int, struct tc_action *);
 };
+extern struct tcf_common *tcf_hash_lookup(u32 index,
+                                          struct tcf_hashinfo *hinfo);
+extern void tcf_hash_destroy(struct tcf_common *p, struct tcf_hashinfo *hinfo);
+extern int tcf_hash_release(struct tcf_common *p, int bind,
+                            struct tcf_hashinfo *hinfo);
+extern int tcf_generic_walker(struct sk_buff *skb, struct netlink_callback *cb,
+                              int type, struct tc_action *a);
+extern u32 tcf_hash_new_index(u32 *idx_gen, struct tcf_hashinfo *hinfo);
+extern int tcf_hash_search(struct tc_action *a, u32 index);
+extern struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a,
+                                         int bind, struct tcf_hashinfo *hinfo);
+extern struct tcf_common *tcf_hash_create(u32 index, struct rtattr *est,
+                                          struct tc_action *a, int size,
+                                          int bind, u32 *idx_gen,
+                                          struct tcf_hashinfo *hinfo);
+extern void tcf_hash_insert(struct tcf_common *p, struct tcf_hashinfo *hinfo);
 extern int tcf_register_action(struct tc_action_ops *a);
 extern int tcf_unregister_action(struct tc_action_ops *a);
 extern void tcf_action_destroy(struct tc_action *a, int bind);
@@ -96,17 +136,17 @@ tcf_police_release(struct tcf_police *p, int bind)
        int ret = 0;
 #ifdef CONFIG_NET_CLS_ACT
        if (p) {
-                if (bind) {
+                if (bind)
-                         p->bindcnt--;
+                        p->tcf_bindcnt--;
-                }
-                p->refcnt--;
+                p->tcf_refcnt--;
-                if (p->refcnt <= 0 && !p->bindcnt) {
+                if (p->tcf_refcnt <= 0 && !p->tcf_bindcnt) {
                        tcf_police_destroy(p);
                        ret = 1;
                }
        }
 #else
-        if (p && --p->refcnt == 0)
+        if (p && --p->tcf_refcnt == 0)
                tcf_police_destroy(p);
 #endif /* CONFIG_NET_CLS_ACT */
diff --git a/include/net/act_generic.h b/include/net/act_generic.h
deleted file mode 100644
index c9daa7e52300..000000000000
--- a/include/net/act_generic.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * include/net/act_generic.h
- *
-*/
-#ifndef _NET_ACT_GENERIC_H
-#define _NET_ACT_GENERIC_H
-static inline int tcf_defact_release(struct tcf_defact *p, int bind)
-{
-        int ret = 0;
-        if (p) {
-                if (bind) {
-                        p->bindcnt--;
-                }
-                p->refcnt--;
-                if (p->bindcnt <= 0 && p->refcnt <= 0) {
-                        kfree(p->defdata);
-                        tcf_hash_destroy(p);
-                        ret = 1;
-                }
-        }
-        return ret;
-}
-static inline int
-alloc_defdata(struct tcf_defact *p, u32 datalen, void *defdata)
-{
-        p->defdata = kmalloc(datalen, GFP_KERNEL);
-        if (p->defdata == NULL)
-                return -ENOMEM;
-        p->datalen = datalen;
-        memcpy(p->defdata, defdata, datalen);
-        return 0;
-}
-static inline int
-realloc_defdata(struct tcf_defact *p, u32 datalen, void *defdata)
-{
-        /* safer to be just brute force for now */
-        kfree(p->defdata);
-        return alloc_defdata(p, datalen, defdata);
-}
-static inline int
-tcf_defact_init(struct rtattr *rta, struct rtattr *est,
-                struct tc_action *a, int ovr, int bind)
-{
-        struct rtattr *tb[TCA_DEF_MAX];
-        struct tc_defact *parm;
-        struct tcf_defact *p;
-        void *defdata;
-        u32 datalen = 0;
-        int ret = 0;
-        if (rta == NULL || rtattr_parse_nested(tb, TCA_DEF_MAX, rta) < 0)
-                return -EINVAL;
-        if (tb[TCA_DEF_PARMS - 1] == NULL || 
-            RTA_PAYLOAD(tb[TCA_DEF_PARMS - 1]) < sizeof(*parm))
-                return -EINVAL;
-        parm = RTA_DATA(tb[TCA_DEF_PARMS - 1]);
-        defdata = RTA_DATA(tb[TCA_DEF_DATA - 1]);
-        if (defdata == NULL)
-                return -EINVAL;
-        datalen = RTA_PAYLOAD(tb[TCA_DEF_DATA - 1]);
-        if (datalen <= 0)
-                return -EINVAL;
-        p = tcf_hash_check(parm->index, a, ovr, bind);
-        if (p == NULL) {
-                p = tcf_hash_create(parm->index, est, a, sizeof(*p), ovr, bind);
-                if (p == NULL)
-                        return -ENOMEM;
-                ret = alloc_defdata(p, datalen, defdata);
-                if (ret < 0) {
-                        kfree(p);
-                        return ret;
-                }
-                ret = ACT_P_CREATED;
-        } else {
-                if (!ovr) {
-                        tcf_defact_release(p, bind);
-                        return -EEXIST;
-                }
-                realloc_defdata(p, datalen, defdata);
-        }
-        spin_lock_bh(&p->lock);
-        p->action = parm->action;
-        spin_unlock_bh(&p->lock);
-        if (ret == ACT_P_CREATED)
-                tcf_hash_insert(p);
-        return ret;
-}
-static inline int tcf_defact_cleanup(struct tc_action *a, int bind)
-{
-        struct tcf_defact *p = PRIV(a, defact);
-        if (p != NULL)
-                return tcf_defact_release(p, bind);
-        return 0;
-}
-static inline int
-tcf_defact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int ref)
-{
-        unsigned char *b = skb->tail;
-        struct tc_defact opt;
-        struct tcf_defact *p = PRIV(a, defact);
-        struct tcf_t t;
-        opt.index = p->index;
-        opt.refcnt = p->refcnt - ref;
-        opt.bindcnt = p->bindcnt - bind;
-        opt.action = p->action;
-        RTA_PUT(skb, TCA_DEF_PARMS, sizeof(opt), &opt);
-        RTA_PUT(skb, TCA_DEF_DATA, p->datalen, p->defdata);
-        t.install = jiffies_to_clock_t(jiffies - p->tm.install);
-        t.lastuse = jiffies_to_clock_t(jiffies - p->tm.lastuse);
-        t.expires = jiffies_to_clock_t(p->tm.expires);
-        RTA_PUT(skb, TCA_DEF_TM, sizeof(t), &t);
-        return skb->len;
-rtattr_failure:
-        skb_trim(skb, b - skb->data);
-        return -1;
-}
-#define tca_use_default_ops \
-        .dump           =       tcf_defact_dump, \
-        .cleanup        =       tcf_defact_cleanup, \
-        .init           =       tcf_defact_init, \
-        .walk           =       tcf_generic_walker, \
-#define tca_use_default_defines(name) \
-        static u32 idx_gen; \
-        static struct tcf_defact *tcf_##name_ht[MY_TAB_SIZE]; \
-        static DEFINE_RWLOCK(##name_lock);
-#endif /* _NET_ACT_GENERIC_H */
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 3d71251b3eca..44f1b673f916 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -61,6 +61,9 @@ extern int			addrconf_set_dstaddr(void __user *arg);
 extern int                      ipv6_chk_addr(struct in6_addr *addr,
                                              struct net_device *dev,
                                              int strict);
+#ifdef CONFIG_IPV6_MIP6
+extern int                      ipv6_chk_home_addr(struct in6_addr *addr);
+#endif
 extern struct inet6_ifaddr *    ipv6_get_ifaddr(struct in6_addr *addr,
                                                struct net_device *dev,
                                                int strict);
@@ -126,20 +129,18 @@ extern int unregister_inet6addr_notifier(struct notifier_block *nb);
 static inline struct inet6_dev *
 __in6_dev_get(struct net_device *dev)
 {
-        return (struct inet6_dev *)dev->ip6_ptr;
+        return rcu_dereference(dev->ip6_ptr);
 }
-extern rwlock_t addrconf_lock;
 static inline struct inet6_dev *
 in6_dev_get(struct net_device *dev)
 {
        struct inet6_dev *idev = NULL;
-        read_lock(&addrconf_lock);
+        rcu_read_lock();
-        idev = dev->ip6_ptr;
+        idev = __in6_dev_get(dev);
        if (idev)
                atomic_inc(&idev->refcnt);
-        read_unlock(&addrconf_lock);
+        rcu_read_unlock();
        return idev;
 }
diff --git a/include/net/ah.h b/include/net/ah.h
index ceff00afae09..8f257c159902 100644
--- a/include/net/ah.h
+++ b/include/net/ah.h
@@ -1,6 +1,7 @@
 #ifndef _NET_AH_H
 #define _NET_AH_H
+#include <linux/crypto.h>
 #include <net/xfrm.h>
 /* This is the maximum truncated ICV length that we know of. */
@@ -14,22 +15,29 @@ struct ah_data
        int                     icv_full_len;
        int                     icv_trunc_len;
-        void                    (*icv)(struct ah_data*,
+        struct crypto_hash      *tfm;
-                                       struct sk_buff *skb, u8 *icv);
-        struct crypto_tfm       *tfm;
 };
-static inline void
+static inline int ah_mac_digest(struct ah_data *ahp, struct sk_buff *skb,
-ah_hmac_digest(struct ah_data *ahp, struct sk_buff *skb, u8 *auth_data)
+                                u8 *auth_data)
 {
-        struct crypto_tfm *tfm = ahp->tfm;
+        struct hash_desc desc;
+        int err;
+        desc.tfm = ahp->tfm;
+        desc.flags = 0;
        memset(auth_data, 0, ahp->icv_trunc_len);
-        crypto_hmac_init(tfm, ahp->key, &ahp->key_len);
+        err = crypto_hash_init(&desc);
-        skb_icv_walk(skb, tfm, 0, skb->len, crypto_hmac_update);
+        if (unlikely(err))
-        crypto_hmac_final(tfm, ahp->key, &ahp->key_len, ahp->work_icv);
+                goto out;
-        memcpy(auth_data, ahp->work_icv, ahp->icv_trunc_len);
+        err = skb_icv_walk(skb, &desc, 0, skb->len, crypto_hash_update);
+        if (unlikely(err))
+                goto out;
+        err = crypto_hash_final(&desc, ahp->work_icv);
+out:
+        return err;
 }
 #endif
diff --git a/include/net/arp.h b/include/net/arp.h
index 643bded9f557..6a3d9a7d302b 100644
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -12,15 +12,15 @@ extern struct neigh_table arp_tbl;
 extern void     arp_init(void);
 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, 
+extern void     arp_send(int type, int ptype, __be32 dest_ip,
-                         struct net_device *dev, u32 src_ip, 
+                         struct net_device *dev, __be32 src_ip,
                         unsigned char *dest_hw, unsigned char *src_hw, unsigned char *th);
 extern int      arp_bind_neighbour(struct dst_entry *dst);
 extern int      arp_mc_map(u32 addr, u8 *haddr, struct net_device *dev, int dir);
 extern void     arp_ifdown(struct net_device *dev);
-extern struct sk_buff *arp_create(int type, int ptype, u32 dest_ip,
+extern struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
-                                  struct net_device *dev, u32 src_ip,
+                                  struct net_device *dev, __be32 src_ip,
                                  unsigned char *dest_hw, unsigned char *src_hw,
                                  unsigned char *target_hw);
 extern void arp_xmit(struct sk_buff *skb);
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b2bdb1aa0429..10a3eec191fd 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -44,12 +44,13 @@
 #define HCI_NOTIFY_VOICE_SETTING        3
 /* HCI device types */
-#define HCI_VHCI        0
+#define HCI_VIRTUAL     0
 #define HCI_USB         1
 #define HCI_PCCARD      2
 #define HCI_UART        3
 #define HCI_RS232       4
 #define HCI_PCI         5
+#define HCI_SDIO        6
 /* HCI device quirks */
 enum {
@@ -296,6 +297,7 @@ struct hci_cp_host_buffer_size {
 /* Link Control */
 #define OGF_LINK_CTL    0x01 
 #define OCF_CREATE_CONN         0x0005
 struct hci_cp_create_conn {
        bdaddr_t bdaddr;
@@ -306,6 +308,11 @@ struct hci_cp_create_conn {
        __u8     role_switch;
 } __attribute__ ((packed));
+#define OCF_CREATE_CONN_CANCEL  0x0008
+struct hci_cp_create_conn_cancel {
+        bdaddr_t bdaddr;
+} __attribute__ ((packed));
 #define OCF_ACCEPT_CONN_REQ     0x0009
 struct hci_cp_accept_conn_req {
        bdaddr_t bdaddr;
@@ -339,6 +346,8 @@ struct hci_cp_inquiry {
 #define OCF_INQUIRY_CANCEL      0x0002
+#define OCF_EXIT_PERIODIC_INQ   0x0004
 #define OCF_LINK_KEY_REPLY      0x000B
 struct hci_cp_link_key_reply {
        bdaddr_t bdaddr;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index d84855fe7336..df22efcfcc0b 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -72,6 +72,9 @@ struct hci_dev {
        __u8            type;
        bdaddr_t        bdaddr;
        __u8            features[8];
+        __u8            hci_ver;
+        __u16           hci_rev;
+        __u16           manufacturer;
        __u16           voice_setting;
        __u16           pkt_type;
@@ -165,6 +168,10 @@ struct hci_conn {
        struct timer_list disc_timer;
        struct timer_list idle_timer;
+        struct work_struct work;
+        struct device   dev;
        struct hci_dev  *hdev;
        void            *l2cap_data;
        void            *sco_data;
@@ -309,10 +316,13 @@ static inline void hci_conn_put(struct hci_conn *conn)
        if (atomic_dec_and_test(&conn->refcnt)) {
                unsigned long timeo;
                if (conn->type == ACL_LINK) {
-                        timeo = msecs_to_jiffies(HCI_DISCONN_TIMEOUT);
-                        if (!conn->out)
-                                timeo *= 2;
                        del_timer(&conn->idle_timer);
+                        if (conn->state == BT_CONNECTED) {
+                                timeo = msecs_to_jiffies(HCI_DISCONN_TIMEOUT);
+                                if (!conn->out)
+                                        timeo *= 2;
+                        } else
+                                timeo = msecs_to_jiffies(10);
                } else
                        timeo = msecs_to_jiffies(10);
                mod_timer(&conn->disc_timer, jiffies + timeo);
@@ -412,6 +422,8 @@ static inline int hci_recv_frame(struct sk_buff *skb)
 int hci_register_sysfs(struct hci_dev *hdev);
 void hci_unregister_sysfs(struct hci_dev *hdev);
+void hci_conn_add_sysfs(struct hci_conn *conn);
+void hci_conn_del_sysfs(struct hci_conn *conn);
 #define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->parent = (pdev))
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
new file mode 100644
index 000000000000..718b4d9c891f
--- /dev/null
+++ b/include/net/cipso_ipv4.h
@@ -0,0 +1,254 @@
+/*
+ * CIPSO - Commercial IP Security Option
+ *
+ * This is an implementation of the CIPSO 2.2 protocol as specified in
+ * draft-ietf-cipso-ipsecurity-01.txt with additional tag types as found in
+ * FIPS-188, copies of both documents can be found in the Documentation
+ * directory.  While CIPSO never became a full IETF RFC standard many vendors
+ * have chosen to adopt the protocol and over the years it has become a
+ * de-facto standard for labeled networking.
+ *
+ * Author: Paul Moore <paul.moore@hp.com>
+ *
+ */
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * 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
+ *
+ */
+#ifndef _CIPSO_IPV4_H
+#define _CIPSO_IPV4_H
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <net/netlabel.h>
+/* known doi values */
+#define CIPSO_V4_DOI_UNKNOWN          0x00000000
+/* tag types */
+#define CIPSO_V4_TAG_INVALID          0
+#define CIPSO_V4_TAG_RBITMAP          1
+#define CIPSO_V4_TAG_ENUM             2
+#define CIPSO_V4_TAG_RANGE            5
+#define CIPSO_V4_TAG_PBITMAP          6
+#define CIPSO_V4_TAG_FREEFORM         7
+/* doi mapping types */
+#define CIPSO_V4_MAP_UNKNOWN          0
+#define CIPSO_V4_MAP_STD              1
+#define CIPSO_V4_MAP_PASS             2
+/* limits */
+#define CIPSO_V4_MAX_REM_LVLS         256
+#define CIPSO_V4_INV_LVL              0x80000000
+#define CIPSO_V4_MAX_LOC_LVLS         (CIPSO_V4_INV_LVL - 1)
+#define CIPSO_V4_MAX_REM_CATS         65536
+#define CIPSO_V4_INV_CAT              0x80000000
+#define CIPSO_V4_MAX_LOC_CATS         (CIPSO_V4_INV_CAT - 1)
+/*
+ * CIPSO DOI definitions
+ */
+/* DOI definition struct */
+#define CIPSO_V4_TAG_MAXCNT           5
+struct cipso_v4_doi {
+        u32 doi;
+        u32 type;
+        union {
+                struct cipso_v4_std_map_tbl *std;
+        } map;
+        u8 tags[CIPSO_V4_TAG_MAXCNT];
+        u32 valid;
+        struct list_head list;
+        struct rcu_head rcu;
+        struct list_head dom_list;
+};
+/* Standard CIPSO mapping table */
+/* NOTE: the highest order bit (i.e. 0x80000000) is an 'invalid' flag, if the
+ *       bit is set then consider that value as unspecified, meaning the
+ *       mapping for that particular level/category is invalid */
+struct cipso_v4_std_map_tbl {
+        struct {
+                u32 *cipso;
+                u32 *local;
+                u32 cipso_size;
+                u32 local_size;
+        } lvl;
+        struct {
+                u32 *cipso;
+                u32 *local;
+                u32 cipso_size;
+                u32 local_size;
+        } cat;
+};
+/*
+ * Sysctl Variables
+ */
+#ifdef CONFIG_NETLABEL
+extern int cipso_v4_cache_enabled;
+extern int cipso_v4_cache_bucketsize;
+extern int cipso_v4_rbm_optfmt;
+extern int cipso_v4_rbm_strictvalid;
+#endif
+/*
+ * Helper Functions
+ */
+#define CIPSO_V4_OPTEXIST(x) (IPCB(x)->opt.cipso != 0)
+#define CIPSO_V4_OPTPTR(x) ((x)->nh.raw + IPCB(x)->opt.cipso)
+/*
+ * DOI List Functions
+ */
+#ifdef CONFIG_NETLABEL
+int cipso_v4_doi_add(struct cipso_v4_doi *doi_def);
+int cipso_v4_doi_remove(u32 doi,
+                        struct netlbl_audit *audit_info,
+                        void (*callback) (struct rcu_head * head));
+struct cipso_v4_doi *cipso_v4_doi_getdef(u32 doi);
+int cipso_v4_doi_walk(u32 *skip_cnt,
+                     int (*callback) (struct cipso_v4_doi *doi_def, void *arg),
+                     void *cb_arg);
+int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def, const char *domain);
+int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
+                               const char *domain);
+#else
+static inline int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
+{
+        return -ENOSYS;
+}
+static inline int cipso_v4_doi_remove(u32 doi,
+                                    struct netlbl_audit *audit_info,
+                                    void (*callback) (struct rcu_head * head))
+{
+        return 0;
+}
+static inline struct cipso_v4_doi *cipso_v4_doi_getdef(u32 doi)
+{
+        return NULL;
+}
+static inline int cipso_v4_doi_walk(u32 *skip_cnt,
+                     int (*callback) (struct cipso_v4_doi *doi_def, void *arg),
+                     void *cb_arg)
+{
+        return 0;
+}
+static inline int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def,
+                                          const char *domain)
+{
+        return -ENOSYS;
+}
+static inline int cipso_v4_doi_domhsh_remove(struct cipso_v4_doi *doi_def,
+                                             const char *domain)
+{
+        return 0;
+}
+#endif /* CONFIG_NETLABEL */
+/*
+ * Label Mapping Cache Functions
+ */
+#ifdef CONFIG_NETLABEL
+void cipso_v4_cache_invalidate(void);
+int cipso_v4_cache_add(const struct sk_buff *skb,
+                       const struct netlbl_lsm_secattr *secattr);
+#else
+static inline void cipso_v4_cache_invalidate(void)
+{
+        return;
+}
+static inline int cipso_v4_cache_add(const struct sk_buff *skb,
+                                     const struct netlbl_lsm_secattr *secattr)
+{
+        return 0;
+}
+#endif /* CONFIG_NETLABEL */
+/*
+ * Protocol Handling Functions
+ */
+#ifdef CONFIG_NETLABEL
+void cipso_v4_error(struct sk_buff *skb, int error, u32 gateway);
+int cipso_v4_socket_setattr(const struct socket *sock,
+                            const struct cipso_v4_doi *doi_def,
+                            const struct netlbl_lsm_secattr *secattr);
+int cipso_v4_sock_getattr(struct sock *sk, struct netlbl_lsm_secattr *secattr);
+int cipso_v4_socket_getattr(const struct socket *sock,
+                            struct netlbl_lsm_secattr *secattr);
+int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
+                            struct netlbl_lsm_secattr *secattr);
+int cipso_v4_validate(unsigned char **option);
+#else
+static inline void cipso_v4_error(struct sk_buff *skb,
+                                  int error,
+                                  u32 gateway)
+{
+        return;
+}
+static inline int cipso_v4_socket_setattr(const struct socket *sock,
+                                  const struct cipso_v4_doi *doi_def,
+                                  const struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline int cipso_v4_sock_getattr(struct sock *sk,
+                                        struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline int cipso_v4_socket_getattr(const struct socket *sock,
+                                          struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
+                                          struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline int cipso_v4_validate(unsigned char **option)
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_NETLABEL */
+#endif /* _CIPSO_IPV4_H */
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index a15dcf0d5c1e..f01626cbbed6 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -22,7 +22,7 @@ struct dn_kern_rta
 };
 struct dn_fib_res {
-        struct dn_fib_rule *r;
+        struct fib_rule *r;
        struct dn_fib_info *fi;
        unsigned char prefixlen;
        unsigned char nh_sel;
@@ -94,7 +94,8 @@ struct dn_fib_node {
 struct dn_fib_table {
-        int n;
+        struct hlist_node hlist;
+        u32 n;
        int (*insert)(struct dn_fib_table *t, struct rtmsg *r, 
                        struct dn_kern_rta *rta, struct nlmsghdr *n, 
@@ -130,14 +131,11 @@ extern __le16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type);
 extern void dn_fib_flush(void);
 extern void dn_fib_select_multipath(const struct flowi *fl,
                                        struct dn_fib_res *res);
-extern int dn_fib_sync_down(__le16 local, struct net_device *dev,
-                                int force);
-extern int dn_fib_sync_up(struct net_device *dev);
 /*
 * dn_tables.c
 */
-extern struct dn_fib_table *dn_fib_get_table(int n, int creat);
+extern struct dn_fib_table *dn_fib_get_table(u32 n, int creat);
 extern struct dn_fib_table *dn_fib_empty_table(void);
 extern void dn_fib_table_init(void);
 extern void dn_fib_table_cleanup(void);
@@ -147,10 +145,8 @@ extern void dn_fib_table_cleanup(void);
 */
 extern void dn_fib_rules_init(void);
 extern void dn_fib_rules_cleanup(void);
-extern void dn_fib_rule_put(struct dn_fib_rule *);
-extern __le16 dn_fib_rules_policy(__le16 saddr, struct dn_fib_res *res, unsigned *flags);
 extern unsigned dnet_addr_type(__le16 addr);
-extern int dn_fib_lookup(const struct flowi *fl, struct dn_fib_res *res);
+extern int dn_fib_lookup(struct flowi *fl, struct dn_fib_res *res);
 /*
 * rtnetlink interface
@@ -176,11 +172,9 @@ static inline void dn_fib_res_put(struct dn_fib_res *res)
        if (res->fi)
                dn_fib_info_put(res->fi);
        if (res->r)
-                dn_fib_rule_put(res->r);
+                fib_rule_put(res->r);
 }
-extern struct dn_fib_table *dn_fib_tables[];
 #else /* Endnode */
 #define dn_fib_init()  do { } while(0)
diff --git a/include/net/dst.h b/include/net/dst.h
index 36d54fc248b0..e156e38e4ac3 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -54,6 +54,7 @@ struct dst_entry
        unsigned long           expires;
        unsigned short          header_len;     /* more space at head required */
+        unsigned short          nfheader_len;   /* more non-fragment space at head required */
        unsigned short          trailer_len;    /* space to reserve at tail */
        u32                     metrics[RTAX_MAX];
@@ -83,7 +84,7 @@ struct dst_entry
 struct dst_ops
 {
        unsigned short          family;
-        unsigned short          protocol;
+        __be16                  protocol;
        unsigned                gc_thresh;
        int                     (*gc)(void);
diff --git a/include/net/esp.h b/include/net/esp.h
index 90cd94fad7d9..713d039f4af7 100644
--- a/include/net/esp.h
+++ b/include/net/esp.h
@@ -1,6 +1,7 @@
 #ifndef _NET_ESP_H
 #define _NET_ESP_H
+#include <linux/crypto.h>
 #include <net/xfrm.h>
 #include <asm/scatterlist.h>
@@ -14,14 +15,15 @@ struct esp_data
        struct {
                u8                      *key;           /* Key */
                int                     key_len;        /* Key length */
-                u8                      *ivec;          /* ivec buffer */
+                int                     padlen;         /* 0..255 */
                /* ivlen is offset from enc_data, where encrypted data start.
                 * It is logically different of crypto_tfm_alg_ivsize(tfm).
                 * We assume that it is either zero (no ivec), or
                 * >= crypto_tfm_alg_ivsize(tfm). */
                int                     ivlen;
-                int                     padlen;         /* 0..255 */
+                int                     ivinitted;
-                struct crypto_tfm       *tfm;           /* crypto handle */
+                u8                      *ivec;          /* ivec buffer */
+                struct crypto_blkcipher *tfm;           /* crypto handle */
        } conf;
        /* Integrity. It is active when icv_full_len != 0 */
@@ -34,7 +36,7 @@ struct esp_data
                void                    (*icv)(struct esp_data*,
                                               struct sk_buff *skb,
                                               int offset, int len, u8 *icv);
-                struct crypto_tfm       *tfm;
+                struct crypto_hash      *tfm;
        } auth;
 };
@@ -42,18 +44,22 @@ extern int skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset,
 extern int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer);
 extern void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len);
-static inline void
+static inline int esp_mac_digest(struct esp_data *esp, struct sk_buff *skb,
-esp_hmac_digest(struct esp_data *esp, struct sk_buff *skb, int offset,
+                                 int offset, int len)
-                int len, u8 *auth_data)
 {
-        struct crypto_tfm *tfm = esp->auth.tfm;
+        struct hash_desc desc;
-        char *icv = esp->auth.work_icv;
+        int err;
-        memset(auth_data, 0, esp->auth.icv_trunc_len);
+        desc.tfm = esp->auth.tfm;
-        crypto_hmac_init(tfm, esp->auth.key, &esp->auth.key_len);
+        desc.flags = 0;
-        skb_icv_walk(skb, tfm, offset, len, crypto_hmac_update);
-        crypto_hmac_final(tfm, esp->auth.key, &esp->auth.key_len, icv);
+        err = crypto_hash_init(&desc);
-        memcpy(auth_data, icv, esp->auth.icv_trunc_len);
+        if (unlikely(err))
+                return err;
+        err = skb_icv_walk(skb, &desc, offset, len, crypto_hash_update);
+        if (unlikely(err))
+                return err;
+        return crypto_hash_final(&desc, esp->auth.work_icv);
 }
 #endif
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
new file mode 100644
index 000000000000..8e2f473d3e82
--- /dev/null
+++ b/include/net/fib_rules.h
@@ -0,0 +1,97 @@
+#ifndef __NET_FIB_RULES_H
+#define __NET_FIB_RULES_H
+#include <linux/types.h>
+#include <linux/netdevice.h>
+#include <linux/fib_rules.h>
+#include <net/flow.h>
+#include <net/netlink.h>
+struct fib_rule
+{
+        struct list_head        list;
+        atomic_t                refcnt;
+        int                     ifindex;
+        char                    ifname[IFNAMSIZ];
+        u32                     pref;
+        u32                     flags;
+        u32                     table;
+        u8                      action;
+        struct rcu_head         rcu;
+};
+struct fib_lookup_arg
+{
+        void                    *lookup_ptr;
+        void                    *result;
+        struct fib_rule         *rule;
+};
+struct fib_rules_ops
+{
+        int                     family;
+        struct list_head        list;
+        int                     rule_size;
+        int                     (*action)(struct fib_rule *,
+                                          struct flowi *, int,
+                                          struct fib_lookup_arg *);
+        int                     (*match)(struct fib_rule *,
+                                         struct flowi *, int);
+        int                     (*configure)(struct fib_rule *,
+                                             struct sk_buff *,
+                                             struct nlmsghdr *,
+                                             struct fib_rule_hdr *,
+                                             struct nlattr **);
+        int                     (*compare)(struct fib_rule *,
+                                           struct fib_rule_hdr *,
+                                           struct nlattr **);
+        int                     (*fill)(struct fib_rule *, struct sk_buff *,
+                                        struct nlmsghdr *,
+                                        struct fib_rule_hdr *);
+        u32                     (*default_pref)(void);
+        int                     nlgroup;
+        struct nla_policy       *policy;
+        struct list_head        *rules_list;
+        struct module           *owner;
+};
+static inline void fib_rule_get(struct fib_rule *rule)
+{
+        atomic_inc(&rule->refcnt);
+}
+static inline void fib_rule_put_rcu(struct rcu_head *head)
+{
+        struct fib_rule *rule = container_of(head, struct fib_rule, rcu);
+        kfree(rule);
+}
+static inline void fib_rule_put(struct fib_rule *rule)
+{
+        if (atomic_dec_and_test(&rule->refcnt))
+                call_rcu(&rule->rcu, fib_rule_put_rcu);
+}
+static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
+{
+        if (nla[FRA_TABLE])
+                return nla_get_u32(nla[FRA_TABLE]);
+        return frh->table;
+}
+extern int                      fib_rules_register(struct fib_rules_ops *);
+extern int                      fib_rules_unregister(struct fib_rules_ops *);
+extern int                      fib_rules_lookup(struct fib_rules_ops *,
+                                                 struct flowi *, int flags,
+                                                 struct fib_lookup_arg *);
+extern int                      fib_nl_newrule(struct sk_buff *,
+                                               struct nlmsghdr *, void *);
+extern int                      fib_nl_delrule(struct sk_buff *,
+                                               struct nlmsghdr *, void *);
+extern int                      fib_rules_dump(struct sk_buff *,
+                                               struct netlink_callback *, int);
+#endif
diff --git a/include/net/flow.h b/include/net/flow.h
index 04d89f763451..ddf5f3ca1720 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -16,8 +16,8 @@ struct flowi {
        union {
                struct {
-                        __u32                   daddr;
+                        __be32                  daddr;
-                        __u32                   saddr;
+                        __be32                  saddr;
                        __u32                   fwmark;
                        __u8                    tos;
                        __u8                    scope;
@@ -26,6 +26,7 @@ struct flowi {
                struct {
                        struct in6_addr         daddr;
                        struct in6_addr         saddr;
+                        __u32                   fwmark;
                        __u32                   flowlabel;
                } ip6_u;
@@ -42,6 +43,7 @@ struct flowi {
 #define fld_scope       nl_u.dn_u.scope
 #define fl6_dst         nl_u.ip6_u.daddr
 #define fl6_src         nl_u.ip6_u.saddr
+#define fl6_fwmark      nl_u.ip6_u.fwmark
 #define fl6_flowlabel   nl_u.ip6_u.flowlabel
 #define fl4_dst         nl_u.ip4_u.daddr
 #define fl4_src         nl_u.ip4_u.saddr
@@ -54,8 +56,8 @@ struct flowi {
 #define FLOWI_FLAG_MULTIPATHOLDROUTE 0x01
        union {
                struct {
-                        __u16   sport;
+                        __be16  sport;
-                        __u16   dport;
+                        __be16  dport;
                } ports;
                struct {
@@ -71,13 +73,23 @@ struct flowi {
                        __u8    objname[16]; /* Not zero terminated */
                } dnports;
-                __u32           spi;
+                __be32          spi;
+#ifdef CONFIG_IPV6_MIP6
+                struct {
+                        __u8    type;
+                } mht;
+#endif
        } uli_u;
 #define fl_ip_sport     uli_u.ports.sport
 #define fl_ip_dport     uli_u.ports.dport
 #define fl_icmp_type    uli_u.icmpt.type
 #define fl_icmp_code    uli_u.icmpt.code
 #define fl_ipsec_spi    uli_u.spi
+#ifdef CONFIG_IPV6_MIP6
+#define fl_mh_type      uli_u.mht.type
+#endif
+        __u32           secid;  /* used by xfrm; see secid.txt */
 } __attribute__((__aligned__(BITS_PER_LONG/8)));
 #define FLOW_DIR_IN     0
@@ -85,10 +97,10 @@ struct flowi {
 #define FLOW_DIR_FWD    2
 struct sock;
-typedef void (*flow_resolve_t)(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+typedef void (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
                               void **objp, atomic_t **obj_refp);
-extern void *flow_cache_lookup(struct flowi *key, u32 sk_sid, u16 family, u8 dir,
+extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
                               flow_resolve_t resolver);
 extern void flow_cache_flush(void);
 extern atomic_t flow_cache_genid;
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 8c2287264266..b619314218a6 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -27,8 +27,6 @@ struct genl_family
        struct list_head        family_list;    /* private */
 };
-#define GENL_ADMIN_PERM         0x01
 /**
 * struct genl_info - receiving information
 * @snd_seq: sending sequence number
@@ -133,11 +131,12 @@ static inline int genlmsg_cancel(struct sk_buff *skb, void *hdr)
 * @skb: netlink message as socket buffer
 * @pid: own netlink pid to avoid sending to yourself
 * @group: multicast group id
+ * @flags: allocation flags
 */
 static inline int genlmsg_multicast(struct sk_buff *skb, u32 pid,
-                                    unsigned int group)
+                                    unsigned int group, gfp_t flags)
 {
-        return nlmsg_multicast(genl_sock, skb, pid, group);
+        return nlmsg_multicast(genl_sock, skb, pid, group, flags);
 }
 /**
@@ -170,4 +169,22 @@ static inline int genlmsg_len(const struct genlmsghdr *gnlh)
        return (nlh->nlmsg_len - GENL_HDRLEN - NLMSG_HDRLEN);
 }
+/**
+ * genlmsg_msg_size - length of genetlink message not including padding
+ * @payload: length of message payload
+ */
+static inline int genlmsg_msg_size(int payload)
+{
+        return GENL_HDRLEN + payload;
+}
+/**
+ * genlmsg_total_size - length of genetlink message including padding
+ * @payload: length of message payload
+ */
+static inline int genlmsg_total_size(int payload)
+{
+        return NLMSG_ALIGN(genlmsg_msg_size(payload));
+}
 #endif  /* __NET_GENERIC_NETLINK_H */
diff --git a/include/net/icmp.h b/include/net/icmp.h
index 05f8ff7d9316..dc09474efcf3 100644
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -38,7 +38,7 @@ struct dst_entry;
 struct net_proto_family;
 struct sk_buff;
-extern void     icmp_send(struct sk_buff *skb_in,  int type, int code, u32 info);
+extern void     icmp_send(struct sk_buff *skb_in,  int type, int code, __be32 info);
 extern int      icmp_rcv(struct sk_buff *skb);
 extern int      icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern void     icmp_init(struct net_proto_family *ops);
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index ecc42864b001..b174ebb277a9 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -240,6 +240,11 @@ struct ieee80211_snap_hdr {
 #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
 #define WLAN_CAPABILITY_DSSS_OFDM (1<<13)
+/* 802.11g ERP information element */
+#define WLAN_ERP_NON_ERP_PRESENT (1<<0)
+#define WLAN_ERP_USE_PROTECTION (1<<1)
+#define WLAN_ERP_BARKER_PREAMBLE (1<<2)
 /* Status codes */
 enum ieee80211_statuscode {
        WLAN_STATUS_SUCCESS = 0,
@@ -747,6 +752,8 @@ struct ieee80211_txb {
 #define NETWORK_HAS_IBSS_DFS            (1<<8)
 #define NETWORK_HAS_TPC_REPORT          (1<<9)
+#define NETWORK_HAS_ERP_VALUE           (1<<10)
 #define QOS_QUEUE_NUM                   4
 #define QOS_OUI_LEN                     3
 #define QOS_OUI_TYPE                    2
@@ -1252,6 +1259,8 @@ extern int ieee80211_tx_frame(struct ieee80211_device *ieee,
                              int total_len, int encrypt_mpdu);
 /* ieee80211_rx.c */
+extern void ieee80211_rx_any(struct ieee80211_device *ieee,
+                     struct sk_buff *skb, struct ieee80211_rx_stats *stats);
 extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                        struct ieee80211_rx_stats *rx_stats);
 /* make sure to set stats->len */
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
index 00ad810eb883..425b3a57ac74 100644
--- a/include/net/ieee80211softmac.h
+++ b/include/net/ieee80211softmac.h
@@ -86,9 +86,6 @@ struct ieee80211softmac_assoc_info {
        
        /* BSSID we're trying to associate to */
        char bssid[ETH_ALEN];
-        /* Rates supported by the network */
-        struct ieee80211softmac_ratesinfo supported_rates;
        
        /* some flags.
         * static_essid is valid if the essid is constant,
@@ -103,6 +100,7 @@ struct ieee80211softmac_assoc_info {
         * bssfixed is used for SIOCSIWAP.
         */
        u8 static_essid:1,
+           short_preamble_available:1,
           associating:1,
           assoc_wait:1,
           bssvalid:1,
@@ -115,6 +113,19 @@ struct ieee80211softmac_assoc_info {
        struct work_struct timeout;
 };
+struct ieee80211softmac_bss_info {
+        /* Rates supported by the network */
+        struct ieee80211softmac_ratesinfo supported_rates;
+        /* This indicates whether frames can currently be transmitted with
+         * short preamble (only use this variable during TX at CCK rates) */
+        u8 short_preamble:1;
+        /* This indicates whether protection (e.g. self-CTS) should be used
+         * when transmitting with OFDM modulation */
+        u8 use_protection:1;
+};
 enum {
        IEEE80211SOFTMAC_AUTH_OPEN_REQUEST      = 1,
        IEEE80211SOFTMAC_AUTH_OPEN_RESPONSE     = 2,
@@ -157,6 +168,10 @@ struct ieee80211softmac_txrates {
 #define IEEE80211SOFTMAC_TXRATECHG_MCAST                (1 << 2) /* mcast_rate */
 #define IEEE80211SOFTMAC_TXRATECHG_MGT_MCAST            (1 << 3) /* mgt_mcast_rate */
+#define IEEE80211SOFTMAC_BSSINFOCHG_RATES               (1 << 0) /* supported_rates */
+#define IEEE80211SOFTMAC_BSSINFOCHG_SHORT_PREAMBLE      (1 << 1) /* short_preamble */
+#define IEEE80211SOFTMAC_BSSINFOCHG_PROTECTION          (1 << 2) /* use_protection */
 struct ieee80211softmac_device {
        /* 802.11 structure for data stuff */
        struct ieee80211_device *ieee;
@@ -200,10 +215,16 @@ struct ieee80211softmac_device {
         * The driver just needs to read them.
         */
        struct ieee80211softmac_txrates txrates;
-        /* If the driver needs to do stuff on TX rate changes, assign this callback. */
+        /* If the driver needs to do stuff on TX rate changes, assign this
+         * callback. See IEEE80211SOFTMAC_TXRATECHG for change flags. */
        void (*txrates_change)(struct net_device *dev,
-                               u32 changes, /* see IEEE80211SOFTMAC_TXRATECHG flags */
+                               u32 changes);
-                               const struct ieee80211softmac_txrates *rates_before_change);
+        /* If the driver needs to do stuff when BSS properties change, assign
+         * this callback. see IEEE80211SOFTMAC_BSSINFOCHG for change flags. */
+        void (*bssinfo_change)(struct net_device *dev,
+                               u32 changes);
        /* private stuff follows */
        /* this lock protects this structure */
@@ -216,6 +237,7 @@ struct ieee80211softmac_device {
        
        struct ieee80211softmac_scaninfo *scaninfo;
        struct ieee80211softmac_assoc_info associnfo;
+        struct ieee80211softmac_bss_info bssinfo;
        struct list_head auth_queue;
        struct list_head events;
@@ -257,6 +279,14 @@ extern void ieee80211softmac_fragment_lost(struct net_device *dev,
 * Note that the rates need to be sorted. */
 extern void ieee80211softmac_set_rates(struct net_device *dev, u8 count, u8 *rates);
+/* Finds the highest rate which is:
+ *  1. Present in ri (optionally a basic rate)
+ *  2. Supported by the device
+ *  3. Less than or equal to the user-defined rate
+ */
+extern u8 ieee80211softmac_highest_supported_rate(struct ieee80211softmac_device *mac,
+        struct ieee80211softmac_ratesinfo *ri, int basic_only);
 /* Helper function which advises you the rate at which a frame should be
 * transmitted at. */
 static inline u8 ieee80211softmac_suggest_txrate(struct ieee80211softmac_device *mac,
@@ -279,6 +309,24 @@ static inline u8 ieee80211softmac_suggest_txrate(struct ieee80211softmac_device
                return txrates->mcast_rate;
 }
+/* Helper function which advises you when it is safe to transmit with short
+ * preamble.
+ * You should only call this function when transmitting at CCK rates. */
+static inline int ieee80211softmac_short_preamble_ok(struct ieee80211softmac_device *mac,
+                                                    int is_multicast,
+                                                    int is_mgt)
+{
+        return (is_multicast && is_mgt) ? 0 : mac->bssinfo.short_preamble;
+}
+/* Helper function which advises you whether protection (e.g. self-CTS) is
+ * needed. 1 = protection needed, 0 = no protection needed
+ * Only use this function when transmitting with OFDM modulation. */
+static inline int ieee80211softmac_protection_needed(struct ieee80211softmac_device *mac)
+{
+        return mac->bssinfo.use_protection;
+}
 /* Start the SoftMAC. Call this after you initialized the device
 * and it is ready to run.
 */
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index e459e1a0ae4a..34489c13c119 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -189,6 +189,7 @@ struct inet6_dev
        struct ipv6_devconf     cnf;
        struct ipv6_devstat     stats;
        unsigned long           tstamp; /* ipv6InterfaceTable update timestamp */
+        struct rcu_head         rcu;
 };
 extern struct ipv6_devconf ipv6_devconf;
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 9bf73fe50948..0bcf9f237e1f 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -147,7 +147,8 @@ extern struct sock *inet_csk_clone(struct sock *sk,
 enum inet_csk_ack_state_t {
        ICSK_ACK_SCHED  = 1,
        ICSK_ACK_TIMER  = 2,
-        ICSK_ACK_PUSHED = 4
+        ICSK_ACK_PUSHED = 4,
+        ICSK_ACK_PUSHED2 = 8
 };
 extern void inet_csk_init_xmit_timers(struct sock *sk,
@@ -237,9 +238,9 @@ extern struct sock *inet_csk_accept(struct sock *sk, int flags, int *err);
 extern struct request_sock *inet_csk_search_req(const struct sock *sk,
                                                struct request_sock ***prevp,
-                                                const __u16 rport,
+                                                const __be16 rport,
-                                                const __u32 raddr,
+                                                const __be32 raddr,
-                                                const __u32 laddr);
+                                                const __be32 laddr);
 extern int inet_csk_bind_conflict(const struct sock *sk,
                                  const struct inet_bind_bucket *tb);
 extern int inet_csk_get_port(struct inet_hashinfo *hashinfo,
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 98e0bb3014fe..a9eb2eaf094e 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -271,66 +271,57 @@ static inline int inet_iif(const struct sk_buff *skb)
        return ((struct rtable *)skb->dst)->rt_iif;
 }
-extern struct sock *__inet_lookup_listener(const struct hlist_head *head,
+extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
-                                           const u32 daddr,
+                                           const __be32 daddr,
                                           const unsigned short hnum,
                                           const int dif);
-/* Optimize the common listener case. */
+static inline struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo,
-static inline struct sock *
+                                                __be32 daddr, __be16 dport, int dif)
-                inet_lookup_listener(struct inet_hashinfo *hashinfo,
-                                     const u32 daddr,
-                                     const unsigned short hnum, const int dif)
 {
-        struct sock *sk = NULL;
+        return __inet_lookup_listener(hashinfo, daddr, ntohs(dport), dif);
-        const struct hlist_head *head;
-        read_lock(&hashinfo->lhash_lock);
-        head = &hashinfo->listening_hash[inet_lhashfn(hnum)];
-        if (!hlist_empty(head)) {
-                const struct inet_sock *inet = inet_sk((sk = __sk_head(head)));
-                if (inet->num == hnum && !sk->sk_node.next &&
-                    (!inet->rcv_saddr || inet->rcv_saddr == daddr) &&
-                    (sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
-                    !sk->sk_bound_dev_if)
-                        goto sherry_cache;
-                sk = __inet_lookup_listener(head, daddr, hnum, dif);
-        }
-        if (sk) {
-sherry_cache:
-                sock_hold(sk);
-        }
-        read_unlock(&hashinfo->lhash_lock);
-        return sk;
 }
 /* Socket demux engine toys. */
+/* What happens here is ugly; there's a pair of adjacent fields in
+   struct inet_sock; __be16 dport followed by __u16 num.  We want to
+   search by pair, so we combine the keys into a single 32bit value
+   and compare with 32bit value read from &...->dport.  Let's at least
+   make sure that it's not mixed with anything else...
+   On 64bit targets we combine comparisons with pair of adjacent __be32
+   fields in the same way.
+*/
+typedef __u32 __bitwise __portpair;
 #ifdef __BIG_ENDIAN
 #define INET_COMBINED_PORTS(__sport, __dport) \
-        (((__u32)(__sport) << 16) | (__u32)(__dport))
+        ((__force __portpair)(((__force __u32)(__be16)(__sport) << 16) | (__u32)(__dport)))
 #else /* __LITTLE_ENDIAN */
 #define INET_COMBINED_PORTS(__sport, __dport) \
-        (((__u32)(__dport) << 16) | (__u32)(__sport))
+        ((__force __portpair)(((__u32)(__dport) << 16) | (__force __u32)(__be16)(__sport)))
 #endif
 #if (BITS_PER_LONG == 64)
+typedef __u64 __bitwise __addrpair;
 #ifdef __BIG_ENDIAN
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr) \
-        const __u64 __name = (((__u64)(__saddr)) << 32) | ((__u64)(__daddr));
+        const __addrpair __name = (__force __addrpair) ( \
+                                   (((__force __u64)(__be32)(__saddr)) << 32) | \
+                                   ((__force __u64)(__be32)(__daddr)));
 #else /* __LITTLE_ENDIAN */
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr) \
-        const __u64 __name = (((__u64)(__daddr)) << 32) | ((__u64)(__saddr));
+        const __addrpair __name = (__force __addrpair) ( \
+                                   (((__force __u64)(__be32)(__daddr)) << 32) | \
+                                   ((__force __u64)(__be32)(__saddr)));
 #endif /* __BIG_ENDIAN */
 #define INET_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
        (((__sk)->sk_hash == (__hash))                          &&      \
-         ((*((__u64 *)&(inet_sk(__sk)->daddr))) == (__cookie))  &&      \
+         ((*((__addrpair *)&(inet_sk(__sk)->daddr))) == (__cookie))     &&      \
-         ((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports))   &&      \
+         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      &&      \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #define INET_TW_MATCH(__sk, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
        (((__sk)->sk_hash == (__hash))                          &&      \
-         ((*((__u64 *)&(inet_twsk(__sk)->tw_daddr))) == (__cookie)) &&  \
+         ((*((__addrpair *)&(inet_twsk(__sk)->tw_daddr))) == (__cookie)) &&     \
-         ((*((__u32 *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&   \
+         ((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&      \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #else /* 32-bit arch */
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr)
@@ -338,13 +329,13 @@ sherry_cache:
        (((__sk)->sk_hash == (__hash))                          &&      \
         (inet_sk(__sk)->daddr          == (__saddr))           &&      \
         (inet_sk(__sk)->rcv_saddr      == (__daddr))           &&      \
-         ((*((__u32 *)&(inet_sk(__sk)->dport))) == (__ports))   &&      \
+         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      &&      \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #define INET_TW_MATCH(__sk, __hash,__cookie, __saddr, __daddr, __ports, __dif)  \
        (((__sk)->sk_hash == (__hash))                          &&      \
         (inet_twsk(__sk)->tw_daddr     == (__saddr))           &&      \
         (inet_twsk(__sk)->tw_rcv_saddr == (__daddr))           &&      \
-         ((*((__u32 *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&   \
+         ((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&      \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #endif /* 64-bit arch */
@@ -356,12 +347,12 @@ sherry_cache:
 */
 static inline struct sock *
        __inet_lookup_established(struct inet_hashinfo *hashinfo,
-                                  const u32 saddr, const u16 sport,
+                                  const __be32 saddr, const __be16 sport,
-                                  const u32 daddr, const u16 hnum,
+                                  const __be32 daddr, const u16 hnum,
                                  const int dif)
 {
        INET_ADDR_COOKIE(acookie, saddr, daddr)
-        const __u32 ports = INET_COMBINED_PORTS(sport, hnum);
+        const __portpair ports = INET_COMBINED_PORTS(sport, hnum);
        struct sock *sk;
        const struct hlist_node *node;
        /* Optimize here for direct hit, only listening connections can
@@ -391,25 +382,36 @@ hit:
        goto out;
 }
+static inline struct sock *
+        inet_lookup_established(struct inet_hashinfo *hashinfo,
+                                const __be32 saddr, const __be16 sport,
+                                const __be32 daddr, const __be16 dport,
+                                const int dif)
+{
+        return __inet_lookup_established(hashinfo, saddr, sport, daddr,
+                                         ntohs(dport), dif);
+}
 static inline struct sock *__inet_lookup(struct inet_hashinfo *hashinfo,
-                                         const u32 saddr, const u16 sport,
+                                         const __be32 saddr, const __be16 sport,
-                                         const u32 daddr, const u16 hnum,
+                                         const __be32 daddr, const __be16 dport,
                                         const int dif)
 {
+        u16 hnum = ntohs(dport);
        struct sock *sk = __inet_lookup_established(hashinfo, saddr, sport, daddr,
                                                    hnum, dif);
-        return sk ? : inet_lookup_listener(hashinfo, daddr, hnum, dif);
+        return sk ? : __inet_lookup_listener(hashinfo, daddr, hnum, dif);
 }
 static inline struct sock *inet_lookup(struct inet_hashinfo *hashinfo,
-                                       const u32 saddr, const u16 sport,
+                                       const __be32 saddr, const __be16 sport,
-                                       const u32 daddr, const u16 dport,
+                                       const __be32 daddr, const __be16 dport,
                                       const int dif)
 {
        struct sock *sk;
        local_bh_disable();
-        sk = __inet_lookup(hashinfo, saddr, sport, daddr, ntohs(dport), dif);
+        sk = __inet_lookup(hashinfo, saddr, sport, daddr, dport, dif);
        local_bh_enable();
        return sk;
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 1f4a9a60d4cc..ce6da97bc848 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -27,7 +27,6 @@
 /** struct ip_options - IP Options
 *
 * @faddr - Saved first hop address
- * @is_setbyuser - Set by setsockopt?
 * @is_data - Options in __data, rather than skb
 * @is_strictroute - Strict source route
 * @srr_is_hit - Packet destination addr was our one
@@ -37,13 +36,12 @@
 * @ts_needaddr - Need to record addr of outgoing dev
 */
 struct ip_options {
-        __u32           faddr;
+        __be32          faddr;
        unsigned char   optlen;
        unsigned char   srr;
        unsigned char   rr;
        unsigned char   ts;
-        unsigned char   is_setbyuser:1,
+        unsigned char   is_data:1,
-                        is_data:1,
                        is_strictroute:1,
                        srr_is_hit:1,
                        is_changed:1,
@@ -51,7 +49,7 @@ struct ip_options {
                        ts_needtime:1,
                        ts_needaddr:1;
        unsigned char   router_alert;
-        unsigned char   __pad1;
+        unsigned char   cipso;
        unsigned char   __pad2;
        unsigned char   __data[0];
 };
@@ -64,9 +62,9 @@ struct inet_request_sock {
        u16                     inet6_rsk_offset;
        /* 2 bytes hole, try to pack */
 #endif
-        u32                     loc_addr;
+        __be32                  loc_addr;
-        u32                     rmt_addr;
+        __be32                  rmt_addr;
-        u16                     rmt_port;
+        __be16                  rmt_port;
        u16                     snd_wscale : 4, 
                                rcv_wscale : 4, 
                                tstamp_ok  : 1,
@@ -112,15 +110,15 @@ struct inet_sock {
        struct ipv6_pinfo       *pinet6;
 #endif
        /* Socket demultiplex comparisons on incoming packets. */
-        __u32                   daddr;
+        __be32                  daddr;
-        __u32                   rcv_saddr;
+        __be32                  rcv_saddr;
-        __u16                   dport;
+        __be16                  dport;
        __u16                   num;
-        __u32                   saddr;
+        __be32                  saddr;
        __s16                   uc_ttl;
        __u16                   cmsg_flags;
        struct ip_options       *opt;
-        __u16                   sport;
+        __be16                  sport;
        __u16                   id;
        __u8                    tos;
        __u8                    mc_ttl;
@@ -131,7 +129,7 @@ struct inet_sock {
                                hdrincl:1,
                                mc_loop:1;
        int                     mc_index;
-        __u32                   mc_addr;
+        __be32                  mc_addr;
        struct ip_mc_socklist   *mc_list;
        struct {
                unsigned int            flags;
@@ -139,7 +137,7 @@ struct inet_sock {
                struct ip_options       *opt;
                struct rtable           *rt;
                int                     length; /* Total length of all frames */
-                u32                     addr;
+                __be32                  addr;
                struct flowi            fl;
        } cork;
 };
@@ -169,10 +167,10 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,
 extern int inet_sk_rebuild_header(struct sock *sk);
-static inline unsigned int inet_ehashfn(const __u32 laddr, const __u16 lport,
+static inline unsigned int inet_ehashfn(const __be32 laddr, const __u16 lport,
-                                        const __u32 faddr, const __u16 fport)
+                                        const __be32 faddr, const __be16 fport)
 {
-        unsigned int h = (laddr ^ lport) ^ (faddr ^ fport);
+        unsigned int h = ((__force __u32)laddr ^ lport) ^ ((__force __u32)faddr ^ (__force __u32)fport);
        h ^= h >> 16;
        h ^= h >> 8;
        return h;
@@ -181,10 +179,10 @@ static inline unsigned int inet_ehashfn(const __u32 laddr, const __u16 lport,
 static inline int inet_sk_ehashfn(const struct sock *sk)
 {
        const struct inet_sock *inet = inet_sk(sk);
-        const __u32 laddr = inet->rcv_saddr;
+        const __be32 laddr = inet->rcv_saddr;
        const __u16 lport = inet->num;
-        const __u32 faddr = inet->daddr;
+        const __be32 faddr = inet->daddr;
-        const __u16 fport = inet->dport;
+        const __be16 fport = inet->dport;
        return inet_ehashfn(laddr, lport, faddr, fport);
 }
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 600cb543550d..6d14c22a00c5 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -120,10 +120,10 @@ struct inet_timewait_sock {
        unsigned char           tw_rcv_wscale;
        /* Socket demultiplex comparisons on incoming packets. */
        /* these five are in inet_sock */
-        __u16                   tw_sport;
+        __be16                  tw_sport;
-        __u32                   tw_daddr __attribute__((aligned(INET_TIMEWAIT_ADDRCMP_ALIGN_BYTES)));
+        __be32                  tw_daddr __attribute__((aligned(INET_TIMEWAIT_ADDRCMP_ALIGN_BYTES)));
-        __u32                   tw_rcv_saddr;
+        __be32                  tw_rcv_saddr;
-        __u16                   tw_dport;
+        __be16                  tw_dport;
        __u16                   tw_num;
        /* And these are ours. */
        __u8                    tw_ipv6only:1;
@@ -186,7 +186,7 @@ static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk)
        return (struct inet_timewait_sock *)sk;
 }
-static inline u32 inet_rcv_saddr(const struct sock *sk)
+static inline __be32 inet_rcv_saddr(const struct sock *sk)
 {
        return likely(sk->sk_state != TCP_TIME_WAIT) ?
                inet_sk(sk)->rcv_saddr : inet_twsk(sk)->tw_rcv_saddr;
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 0965515f40cf..925573fd2aed 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -22,7 +22,7 @@ struct inet_peer
        unsigned long           dtime;          /* the time of last use of not
                                                 * referenced entries */
        atomic_t                refcnt;
-        __u32                   v4daddr;        /* peer's address */
+        __be32                  v4daddr;        /* peer's address */
        __u16                   avl_height;
        __u16                   ip_id_count;    /* IP ID for the next packet */
        atomic_t                rid;            /* Frag reception counter */
@@ -33,7 +33,7 @@ struct inet_peer
 void                    inet_initpeers(void) __init;
 /* can be called with or without local BH being disabled */
-struct inet_peer        *inet_getpeer(__u32 daddr, int create);
+struct inet_peer        *inet_getpeer(__be32 daddr, int create);
 extern spinlock_t inet_peer_unused_lock;
 extern struct inet_peer **inet_peer_unused_tailp;
diff --git a/include/net/ip.h b/include/net/ip.h
index 98f908400771..b6d95e553401 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -45,7 +45,7 @@ struct inet_skb_parm
 struct ipcm_cookie
 {
-        u32                     addr;
+        __be32                  addr;
        int                     oif;
        struct ip_options       *opt;
 };
@@ -86,7 +86,7 @@ extern int		igmp_mc_proc_init(void);
 */
 extern int              ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
-                                              u32 saddr, u32 daddr,
+                                              __be32 saddr, __be32 daddr,
                                              struct ip_options *opt);
 extern int              ip_rcv(struct sk_buff *skb, struct net_device *dev,
                               struct packet_type *pt, struct net_device *orig_dev);
@@ -335,7 +335,7 @@ extern int ip_net_unreachable(struct sk_buff *skb);
 *      Functions provided by ip_options.c
 */
 
-extern void ip_options_build(struct sk_buff *skb, struct ip_options *opt, u32 daddr, struct rtable *rt, int is_frag);
+extern void ip_options_build(struct sk_buff *skb, struct ip_options *opt, __be32 daddr, struct rtable *rt, int is_frag);
 extern int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb);
 extern void ip_options_fragment(struct sk_buff *skb);
 extern int ip_options_compile(struct ip_options *opt, struct sk_buff *skb);
@@ -363,8 +363,8 @@ extern int	ip_ra_control(struct sock *sk, unsigned char on, void (*destructor)(s
 extern int      ip_recv_error(struct sock *sk, struct msghdr *msg, int len);
 extern void     ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err, 
-                              u16 port, u32 info, u8 *payload);
+                              __be16 port, u32 info, u8 *payload);
-extern void     ip_local_error(struct sock *sk, int err, u32 daddr, u16 dport,
+extern void     ip_local_error(struct sock *sk, int err, __be32 daddr, __be16 dport,
                               u32 info);
 /* sysctl helpers - any sysctl which holds a value that ends up being
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index a66e9de16a6c..e4438de3bd6b 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -16,14 +16,35 @@
 #ifdef __KERNEL__
 #include <linux/ipv6_route.h>
-#include <net/dst.h>
-#include <net/flow.h>
 #include <linux/rtnetlink.h>
 #include <linux/spinlock.h>
+#include <net/dst.h>
+#include <net/flow.h>
+#include <net/netlink.h>
 struct rt6_info;
+struct fib6_config
+{
+        u32             fc_table;
+        u32             fc_metric;
+        int             fc_dst_len;
+        int             fc_src_len;
+        int             fc_ifindex;
+        u32             fc_flags;
+        u32             fc_protocol;
+        struct in6_addr fc_dst;
+        struct in6_addr fc_src;
+        struct in6_addr fc_gateway;
+        unsigned long   fc_expires;
+        struct nlattr   *fc_mx;
+        int             fc_mx_len;
+        struct nl_info  fc_nlinfo;
+};
 struct fib6_node
 {
        struct fib6_node        *parent;
@@ -39,6 +60,11 @@ struct fib6_node
        __u32                   fn_sernum;
 };
+#ifndef CONFIG_IPV6_SUBTREES
+#define FIB6_SUBTREE(fn)        NULL
+#else
+#define FIB6_SUBTREE(fn)        ((fn)->subtree)
+#endif
 /*
 *      routing information
@@ -51,6 +77,8 @@ struct rt6key
        int             plen;
 };
+struct fib6_table;
 struct rt6_info
 {
        union {
@@ -71,6 +99,7 @@ struct rt6_info
        u32                             rt6i_flags;
        u32                             rt6i_metric;
        atomic_t                        rt6i_ref;
+        struct fib6_table               *rt6i_table;
        struct rt6key                   rt6i_dst;
        struct rt6key                   rt6i_src;
@@ -89,28 +118,6 @@ struct fib6_walker_t
        void *args;
 };
-extern struct fib6_walker_t fib6_walker_list;
-extern rwlock_t fib6_walker_lock;
-static inline void fib6_walker_link(struct fib6_walker_t *w)
-{
-        write_lock_bh(&fib6_walker_lock);
-        w->next = fib6_walker_list.next;
-        w->prev = &fib6_walker_list;
-        w->next->prev = w;
-        w->prev->next = w;
-        write_unlock_bh(&fib6_walker_lock);
-}
-static inline void fib6_walker_unlink(struct fib6_walker_t *w)
-{
-        write_lock_bh(&fib6_walker_lock);
-        w->next->prev = w->prev;
-        w->prev->next = w->next;
-        w->prev = w->next = w;
-        write_unlock_bh(&fib6_walker_lock);
-}
 struct rt6_statistics {
        __u32           fib_nodes;
        __u32           fib_route_nodes;
@@ -143,12 +150,41 @@ struct rt6_statistics {
 typedef void                    (*f_pnode)(struct fib6_node *fn, void *);
-extern struct fib6_node         ip6_routing_table;
+struct fib6_table {
+        struct hlist_node       tb6_hlist;
+        u32                     tb6_id;
+        rwlock_t                tb6_lock;
+        struct fib6_node        tb6_root;
+};
+#define RT6_TABLE_UNSPEC        RT_TABLE_UNSPEC
+#define RT6_TABLE_MAIN          RT_TABLE_MAIN
+#define RT6_TABLE_DFLT          RT6_TABLE_MAIN
+#define RT6_TABLE_INFO          RT6_TABLE_MAIN
+#define RT6_TABLE_PREFIX        RT6_TABLE_MAIN
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+#define FIB6_TABLE_MIN          1
+#define FIB6_TABLE_MAX          RT_TABLE_MAX
+#define RT6_TABLE_LOCAL         RT_TABLE_LOCAL
+#else
+#define FIB6_TABLE_MIN          RT_TABLE_MAIN
+#define FIB6_TABLE_MAX          FIB6_TABLE_MIN
+#define RT6_TABLE_LOCAL         RT6_TABLE_MAIN
+#endif
+typedef struct rt6_info *(*pol_lookup_t)(struct fib6_table *,
+                                         struct flowi *, int);
 /*
 *      exported functions
 */
+extern struct fib6_table *      fib6_get_table(u32 id);
+extern struct fib6_table *      fib6_new_table(u32 id);
+extern struct dst_entry *       fib6_rule_lookup(struct flowi *fl, int flags,
+                                                 pol_lookup_t lookup);
 extern struct fib6_node         *fib6_lookup(struct fib6_node *root,
                                             struct in6_addr *daddr,
                                             struct in6_addr *saddr);
@@ -157,32 +193,29 @@ struct fib6_node		*fib6_locate(struct fib6_node *root,
                                             struct in6_addr *daddr, int dst_len,
                                             struct in6_addr *saddr, int src_len);
-extern void                     fib6_clean_tree(struct fib6_node *root,
+extern void                     fib6_clean_all(int (*func)(struct rt6_info *, void *arg),
-                                                int (*func)(struct rt6_info *, void *arg),
+                                               int prune, void *arg);
-                                                int prune, void *arg);
-extern int                      fib6_walk(struct fib6_walker_t *w);
-extern int                      fib6_walk_continue(struct fib6_walker_t *w);
 extern int                      fib6_add(struct fib6_node *root,
                                         struct rt6_info *rt,
-                                         struct nlmsghdr *nlh,
+                                         struct nl_info *info);
-                                         void *rtattr,
-                                         struct netlink_skb_parms *req);
 extern int                      fib6_del(struct rt6_info *rt,
-                                         struct nlmsghdr *nlh,
+                                         struct nl_info *info);
-                                         void *rtattr,
-                                         struct netlink_skb_parms *req);
 extern void                     inet6_rt_notify(int event, struct rt6_info *rt,
-                                                struct nlmsghdr *nlh,
+                                                struct nl_info *info);
-                                                struct netlink_skb_parms *req);
 extern void                     fib6_run_gc(unsigned long dummy);
 extern void                     fib6_gc_cleanup(void);
 extern void                     fib6_init(void);
+extern void                     fib6_rules_init(void);
+extern void                     fib6_rules_cleanup(void);
+extern int                      fib6_rules_dump(struct sk_buff *,
+                                                struct netlink_callback *);
 #endif
 #endif
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 96b0e66406ec..6ca6b71dfe0f 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -32,6 +32,10 @@ struct route_info {
 #include <linux/ip.h>
 #include <linux/ipv6.h>
+#define RT6_LOOKUP_F_IFACE      0x1
+#define RT6_LOOKUP_F_REACHABLE  0x2
+#define RT6_LOOKUP_F_HAS_SADDR  0x4
 struct pol_chain {
        int                     type;
        int                     priority;
@@ -41,6 +45,11 @@ struct pol_chain {
 extern struct rt6_info  ip6_null_entry;
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+extern struct rt6_info  ip6_prohibit_entry;
+extern struct rt6_info  ip6_blk_hole_entry;
+#endif
 extern int ip6_rt_gc_interval;
 extern void                     ip6_route_input(struct sk_buff *skb);
@@ -48,25 +57,14 @@ extern void			ip6_route_input(struct sk_buff *skb);
 extern struct dst_entry *       ip6_route_output(struct sock *sk,
                                                 struct flowi *fl);
-extern int                      ip6_route_me_harder(struct sk_buff *skb);
 extern void                     ip6_route_init(void);
 extern void                     ip6_route_cleanup(void);
 extern int                      ipv6_route_ioctl(unsigned int cmd, void __user *arg);
-extern int                      ip6_route_add(struct in6_rtmsg *rtmsg,
+extern int                      ip6_route_add(struct fib6_config *cfg);
-                                              struct nlmsghdr *,
+extern int                      ip6_ins_rt(struct rt6_info *);
-                                              void *rtattr,
+extern int                      ip6_del_rt(struct rt6_info *);
-                                              struct netlink_skb_parms *req);
-extern int                      ip6_ins_rt(struct rt6_info *,
-                                           struct nlmsghdr *,
-                                           void *rtattr,
-                                           struct netlink_skb_parms *req);
-extern int                      ip6_del_rt(struct rt6_info *,
-                                           struct nlmsghdr *,
-                                           void *rtattr,
-                                           struct netlink_skb_parms *req);
 extern int                      ip6_rt_addr_add(struct in6_addr *addr,
                                                struct net_device *dev,
@@ -114,6 +112,7 @@ extern int			rt6_route_rcv(struct net_device *dev,
                                              struct in6_addr *gwaddr);
 extern void                     rt6_redirect(struct in6_addr *dest,
+                                             struct in6_addr *src,
                                             struct in6_addr *saddr,
                                             struct neighbour *neigh,
                                             u8 *lladdr,
@@ -131,6 +130,13 @@ extern int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *a
 extern int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
 extern int inet6_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
+struct rt6_rtnl_dump_arg
+{
+        struct sk_buff *skb;
+        struct netlink_callback *cb;
+};
+extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
 extern void rt6_ifdown(struct net_device *dev);
 extern void rt6_mtu_change(struct net_device *dev, unsigned mtu);
@@ -140,21 +146,24 @@ extern rwlock_t rt6_lock;
 *      Store a destination cache entry in a socket
 */
 static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-                                   struct in6_addr *daddr)
+                                   struct in6_addr *daddr, struct in6_addr *saddr)
 {
        struct ipv6_pinfo *np = inet6_sk(sk);
        struct rt6_info *rt = (struct rt6_info *) dst;
        sk_setup_caps(sk, dst);
        np->daddr_cache = daddr;
+#ifdef CONFIG_IPV6_SUBTREES
+        np->saddr_cache = saddr;
+#endif
        np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;
 }
 static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-                                 struct in6_addr *daddr)
+                                 struct in6_addr *daddr, struct in6_addr *saddr)
 {
        write_lock(&sk->sk_dst_lock);
-        __ip6_dst_store(sk, dst, daddr);
+        __ip6_dst_store(sk, dst, daddr, saddr);
        write_unlock(&sk->sk_dst_lock);
 }
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index a095d1dec7a4..82229146bac7 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -18,26 +18,34 @@
 #include <net/flow.h>
 #include <linux/seq_file.h>
+#include <net/fib_rules.h>
-/* WARNING: The ordering of these elements must match ordering
- *          of RTA_* rtnetlink attribute numbers.
+struct fib_config {
- */
+        u8                      fc_family;
-struct kern_rta {
+        u8                      fc_dst_len;
-        void            *rta_dst;
+        u8                      fc_src_len;
-        void            *rta_src;
+        u8                      fc_tos;
-        int             *rta_iif;
+        u8                      fc_protocol;
-        int             *rta_oif;
+        u8                      fc_scope;
-        void            *rta_gw;
+        u8                      fc_type;
-        u32             *rta_priority;
+        /* 1 byte unused */
-        void            *rta_prefsrc;
+        u32                     fc_table;
-        struct rtattr   *rta_mx;
+        __be32                  fc_dst;
-        struct rtattr   *rta_mp;
+        __be32                  fc_src;
-        unsigned char   *rta_protoinfo;
+        __be32                  fc_gw;
-        u32             *rta_flow;
+        int                     fc_oif;
-        struct rta_cacheinfo *rta_ci;
+        u32                     fc_flags;
-        struct rta_session *rta_sess;
+        u32                     fc_priority;
-        u32             *rta_mp_alg;
+        __be32                  fc_prefsrc;
-};
+        struct nlattr           *fc_mx;
+        struct rtnexthop        *fc_mp;
+        int                     fc_mx_len;
+        int                     fc_mp_len;
+        u32                     fc_flow;
+        u32                     fc_mp_alg;
+        u32                     fc_nlflags;
+        struct nl_info          fc_nlinfo;
+ };
 struct fib_info;
@@ -55,7 +63,7 @@ struct fib_nh {
        __u32                   nh_tclassid;
 #endif
        int                     nh_oif;
-        u32                     nh_gw;
+        __be32                  nh_gw;
 };
 /*
@@ -70,7 +78,7 @@ struct fib_info {
        int                     fib_dead;
        unsigned                fib_flags;
        int                     fib_protocol;
-        u32                     fib_prefsrc;
+        __be32                  fib_prefsrc;
        u32                     fib_priority;
        u32                     fib_metrics[RTAX_MAX];
 #define fib_mtu fib_metrics[RTAX_MTU-1]
@@ -99,8 +107,8 @@ struct fib_result {
        unsigned char   type;
        unsigned char   scope;
 #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
-        __u32           network;
+        __be32          network;
-        __u32           netmask;
+        __be32          netmask;
 #endif
        struct fib_info *fi;
 #ifdef CONFIG_IP_MULTIPLE_TABLES
@@ -109,7 +117,7 @@ struct fib_result {
 };
 struct fib_result_nl {
-        u32             fl_addr;   /* To be looked up*/ 
+        __be32          fl_addr;   /* To be looked up*/
        u32             fl_fwmark; 
        unsigned char   fl_tos;
        unsigned char   fl_scope;
@@ -149,15 +157,12 @@ struct fib_result_nl {
 #endif /* CONFIG_IP_ROUTE_MULTIPATH_WRANDOM */
 struct fib_table {
-        unsigned char   tb_id;
+        struct hlist_node tb_hlist;
+        u32             tb_id;
        unsigned        tb_stamp;
        int             (*tb_lookup)(struct fib_table *tb, const struct flowi *flp, struct fib_result *res);
-        int             (*tb_insert)(struct fib_table *table, struct rtmsg *r,
+        int             (*tb_insert)(struct fib_table *, struct fib_config *);
-                                     struct kern_rta *rta, struct nlmsghdr *n,
+        int             (*tb_delete)(struct fib_table *, struct fib_config *);
-                                     struct netlink_skb_parms *req);
-        int             (*tb_delete)(struct fib_table *table, struct rtmsg *r,
-                                     struct kern_rta *rta, struct nlmsghdr *n,
-                                     struct netlink_skb_parms *req);
        int             (*tb_dump)(struct fib_table *table, struct sk_buff *skb,
                                     struct netlink_callback *cb);
        int             (*tb_flush)(struct fib_table *table);
@@ -172,14 +177,14 @@ struct fib_table {
 extern struct fib_table *ip_fib_local_table;
 extern struct fib_table *ip_fib_main_table;
-static inline struct fib_table *fib_get_table(int id)
+static inline struct fib_table *fib_get_table(u32 id)
 {
        if (id != RT_TABLE_LOCAL)
                return ip_fib_main_table;
        return ip_fib_local_table;
 }
-static inline struct fib_table *fib_new_table(int id)
+static inline struct fib_table *fib_new_table(u32 id)
 {
        return fib_get_table(id);
 }
@@ -199,67 +204,48 @@ static inline void fib_select_default(const struct flowi *flp, struct fib_result
 }
 #else /* CONFIG_IP_MULTIPLE_TABLES */
-#define ip_fib_local_table (fib_tables[RT_TABLE_LOCAL])
+#define ip_fib_local_table fib_get_table(RT_TABLE_LOCAL)
-#define ip_fib_main_table (fib_tables[RT_TABLE_MAIN])
+#define ip_fib_main_table fib_get_table(RT_TABLE_MAIN)
-extern struct fib_table * fib_tables[RT_TABLE_MAX+1];
-extern int fib_lookup(const struct flowi *flp, struct fib_result *res);
-extern struct fib_table *__fib_new_table(int id);
-extern void fib_rule_put(struct fib_rule *r);
-static inline struct fib_table *fib_get_table(int id)
+extern int fib_lookup(struct flowi *flp, struct fib_result *res);
-{
-        if (id == 0)
-                id = RT_TABLE_MAIN;
-        return fib_tables[id];
-}
-static inline struct fib_table *fib_new_table(int id)
-{
-        if (id == 0)
-                id = RT_TABLE_MAIN;
-        return fib_tables[id] ? : __fib_new_table(id);
-}
+extern struct fib_table *fib_new_table(u32 id);
+extern struct fib_table *fib_get_table(u32 id);
 extern void fib_select_default(const struct flowi *flp, struct fib_result *res);
 #endif /* CONFIG_IP_MULTIPLE_TABLES */
 /* Exported by fib_frontend.c */
+extern struct nla_policy rtm_ipv4_policy[];
 extern void             ip_fib_init(void);
 extern int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
 extern int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
 extern int inet_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
 extern int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb);
-extern int fib_validate_source(u32 src, u32 dst, u8 tos, int oif,
+extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
-                               struct net_device *dev, u32 *spec_dst, u32 *itag);
+                               struct net_device *dev, __be32 *spec_dst, u32 *itag);
 extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res);
 struct rtentry;
 /* Exported by fib_semantics.c */
-extern int ip_fib_check_default(u32 gw, struct net_device *dev);
+extern int ip_fib_check_default(__be32 gw, struct net_device *dev);
-extern int fib_sync_down(u32 local, struct net_device *dev, int force);
+extern int fib_sync_down(__be32 local, struct net_device *dev, int force);
 extern int fib_sync_up(struct net_device *dev);
-extern int fib_convert_rtentry(int cmd, struct nlmsghdr *nl, struct rtmsg *rtm,
+extern __be32  __fib_res_prefsrc(struct fib_result *res);
-                               struct kern_rta *rta, struct rtentry *r);
-extern u32  __fib_res_prefsrc(struct fib_result *res);
 /* Exported by fib_hash.c */
-extern struct fib_table *fib_hash_init(int id);
+extern struct fib_table *fib_hash_init(u32 id);
 #ifdef CONFIG_IP_MULTIPLE_TABLES
-/* Exported by fib_rules.c */
+extern int fib4_rules_dump(struct sk_buff *skb, struct netlink_callback *cb);
+extern void __init fib4_rules_init(void);
-extern int inet_rtm_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet_rtm_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
-extern int inet_dump_rules(struct sk_buff *skb, struct netlink_callback *cb);
 #ifdef CONFIG_NET_CLS_ROUTE
 extern u32 fib_rules_tclass(struct fib_result *res);
 #endif
-extern void fib_rules_init(void);
 #endif
 static inline void fib_combine_itag(u32 *itag, struct fib_result *res)
diff --git a/include/net/ip_mp_alg.h b/include/net/ip_mp_alg.h
index ac747b64734c..beffdd66ad74 100644
--- a/include/net/ip_mp_alg.h
+++ b/include/net/ip_mp_alg.h
@@ -17,7 +17,7 @@ struct ip_mp_alg_ops {
        void    (*mp_alg_select_route)(const struct flowi *flp,
                                       struct rtable *rth, struct rtable **rp);
        void    (*mp_alg_flush)(void);
-        void    (*mp_alg_set_nhinfo)(__u32 network, __u32 netmask,
+        void    (*mp_alg_set_nhinfo)(__be32 network, __be32 netmask,
                                     unsigned char prefixlen,
                                     const struct fib_nh *nh);
        void    (*mp_alg_remove)(struct rtable *rth);
@@ -59,7 +59,7 @@ static inline void multipath_flush(void)
 }
 static inline void multipath_set_nhinfo(struct rtable *rth,
-                                        __u32 network, __u32 netmask,
+                                        __be32 network, __be32 netmask,
                                        unsigned char prefixlen,
                                        const struct fib_nh *nh)
 {
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 3b57b159b653..49c717e3b040 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -100,22 +100,22 @@
 struct ip_vs_service_user {
        /* virtual service addresses */
        u_int16_t               protocol;
-        u_int32_t               addr;           /* virtual ip address */
+        __be32                  addr;           /* virtual ip address */
-        u_int16_t               port;
+        __be16                  port;
        u_int32_t               fwmark;         /* firwall mark of service */
        /* virtual service options */
        char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
        unsigned                flags;          /* virtual service flags */
        unsigned                timeout;        /* persistent timeout in sec */
-        u_int32_t               netmask;        /* persistent netmask */
+        __be32                  netmask;        /* persistent netmask */
 };
 struct ip_vs_dest_user {
        /* destination server address */
-        u_int32_t               addr;
+        __be32                  addr;
-        u_int16_t               port;
+        __be16                  port;
        /* real server options */
        unsigned                conn_flags;     /* connection flags */
@@ -163,15 +163,15 @@ struct ip_vs_getinfo {
 struct ip_vs_service_entry {
        /* which service: user fills in these */
        u_int16_t               protocol;
-        u_int32_t               addr;           /* virtual address */
+        __be32                  addr;           /* virtual address */
-        u_int16_t               port;
+        __be16                  port;
        u_int32_t               fwmark;         /* firwall mark of service */
        /* service options */
        char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
        unsigned                flags;          /* virtual service flags */
        unsigned                timeout;        /* persistent timeout */
-        u_int32_t               netmask;        /* persistent netmask */
+        __be32                  netmask;        /* persistent netmask */
        /* number of real servers */
        unsigned int            num_dests;
@@ -182,8 +182,8 @@ struct ip_vs_service_entry {
 struct ip_vs_dest_entry {
-        u_int32_t               addr;           /* destination address */
+        __be32                  addr;           /* destination address */
-        u_int16_t               port;
+        __be16                  port;
        unsigned                conn_flags;     /* connection flags */
        int                     weight;         /* destination weight */
@@ -203,8 +203,8 @@ struct ip_vs_dest_entry {
 struct ip_vs_get_dests {
        /* which service: user fills in these */
        u_int16_t               protocol;
-        u_int32_t               addr;           /* virtual address */
+        __be32                  addr;           /* virtual address */
-        u_int16_t               port;
+        __be16                  port;
        u_int32_t               fwmark;         /* firwall mark of service */
        /* number of real servers */
@@ -502,12 +502,12 @@ struct ip_vs_conn {
        struct list_head        c_list;         /* hashed list heads */
        /* Protocol, addresses and port numbers */
-        __u32                   caddr;          /* client address */
+        __be32                   caddr;          /* client address */
-        __u32                   vaddr;          /* virtual address */
+        __be32                   vaddr;          /* virtual address */
-        __u32                   daddr;          /* destination address */
+        __be32                   daddr;          /* destination address */
-        __u16                   cport;
+        __be16                   cport;
-        __u16                   vport;
+        __be16                   vport;
-        __u16                   dport;
+        __be16                   dport;
        __u16                   protocol;       /* Which protocol (TCP/UDP) */
        /* counter and timer */
@@ -554,12 +554,12 @@ struct ip_vs_service {
        atomic_t                usecnt;   /* use counter */
        __u16                   protocol; /* which protocol (TCP/UDP) */
-        __u32                   addr;     /* IP address for virtual service */
+        __be32                  addr;     /* IP address for virtual service */
-        __u16                   port;     /* port number for the service */
+        __be16                  port;     /* port number for the service */
        __u32                   fwmark;   /* firewall mark of the service */
        unsigned                flags;    /* service status flags */
        unsigned                timeout;  /* persistent timeout in ticks */
-        __u32                   netmask;  /* grouping granularity */
+        __be32                  netmask;  /* grouping granularity */
        struct list_head        destinations;  /* real server d-linked list */
        __u32                   num_dests;     /* number of servers */
@@ -581,8 +581,8 @@ struct ip_vs_dest {
        struct list_head        n_list;   /* for the dests in the service */
        struct list_head        d_list;   /* for table with all the dests */
-        __u32                   addr;           /* IP address of the server */
+        __be32                  addr;           /* IP address of the server */
-        __u16                   port;           /* port number of the server */
+        __be16                  port;           /* port number of the server */
        volatile unsigned       flags;          /* dest status flags */
        atomic_t                conn_flags;     /* flags to copy to conn */
        atomic_t                weight;         /* server weight */
@@ -605,8 +605,8 @@ struct ip_vs_dest {
        /* for virtual service */
        struct ip_vs_service    *svc;           /* service it belongs to */
        __u16                   protocol;       /* which protocol (TCP/UDP) */
-        __u32                   vaddr;          /* virtual IP address */
+        __be32                  vaddr;          /* virtual IP address */
-        __u16                   vport;          /* virtual port number */
+        __be16                  vport;          /* virtual port number */
        __u32                   vfwmark;        /* firewall mark of service */
 };
@@ -648,7 +648,7 @@ struct ip_vs_app
        /* members for application incarnations */
        struct list_head        p_list;         /* member in proto app list */
        struct ip_vs_app        *app;           /* its real application */
-        __u16                   port;           /* port number in net order */
+        __be16                  port;           /* port number in net order */
        atomic_t                usecnt;         /* usage counter */
        /* output hook: return false if can't linearize. diff set for TCP.  */
@@ -740,11 +740,11 @@ enum {
 };
 extern struct ip_vs_conn *ip_vs_conn_in_get
-(int protocol, __u32 s_addr, __u16 s_port, __u32 d_addr, __u16 d_port);
+(int protocol, __be32 s_addr, __be16 s_port, __be32 d_addr, __be16 d_port);
 extern struct ip_vs_conn *ip_vs_ct_in_get
-(int protocol, __u32 s_addr, __u16 s_port, __u32 d_addr, __u16 d_port);
+(int protocol, __be32 s_addr, __be16 s_port, __be32 d_addr, __be16 d_port);
 extern struct ip_vs_conn *ip_vs_conn_out_get
-(int protocol, __u32 s_addr, __u16 s_port, __u32 d_addr, __u16 d_port);
+(int protocol, __be32 s_addr, __be16 s_port, __be32 d_addr, __be16 d_port);
 /* put back the conn without restarting its timer */
 static inline void __ip_vs_conn_put(struct ip_vs_conn *cp)
@@ -752,11 +752,11 @@ static inline void __ip_vs_conn_put(struct ip_vs_conn *cp)
        atomic_dec(&cp->refcnt);
 }
 extern void ip_vs_conn_put(struct ip_vs_conn *cp);
-extern void ip_vs_conn_fill_cport(struct ip_vs_conn *cp, __u16 cport);
+extern void ip_vs_conn_fill_cport(struct ip_vs_conn *cp, __be16 cport);
 extern struct ip_vs_conn *
-ip_vs_conn_new(int proto, __u32 caddr, __u16 cport, __u32 vaddr, __u16 vport,
+ip_vs_conn_new(int proto, __be32 caddr, __be16 cport, __be32 vaddr, __be16 vport,
-               __u32 daddr, __u16 dport, unsigned flags,
+               __be32 daddr, __be16 dport, unsigned flags,
               struct ip_vs_dest *dest);
 extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp);
@@ -887,7 +887,7 @@ extern int sysctl_ip_vs_nat_icmp_send;
 extern struct ip_vs_stats ip_vs_stats;
 extern struct ip_vs_service *
-ip_vs_service_get(__u32 fwmark, __u16 protocol, __u32 vaddr, __u16 vport);
+ip_vs_service_get(__u32 fwmark, __u16 protocol, __be32 vaddr, __be16 vport);
 static inline void ip_vs_service_put(struct ip_vs_service *svc)
 {
@@ -895,7 +895,7 @@ static inline void ip_vs_service_put(struct ip_vs_service *svc)
 }
 extern struct ip_vs_dest *
-ip_vs_lookup_real_service(__u16 protocol, __u32 daddr, __u16 dport);
+ip_vs_lookup_real_service(__u16 protocol, __be32 daddr, __be16 dport);
 extern int ip_vs_use_count_inc(void);
 extern void ip_vs_use_count_dec(void);
 extern int ip_vs_control_init(void);
diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h
index e651a57ecdd5..87c1af3e5e82 100644
--- a/include/net/ipcomp.h
+++ b/include/net/ipcomp.h
@@ -1,11 +1,14 @@
 #ifndef _NET_IPCOMP_H
 #define _NET_IPCOMP_H
+#include <linux/crypto.h>
+#include <linux/types.h>
 #define IPCOMP_SCRATCH_SIZE     65400
 struct ipcomp_data {
        u16 threshold;
-        struct crypto_tfm **tfms;
+        struct crypto_comp **tfms;
 };
 #endif
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index ece7e8a84ffd..8223c4410b4b 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -40,6 +40,7 @@
 #define NEXTHDR_ICMP            58      /* ICMP for IPv6. */
 #define NEXTHDR_NONE            59      /* No next header */
 #define NEXTHDR_DEST            60      /* Destination options header. */
+#define NEXTHDR_MOBILITY        135     /* Mobility header. */
 #define NEXTHDR_MAX             255
@@ -229,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);
+extern int                      ipv6_parse_hopopts(struct sk_buff **skbp);
 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,
@@ -317,8 +318,8 @@ static inline void ipv6_addr_prefix(struct in6_addr *pfx,
 #ifndef __HAVE_ARCH_ADDR_SET
 static inline void ipv6_addr_set(struct in6_addr *addr, 
-                                     __u32 w1, __u32 w2,
+                                     __be32 w1, __be32 w2,
-                                     __u32 w3, __u32 w4)
+                                     __be32 w3, __be32 w4)
 {
        addr->s6_addr32[0] = w1;
        addr->s6_addr32[1] = w2;
@@ -336,7 +337,7 @@ static inline int ipv6_addr_equal(const struct in6_addr *a1,
                a1->s6_addr32[3] == a2->s6_addr32[3]);
 }
-static inline int __ipv6_prefix_equal(const u32 *a1, const u32 *a2,
+static inline int __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
                                      unsigned int prefixlen)
 {
        unsigned pdw, pbi;
@@ -506,6 +507,8 @@ extern int			ipv6_skip_exthdr(const struct sk_buff *, int start,
 extern int                      ipv6_ext_hdr(u8 nexthdr);
+extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);
 extern struct ipv6_txoptions *  ipv6_invert_rthdr(struct sock *sk,
                                                  struct ipv6_rt_hdr *hdr);
diff --git a/include/net/irda/irlan_common.h b/include/net/irda/irlan_common.h
index 1c73bdbc3eb3..9592c374b41d 100644
--- a/include/net/irda/irlan_common.h
+++ b/include/net/irda/irlan_common.h
@@ -98,7 +98,15 @@
 #define IRLAN_SHORT  1
 #define IRLAN_ARRAY  2
-#define IRLAN_MAX_HEADER (TTP_HEADER+LMP_HEADER+LAP_MAX_HEADER)
+/* IrLAN sits on top if IrTTP */
+#define IRLAN_MAX_HEADER (TTP_HEADER+LMP_HEADER)
+/* 1 byte for the command code and 1 byte for the parameter count */
+#define IRLAN_CMD_HEADER 2
+#define IRLAN_STRING_PARAMETER_LEN(name, value) (1 + strlen((name)) + 2 \
+                                                + strlen ((value)))
+#define IRLAN_BYTE_PARAMETER_LEN(name)          (1 + strlen((name)) + 2 + 1)
+#define IRLAN_SHORT_PARAMETER_LEN(name)         (1 + strlen((name)) + 2 + 2)
 /*
 *  IrLAN client
diff --git a/include/net/irda/irlap_frame.h b/include/net/irda/irlap_frame.h
index 3452ae257c84..9dd54a5002b2 100644
--- a/include/net/irda/irlap_frame.h
+++ b/include/net/irda/irlap_frame.h
@@ -74,6 +74,19 @@ struct discovery_t;
 #define PF_BIT    0x10 /* Poll/final bit */
+/* Some IrLAP field lengths */
+/*
+ * Only baud rate triplet is 4 bytes (PV can be 2 bytes).
+ * All others params (7) are 3 bytes, so that's 7*3 + 1*4 bytes.
+ */
+#define IRLAP_NEGOCIATION_PARAMS_LEN 25
+#define IRLAP_DISCOVERY_INFO_LEN     32
+struct disc_frame {
+        __u8 caddr;          /* Connection address */
+        __u8 control;
+} IRDA_PACK;
 struct xid_frame {
        __u8  caddr; /* Connection address */
        __u8  control;
@@ -95,11 +108,25 @@ struct test_frame {
 struct ua_frame {
        __u8 caddr;
        __u8 control;
        __u32 saddr; /* Source device address */
        __u32 daddr; /* Dest device address */
 } IRDA_PACK;
-        
+struct dm_frame {
+        __u8 caddr;          /* Connection address */
+        __u8 control;
+} IRDA_PACK;
+struct rd_frame {
+        __u8 caddr;          /* Connection address */
+        __u8 control;
+} IRDA_PACK;
+struct rr_frame {
+        __u8 caddr;          /* Connection address */
+        __u8 control;
+} IRDA_PACK;
 struct i_frame {
        __u8 caddr;
        __u8 control;
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h
index 11ecfa58a648..e212b9bc2503 100644
--- a/include/net/irda/irlmp.h
+++ b/include/net/irda/irlmp.h
@@ -48,7 +48,7 @@
 #define DEV_ADDR_ANY  0xffffffff
 #define LMP_HEADER          2    /* Dest LSAP + Source LSAP */
-#define LMP_CONTROL_HEADER  4
+#define LMP_CONTROL_HEADER  4    /* LMP_HEADER + opcode + parameter */
 #define LMP_PID_HEADER      1    /* Used by Ultra */
 #define LMP_MAX_HEADER      (LMP_CONTROL_HEADER+LAP_MAX_HEADER)
diff --git a/include/net/mip6.h b/include/net/mip6.h
new file mode 100644
index 000000000000..68263c6d9996
--- /dev/null
+++ b/include/net/mip6.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C)2003-2006 Helsinki University of Technology
+ * Copyright (C)2003-2006 USAGI/WIDE Project
+ *
+ * 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
+ */
+/*
+ * Authors:
+ *      Noriaki TAKAMIYA @USAGI
+ *      Masahide NAKAMURA @USAGI
+ *      YOSHIFUJI Hideaki @USAGI
+ */
+#ifndef _NET_MIP6_H
+#define _NET_MIP6_H
+#include <linux/skbuff.h>
+#include <net/sock.h>
+#define MIP6_OPT_PAD_1  0
+#define MIP6_OPT_PAD_N  1
+/*
+ * Mobility Header
+ */
+struct ip6_mh {
+        __u8    ip6mh_proto;
+        __u8    ip6mh_hdrlen;
+        __u8    ip6mh_type;
+        __u8    ip6mh_reserved;
+        __u16   ip6mh_cksum;
+        /* Followed by type specific messages */
+        __u8    data[0];
+} __attribute__ ((__packed__));
+#define IP6_MH_TYPE_BRR         0   /* Binding Refresh Request */
+#define IP6_MH_TYPE_HOTI        1   /* HOTI Message   */
+#define IP6_MH_TYPE_COTI        2   /* COTI Message  */
+#define IP6_MH_TYPE_HOT         3   /* HOT Message   */
+#define IP6_MH_TYPE_COT         4   /* COT Message  */
+#define IP6_MH_TYPE_BU          5   /* Binding Update */
+#define IP6_MH_TYPE_BACK        6   /* Binding ACK */
+#define IP6_MH_TYPE_BERROR      7   /* Binding Error */
+#define IP6_MH_TYPE_MAX         IP6_MH_TYPE_BERROR
+extern int mip6_init(void);
+extern void mip6_fini(void);
+extern int mip6_mh_filter(struct sock *sk, struct sk_buff *skb);
+#endif
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 4901ee446879..c8aacbd2e333 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -1,6 +1,8 @@
 #ifndef _NET_NEIGHBOUR_H
 #define _NET_NEIGHBOUR_H
+#include <linux/neighbour.h>
 /*
 *      Generic neighbour manipulation
 *
@@ -14,40 +16,6 @@
 *              - Add neighbour cache statistics like rtstat
 */
-/* The following flags & states are exported to user space,
-   so that they should be moved to include/linux/ directory.
- */
-/*
- *      Neighbor Cache Entry Flags
- */
-#define NTF_PROXY       0x08    /* == ATF_PUBL */
-#define NTF_ROUTER      0x80
-/*
- *      Neighbor Cache Entry States.
- */
-#define NUD_INCOMPLETE  0x01
-#define NUD_REACHABLE   0x02
-#define NUD_STALE       0x04
-#define NUD_DELAY       0x08
-#define NUD_PROBE       0x10
-#define NUD_FAILED      0x20
-/* Dummy states */
-#define NUD_NOARP       0x40
-#define NUD_PERMANENT   0x80
-#define NUD_NONE        0x00
-/* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change
-   and make no address resolution or NUD.
-   NUD_PERMANENT is also cannot be deleted by garbage collectors.
- */
-#ifdef __KERNEL__
 #include <asm/atomic.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
@@ -133,7 +101,7 @@ struct neighbour
        __u8                    dead;
        atomic_t                probes;
        rwlock_t                lock;
-        unsigned char           ha[(MAX_ADDR_LEN+sizeof(unsigned long)-1)&~(sizeof(unsigned long)-1)];
+        unsigned char           ha[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))];
        struct hh_cache         *hh;
        atomic_t                refcnt;
        int                     (*output)(struct sk_buff *skb);
@@ -158,6 +126,7 @@ struct pneigh_entry
 {
        struct pneigh_entry     *next;
        struct net_device               *dev;
+        u8                      flags;
        u8                      key[0];
 };
@@ -374,6 +343,3 @@ struct neighbour_cb {
 #define NEIGH_CB(skb)   ((struct neighbour_cb *)(skb)->cb)
 #endif
-#endif
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
new file mode 100644
index 000000000000..c63a58058e21
--- /dev/null
+++ b/include/net/netlabel.h
@@ -0,0 +1,261 @@
+/*
+ * NetLabel System
+ *
+ * The NetLabel system manages static and dynamic label mappings for network
+ * protocols such as CIPSO and RIPSO.
+ *
+ * Author: Paul Moore <paul.moore@hp.com>
+ *
+ */
+/*
+ * (c) Copyright Hewlett-Packard Development Company, L.P., 2006
+ *
+ * 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
+ *
+ */
+#ifndef _NETLABEL_H
+#define _NETLABEL_H
+#include <linux/types.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <net/netlink.h>
+/*
+ * NetLabel - A management interface for maintaining network packet label
+ *            mapping tables for explicit packet labling protocols.
+ *
+ * Network protocols such as CIPSO and RIPSO require a label translation layer
+ * to convert the label on the packet into something meaningful on the host
+ * machine.  In the current Linux implementation these mapping tables live
+ * inside the kernel; NetLabel provides a mechanism for user space applications
+ * to manage these mapping tables.
+ *
+ * NetLabel makes use of the Generic NETLINK mechanism as a transport layer to
+ * send messages between kernel and user space.  The general format of a
+ * NetLabel message is shown below:
+ *
+ *  +-----------------+-------------------+--------- --- -- -
+ *  | struct nlmsghdr | struct genlmsghdr | payload
+ *  +-----------------+-------------------+--------- --- -- -
+ *
+ * The 'nlmsghdr' and 'genlmsghdr' structs should be dealt with like normal.
+ * The payload is dependent on the subsystem specified in the
+ * 'nlmsghdr->nlmsg_type' and should be defined below, supporting functions
+ * should be defined in the corresponding net/netlabel/netlabel_<subsys>.h|c
+ * file.  All of the fields in the NetLabel payload are NETLINK attributes, see
+ * the include/net/netlink.h file for more information on NETLINK attributes.
+ *
+ */
+/*
+ * NetLabel NETLINK protocol
+ */
+#define NETLBL_PROTO_VERSION            1
+/* NetLabel NETLINK types/families */
+#define NETLBL_NLTYPE_NONE              0
+#define NETLBL_NLTYPE_MGMT              1
+#define NETLBL_NLTYPE_MGMT_NAME         "NLBL_MGMT"
+#define NETLBL_NLTYPE_RIPSO             2
+#define NETLBL_NLTYPE_RIPSO_NAME        "NLBL_RIPSO"
+#define NETLBL_NLTYPE_CIPSOV4           3
+#define NETLBL_NLTYPE_CIPSOV4_NAME      "NLBL_CIPSOv4"
+#define NETLBL_NLTYPE_CIPSOV6           4
+#define NETLBL_NLTYPE_CIPSOV6_NAME      "NLBL_CIPSOv6"
+#define NETLBL_NLTYPE_UNLABELED         5
+#define NETLBL_NLTYPE_UNLABELED_NAME    "NLBL_UNLBL"
+/*
+ * NetLabel - Kernel API for accessing the network packet label mappings.
+ *
+ * The following functions are provided for use by other kernel modules,
+ * specifically kernel LSM modules, to provide a consistent, transparent API
+ * for dealing with explicit packet labeling protocols such as CIPSO and
+ * RIPSO.  The functions defined here are implemented in the
+ * net/netlabel/netlabel_kapi.c file.
+ *
+ */
+/* NetLabel audit information */
+struct netlbl_audit {
+        u32 secid;
+        uid_t loginuid;
+};
+/* Domain mapping definition struct */
+struct netlbl_dom_map;
+/* Domain mapping operations */
+int netlbl_domhsh_remove(const char *domain, struct netlbl_audit *audit_info);
+/* LSM security attributes */
+struct netlbl_lsm_cache {
+        void (*free) (const void *data);
+        void *data;
+};
+struct netlbl_lsm_secattr {
+        char *domain;
+        u32 mls_lvl;
+        u32 mls_lvl_vld;
+        unsigned char *mls_cat;
+        size_t mls_cat_len;
+        struct netlbl_lsm_cache cache;
+};
+/*
+ * LSM security attribute operations
+ */
+/**
+ * netlbl_secattr_init - Initialize a netlbl_lsm_secattr struct
+ * @secattr: the struct to initialize
+ *
+ * Description:
+ * Initialize an already allocated netlbl_lsm_secattr struct.  Returns zero on
+ * success, negative values on error.
+ *
+ */
+static inline int netlbl_secattr_init(struct netlbl_lsm_secattr *secattr)
+{
+        memset(secattr, 0, sizeof(*secattr));
+        return 0;
+}
+/**
+ * netlbl_secattr_destroy - Clears a netlbl_lsm_secattr struct
+ * @secattr: the struct to clear
+ * @clear_cache: cache clear flag
+ *
+ * Description:
+ * Destroys the @secattr struct, including freeing all of the internal buffers.
+ * If @clear_cache is true then free the cache fields, otherwise leave them
+ * intact.  The struct must be reset with a call to netlbl_secattr_init()
+ * before reuse.
+ *
+ */
+static inline void netlbl_secattr_destroy(struct netlbl_lsm_secattr *secattr,
+                                          u32 clear_cache)
+{
+        if (clear_cache && secattr->cache.data != NULL && secattr->cache.free)
+                secattr->cache.free(secattr->cache.data);
+        kfree(secattr->domain);
+        kfree(secattr->mls_cat);
+}
+/**
+ * netlbl_secattr_alloc - Allocate and initialize a netlbl_lsm_secattr struct
+ * @flags: the memory allocation flags
+ *
+ * Description:
+ * Allocate and initialize a netlbl_lsm_secattr struct.  Returns a valid
+ * pointer on success, or NULL on failure.
+ *
+ */
+static inline struct netlbl_lsm_secattr *netlbl_secattr_alloc(int flags)
+{
+        return kzalloc(sizeof(struct netlbl_lsm_secattr), flags);
+}
+/**
+ * netlbl_secattr_free - Frees a netlbl_lsm_secattr struct
+ * @secattr: the struct to free
+ * @clear_cache: cache clear flag
+ *
+ * Description:
+ * Frees @secattr including all of the internal buffers.  If @clear_cache is
+ * true then free the cache fields, otherwise leave them intact.
+ *
+ */
+static inline void netlbl_secattr_free(struct netlbl_lsm_secattr *secattr,
+                                       u32 clear_cache)
+{
+        netlbl_secattr_destroy(secattr, clear_cache);
+        kfree(secattr);
+}
+/*
+ * LSM protocol operations
+ */
+#ifdef CONFIG_NETLABEL
+int netlbl_socket_setattr(const struct socket *sock,
+                          const struct netlbl_lsm_secattr *secattr);
+int netlbl_sock_getattr(struct sock *sk,
+                        struct netlbl_lsm_secattr *secattr);
+int netlbl_socket_getattr(const struct socket *sock,
+                          struct netlbl_lsm_secattr *secattr);
+int netlbl_skbuff_getattr(const struct sk_buff *skb,
+                          struct netlbl_lsm_secattr *secattr);
+void netlbl_skbuff_err(struct sk_buff *skb, int error);
+#else
+static inline int netlbl_socket_setattr(const struct socket *sock,
+                                     const struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline int netlbl_sock_getattr(struct sock *sk,
+                                      struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline int netlbl_socket_getattr(const struct socket *sock,
+                                        struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline int netlbl_skbuff_getattr(const struct sk_buff *skb,
+                                        struct netlbl_lsm_secattr *secattr)
+{
+        return -ENOSYS;
+}
+static inline void netlbl_skbuff_err(struct sk_buff *skb, int error)
+{
+        return;
+}
+#endif /* CONFIG_NETLABEL */
+/*
+ * LSM label mapping cache operations
+ */
+#ifdef CONFIG_NETLABEL
+void netlbl_cache_invalidate(void);
+int netlbl_cache_add(const struct sk_buff *skb,
+                     const struct netlbl_lsm_secattr *secattr);
+#else
+static inline void netlbl_cache_invalidate(void)
+{
+        return;
+}
+static inline int netlbl_cache_add(const struct sk_buff *skb,
+                                   const struct netlbl_lsm_secattr *secattr)
+{
+        return 0;
+}
+#endif /* CONFIG_NETLABEL */
+#endif /* _NETLABEL_H */
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 640c26a90cf1..ce5cba19c393 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -35,12 +35,15 @@
 *   nlmsg_put()                        add a netlink message to an skb
 *   nlmsg_put_answer()                 callback based nlmsg_put()
 *   nlmsg_end()                        finanlize netlink message
+ *   nlmsg_get_pos()                    return current position in message
+ *   nlmsg_trim()                       trim part of message
 *   nlmsg_cancel()                     cancel message construction
 *   nlmsg_free()                       free a netlink message
 *
 * Message Sending:
 *   nlmsg_multicast()                  multicast message to several groups
 *   nlmsg_unicast()                    unicast a message to a single socket
+ *   nlmsg_notify()                     send notification message
 *
 * Message Length Calculations:
 *   nlmsg_msg_size(payload)            length of message w/o padding
@@ -62,6 +65,9 @@
 *   nlmsg_validate()                   validate netlink message incl. attrs
 *   nlmsg_for_each_attr()              loop over all attributes
 *
+ * Misc:
+ *   nlmsg_report()                     report back to application?
+ *
 * ------------------------------------------------------------------------
 *                          Attributes Interface
 * ------------------------------------------------------------------------
@@ -80,8 +86,10 @@
 *   struct nlattr                      netlink attribtue header
 *
 * Attribute Construction:
- *   nla_reserve(skb, type, len)        reserve skb tailroom for an attribute
+ *   nla_reserve(skb, type, len)        reserve room for an attribute
+ *   nla_reserve_nohdr(skb, len)        reserve room for an attribute w/o hdr
 *   nla_put(skb, type, len, data)      add attribute to skb
+ *   nla_put_nohdr(skb, len, data)      add attribute w/o hdr
 *
 * Attribute Construction for Basic Types:
 *   nla_put_u8(skb, type, value)       add u8 attribute to skb
@@ -138,10 +146,13 @@
 *   nla_ok(nla, remaining)             does nla fit into remaining bytes?
 *   nla_next(nla, remaining)           get next netlink attribute
 *   nla_validate()                     validate a stream of attributes
+ *   nla_validate_nested()              validate a stream of nested attributes
 *   nla_find()                         find attribute in stream of attributes
+ *   nla_find_nested()                  find attribute in nested attributes
 *   nla_parse()                        parse and validate stream of attrs
 *   nla_parse_nested()                 parse nested attribuets
 *   nla_for_each_attr()                loop over all attributes
+ *   nla_for_each_nested()              loop over the nested attributes
 *=========================================================================
 */
@@ -158,6 +169,7 @@ enum {
        NLA_FLAG,
        NLA_MSECS,
        NLA_NESTED,
+        NLA_NUL_STRING,
        __NLA_TYPE_MAX,
 };
@@ -166,21 +178,37 @@ enum {
 /**
 * struct nla_policy - attribute validation policy
 * @type: Type of attribute or NLA_UNSPEC
- * @minlen: Minimal length of payload required to be available
+ * @len: Type specific length of payload
 *
 * Policies are defined as arrays of this struct, the array must be
 * accessible by attribute type up to the highest identifier to be expected.
 *
+ * Meaning of `len' field:
+ *    NLA_STRING           Maximum length of string
+ *    NLA_NUL_STRING       Maximum length of string (excluding NUL)
+ *    NLA_FLAG             Unused
+ *    All other            Exact length of attribute payload
+ *
 * Example:
 * static struct nla_policy my_policy[ATTR_MAX+1] __read_mostly = {
 *      [ATTR_FOO] = { .type = NLA_U16 },
- *      [ATTR_BAR] = { .type = NLA_STRING },
+ *      [ATTR_BAR] = { .type = NLA_STRING, len = BARSIZ },
- *      [ATTR_BAZ] = { .minlen = sizeof(struct mystruct) },
+ *      [ATTR_BAZ] = { .len = sizeof(struct mystruct) },
 * };
 */
 struct nla_policy {
        u16             type;
-        u16             minlen;
+        u16             len;
+};
+/**
+ * struct nl_info - netlink source information
+ * @nlh: Netlink message header of original request
+ * @pid: Netlink PID of requesting application
+ */
+struct nl_info {
+        struct nlmsghdr         *nlh;
+        u32                     pid;
 };
 extern void             netlink_run_queue(struct sock *sk, unsigned int *qlen,
@@ -188,6 +216,9 @@ extern void		netlink_run_queue(struct sock *sk, unsigned int *qlen,
                                                    struct nlmsghdr *, int *));
 extern void             netlink_queue_skip(struct nlmsghdr *nlh,
                                           struct sk_buff *skb);
+extern int              nlmsg_notify(struct sock *sk, struct sk_buff *skb,
+                                     u32 pid, unsigned int group, int report,
+                                     gfp_t flags);
 extern int              nla_validate(struct nlattr *head, int len, int maxtype,
                                     struct nla_policy *policy);
@@ -203,12 +234,18 @@ extern int		nla_memcmp(const struct nlattr *nla, const void *data,
 extern int              nla_strcmp(const struct nlattr *nla, const char *str);
 extern struct nlattr *  __nla_reserve(struct sk_buff *skb, int attrtype,
                                      int attrlen);
+extern void *           __nla_reserve_nohdr(struct sk_buff *skb, int attrlen);
 extern struct nlattr *  nla_reserve(struct sk_buff *skb, int attrtype,
                                    int attrlen);
+extern void *           nla_reserve_nohdr(struct sk_buff *skb, int attrlen);
 extern void             __nla_put(struct sk_buff *skb, int attrtype,
                                  int attrlen, const void *data);
+extern void             __nla_put_nohdr(struct sk_buff *skb, int attrlen,
+                                        const void *data);
 extern int              nla_put(struct sk_buff *skb, int attrtype,
                                int attrlen, const void *data);
+extern int              nla_put_nohdr(struct sk_buff *skb, int attrlen,
+                                      const void *data);
 /**************************************************************************
 * Netlink Messages
@@ -364,6 +401,17 @@ static inline int nlmsg_validate(struct nlmsghdr *nlh, int hdrlen, int maxtype,
 }
 /**
+ * nlmsg_report - need to report back to application?
+ * @nlh: netlink message header
+ *
+ * Returns 1 if a report back to the application is requested.
+ */
+static inline int nlmsg_report(struct nlmsghdr *nlh)
+{
+        return !!(nlh->nlmsg_flags & NLM_F_ECHO);
+}
+/**
 * nlmsg_for_each_attr - iterate over a stream of attributes
 * @pos: loop counter, set to current attribute
 * @nlh: netlink message header
@@ -453,12 +501,13 @@ static inline struct nlmsghdr *nlmsg_put_answer(struct sk_buff *skb,
 /**
 * nlmsg_new - Allocate a new netlink message
 * @size: maximum size of message
+ * @flags: the type of memory to allocate.
 *
 * Use NLMSG_GOODSIZE if size isn't know and you need a good default size.
 */
-static inline struct sk_buff *nlmsg_new(int size)
+static inline struct sk_buff *nlmsg_new(int size, gfp_t flags)
 {
-        return alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
+        return alloc_skb(size, flags);
 }
 /**
@@ -480,6 +529,32 @@ static inline int nlmsg_end(struct sk_buff *skb, struct nlmsghdr *nlh)
 }
 /**
+ * nlmsg_get_pos - return current position in netlink message
+ * @skb: socket buffer the message is stored in
+ *
+ * Returns a pointer to the current tail of the message.
+ */
+static inline void *nlmsg_get_pos(struct sk_buff *skb)
+{
+        return skb->tail;
+}
+/**
+ * nlmsg_trim - Trim message to a mark
+ * @skb: socket buffer the message is stored in
+ * @mark: mark to trim to
+ *
+ * Trims the message to the provided mark. Returns -1.
+ */
+static inline int nlmsg_trim(struct sk_buff *skb, void *mark)
+{
+        if (mark)
+                skb_trim(skb, (unsigned char *) mark - skb->data);
+        return -1;
+}
+/**
 * nlmsg_cancel - Cancel construction of a netlink message
 * @skb: socket buffer the message is stored in
 * @nlh: netlink message header
@@ -489,9 +564,7 @@ static inline int nlmsg_end(struct sk_buff *skb, struct nlmsghdr *nlh)
 */
 static inline int nlmsg_cancel(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
-        skb_trim(skb, (unsigned char *) nlh - skb->data);
+        return nlmsg_trim(skb, nlh);
-        return -1;
 }
 /**
@@ -509,15 +582,16 @@ static inline void nlmsg_free(struct sk_buff *skb)
 * @skb: netlink message as socket buffer
 * @pid: own netlink pid to avoid sending to yourself
 * @group: multicast group id
+ * @flags: allocation flags
 */
 static inline int nlmsg_multicast(struct sock *sk, struct sk_buff *skb,
-                                  u32 pid, unsigned int group)
+                                  u32 pid, unsigned int group, gfp_t flags)
 {
        int err;
        NETLINK_CB(skb).dst_group = group;
-        err = netlink_broadcast(sk, skb, pid, group, GFP_KERNEL);
+        err = netlink_broadcast(sk, skb, pid, group, flags);
        if (err > 0)
                err = 0;
@@ -631,6 +705,18 @@ static inline struct nlattr *nla_next(const struct nlattr *nla, int *remaining)
 }
 /**
+ * nla_find_nested - find attribute in a set of nested attributes
+ * @nla: attribute containing the nested attributes
+ * @attrtype: type of attribute to look for
+ *
+ * Returns the first attribute which matches the specified type.
+ */
+static inline struct nlattr *nla_find_nested(struct nlattr *nla, int attrtype)
+{
+        return nla_find(nla_data(nla), nla_len(nla), attrtype);
+}
+/**
 * nla_parse_nested - parse nested attributes
 * @tb: destination array with maxtype+1 elements
 * @maxtype: maximum attribute type to be expected
@@ -745,13 +831,16 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
 #define NLA_PUT_U32(skb, attrtype, value) \
        NLA_PUT_TYPE(skb, u32, attrtype, value)
+#define NLA_PUT_BE32(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, __be32, attrtype, value)
 #define NLA_PUT_U64(skb, attrtype, value) \
        NLA_PUT_TYPE(skb, u64, attrtype, value)
 #define NLA_PUT_STRING(skb, attrtype, value) \
        NLA_PUT(skb, attrtype, strlen(value) + 1, value)
-#define NLA_PUT_FLAG(skb, attrtype, value) \
+#define NLA_PUT_FLAG(skb, attrtype) \
        NLA_PUT(skb, attrtype, 0, NULL)
 #define NLA_PUT_MSECS(skb, attrtype, jiffies) \
@@ -767,6 +856,15 @@ static inline u32 nla_get_u32(struct nlattr *nla)
 }
 /**
+ * nla_get_be32 - return payload of __be32 attribute
+ * @nla: __be32 netlink attribute
+ */
+static inline __be32 nla_get_be32(struct nlattr *nla)
+{
+        return *(__be32 *) nla_data(nla);
+}
+/**
 * nla_get_u16 - return payload of u16 attribute
 * @nla: u16 netlink attribute
 */
@@ -862,10 +960,25 @@ static inline int nla_nest_end(struct sk_buff *skb, struct nlattr *start)
 */
 static inline int nla_nest_cancel(struct sk_buff *skb, struct nlattr *start)
 {
-        if (start)
+        return nlmsg_trim(skb, start);
-                skb_trim(skb, (unsigned char *) start - skb->data);
+}
-        return -1;
+/**
+ * nla_validate_nested - Validate a stream of nested attributes
+ * @start: container attribute
+ * @maxtype: maximum attribute type to be expected
+ * @policy: validation policy
+ *
+ * Validates all attributes in the nested attribute stream against the
+ * specified policy. Attributes with a type exceeding maxtype will be
+ * ignored. See documenation of struct nla_policy for more details.
+ *
+ * Returns 0 on success or a negative error code.
+ */
+static inline int nla_validate_nested(struct nlattr *start, int maxtype,
+                                      struct nla_policy *policy)
+{
+        return nla_validate(nla_data(start), nla_len(start), maxtype, policy);
 }
 /**
@@ -880,4 +993,13 @@ static inline int nla_nest_cancel(struct sk_buff *skb, struct nlattr *start)
             nla_ok(pos, rem); \
             pos = nla_next(pos, &(rem)))
+/**
+ * nla_for_each_nested - iterate over nested attributes
+ * @pos: loop counter, set to current attribute
+ * @nla: attribute containing the nested attributes
+ * @rem: initialized to len, holds bytes currently remaining in stream
+ */
+#define nla_for_each_nested(pos, nla, rem) \
+        nla_for_each_attr(pos, nla_data(nla), nla_len(nla), rem)
 #endif
diff --git a/include/net/nexthop.h b/include/net/nexthop.h
new file mode 100644
index 000000000000..3334dbfa5aa4
--- /dev/null
+++ b/include/net/nexthop.h
@@ -0,0 +1,33 @@
+#ifndef __NET_NEXTHOP_H
+#define __NET_NEXTHOP_H
+#include <linux/rtnetlink.h>
+#include <net/netlink.h>
+static inline int rtnh_ok(const struct rtnexthop *rtnh, int remaining)
+{
+        return remaining >= sizeof(*rtnh) &&
+               rtnh->rtnh_len >= sizeof(*rtnh) &&
+               rtnh->rtnh_len <= remaining;
+}
+static inline struct rtnexthop *rtnh_next(const struct rtnexthop *rtnh,
+                                         int *remaining)
+{
+        int totlen = NLA_ALIGN(rtnh->rtnh_len);
+        *remaining -= totlen;
+        return (struct rtnexthop *) ((char *) rtnh + totlen);
+}
+static inline struct nlattr *rtnh_attrs(const struct rtnexthop *rtnh)
+{
+        return (struct nlattr *) ((char *) rtnh + NLA_ALIGN(sizeof(*rtnh)));
+}
+static inline int rtnh_attrlen(const struct rtnexthop *rtnh)
+{
+        return rtnh->rtnh_len - NLA_ALIGN(sizeof(*rtnh));
+}
+#endif
diff --git a/include/net/pkt_act.h b/include/net/pkt_act.h
deleted file mode 100644
index cf5e4d2e4c21..000000000000
--- a/include/net/pkt_act.h
+++ /dev/null
@@ -1,273 +0,0 @@
-#ifndef __NET_PKT_ACT_H
-#define __NET_PKT_ACT_H
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <linux/bitops.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/skbuff.h>
-#include <linux/rtnetlink.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/proc_fs.h>
-#include <net/sock.h>
-#include <net/pkt_sched.h>
-#define tca_st(val) (struct tcf_##val *)
-#define PRIV(a,name) ( tca_st(name) (a)->priv)
-#if 0 /* control */
-#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define DPRINTK(format,args...)
-#endif
-#if 0 /* data */
-#define D2PRINTK(format,args...) printk(KERN_DEBUG format,##args)
-#else
-#define D2PRINTK(format,args...)
-#endif
-static __inline__ unsigned
-tcf_hash(u32 index)
-{
-        return index & MY_TAB_MASK;
-}
-/* probably move this from being inline
- * and put into act_generic
-*/
-static inline void
-tcf_hash_destroy(struct tcf_st *p)
-{
-        unsigned h = tcf_hash(p->index);
-        struct tcf_st **p1p;
-        for (p1p = &tcf_ht[h]; *p1p; p1p = &(*p1p)->next) {
-                if (*p1p == p) {
-                        write_lock_bh(&tcf_t_lock);
-                        *p1p = p->next;
-                        write_unlock_bh(&tcf_t_lock);
-#ifdef CONFIG_NET_ESTIMATOR
-                        gen_kill_estimator(&p->bstats, &p->rate_est);
-#endif
-                        kfree(p);
-                        return;
-                }
-        }
-        BUG_TRAP(0);
-}
-static inline int
-tcf_hash_release(struct tcf_st *p, int bind )
-{
-        int ret = 0;
-        if (p) {
-                if (bind) {
-                        p->bindcnt--;
-                }
-                p->refcnt--;
-                if(p->bindcnt <=0 && p->refcnt <= 0) {
-                        tcf_hash_destroy(p);
-                        ret = 1;
-                }
-        }
-        return ret;
-}
-static __inline__ int
-tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
-                struct tc_action *a)
-{
-        struct tcf_st *p;
-        int err =0, index =  -1,i= 0, s_i = 0, n_i = 0;
-        struct rtattr *r ;
-        read_lock(&tcf_t_lock);
-        s_i = cb->args[0];
-        for (i = 0; i < MY_TAB_SIZE; i++) {
-                p = tcf_ht[tcf_hash(i)];
-                for (; p; p = p->next) {
-                        index++;
-                        if (index < s_i)
-                                continue;
-                        a->priv = p;
-                        a->order = n_i;
-                        r = (struct rtattr*) skb->tail;
-                        RTA_PUT(skb, a->order, 0, NULL);
-                        err = tcf_action_dump_1(skb, a, 0, 0);
-                        if (0 > err) {
-                                index--;
-                                skb_trim(skb, (u8*)r - skb->data);
-                                goto done;
-                        }
-                        r->rta_len = skb->tail - (u8*)r;
-                        n_i++;
-                        if (n_i >= TCA_ACT_MAX_PRIO) {
-                                goto done;
-                        }
-                }
-        }
-done:
-        read_unlock(&tcf_t_lock);
-        if (n_i)
-                cb->args[0] += n_i;
-        return n_i;
-rtattr_failure:
-        skb_trim(skb, (u8*)r - skb->data);
-        goto done;
-}
-static __inline__ int
-tcf_del_walker(struct sk_buff *skb, struct tc_action *a)
-{
-        struct tcf_st *p, *s_p;
-        struct rtattr *r ;
-        int i= 0, n_i = 0;
-        r = (struct rtattr*) skb->tail;
-        RTA_PUT(skb, a->order, 0, NULL);
-        RTA_PUT(skb, TCA_KIND, IFNAMSIZ, a->ops->kind);
-        for (i = 0; i < MY_TAB_SIZE; i++) {
-                p = tcf_ht[tcf_hash(i)];
-                while (p != NULL) {
-                        s_p = p->next;
-                        if (ACT_P_DELETED == tcf_hash_release(p, 0)) {
-                                 module_put(a->ops->owner);
-                        }
-                        n_i++;
-                        p = s_p;
-                }
-        }
-        RTA_PUT(skb, TCA_FCNT, 4, &n_i);
-        r->rta_len = skb->tail - (u8*)r;
-        return n_i;
-rtattr_failure:
-        skb_trim(skb, (u8*)r - skb->data);
-        return -EINVAL;
-}
-static __inline__ int
-tcf_generic_walker(struct sk_buff *skb, struct netlink_callback *cb, int type,
-                struct tc_action *a)
-{
-                if (type == RTM_DELACTION) {
-                        return tcf_del_walker(skb,a);
-                } else if (type == RTM_GETACTION) {
-                        return tcf_dump_walker(skb,cb,a);
-                } else {
-                        printk("tcf_generic_walker: unknown action %d\n",type);
-                        return -EINVAL;
-                }
-}
-static __inline__ struct tcf_st *
-tcf_hash_lookup(u32 index)
-{
-        struct tcf_st *p;
-        read_lock(&tcf_t_lock);
-        for (p = tcf_ht[tcf_hash(index)]; p; p = p->next) {
-                if (p->index == index)
-                        break;
-        }
-        read_unlock(&tcf_t_lock);
-        return p;
-}
-static __inline__ u32
-tcf_hash_new_index(void)
-{
-        do {
-                if (++idx_gen == 0)
-                        idx_gen = 1;
-        } while (tcf_hash_lookup(idx_gen));
-        return idx_gen;
-}
-static inline int
-tcf_hash_search(struct tc_action *a, u32 index)
-{
-        struct tcf_st *p = tcf_hash_lookup(index);
-        if (p != NULL) {
-                a->priv = p;
-                return 1;
-        }
-        return 0;
-}
-#ifdef CONFIG_NET_ACT_INIT
-static inline struct tcf_st *
-tcf_hash_check(u32 index, struct tc_action *a, int ovr, int bind)
-{
-        struct tcf_st *p = NULL;
-        if (index && (p = tcf_hash_lookup(index)) != NULL) {
-                if (bind) {
-                        p->bindcnt++;
-                        p->refcnt++;
-                }
-                a->priv = p;
-        }
-        return p;
-}
-static inline struct tcf_st *
-tcf_hash_create(u32 index, struct rtattr *est, struct tc_action *a, int size, int ovr, int bind)
-{
-        struct tcf_st *p = NULL;
-        p = kmalloc(size, GFP_KERNEL);
-        if (p == NULL)
-                return p;
-        memset(p, 0, size);
-        p->refcnt = 1;
-        if (bind) {
-                p->bindcnt = 1;
-        }
-        spin_lock_init(&p->lock);
-        p->stats_lock = &p->lock;
-        p->index = index ? : tcf_hash_new_index();
-        p->tm.install = jiffies;
-        p->tm.lastuse = jiffies;
-#ifdef CONFIG_NET_ESTIMATOR
-        if (est)
-                gen_new_estimator(&p->bstats, &p->rate_est, p->stats_lock, est);
-#endif
-        a->priv = (void *) p;
-        return p;
-}
-static inline void tcf_hash_insert(struct tcf_st *p)
-{
-        unsigned h = tcf_hash(p->index);
-        write_lock_bh(&tcf_t_lock);
-        p->next = tcf_ht[h];
-        tcf_ht[h] = p;
-        write_unlock_bh(&tcf_t_lock);
-}
-#endif
-#endif
diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index c5d7f920c352..8e165ca16bd8 100644
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -53,6 +53,7 @@ struct request_sock {
        unsigned long                   expires;
        struct request_sock_ops         *rsk_ops;
        struct sock                     *sk;
+        u32                             secid;
 };
 static inline struct request_sock *reqsk_alloc(struct request_sock_ops *ops)
diff --git a/include/net/route.h b/include/net/route.h
index c4a068692dcc..486e37aff06c 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -32,6 +32,7 @@
 #include <linux/route.h>
 #include <linux/ip.h>
 #include <linux/cache.h>
+#include <linux/security.h>
 #ifndef __KERNEL__
 #warning This file is not supposed to be used outside of kernel.
@@ -61,18 +62,18 @@ struct rtable
        __u16                   rt_type;
        __u16                   rt_multipath_alg;
-        __u32                   rt_dst; /* Path destination     */
+        __be32                  rt_dst; /* Path destination     */
-        __u32                   rt_src; /* Path source          */
+        __be32                  rt_src; /* Path source          */
        int                     rt_iif;
        /* Info on neighbour */
-        __u32                   rt_gateway;
+        __be32                  rt_gateway;
        /* Cache lookup keys */
        struct flowi            fl;
        /* Miscellaneous cached information */
-        __u32                   rt_spec_dst; /* RFC1122 specific destination */
+        __be32                  rt_spec_dst; /* RFC1122 specific destination */
        struct inet_peer        *peer; /* long-living peer info */
 };
@@ -108,18 +109,18 @@ extern struct ip_rt_acct *ip_rt_acct;
 struct in_device;
 extern int              ip_rt_init(void);
-extern void             ip_rt_redirect(u32 old_gw, u32 dst, u32 new_gw,
+extern void             ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,
-                                       u32 src, struct net_device *dev);
+                                       __be32 src, struct net_device *dev);
 extern void             ip_rt_advice(struct rtable **rp, int advice);
 extern void             rt_cache_flush(int how);
 extern int              __ip_route_output_key(struct rtable **, const struct flowi *flp);
 extern int              ip_route_output_key(struct rtable **, struct flowi *flp);
 extern int              ip_route_output_flow(struct rtable **rp, struct flowi *flp, struct sock *sk, int flags);
-extern int              ip_route_input(struct sk_buff*, u32 dst, u32 src, u8 tos, struct net_device *devin);
+extern int              ip_route_input(struct sk_buff*, __be32 dst, __be32 src, u8 tos, struct net_device *devin);
 extern unsigned short   ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu);
 extern void             ip_rt_send_redirect(struct sk_buff *skb);
-extern unsigned         inet_addr_type(u32 addr);
+extern unsigned         inet_addr_type(__be32 addr);
 extern void             ip_rt_multicast_event(struct in_device *);
 extern int              ip_rt_ioctl(unsigned int cmd, void __user *arg);
 extern void             ip_rt_get_source(u8 *src, struct rtable *rt);
@@ -143,9 +144,9 @@ static inline char rt_tos2priority(u8 tos)
        return ip_tos2prio[IPTOS_TOS(tos)>>1];
 }
-static inline int ip_route_connect(struct rtable **rp, u32 dst,
+static inline int ip_route_connect(struct rtable **rp, __be32 dst,
-                                   u32 src, u32 tos, int oif, u8 protocol,
+                                   __be32 src, u32 tos, int oif, u8 protocol,
-                                   u16 sport, u16 dport, struct sock *sk)
+                                   __be16 sport, __be16 dport, struct sock *sk)
 {
        struct flowi fl = { .oif = oif,
                            .nl_u = { .ip4_u = { .daddr = dst,
@@ -166,11 +167,12 @@ static inline int ip_route_connect(struct rtable **rp, u32 dst,
                ip_rt_put(*rp);
                *rp = NULL;
        }
+        security_sk_classify_flow(sk, &fl);
        return ip_route_output_flow(rp, &fl, sk, 0);
 }
 static inline int ip_route_newports(struct rtable **rp, u8 protocol,
-                                    u16 sport, u16 dport, struct sock *sk)
+                                    __be16 sport, __be16 dport, struct sock *sk)
 {
        if (sport != (*rp)->fl.fl_ip_sport ||
            dport != (*rp)->fl.fl_ip_dport) {
@@ -182,6 +184,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol,
                fl.proto = protocol;
                ip_rt_put(*rp);
                *rp = NULL;
+                security_sk_classify_flow(sk, &fl);
                return ip_route_output_flow(rp, &fl, sk, 0);
        }
        return 0;
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index c51541ee0247..6c632e26f72d 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -264,10 +264,10 @@ enum { SCTP_MAX_DUP_TSNS = 16 };
 enum { SCTP_MAX_GABS = 16 };
 /* Heartbeat interval - 30 secs */
-#define SCTP_DEFAULT_TIMEOUT_HEARTBEAT  (30 * HZ)
+#define SCTP_DEFAULT_TIMEOUT_HEARTBEAT  (30*1000)
 /* Delayed sack timer - 200ms */
-#define SCTP_DEFAULT_TIMEOUT_SACK       ((200 * HZ) / 1000)
+#define SCTP_DEFAULT_TIMEOUT_SACK       (200)
 /* RTO.Initial              - 3  seconds
 * RTO.Min                  - 1  second
@@ -275,9 +275,9 @@ enum { SCTP_MAX_GABS = 16 };
 * RTO.Alpha                - 1/8
 * RTO.Beta                 - 1/4
 */
-#define SCTP_RTO_INITIAL        (3 * HZ)
+#define SCTP_RTO_INITIAL        (3 * 1000)
-#define SCTP_RTO_MIN            (1 * HZ)
+#define SCTP_RTO_MIN            (1 * 1000)
-#define SCTP_RTO_MAX            (60 * HZ)
+#define SCTP_RTO_MAX            (60 * 1000)
 #define SCTP_RTO_ALPHA          3   /* 1/8 when converted to right shifts. */
 #define SCTP_RTO_BETA           2   /* 1/4 when converted to right shifts. */
@@ -290,8 +290,7 @@ enum { SCTP_MAX_GABS = 16 };
 #define SCTP_DEF_MAX_INIT 6
 #define SCTP_DEF_MAX_SEND 10
-#define SCTP_DEFAULT_COOKIE_LIFE_SEC    60 /* seconds */
+#define SCTP_DEFAULT_COOKIE_LIFE        (60 * 1000) /* 60 seconds */
-#define SCTP_DEFAULT_COOKIE_LIFE_USEC   0  /* microseconds */
 #define SCTP_DEFAULT_MINWINDOW  1500    /* default minimum rwnd size */
 #define SCTP_DEFAULT_MAXWINDOW  65535   /* default rwnd size */
@@ -312,9 +311,9 @@ enum { SCTP_MAX_GABS = 16 };
                                 */
 #if defined (CONFIG_SCTP_HMAC_MD5)
-#define SCTP_COOKIE_HMAC_ALG "md5"
+#define SCTP_COOKIE_HMAC_ALG "hmac(md5)"
 #elif defined (CONFIG_SCTP_HMAC_SHA1)
-#define SCTP_COOKIE_HMAC_ALG "sha1"
+#define SCTP_COOKIE_HMAC_ALG "hmac(sha1)"
 #else
 #define SCTP_COOKIE_HMAC_ALG NULL
 #endif
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 92eae0e0f3f1..ee68a3124076 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -128,6 +128,8 @@ extern int sctp_copy_local_addr_list(struct sctp_bind_addr *,
                                     int flags);
 extern struct sctp_pf *sctp_get_pf_specific(sa_family_t family);
 extern int sctp_register_pf(struct sctp_pf *, sa_family_t);
+int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
+                        void *ptr);
 /*
 * sctp/socket.c
@@ -178,6 +180,17 @@ void sctp_backlog_migrate(struct sctp_association *assoc,
                          struct sock *oldsk, struct sock *newsk);
 /*
+ * sctp/proc.c
+ */
+int sctp_snmp_proc_init(void);
+void sctp_snmp_proc_exit(void);
+int sctp_eps_proc_init(void);
+void sctp_eps_proc_exit(void);
+int sctp_assocs_proc_init(void);
+void sctp_assocs_proc_exit(void);
+/*
 *  Section:  Macros, externs, and inlines
 */
@@ -216,6 +229,50 @@ DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics);
 #endif /* !TEST_FRAME */
+/* sctp mib definitions */
+enum
+{
+        SCTP_MIB_NUM = 0,
+        SCTP_MIB_CURRESTAB,                     /* CurrEstab */
+        SCTP_MIB_ACTIVEESTABS,                  /* ActiveEstabs */
+        SCTP_MIB_PASSIVEESTABS,                 /* PassiveEstabs */
+        SCTP_MIB_ABORTEDS,                      /* Aborteds */
+        SCTP_MIB_SHUTDOWNS,                     /* Shutdowns */
+        SCTP_MIB_OUTOFBLUES,                    /* OutOfBlues */
+        SCTP_MIB_CHECKSUMERRORS,                /* ChecksumErrors */
+        SCTP_MIB_OUTCTRLCHUNKS,                 /* OutCtrlChunks */
+        SCTP_MIB_OUTORDERCHUNKS,                /* OutOrderChunks */
+        SCTP_MIB_OUTUNORDERCHUNKS,              /* OutUnorderChunks */
+        SCTP_MIB_INCTRLCHUNKS,                  /* InCtrlChunks */
+        SCTP_MIB_INORDERCHUNKS,                 /* InOrderChunks */
+        SCTP_MIB_INUNORDERCHUNKS,               /* InUnorderChunks */
+        SCTP_MIB_FRAGUSRMSGS,                   /* FragUsrMsgs */
+        SCTP_MIB_REASMUSRMSGS,                  /* ReasmUsrMsgs */
+        SCTP_MIB_OUTSCTPPACKS,                  /* OutSCTPPacks */
+        SCTP_MIB_INSCTPPACKS,                   /* InSCTPPacks */
+        SCTP_MIB_T1_INIT_EXPIREDS,
+        SCTP_MIB_T1_COOKIE_EXPIREDS,
+        SCTP_MIB_T2_SHUTDOWN_EXPIREDS,
+        SCTP_MIB_T3_RTX_EXPIREDS,
+        SCTP_MIB_T4_RTO_EXPIREDS,
+        SCTP_MIB_T5_SHUTDOWN_GUARD_EXPIREDS,
+        SCTP_MIB_DELAY_SACK_EXPIREDS,
+        SCTP_MIB_AUTOCLOSE_EXPIREDS,
+        SCTP_MIB_T3_RETRANSMITS,
+        SCTP_MIB_PMTUD_RETRANSMITS,
+        SCTP_MIB_FAST_RETRANSMITS,
+        SCTP_MIB_IN_PKT_SOFTIRQ,
+        SCTP_MIB_IN_PKT_BACKLOG,
+        SCTP_MIB_IN_PKT_DISCARDS,
+        SCTP_MIB_IN_DATA_CHUNK_DISCARDS,
+        __SCTP_MIB_MAX
+};
+#define SCTP_MIB_MAX    __SCTP_MIB_MAX
+struct sctp_mib {
+        unsigned long   mibs[SCTP_MIB_MAX];
+} __SNMP_MIB_ALIGN__;
 /* Print debugging messages.  */
 #if SCTP_DEBUG
@@ -330,17 +387,6 @@ static inline void sctp_v6_exit(void) { return; }
 #endif /* #if defined(CONFIG_IPV6) */
-/* Some wrappers, in case crypto not available. */
-#if defined (CONFIG_CRYPTO_HMAC)
-#define sctp_crypto_alloc_tfm crypto_alloc_tfm
-#define sctp_crypto_free_tfm crypto_free_tfm
-#define sctp_crypto_hmac crypto_hmac
-#else
-#define sctp_crypto_alloc_tfm(x...) NULL
-#define sctp_crypto_free_tfm(x...)
-#define sctp_crypto_hmac(x...)
-#endif
 /* Map an association to an assoc_id. */
 static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc)
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index e5aa7ff1f5b5..c6d93bb0dcd2 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -87,6 +87,7 @@ struct sctp_bind_addr;
 struct sctp_ulpq;
 struct sctp_ep_common;
 struct sctp_ssnmap;
+struct crypto_hash;
 #include <net/sctp/tsnmap.h>
@@ -127,9 +128,9 @@ extern struct sctp_globals {
         * RTO.Alpha                - 1/8  (3 when converted to right shifts.)
         * RTO.Beta                 - 1/4  (2 when converted to right shifts.)
         */
-        unsigned long rto_initial;
+        unsigned int rto_initial;
-        unsigned long rto_min;
+        unsigned int rto_min;
-        unsigned long rto_max;
+        unsigned int rto_max;
        /* Note: rto_alpha and rto_beta are really defined as inverse
         * powers of two to facilitate integer operations.
@@ -144,13 +145,13 @@ extern struct sctp_globals {
        int cookie_preserve_enable;
        /* Valid.Cookie.Life        - 60  seconds  */
-        unsigned long valid_cookie_life;
+        unsigned int valid_cookie_life;
        /* Delayed SACK timeout  200ms default*/
-        unsigned long sack_timeout;
+        unsigned int sack_timeout;
        /* HB.interval              - 30 seconds  */
-        unsigned long hb_interval;
+        unsigned int hb_interval;
        /* Association.Max.Retrans  - 10 attempts
         * Path.Max.Retrans         - 5  attempts (per destination address)
@@ -264,7 +265,7 @@ struct sctp_sock {
        struct sctp_pf *pf;
        /* Access to HMAC transform. */
-        struct crypto_tfm *hmac;
+        struct crypto_hash *hmac;
        /* What is our base endpointer? */
        struct sctp_endpoint *ep;
diff --git a/include/net/snmp.h b/include/net/snmp.h
index a36bed8ea210..464970e39ec0 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -100,12 +100,6 @@ struct udp_mib {
        unsigned long   mibs[UDP_MIB_MAX];
 } __SNMP_MIB_ALIGN__;
-/* SCTP */
-#define SCTP_MIB_MAX    __SCTP_MIB_MAX
-struct sctp_mib {
-        unsigned long   mibs[SCTP_MIB_MAX];
-} __SNMP_MIB_ALIGN__;
 /* Linux */
 #define LINUX_MIB_MAX   __LINUX_MIB_MAX
 struct linux_mib {
diff --git a/include/net/sock.h b/include/net/sock.h
index 324b3ea233d6..40bb90ebb2d1 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -665,7 +665,6 @@ struct sock_iocb {
        struct sock             *sk;
        struct scm_cookie       *scm;
        struct msghdr           *msg, async_msg;
-        struct iovec            async_iov;
        struct kiocb            *kiocb;
 };
@@ -862,30 +861,24 @@ extern void sock_init_data(struct socket *sock, struct sock *sk);
 *
 */
-static inline int sk_filter(struct sock *sk, struct sk_buff *skb, int needlock)
+static inline int sk_filter(struct sock *sk, struct sk_buff *skb)
 {
        int err;
+        struct sk_filter *filter;
        
        err = security_sock_rcv_skb(sk, skb);
        if (err)
                return err;
        
-        if (sk->sk_filter) {
+        rcu_read_lock_bh();
-                struct sk_filter *filter;
+        filter = sk->sk_filter;
-                
+        if (filter) {
-                if (needlock)
+                unsigned int pkt_len = sk_run_filter(skb, filter->insns,
-                        bh_lock_sock(sk);
+                                filter->len);
-                
+                err = pkt_len ? pskb_trim(skb, pkt_len) : -EPERM;
-                filter = sk->sk_filter;
-                if (filter) {
-                        unsigned int pkt_len = sk_run_filter(skb, filter->insns,
-                                                             filter->len);
-                        err = pkt_len ? pskb_trim(skb, pkt_len) : -EPERM;
-                }
-                if (needlock)
-                        bh_unlock_sock(sk);
        }
+        rcu_read_unlock_bh();
        return err;
 }
@@ -897,6 +890,12 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb, int needlock)
 *      Remove a filter from a socket and release its resources.
 */
 
+static inline void sk_filter_rcu_free(struct rcu_head *rcu)
+{
+        struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu);
+        kfree(fp);
+}
 static inline void sk_filter_release(struct sock *sk, struct sk_filter *fp)
 {
        unsigned int size = sk_filter_len(fp);
@@ -904,7 +903,7 @@ static inline void sk_filter_release(struct sock *sk, struct sk_filter *fp)
        atomic_sub(size, &sk->sk_omem_alloc);
        if (atomic_dec_and_test(&fp->refcnt))
-                kfree(fp);
+                call_rcu_bh(&fp->rcu, sk_filter_rcu_free);
 }
 static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp)
@@ -969,9 +968,23 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)
        sk->sk_sleep = &parent->wait;
        parent->sk = sk;
        sk->sk_socket = parent;
+        security_sock_graft(sk, parent);
        write_unlock_bh(&sk->sk_callback_lock);
 }
+static inline void sock_copy(struct sock *nsk, const struct sock *osk)
+{
+#ifdef CONFIG_SECURITY_NETWORK
+        void *sptr = nsk->sk_security;
+#endif
+        memcpy(nsk, osk, osk->sk_prot->obj_size);
+#ifdef CONFIG_SECURITY_NETWORK
+        nsk->sk_security = sptr;
+        security_sk_clone(osk, nsk);
+#endif
+}
 extern int sock_i_uid(struct sock *sk);
 extern unsigned long sock_i_ino(struct sock *sk);
diff --git a/include/net/tc_act/tc_defact.h b/include/net/tc_act/tc_defact.h
index 463aa671f95d..65f024b80958 100644
--- a/include/net/tc_act/tc_defact.h
+++ b/include/net/tc_act/tc_defact.h
@@ -3,11 +3,12 @@
 #include <net/act_api.h>
-struct tcf_defact
+struct tcf_defact {
-{
+        struct tcf_common       common;
-        tca_gen(defact);
+        u32                     tcfd_datalen;
-        u32     datalen;
+        void                    *tcfd_defdata;
-        void    *defdata;
 };
+#define to_defact(pc) \
+        container_of(pc, struct tcf_defact, common)
-#endif
+#endif /* __NET_TC_DEF_H */
diff --git a/include/net/tc_act/tc_gact.h b/include/net/tc_act/tc_gact.h
index 59f0d9628ad1..9e3f6767b80e 100644
--- a/include/net/tc_act/tc_gact.h
+++ b/include/net/tc_act/tc_gact.h
@@ -3,15 +3,15 @@
 #include <net/act_api.h>
-struct tcf_gact
+struct tcf_gact {
-{
+        struct tcf_common       common;
-        tca_gen(gact);
 #ifdef CONFIG_GACT_PROB
-        u16                 ptype;
+        u16                     tcfg_ptype;
-        u16                 pval;
+        u16                     tcfg_pval;
-        int                 paction;
+        int                     tcfg_paction;
 #endif
-                                                                                
 };
-                                                                                
+#define to_gact(pc) \
-#endif
+        container_of(pc, struct tcf_gact, common)
+#endif /* __NET_TC_GACT_H */
diff --git a/include/net/tc_act/tc_ipt.h b/include/net/tc_act/tc_ipt.h
index cb37ad08427f..f7d25dfcc4b7 100644
--- a/include/net/tc_act/tc_ipt.h
+++ b/include/net/tc_act/tc_ipt.h
@@ -5,12 +5,13 @@
 struct xt_entry_target;
-struct tcf_ipt
+struct tcf_ipt {
-{
+        struct tcf_common       common;
-        tca_gen(ipt);
+        u32                     tcfi_hook;
-        u32 hook;
+        char                    *tcfi_tname;
-        char *tname;
+        struct xt_entry_target  *tcfi_t;
-        struct xt_entry_target *t;
 };
+#define to_ipt(pc) \
+        container_of(pc, struct tcf_ipt, common)
-#endif
+#endif /* __NET_TC_IPT_H */
diff --git a/include/net/tc_act/tc_mirred.h b/include/net/tc_act/tc_mirred.h
index b5c32f65c12c..ceac661cdfd5 100644
--- a/include/net/tc_act/tc_mirred.h
+++ b/include/net/tc_act/tc_mirred.h
@@ -3,13 +3,14 @@
 #include <net/act_api.h>
-struct tcf_mirred
+struct tcf_mirred {
-{
+        struct tcf_common       common;
-        tca_gen(mirred);
+        int                     tcfm_eaction;
-        int eaction;
+        int                     tcfm_ifindex;
-        int ifindex;
+        int                     tcfm_ok_push;
-        int ok_push;
+        struct net_device       *tcfm_dev;
-        struct net_device *dev;
 };
+#define to_mirred(pc) \
+        container_of(pc, struct tcf_mirred, common)
-#endif
+#endif /* __NET_TC_MIR_H */
diff --git a/include/net/tc_act/tc_pedit.h b/include/net/tc_act/tc_pedit.h
index eb21689d759d..e6f6e15956f5 100644
--- a/include/net/tc_act/tc_pedit.h
+++ b/include/net/tc_act/tc_pedit.h
@@ -3,12 +3,13 @@
 #include <net/act_api.h>
-struct tcf_pedit
+struct tcf_pedit {
-{
+        struct tcf_common       common;
-        tca_gen(pedit);
+        unsigned char           tcfp_nkeys;
-        unsigned char           nkeys;
+        unsigned char           tcfp_flags;
-        unsigned char           flags;
+        struct tc_pedit_key     *tcfp_keys;
-        struct tc_pedit_key     *keys;
 };
+#define to_pedit(pc) \
+        container_of(pc, struct tcf_pedit, common)
-#endif
+#endif /* __NET_TC_PED_H */
diff --git a/include/net/udp.h b/include/net/udp.h
index 766fba1369ce..db0c05f67546 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -30,25 +30,9 @@
 #define UDP_HTABLE_SIZE         128
-/* udp.c: This needs to be shared by v4 and v6 because the lookup
- *        and hashing code needs to work with different AF's yet
- *        the port space is shared.
- */
 extern struct hlist_head udp_hash[UDP_HTABLE_SIZE];
 extern rwlock_t udp_hash_lock;
-extern int udp_port_rover;
-static inline int udp_lport_inuse(u16 num)
-{
-        struct sock *sk;
-        struct hlist_node *node;
-        sk_for_each(sk, node, &udp_hash[num & (UDP_HTABLE_SIZE - 1)])
-                if (inet_sk(sk)->num == num)
-                        return 1;
-        return 0;
-}
 /* Note: this must match 'valbool' in sock_setsockopt */
 #define UDP_CSUM_NOXMIT         1
@@ -63,6 +47,8 @@ extern struct proto udp_prot;
 struct sk_buff;
+extern int      udp_get_port(struct sock *sk, unsigned short snum,
+                             int (*saddr_cmp)(const struct sock *, const struct sock *));
 extern void     udp_err(struct sk_buff *, u32);
 extern int      udp_sendmsg(struct kiocb *iocb, struct sock *sk,
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 9c5ee9f20b65..1e2a4ddec96e 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -8,8 +8,8 @@
 #include <linux/list.h>
 #include <linux/skbuff.h>
 #include <linux/socket.h>
-#include <linux/crypto.h>
 #include <linux/pfkeyv2.h>
+#include <linux/ipsec.h>
 #include <linux/in6.h>
 #include <linux/mutex.h>
@@ -94,8 +94,9 @@ extern struct mutex xfrm_cfg_mutex;
 struct xfrm_state
 {
        /* Note: bydst is re-used during gc */
-        struct list_head        bydst;
+        struct hlist_node       bydst;
-        struct list_head        byspi;
+        struct hlist_node       bysrc;
+        struct hlist_node       byspi;
        atomic_t                refcnt;
        spinlock_t              lock;
@@ -103,6 +104,8 @@ struct xfrm_state
        struct xfrm_id          id;
        struct xfrm_selector    sel;
+        u32                     genid;
        /* Key manger bits */
        struct {
                u8              state;
@@ -133,6 +136,9 @@ struct xfrm_state
        /* Data for encapsulator */
        struct xfrm_encap_tmpl  *encap;
+        /* Data for care-of address */
+        xfrm_address_t  *coaddr;
        /* IPComp needs an IPIP tunnel for handling uncompressed packets */
        struct xfrm_state       *tunnel;
@@ -163,6 +169,9 @@ struct xfrm_state
        struct xfrm_lifetime_cur curlft;
        struct timer_list       timer;
+        /* Last used time */
+        u64                     lastused;
        /* Reference to data common to all the instances of this
         * transformer. */
        struct xfrm_type        *type;
@@ -196,6 +205,7 @@ struct km_event
                u32 proto;
                u32 byid;
                u32 aevent;
+                u32 type;
        } data;
        u32     seq;
@@ -212,6 +222,7 @@ struct xfrm_policy_afinfo {
        struct dst_ops          *dst_ops;
        void                    (*garbage_collect)(void);
        int                     (*dst_lookup)(struct xfrm_dst **dst, struct flowi *fl);
+        int                     (*get_saddr)(xfrm_address_t *saddr, xfrm_address_t *daddr);
        struct dst_entry        *(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy);
        int                     (*bundle_create)(struct xfrm_policy *policy, 
                                                 struct xfrm_state **xfrm, 
@@ -235,16 +246,12 @@ extern int __xfrm_state_delete(struct xfrm_state *x);
 struct xfrm_state_afinfo {
        unsigned short          family;
-        struct list_head        *state_bydst;
-        struct list_head        *state_byspi;
        int                     (*init_flags)(struct xfrm_state *x);
        void                    (*init_tempsel)(struct xfrm_state *x, struct flowi *fl,
                                                struct xfrm_tmpl *tmpl,
                                                xfrm_address_t *daddr, xfrm_address_t *saddr);
-        struct xfrm_state       *(*state_lookup)(xfrm_address_t *daddr, u32 spi, u8 proto);
+        int                     (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);
-        struct xfrm_state       *(*find_acq)(u8 mode, u32 reqid, u8 proto, 
+        int                     (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);
-                                             xfrm_address_t *daddr, xfrm_address_t *saddr, 
-                                             int create);
 };
 extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
@@ -257,11 +264,17 @@ struct xfrm_type
        char                    *description;
        struct module           *owner;
        __u8                    proto;
+        __u8                    flags;
+#define XFRM_TYPE_NON_FRAGMENT  1
        int                     (*init_state)(struct xfrm_state *x);
        void                    (*destructor)(struct xfrm_state *);
        int                     (*input)(struct xfrm_state *, struct sk_buff *skb);
        int                     (*output)(struct xfrm_state *, struct sk_buff *pskb);
+        int                     (*reject)(struct xfrm_state *, struct sk_buff *, struct flowi *);
+        int                     (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);
+        xfrm_address_t          *(*local_addr)(struct xfrm_state *, xfrm_address_t *);
+        xfrm_address_t          *(*remote_addr)(struct xfrm_state *, xfrm_address_t *);
        /* Estimate maximal size of result of transformation of a dgram */
        u32                     (*get_max_size)(struct xfrm_state *, int size);
 };
@@ -273,7 +286,7 @@ extern void xfrm_put_type(struct xfrm_type *type);
 struct xfrm_mode {
        int (*input)(struct xfrm_state *x, struct sk_buff *skb);
-        int (*output)(struct sk_buff *skb);
+        int (*output)(struct xfrm_state *x,struct sk_buff *skb);
        struct module *owner;
        unsigned int encap;
@@ -299,7 +312,7 @@ struct xfrm_tmpl
        __u32                   reqid;
-/* Mode: transport/tunnel */
+/* Mode: transport, tunnel etc. */
        __u8                    mode;
 /* Sharing mode: unique, this session only, this user only etc. */
@@ -314,18 +327,20 @@ struct xfrm_tmpl
        __u32                   calgos;
 };
-#define XFRM_MAX_DEPTH          4
+#define XFRM_MAX_DEPTH          6
 struct xfrm_policy
 {
        struct xfrm_policy      *next;
-        struct list_head        list;
+        struct hlist_node       bydst;
+        struct hlist_node       byidx;
        /* This lock only affects elements except for entry. */
        rwlock_t                lock;
        atomic_t                refcnt;
        struct timer_list       timer;
+        u8                      type;
        u32                     priority;
        u32                     index;
        struct xfrm_selector    selector;
@@ -363,16 +378,16 @@ struct xfrm_mgr
        char                    *id;
        int                     (*notify)(struct xfrm_state *x, struct km_event *c);
        int                     (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
-        struct xfrm_policy      *(*compile_policy)(u16 family, int opt, u8 *data, int len, int *dir);
+        struct xfrm_policy      *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
        int                     (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport);
        int                     (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
+        int                     (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
 };
 extern int xfrm_register_km(struct xfrm_mgr *km);
 extern int xfrm_unregister_km(struct xfrm_mgr *km);
+extern unsigned int xfrm_policy_count[XFRM_POLICY_MAX*2];
-extern struct xfrm_policy *xfrm_policy_list[XFRM_POLICY_MAX*2];
 static inline void xfrm_pol_hold(struct xfrm_policy *policy)
 {
@@ -388,67 +403,19 @@ static inline void xfrm_pol_put(struct xfrm_policy *policy)
                __xfrm_policy_destroy(policy);
 }
-#define XFRM_DST_HSIZE          1024
+#ifdef CONFIG_XFRM_SUB_POLICY
+static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
-static __inline__
-unsigned __xfrm4_dst_hash(xfrm_address_t *addr)
-{
-        unsigned h;
-        h = ntohl(addr->a4);
-        h = (h ^ (h>>16)) % XFRM_DST_HSIZE;
-        return h;
-}
-static __inline__
-unsigned __xfrm6_dst_hash(xfrm_address_t *addr)
-{
-        unsigned h;
-        h = ntohl(addr->a6[2]^addr->a6[3]);
-        h = (h ^ (h>>16)) % XFRM_DST_HSIZE;
-        return h;
-}
-static __inline__
-unsigned xfrm_dst_hash(xfrm_address_t *addr, unsigned short family)
-{
-        switch (family) {
-        case AF_INET:
-                return __xfrm4_dst_hash(addr);
-        case AF_INET6:
-                return __xfrm6_dst_hash(addr);
-        }
-        return 0;
-}
-static __inline__
-unsigned __xfrm4_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto)
 {
-        unsigned h;
+        int i;
-        h = ntohl(addr->a4^spi^proto);
+        for (i = npols - 1; i >= 0; --i)
-        h = (h ^ (h>>10) ^ (h>>20)) % XFRM_DST_HSIZE;
+                xfrm_pol_put(pols[i]);
-        return h;
 }
+#else
-static __inline__
+static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
-unsigned __xfrm6_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto)
-{
-        unsigned h;
-        h = ntohl(addr->a6[2]^addr->a6[3]^spi^proto);
-        h = (h ^ (h>>10) ^ (h>>20)) % XFRM_DST_HSIZE;
-        return h;
-}
-static __inline__
-unsigned xfrm_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto, unsigned short family)
 {
-        switch (family) {
+        xfrm_pol_put(pols[0]);
-        case AF_INET:
-                return __xfrm4_spi_hash(addr, spi, proto);
-        case AF_INET6:
-                return __xfrm6_spi_hash(addr, spi, proto);
-        }
-        return 0;       /*XXX*/
 }
+#endif
 extern void __xfrm_state_destroy(struct xfrm_state *);
@@ -470,8 +437,8 @@ static inline void xfrm_state_hold(struct xfrm_state *x)
 static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
 {
-        __u32 *a1 = token1;
+        __be32 *a1 = token1;
-        __u32 *a2 = token2;
+        __be32 *a2 = token2;
        int pdw;
        int pbi;
@@ -483,7 +450,7 @@ static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
                        return 0;
        if (pbi) {
-                __u32 mask;
+                __be32 mask;
                mask = htonl((0xffffffff) << (32 - pbi));
@@ -495,9 +462,9 @@ static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
 }
 static __inline__
-u16 xfrm_flowi_sport(struct flowi *fl)
+__be16 xfrm_flowi_sport(struct flowi *fl)
 {
-        u16 port;
+        __be16 port;
        switch(fl->proto) {
        case IPPROTO_TCP:
        case IPPROTO_UDP:
@@ -508,6 +475,11 @@ u16 xfrm_flowi_sport(struct flowi *fl)
        case IPPROTO_ICMPV6:
                port = htons(fl->fl_icmp_type);
                break;
+#ifdef CONFIG_IPV6_MIP6
+        case IPPROTO_MH:
+                port = htons(fl->fl_mh_type);
+                break;
+#endif
        default:
                port = 0;       /*XXX*/
        }
@@ -515,9 +487,9 @@ u16 xfrm_flowi_sport(struct flowi *fl)
 }
 static __inline__
-u16 xfrm_flowi_dport(struct flowi *fl)
+__be16 xfrm_flowi_dport(struct flowi *fl)
 {
-        u16 port;
+        __be16 port;
        switch(fl->proto) {
        case IPPROTO_TCP:
        case IPPROTO_UDP:
@@ -608,6 +580,7 @@ struct xfrm_dst
                struct rt6_info         rt6;
        } u;
        struct dst_entry *route;
+        u32 genid;
        u32 route_mtu_cached;
        u32 child_mtu_cached;
        u32 route_cookie;
@@ -659,6 +632,18 @@ secpath_reset(struct sk_buff *skb)
 }
 static inline int
+xfrm_addr_any(xfrm_address_t *addr, unsigned short family)
+{
+        switch (family) {
+        case AF_INET:
+                return addr->a4 == 0;
+        case AF_INET6:
+                return ipv6_addr_any((struct in6_addr *)&addr->a6);
+        }
+        return 0;
+}
+static inline int
 __xfrm4_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x)
 {
        return  (tmpl->saddr.a4 &&
@@ -692,8 +677,8 @@ static inline int xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *sk
 {
        if (sk && sk->sk_policy[XFRM_POLICY_IN])
                return __xfrm_policy_check(sk, dir, skb, family);
-                
-        return  (!xfrm_policy_list[dir] && !skb->sp) ||
+        return  (!xfrm_policy_count[dir] && !skb->sp) ||
                (skb->dst->flags & DST_NOPOLICY) ||
                __xfrm_policy_check(sk, dir, skb, family);
 }
@@ -713,7 +698,7 @@ extern int __xfrm_route_forward(struct sk_buff *skb, unsigned short family);
 static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family)
 {
-        return  !xfrm_policy_list[XFRM_POLICY_OUT] ||
+        return  !xfrm_policy_count[XFRM_POLICY_OUT] ||
                (skb->dst->flags & DST_NOXFRM) ||
                __xfrm_route_forward(skb, family);
 }
@@ -831,11 +816,36 @@ xfrm_state_addr_check(struct xfrm_state *x,
        return 0;
 }
+static __inline__ int
+xfrm_state_addr_flow_check(struct xfrm_state *x, struct flowi *fl,
+                           unsigned short family)
+{
+        switch (family) {
+        case AF_INET:
+                return __xfrm4_state_addr_check(x,
+                                                (xfrm_address_t *)&fl->fl4_dst,
+                                                (xfrm_address_t *)&fl->fl4_src);
+        case AF_INET6:
+                return __xfrm6_state_addr_check(x,
+                                                (xfrm_address_t *)&fl->fl6_dst,
+                                                (xfrm_address_t *)&fl->fl6_src);
+        }
+        return 0;
+}
 static inline int xfrm_state_kern(struct xfrm_state *x)
 {
        return atomic_read(&x->tunnel_users);
 }
+static inline int xfrm_id_proto_match(u8 proto, u8 userproto)
+{
+        return (!userproto || proto == userproto ||
+                (userproto == IPSEC_PROTO_ANY && (proto == IPPROTO_AH ||
+                                                  proto == IPPROTO_ESP ||
+                                                  proto == IPPROTO_COMP)));
+}
 /*
 * xfrm algorithm information
 */
@@ -855,6 +865,7 @@ struct xfrm_algo_comp_info {
 struct xfrm_algo_desc {
        char *name;
+        char *compat;
        u8 available:1;
        union {
                struct xfrm_algo_auth_info auth;
@@ -901,12 +912,31 @@ extern int xfrm_state_check_expire(struct xfrm_state *x);
 extern void xfrm_state_insert(struct xfrm_state *x);
 extern int xfrm_state_add(struct xfrm_state *x);
 extern int xfrm_state_update(struct xfrm_state *x);
-extern struct xfrm_state *xfrm_state_lookup(xfrm_address_t *daddr, u32 spi, u8 proto, unsigned short family);
+extern struct xfrm_state *xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family);
+extern struct xfrm_state *xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family);
+#ifdef CONFIG_XFRM_SUB_POLICY
+extern int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src,
+                          int n, unsigned short family);
+extern int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src,
+                           int n, unsigned short family);
+#else
+static inline int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src,
+                                 int n, unsigned short family)
+{
+        return -ENOSYS;
+}
+static inline int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src,
+                                  int n, unsigned short family)
+{
+        return -ENOSYS;
+}
+#endif
 extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq);
 extern int xfrm_state_delete(struct xfrm_state *x);
 extern void xfrm_state_flush(u8 proto);
-extern int xfrm_replay_check(struct xfrm_state *x, u32 seq);
+extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq);
-extern void xfrm_replay_advance(struct xfrm_state *x, u32 seq);
+extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq);
 extern void xfrm_replay_notify(struct xfrm_state *x, int event);
 extern int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb);
 extern int xfrm_state_mtu(struct xfrm_state *x, int mtu);
@@ -915,14 +945,18 @@ extern int xfrm4_rcv(struct sk_buff *skb);
 extern int xfrm4_output(struct sk_buff *skb);
 extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler);
 extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler);
-extern int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi);
+extern int xfrm6_rcv_spi(struct sk_buff *skb, __be32 spi);
 extern int xfrm6_rcv(struct sk_buff **pskb);
+extern int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
+                            xfrm_address_t *saddr, u8 proto);
 extern int xfrm6_tunnel_register(struct xfrm6_tunnel *handler);
 extern int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler);
 extern u32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr);
 extern void xfrm6_tunnel_free_spi(xfrm_address_t *saddr);
 extern u32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr);
 extern int xfrm6_output(struct sk_buff *skb);
+extern int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
+                                 u8 **prevhdr);
 #ifdef CONFIG_XFRM
 extern int xfrm4_rcv_encap(struct sk_buff *skb, __u16 encap_type);
@@ -947,30 +981,30 @@ static inline int xfrm_dst_lookup(struct xfrm_dst **dst, struct flowi *fl, unsig
 #endif
 struct xfrm_policy *xfrm_policy_alloc(gfp_t gfp);
-extern int xfrm_policy_walk(int (*func)(struct xfrm_policy *, int, int, void*), void *);
+extern int xfrm_policy_walk(u8 type, int (*func)(struct xfrm_policy *, int, int, void*), void *);
 int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl);
-struct xfrm_policy *xfrm_policy_bysel_ctx(int dir, struct xfrm_selector *sel,
+struct xfrm_policy *xfrm_policy_bysel_ctx(u8 type, int dir,
+                                          struct xfrm_selector *sel,
                                          struct xfrm_sec_ctx *ctx, int delete);
-struct xfrm_policy *xfrm_policy_byid(int dir, u32 id, int delete);
+struct xfrm_policy *xfrm_policy_byid(u8, int dir, u32 id, int delete);
-void xfrm_policy_flush(void);
+void xfrm_policy_flush(u8 type);
 u32 xfrm_get_acqseq(void);
-void xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi);
+void xfrm_alloc_spi(struct xfrm_state *x, __be32 minspi, __be32 maxspi);
 struct xfrm_state * xfrm_find_acq(u8 mode, u32 reqid, u8 proto, 
                                  xfrm_address_t *daddr, xfrm_address_t *saddr, 
                                  int create, unsigned short family);
-extern void xfrm_policy_flush(void);
+extern void xfrm_policy_flush(u8 type);
 extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
-extern int xfrm_flush_bundles(void);
+extern int xfrm_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl, int family, int strict);
-extern void xfrm_flush_all_bundles(void);
-extern int xfrm_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl, int family);
 extern void xfrm_init_pmtu(struct dst_entry *dst);
 extern wait_queue_head_t km_waitq;
 extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport);
 extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid);
+extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
 extern void xfrm_input_init(void);
-extern int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, u32 *spi, u32 *seq);
+extern int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq);
 extern void xfrm_probe_algs(void);
 extern int xfrm_count_auth_supported(void);
@@ -984,11 +1018,13 @@ extern struct xfrm_algo_desc *xfrm_aalg_get_byname(char *name, int probe);
 extern struct xfrm_algo_desc *xfrm_ealg_get_byname(char *name, int probe);
 extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe);
-struct crypto_tfm;
+struct hash_desc;
-typedef void (icv_update_fn_t)(struct crypto_tfm *, struct scatterlist *, unsigned int);
+struct scatterlist;
+typedef int (icv_update_fn_t)(struct hash_desc *, struct scatterlist *,
+                              unsigned int);
-extern void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm,
+extern int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *tfm,
-                         int offset, int len, icv_update_fn_t icv_update);
+                        int offset, int len, icv_update_fn_t icv_update);
 static inline int xfrm_addr_cmp(xfrm_address_t *a, xfrm_address_t *b,
                                int family)
diff --git a/include/rdma/Kbuild b/include/rdma/Kbuild
index eb710ba9b1a0..e7c043216558 100644
--- a/include/rdma/Kbuild
+++ b/include/rdma/Kbuild
@@ -1 +1 @@
-header-y := ib_user_mad.h
+header-y += ib_user_mad.h
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 0ff67398928d..81b62307621d 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -40,7 +40,7 @@ struct rdma_dev_addr {
        unsigned char src_dev_addr[MAX_ADDR_LEN];
        unsigned char dst_dev_addr[MAX_ADDR_LEN];
        unsigned char broadcast[MAX_ADDR_LEN];
-        enum ib_node_type dev_type;
+        enum rdma_node_type dev_type;
 };
 /**
@@ -72,6 +72,9 @@ int rdma_resolve_ip(struct sockaddr *src_addr, struct sockaddr *dst_addr,
 void rdma_addr_cancel(struct rdma_dev_addr *addr);
+int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,
+              const unsigned char *dst_dev_addr);
 static inline int ip_addr_size(struct sockaddr *addr)
 {
        return addr->sa_family == AF_INET6 ?
@@ -113,4 +116,16 @@ static inline void ib_addr_set_dgid(struct rdma_dev_addr *dev_addr,
        memcpy(dev_addr->dst_dev_addr + 4, gid, sizeof *gid);
 }
+static inline void iw_addr_get_sgid(struct rdma_dev_addr *dev_addr,
+                                    union ib_gid *gid)
+{
+        memcpy(gid, dev_addr->src_dev_addr, sizeof *gid);
+}
+static inline void iw_addr_get_dgid(struct rdma_dev_addr *dev_addr,
+                                    union ib_gid *gid)
+{
+        memcpy(gid, dev_addr->dst_dev_addr, sizeof *gid);
+}
 #endif /* IB_ADDR_H */
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index c99e4420fd7e..97715b0c20b6 100644
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -1,6 +1,7 @@
 /*
 * Copyright (c) 2004 Topspin Communications.  All rights reserved.
 * Copyright (c) 2005 Voltaire, Inc.  All rights reserved.
+ * Copyright (c) 2006 Intel Corporation.  All rights reserved.
 *
 * This software is available to you under a choice of one of two
 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -36,8 +37,11 @@
 #ifndef IB_SA_H
 #define IB_SA_H
+#include <linux/completion.h>
 #include <linux/compiler.h>
+#include <asm/atomic.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_mad.h>
@@ -79,8 +83,8 @@ enum {
 };
 enum ib_sa_selector {
-        IB_SA_GTE  = 0,
+        IB_SA_GT   = 0,
-        IB_SA_LTE  = 1,
+        IB_SA_LT   = 1,
        IB_SA_EQ   = 2,
        /*
         * The meaning of "best" depends on the attribute: for
@@ -250,11 +254,28 @@ struct ib_sa_service_rec {
        u64             data64[2];
 };
+struct ib_sa_client {
+        atomic_t users;
+        struct completion comp;
+};
+/**
+ * ib_sa_register_client - Register an SA client.
+ */
+void ib_sa_register_client(struct ib_sa_client *client);
+/**
+ * ib_sa_unregister_client - Deregister an SA client.
+ * @client: Client object to deregister.
+ */
+void ib_sa_unregister_client(struct ib_sa_client *client);
 struct ib_sa_query;
 void ib_sa_cancel_query(int id, struct ib_sa_query *query);
-int ib_sa_path_rec_get(struct ib_device *device, u8 port_num,
+int ib_sa_path_rec_get(struct ib_sa_client *client,
+                       struct ib_device *device, u8 port_num,
                       struct ib_sa_path_rec *rec,
                       ib_sa_comp_mask comp_mask,
                       int timeout_ms, gfp_t gfp_mask,
@@ -264,7 +285,8 @@ int ib_sa_path_rec_get(struct ib_device *device, u8 port_num,
                       void *context,
                       struct ib_sa_query **query);
-int ib_sa_mcmember_rec_query(struct ib_device *device, u8 port_num,
+int ib_sa_mcmember_rec_query(struct ib_sa_client *client,
+                             struct ib_device *device, u8 port_num,
                             u8 method,
                             struct ib_sa_mcmember_rec *rec,
                             ib_sa_comp_mask comp_mask,
@@ -275,7 +297,8 @@ int ib_sa_mcmember_rec_query(struct ib_device *device, u8 port_num,
                             void *context,
                             struct ib_sa_query **query);
-int ib_sa_service_rec_query(struct ib_device *device, u8 port_num,
+int ib_sa_service_rec_query(struct ib_sa_client *client,
+                         struct ib_device *device, u8 port_num,
                         u8 method,
                         struct ib_sa_service_rec *rec,
                         ib_sa_comp_mask comp_mask,
@@ -288,6 +311,7 @@ int ib_sa_service_rec_query(struct ib_device *device, u8 port_num,
 /**
 * ib_sa_mcmember_rec_set - Start an MCMember set query
+ * @client:SA client
 * @device:device to send query on
 * @port_num: port number to send query on
 * @rec:MCMember Record to send in query
@@ -311,7 +335,8 @@ int ib_sa_service_rec_query(struct ib_device *device, u8 port_num,
 * cancel the query.
 */
 static inline int
-ib_sa_mcmember_rec_set(struct ib_device *device, u8 port_num,
+ib_sa_mcmember_rec_set(struct ib_sa_client *client,
+                       struct ib_device *device, u8 port_num,
                       struct ib_sa_mcmember_rec *rec,
                       ib_sa_comp_mask comp_mask,
                       int timeout_ms, gfp_t gfp_mask,
@@ -321,7 +346,7 @@ ib_sa_mcmember_rec_set(struct ib_device *device, u8 port_num,
                       void *context,
                       struct ib_sa_query **query)
 {
-        return ib_sa_mcmember_rec_query(device, port_num,
+        return ib_sa_mcmember_rec_query(client, device, port_num,
                                        IB_MGMT_METHOD_SET,
                                        rec, comp_mask,
                                        timeout_ms, gfp_mask, callback,
@@ -330,6 +355,7 @@ ib_sa_mcmember_rec_set(struct ib_device *device, u8 port_num,
 /**
 * ib_sa_mcmember_rec_delete - Start an MCMember delete query
+ * @client:SA client
 * @device:device to send query on
 * @port_num: port number to send query on
 * @rec:MCMember Record to send in query
@@ -353,7 +379,8 @@ ib_sa_mcmember_rec_set(struct ib_device *device, u8 port_num,
 * cancel the query.
 */
 static inline int
-ib_sa_mcmember_rec_delete(struct ib_device *device, u8 port_num,
+ib_sa_mcmember_rec_delete(struct ib_sa_client *client,
+                          struct ib_device *device, u8 port_num,
                          struct ib_sa_mcmember_rec *rec,
                          ib_sa_comp_mask comp_mask,
                          int timeout_ms, gfp_t gfp_mask,
@@ -363,7 +390,7 @@ ib_sa_mcmember_rec_delete(struct ib_device *device, u8 port_num,
                          void *context,
                          struct ib_sa_query **query)
 {
-        return ib_sa_mcmember_rec_query(device, port_num,
+        return ib_sa_mcmember_rec_query(client, device, port_num,
                                        IB_SA_METHOD_DELETE,
                                        rec, comp_mask,
                                        timeout_ms, gfp_mask, callback,
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h
index 7b5372010f4b..db1b814b62cc 100644
--- a/include/rdma/ib_user_verbs.h
+++ b/include/rdma/ib_user_verbs.h
@@ -275,6 +275,8 @@ struct ib_uverbs_resize_cq {
 struct ib_uverbs_resize_cq_resp {
        __u32 cqe;
+        __u32 reserved;
+        __u64 driver_data[0];
 };
 struct ib_uverbs_poll_cq {
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index ee1f3a355666..8eacc3510993 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -56,12 +56,22 @@ union ib_gid {
        } global;
 };
-enum ib_node_type {
+enum rdma_node_type {
-        IB_NODE_CA      = 1,
+        /* IB values map to NodeInfo:NodeType. */
-        IB_NODE_SWITCH,
+        RDMA_NODE_IB_CA         = 1,
-        IB_NODE_ROUTER
+        RDMA_NODE_IB_SWITCH,
+        RDMA_NODE_IB_ROUTER,
+        RDMA_NODE_RNIC
 };
+enum rdma_transport_type {
+        RDMA_TRANSPORT_IB,
+        RDMA_TRANSPORT_IWARP
+};
+enum rdma_transport_type
+rdma_node_get_transport(enum rdma_node_type node_type) __attribute_const__;
 enum ib_device_cap_flags {
        IB_DEVICE_RESIZE_MAX_WR         = 1,
        IB_DEVICE_BAD_PKEY_CNTR         = (1<<1),
@@ -78,6 +88,9 @@ enum ib_device_cap_flags {
        IB_DEVICE_RC_RNR_NAK_GEN        = (1<<12),
        IB_DEVICE_SRQ_RESIZE            = (1<<13),
        IB_DEVICE_N_NOTIFY_CQ           = (1<<14),
+        IB_DEVICE_ZERO_STAG             = (1<<15),
+        IB_DEVICE_SEND_W_INV            = (1<<16),
+        IB_DEVICE_MEM_WINDOW            = (1<<17)
 };
 enum ib_atomic_cap {
@@ -835,6 +848,8 @@ struct ib_cache {
        u8                     *lmc_cache;
 };
+struct iw_cm_verbs;
 struct ib_device {
        struct device                *dma_device;
@@ -851,6 +866,8 @@ struct ib_device {
        u32                           flags;
+        struct iw_cm_verbs           *iwcm;
        int                        (*query_device)(struct ib_device *device,
                                                   struct ib_device_attr *device_attr);
        int                        (*query_port)(struct ib_device *device,
@@ -888,7 +905,8 @@ struct ib_device {
                                                 struct ib_udata *udata);
        int                        (*modify_srq)(struct ib_srq *srq,
                                                 struct ib_srq_attr *srq_attr,
-                                                 enum ib_srq_attr_mask srq_attr_mask);
+                                                 enum ib_srq_attr_mask srq_attr_mask,
+                                                 struct ib_udata *udata);
        int                        (*query_srq)(struct ib_srq *srq,
                                                struct ib_srq_attr *srq_attr);
        int                        (*destroy_srq)(struct ib_srq *srq);
@@ -900,7 +918,8 @@ struct ib_device {
                                                struct ib_udata *udata);
        int                        (*modify_qp)(struct ib_qp *qp,
                                                struct ib_qp_attr *qp_attr,
-                                                int qp_attr_mask);
+                                                int qp_attr_mask,
+                                                struct ib_udata *udata);
        int                        (*query_qp)(struct ib_qp *qp,
                                               struct ib_qp_attr *qp_attr,
                                               int qp_attr_mask,
diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
new file mode 100644
index 000000000000..aeefa9b740dc
--- /dev/null
+++ b/include/rdma/iw_cm.h
@@ -0,0 +1,258 @@
+/*
+ * Copyright (c) 2005 Network Appliance, Inc. All rights reserved.
+ * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef IW_CM_H
+#define IW_CM_H
+#include <linux/in.h>
+#include <rdma/ib_cm.h>
+struct iw_cm_id;
+enum iw_cm_event_type {
+        IW_CM_EVENT_CONNECT_REQUEST = 1, /* connect request received */
+        IW_CM_EVENT_CONNECT_REPLY,       /* reply from active connect request */
+        IW_CM_EVENT_ESTABLISHED,         /* passive side accept successful */
+        IW_CM_EVENT_DISCONNECT,          /* orderly shutdown */
+        IW_CM_EVENT_CLOSE                /* close complete */
+};
+enum iw_cm_event_status {
+        IW_CM_EVENT_STATUS_OK = 0,       /* request successful */
+        IW_CM_EVENT_STATUS_ACCEPTED = 0, /* connect request accepted */
+        IW_CM_EVENT_STATUS_REJECTED,     /* connect request rejected */
+        IW_CM_EVENT_STATUS_TIMEOUT,      /* the operation timed out */
+        IW_CM_EVENT_STATUS_RESET,        /* reset from remote peer */
+        IW_CM_EVENT_STATUS_EINVAL,       /* asynchronous failure for bad parm */
+};
+struct iw_cm_event {
+        enum iw_cm_event_type event;
+        enum iw_cm_event_status status;
+        struct sockaddr_in local_addr;
+        struct sockaddr_in remote_addr;
+        void *private_data;
+        u8 private_data_len;
+        void* provider_data;
+};
+/**
+ * iw_cm_handler - Function to be called by the IW CM when delivering events
+ * to the client.
+ *
+ * @cm_id: The IW CM identifier associated with the event.
+ * @event: Pointer to the event structure.
+ */
+typedef int (*iw_cm_handler)(struct iw_cm_id *cm_id,
+                             struct iw_cm_event *event);
+/**
+ * iw_event_handler - Function called by the provider when delivering provider
+ * events to the IW CM.  Returns either 0 indicating the event was processed
+ * or -errno if the event could not be processed.
+ *
+ * @cm_id: The IW CM identifier associated with the event.
+ * @event: Pointer to the event structure.
+ */
+typedef int (*iw_event_handler)(struct iw_cm_id *cm_id,
+                                 struct iw_cm_event *event);
+struct iw_cm_id {
+        iw_cm_handler           cm_handler;      /* client callback function */
+        void                    *context;        /* client cb context */
+        struct ib_device        *device;
+        struct sockaddr_in      local_addr;
+        struct sockaddr_in      remote_addr;
+        void                    *provider_data;  /* provider private data */
+        iw_event_handler        event_handler;   /* cb for provider
+                                                    events */
+        /* Used by provider to add and remove refs on IW cm_id */
+        void (*add_ref)(struct iw_cm_id *);
+        void (*rem_ref)(struct iw_cm_id *);
+};
+struct iw_cm_conn_param {
+        const void *private_data;
+        u16 private_data_len;
+        u32 ord;
+        u32 ird;
+        u32 qpn;
+};
+struct iw_cm_verbs {
+        void            (*add_ref)(struct ib_qp *qp);
+        void            (*rem_ref)(struct ib_qp *qp);
+        struct ib_qp *  (*get_qp)(struct ib_device *device,
+                                  int qpn);
+        int             (*connect)(struct iw_cm_id *cm_id,
+                                   struct iw_cm_conn_param *conn_param);
+        int             (*accept)(struct iw_cm_id *cm_id,
+                                  struct iw_cm_conn_param *conn_param);
+        int             (*reject)(struct iw_cm_id *cm_id,
+                                  const void *pdata, u8 pdata_len);
+        int             (*create_listen)(struct iw_cm_id *cm_id,
+                                         int backlog);
+        int             (*destroy_listen)(struct iw_cm_id *cm_id);
+};
+/**
+ * iw_create_cm_id - Create an IW CM identifier.
+ *
+ * @device: The IB device on which to create the IW CM identier.
+ * @event_handler: User callback invoked to report events associated with the
+ *   returned IW CM identifier.
+ * @context: User specified context associated with the id.
+ */
+struct iw_cm_id *iw_create_cm_id(struct ib_device *device,
+                                 iw_cm_handler cm_handler, void *context);
+/**
+ * iw_destroy_cm_id - Destroy an IW CM identifier.
+ *
+ * @cm_id: The previously created IW CM identifier to destroy.
+ *
+ * The client can assume that no events will be delivered for the CM ID after
+ * this function returns.
+ */
+void iw_destroy_cm_id(struct iw_cm_id *cm_id);
+/**
+ * iw_cm_bind_qp - Unbind the specified IW CM identifier and QP
+ *
+ * @cm_id: The IW CM idenfier to unbind from the QP.
+ * @qp: The QP
+ *
+ * This is called by the provider when destroying the QP to ensure
+ * that any references held by the IWCM are released. It may also
+ * be called by the IWCM when destroying a CM_ID to that any
+ * references held by the provider are released.
+ */
+void iw_cm_unbind_qp(struct iw_cm_id *cm_id, struct ib_qp *qp);
+/**
+ * iw_cm_get_qp - Return the ib_qp associated with a QPN
+ *
+ * @ib_device: The IB device
+ * @qpn: The queue pair number
+ */
+struct ib_qp *iw_cm_get_qp(struct ib_device *device, int qpn);
+/**
+ * iw_cm_listen - Listen for incoming connection requests on the
+ * specified IW CM id.
+ *
+ * @cm_id: The IW CM identifier.
+ * @backlog: The maximum number of outstanding un-accepted inbound listen
+ *   requests to queue.
+ *
+ * The source address and port number are specified in the IW CM identifier
+ * structure.
+ */
+int iw_cm_listen(struct iw_cm_id *cm_id, int backlog);
+/**
+ * iw_cm_accept - Called to accept an incoming connect request.
+ *
+ * @cm_id: The IW CM identifier associated with the connection request.
+ * @iw_param: Pointer to a structure containing connection establishment
+ *   parameters.
+ *
+ * The specified cm_id will have been provided in the event data for a
+ * CONNECT_REQUEST event. Subsequent events related to this connection will be
+ * delivered to the specified IW CM identifier prior and may occur prior to
+ * the return of this function. If this function returns a non-zero value, the
+ * client can assume that no events will be delivered to the specified IW CM
+ * identifier.
+ */
+int iw_cm_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param);
+/**
+ * iw_cm_reject - Reject an incoming connection request.
+ *
+ * @cm_id: Connection identifier associated with the request.
+ * @private_daa: Pointer to data to deliver to the remote peer as part of the
+ *   reject message.
+ * @private_data_len: The number of bytes in the private_data parameter.
+ *
+ * The client can assume that no events will be delivered to the specified IW
+ * CM identifier following the return of this function. The private_data
+ * buffer is available for reuse when this function returns.
+ */
+int iw_cm_reject(struct iw_cm_id *cm_id, const void *private_data,
+                 u8 private_data_len);
+/**
+ * iw_cm_connect - Called to request a connection to a remote peer.
+ *
+ * @cm_id: The IW CM identifier for the connection.
+ * @iw_param: Pointer to a structure containing connection  establishment
+ *   parameters.
+ *
+ * Events may be delivered to the specified IW CM identifier prior to the
+ * return of this function. If this function returns a non-zero value, the
+ * client can assume that no events will be delivered to the specified IW CM
+ * identifier.
+ */
+int iw_cm_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param);
+/**
+ * iw_cm_disconnect - Close the specified connection.
+ *
+ * @cm_id: The IW CM identifier to close.
+ * @abrupt: If 0, the connection will be closed gracefully, otherwise, the
+ *   connection will be reset.
+ *
+ * The IW CM identifier is still active until the IW_CM_EVENT_CLOSE event is
+ * delivered.
+ */
+int iw_cm_disconnect(struct iw_cm_id *cm_id, int abrupt);
+/**
+ * iw_cm_init_qp_attr - Called to initialize the attributes of the QP
+ * associated with a IW CM identifier.
+ *
+ * @cm_id: The IW CM identifier associated with the QP
+ * @qp_attr: Pointer to the QP attributes structure.
+ * @qp_attr_mask: Pointer to a bit vector specifying which QP attributes are
+ *   valid.
+ */
+int iw_cm_init_qp_attr(struct iw_cm_id *cm_id, struct ib_qp_attr *qp_attr,
+                       int *qp_attr_mask);
+#endif /* IW_CM_H */
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index 402c63d7226b..deb5a0a4cee5 100644
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -117,6 +117,14 @@ struct rdma_cm_id {
 struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
                                  void *context, enum rdma_port_space ps);
+/**
+  * rdma_destroy_id - Destroys an RDMA identifier.
+  *
+  * @id: RDMA identifier.
+  *
+  * Note: calling this function has the effect of canceling in-flight
+  * asynchronous operations associated with the id.
+  */
 void rdma_destroy_id(struct rdma_cm_id *id);
 /**
@@ -237,6 +245,10 @@ int rdma_listen(struct rdma_cm_id *id, int backlog);
 * Typically, this routine is only called by the listener to accept a connection
 * request.  It must also be called on the active side of a connection if the
 * user is performing their own QP transitions.
+ *
+ * In the case of error, a reject message is sent to the remote side and the
+ * state of the qp associated with the id is modified to error, such that any
+ * previously posted receive buffers would be flushed.
 */
 int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
index 14a033d73314..744f85011f1e 100644
--- a/include/scsi/Kbuild
+++ b/include/scsi/Kbuild
@@ -1,2 +1,4 @@
 header-y += scsi.h
-unifdef-y := scsi_ioctl.h sg.h
+unifdef-y += scsi_ioctl.h
+unifdef-y += sg.h
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 41904f611d12..401192e56e50 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -102,6 +102,8 @@ struct iscsi_cmd_task {
        uint32_t                unsol_datasn;
        int                     imm_count;      /* imm-data (bytes)   */
        int                     unsol_count;    /* unsolicited (bytes)*/
+        /* offset in unsolicited stream (bytes); */
+        int                     unsol_offset;
        int                     data_count;     /* remaining Data-Out */
        struct scsi_cmnd        *sc;            /* associated SCSI cmd*/
        int                     total_length;
@@ -110,6 +112,7 @@ struct iscsi_cmd_task {
        /* state set/tested under session->lock */
        int                     state;
+        atomic_t                refcount;
        struct list_head        running;        /* running cmd list */
        void                    *dd_data;       /* driver/transport data */
 };
@@ -290,8 +293,7 @@ extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
 extern int iscsi_check_assign_cmdsn(struct iscsi_session *,
                                    struct iscsi_nopin *);
 extern void iscsi_prep_unsolicit_data_pdu(struct iscsi_cmd_task *,
-                                        struct iscsi_data *hdr,
+                                        struct iscsi_data *hdr);
-                                        int transport_data_cnt);
 extern int iscsi_conn_send_pdu(struct iscsi_cls_conn *, struct iscsi_hdr *,
                                char *, uint32_t);
 extern int iscsi_complete_pdu(struct iscsi_conn *, struct iscsi_hdr *,
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
new file mode 100644
index 000000000000..9582e8401669
--- /dev/null
+++ b/include/scsi/libsas.h
@@ -0,0 +1,627 @@
+/*
+ * SAS host prototypes and structures header file
+ *
+ * Copyright (C) 2005 Adaptec, Inc.  All rights reserved.
+ * Copyright (C) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
+ *
+ * This file is licensed under GPLv2.
+ *
+ * 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
+ *
+ */
+#ifndef _LIBSAS_H_
+#define _LIBSAS_H_
+#include <linux/timer.h>
+#include <linux/pci.h>
+#include <scsi/sas.h>
+#include <linux/list.h>
+#include <asm/semaphore.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_transport_sas.h>
+struct block_device;
+enum sas_class {
+        SAS,
+        EXPANDER
+};
+enum sas_phy_role {
+        PHY_ROLE_NONE = 0,
+        PHY_ROLE_TARGET = 0x40,
+        PHY_ROLE_INITIATOR = 0x80,
+};
+enum sas_phy_type {
+        PHY_TYPE_PHYSICAL,
+        PHY_TYPE_VIRTUAL
+};
+/* The events are mnemonically described in sas_dump.c
+ * so when updating/adding events here, please also
+ * update the other file too.
+ */
+enum ha_event {
+        HAE_RESET             = 0U,
+        HA_NUM_EVENTS         = 1,
+};
+enum port_event {
+        PORTE_BYTES_DMAED     = 0U,
+        PORTE_BROADCAST_RCVD  = 1,
+        PORTE_LINK_RESET_ERR  = 2,
+        PORTE_TIMER_EVENT     = 3,
+        PORTE_HARD_RESET      = 4,
+        PORT_NUM_EVENTS       = 5,
+};
+enum phy_event {
+        PHYE_LOSS_OF_SIGNAL   = 0U,
+        PHYE_OOB_DONE         = 1,
+        PHYE_OOB_ERROR        = 2,
+        PHYE_SPINUP_HOLD      = 3, /* hot plug SATA, no COMWAKE sent */
+        PHY_NUM_EVENTS        = 4,
+};
+enum discover_event {
+        DISCE_DISCOVER_DOMAIN   = 0U,
+        DISCE_REVALIDATE_DOMAIN = 1,
+        DISCE_PORT_GONE         = 2,
+        DISC_NUM_EVENTS         = 3,
+};
+/* ---------- Expander Devices ---------- */
+#define ETASK 0xFA
+#define to_dom_device(_obj) container_of(_obj, struct domain_device, dev_obj)
+#define to_dev_attr(_attr)  container_of(_attr, struct domain_dev_attribute,\
+                                         attr)
+enum routing_attribute {
+        DIRECT_ROUTING,
+        SUBTRACTIVE_ROUTING,
+        TABLE_ROUTING,
+};
+enum ex_phy_state {
+        PHY_EMPTY,
+        PHY_VACANT,
+        PHY_NOT_PRESENT,
+        PHY_DEVICE_DISCOVERED
+};
+struct ex_phy {
+        int    phy_id;
+        enum ex_phy_state phy_state;
+        enum sas_dev_type attached_dev_type;
+        enum sas_linkrate linkrate;
+        u8   attached_sata_host:1;
+        u8   attached_sata_dev:1;
+        u8   attached_sata_ps:1;
+        enum sas_proto attached_tproto;
+        enum sas_proto attached_iproto;
+        u8   attached_sas_addr[SAS_ADDR_SIZE];
+        u8   attached_phy_id;
+        u8   phy_change_count;
+        enum routing_attribute routing_attr;
+        u8   virtual:1;
+        int  last_da_index;
+        struct sas_phy *phy;
+        struct sas_port *port;
+};
+struct expander_device {
+        struct list_head children;
+        u16    ex_change_count;
+        u16    max_route_indexes;
+        u8     num_phys;
+        u8     configuring:1;
+        u8     conf_route_table:1;
+        u8     enclosure_logical_id[8];
+        struct ex_phy *ex_phy;
+        struct sas_port *parent_port;
+};
+/* ---------- SATA device ---------- */
+enum ata_command_set {
+        ATA_COMMAND_SET   = 0,
+        ATAPI_COMMAND_SET = 1,
+};
+struct sata_device {
+        enum   ata_command_set command_set;
+        struct smp_resp        rps_resp; /* report_phy_sata_resp */
+        __le16 *identify_device;
+        __le16 *identify_packet_device;
+        u8     port_no;        /* port number, if this is a PM (Port) */
+        struct list_head children; /* PM Ports if this is a PM */
+};
+/* ---------- Domain device ---------- */
+struct domain_device {
+        enum sas_dev_type dev_type;
+        enum sas_linkrate linkrate;
+        enum sas_linkrate min_linkrate;
+        enum sas_linkrate max_linkrate;
+        int  pathways;
+        struct domain_device *parent;
+        struct list_head siblings; /* devices on the same level */
+        struct asd_sas_port *port;        /* shortcut to root of the tree */
+        struct list_head dev_list_node;
+        enum sas_proto    iproto;
+        enum sas_proto    tproto;
+        struct sas_rphy *rphy;
+        u8  sas_addr[SAS_ADDR_SIZE];
+        u8  hashed_sas_addr[HASHED_SAS_ADDR_SIZE];
+        u8  frame_rcvd[32];
+        union {
+                struct expander_device ex_dev;
+                struct sata_device     sata_dev; /* STP & directly attached */
+        };
+        void *lldd_dev;
+};
+struct sas_discovery {
+        spinlock_t disc_event_lock;
+        struct work_struct disc_work[DISC_NUM_EVENTS];
+        unsigned long    pending;
+        u8     fanout_sas_addr[8];
+        u8     eeds_a[8];
+        u8     eeds_b[8];
+        int    max_level;
+};
+/* The port struct is Class:RW, driver:RO */
+struct asd_sas_port {
+/* private: */
+        struct completion port_gone_completion;
+        struct sas_discovery disc;
+        struct domain_device *port_dev;
+        spinlock_t dev_list_lock;
+        struct list_head dev_list;
+        enum   sas_linkrate linkrate;
+        struct sas_phy *phy;
+        struct work_struct work;
+/* public: */
+        int id;
+        enum sas_class   class;
+        u8               sas_addr[SAS_ADDR_SIZE];
+        u8               attached_sas_addr[SAS_ADDR_SIZE];
+        enum sas_proto   iproto;
+        enum sas_proto   tproto;
+        enum sas_oob_mode oob_mode;
+        spinlock_t       phy_list_lock;
+        struct list_head phy_list;
+        int              num_phys;
+        u32              phy_mask;
+        struct sas_ha_struct *ha;
+        struct sas_port *port;
+        void *lldd_port;          /* not touched by the sas class code */
+};
+/* The phy pretty much is controlled by the LLDD.
+ * The class only reads those fields.
+ */
+struct asd_sas_phy {
+/* private: */
+        /* protected by ha->event_lock */
+        struct work_struct   port_events[PORT_NUM_EVENTS];
+        struct work_struct   phy_events[PHY_NUM_EVENTS];
+        unsigned long port_events_pending;
+        unsigned long phy_events_pending;
+        int error;
+        struct sas_phy *phy;
+/* public: */
+        /* The following are class:RO, driver:R/W */
+        int            enabled;   /* must be set */
+        int            id;        /* must be set */
+        enum sas_class class;
+        enum sas_proto iproto;
+        enum sas_proto tproto;
+        enum sas_phy_type  type;
+        enum sas_phy_role  role;
+        enum sas_oob_mode  oob_mode;
+        enum sas_linkrate linkrate;
+        u8   *sas_addr;           /* must be set */
+        u8   attached_sas_addr[SAS_ADDR_SIZE]; /* class:RO, driver: R/W */
+        spinlock_t     frame_rcvd_lock;
+        u8             *frame_rcvd; /* must be set */
+        int            frame_rcvd_size;
+        spinlock_t     sas_prim_lock;
+        u32            sas_prim;
+        struct list_head port_phy_el; /* driver:RO */
+        struct asd_sas_port      *port; /* Class:RW, driver: RO */
+        struct sas_ha_struct *ha; /* may be set; the class sets it anyway */
+        void *lldd_phy;           /* not touched by the sas_class_code */
+};
+struct scsi_core {
+        struct Scsi_Host *shost;
+        spinlock_t        task_queue_lock;
+        struct list_head  task_queue;
+        int               task_queue_size;
+        struct semaphore  queue_thread_sema;
+        int               queue_thread_kill;
+};
+struct sas_ha_struct {
+/* private: */
+        spinlock_t       event_lock;
+        struct work_struct ha_events[HA_NUM_EVENTS];
+        unsigned long    pending;
+        struct scsi_core core;
+/* public: */
+        char *sas_ha_name;
+        struct pci_dev *pcidev;   /* should be set */
+        struct module *lldd_module; /* should be set */
+        u8 *sas_addr;             /* must be set */
+        u8 hashed_sas_addr[HASHED_SAS_ADDR_SIZE];
+        spinlock_t      phy_port_lock;
+        struct asd_sas_phy  **sas_phy; /* array of valid pointers, must be set */
+        struct asd_sas_port **sas_port; /* array of valid pointers, must be set */
+        int             num_phys; /* must be set, gt 0, static */
+        /* The class calls this to send a task for execution. */
+        int lldd_max_execute_num;
+        int lldd_queue_size;
+        /* LLDD calls these to notify the class of an event. */
+        void (*notify_ha_event)(struct sas_ha_struct *, enum ha_event);
+        void (*notify_port_event)(struct asd_sas_phy *, enum port_event);
+        void (*notify_phy_event)(struct asd_sas_phy *, enum phy_event);
+        void *lldd_ha;            /* not touched by sas class code */
+};
+#define SHOST_TO_SAS_HA(_shost) (*(struct sas_ha_struct **)(_shost)->hostdata)
+static inline struct domain_device *
+starget_to_domain_dev(struct scsi_target *starget) {
+        return starget->hostdata;
+}
+static inline struct domain_device *
+sdev_to_domain_dev(struct scsi_device *sdev) {
+        return starget_to_domain_dev(sdev->sdev_target);
+}
+static inline struct domain_device *
+cmd_to_domain_dev(struct scsi_cmnd *cmd)
+{
+        return sdev_to_domain_dev(cmd->device);
+}
+void sas_hash_addr(u8 *hashed, const u8 *sas_addr);
+/* Before calling a notify event, LLDD should use this function
+ * when the link is severed (possibly from its tasklet).
+ * The idea is that the Class only reads those, while the LLDD,
+ * can R/W these (thus avoiding a race).
+ */
+static inline void sas_phy_disconnected(struct asd_sas_phy *phy)
+{
+        phy->oob_mode = OOB_NOT_CONNECTED;
+        phy->linkrate = SAS_LINK_RATE_UNKNOWN;
+}
+/* ---------- Tasks ---------- */
+/*
+      service_response |  SAS_TASK_COMPLETE  |  SAS_TASK_UNDELIVERED |
+  exec_status          |                     |                       |
+  ---------------------+---------------------+-----------------------+
+       SAM_...         |         X           |                       |
+       DEV_NO_RESPONSE |         X           |           X           |
+       INTERRUPTED     |         X           |                       |
+       QUEUE_FULL      |                     |           X           |
+       DEVICE_UNKNOWN  |                     |           X           |
+       SG_ERR          |                     |           X           |
+  ---------------------+---------------------+-----------------------+
+ */
+enum service_response {
+        SAS_TASK_COMPLETE,
+        SAS_TASK_UNDELIVERED = -1,
+};
+enum exec_status {
+        SAM_GOOD         = 0,
+        SAM_CHECK_COND   = 2,
+        SAM_COND_MET     = 4,
+        SAM_BUSY         = 8,
+        SAM_INTERMEDIATE = 0x10,
+        SAM_IM_COND_MET  = 0x12,
+        SAM_RESV_CONFLICT= 0x14,
+        SAM_TASK_SET_FULL= 0x28,
+        SAM_ACA_ACTIVE   = 0x30,
+        SAM_TASK_ABORTED = 0x40,
+        SAS_DEV_NO_RESPONSE = 0x80,
+        SAS_DATA_UNDERRUN,
+        SAS_DATA_OVERRUN,
+        SAS_INTERRUPTED,
+        SAS_QUEUE_FULL,
+        SAS_DEVICE_UNKNOWN,
+        SAS_SG_ERR,
+        SAS_OPEN_REJECT,
+        SAS_OPEN_TO,
+        SAS_PROTO_RESPONSE,
+        SAS_PHY_DOWN,
+        SAS_NAK_R_ERR,
+        SAS_PENDING,
+        SAS_ABORTED_TASK,
+};
+/* When a task finishes with a response, the LLDD examines the
+ * response:
+ *      - For an ATA task task_status_struct::stat is set to
+ * SAS_PROTO_RESPONSE, and the task_status_struct::buf is set to the
+ * contents of struct ata_task_resp.
+ *      - For SSP tasks, if no data is present or status/TMF response
+ * is valid, task_status_struct::stat is set.  If data is present
+ * (SENSE data), the LLDD copies up to SAS_STATUS_BUF_SIZE, sets
+ * task_status_struct::buf_valid_size, and task_status_struct::stat is
+ * set to SAM_CHECK_COND.
+ *
+ * "buf" has format SCSI Sense for SSP task, or struct ata_task_resp
+ * for ATA task.
+ *
+ * "frame_len" is the total frame length, which could be more or less
+ * than actually copied.
+ *
+ * Tasks ending with response, always set the residual field.
+ */
+struct ata_task_resp {
+        u16  frame_len;
+        u8   ending_fis[24];      /* dev to host or data-in */
+        u32  sstatus;
+        u32  serror;
+        u32  scontrol;
+        u32  sactive;
+};
+#define SAS_STATUS_BUF_SIZE 96
+struct task_status_struct {
+        enum service_response resp;
+        enum exec_status      stat;
+        int  buf_valid_size;
+        u8   buf[SAS_STATUS_BUF_SIZE];
+        u32  residual;
+        enum sas_open_rej_reason open_rej_reason;
+};
+/* ATA and ATAPI task queuable to a SAS LLDD.
+ */
+struct sas_ata_task {
+        struct host_to_dev_fis fis;
+        u8     atapi_packet[16];  /* 0 if not ATAPI task */
+        u8     retry_count;       /* hardware retry, should be > 0 */
+        u8     dma_xfer:1;        /* PIO:0 or DMA:1 */
+        u8     use_ncq:1;
+        u8     set_affil_pol:1;
+        u8     stp_affil_pol:1;
+        u8     device_control_reg_update:1;
+};
+struct sas_smp_task {
+        struct scatterlist smp_req;
+        struct scatterlist smp_resp;
+};
+enum task_attribute {
+        TASK_ATTR_SIMPLE = 0,
+        TASK_ATTR_HOQ    = 1,
+        TASK_ATTR_ORDERED= 2,
+        TASK_ATTR_ACA    = 4,
+};
+struct sas_ssp_task {
+        u8     retry_count;       /* hardware retry, should be > 0 */
+        u8     LUN[8];
+        u8     enable_first_burst:1;
+        enum   task_attribute task_attr;
+        u8     task_prio;
+        u8     cdb[16];
+};
+struct sas_task {
+        struct domain_device *dev;
+        struct list_head      list;
+        spinlock_t   task_state_lock;
+        unsigned     task_state_flags;
+        enum   sas_proto      task_proto;
+        /* Used by the discovery code. */
+        struct timer_list     timer;
+        struct completion     completion;
+        union {
+                struct sas_ata_task ata_task;
+                struct sas_smp_task smp_task;
+                struct sas_ssp_task ssp_task;
+        };
+        struct scatterlist *scatter;
+        int    num_scatter;
+        u32    total_xfer_len;
+        u8     data_dir:2;        /* Use PCI_DMA_... */
+        struct task_status_struct task_status;
+        void   (*task_done)(struct sas_task *);
+        void   *lldd_task;        /* for use by LLDDs */
+        void   *uldd_task;
+};
+#define SAS_TASK_STATE_PENDING  1
+#define SAS_TASK_STATE_DONE     2
+#define SAS_TASK_STATE_ABORTED  4
+static inline struct sas_task *sas_alloc_task(gfp_t flags)
+{
+        extern kmem_cache_t *sas_task_cache;
+        struct sas_task *task = kmem_cache_alloc(sas_task_cache, flags);
+        if (task) {
+                memset(task, 0, sizeof(*task));
+                INIT_LIST_HEAD(&task->list);
+                spin_lock_init(&task->task_state_lock);
+                task->task_state_flags = SAS_TASK_STATE_PENDING;
+                init_timer(&task->timer);
+                init_completion(&task->completion);
+        }
+        return task;
+}
+static inline void sas_free_task(struct sas_task *task)
+{
+        if (task) {
+                extern kmem_cache_t *sas_task_cache;
+                BUG_ON(!list_empty(&task->list));
+                kmem_cache_free(sas_task_cache, task);
+        }
+}
+struct sas_domain_function_template {
+        /* The class calls these to notify the LLDD of an event. */
+        void (*lldd_port_formed)(struct asd_sas_phy *);
+        void (*lldd_port_deformed)(struct asd_sas_phy *);
+        /* The class calls these when a device is found or gone. */
+        int  (*lldd_dev_found)(struct domain_device *);
+        void (*lldd_dev_gone)(struct domain_device *);
+        int (*lldd_execute_task)(struct sas_task *, int num,
+                                 gfp_t gfp_flags);
+        /* Task Management Functions. Must be called from process context. */
+        int (*lldd_abort_task)(struct sas_task *);
+        int (*lldd_abort_task_set)(struct domain_device *, u8 *lun);
+        int (*lldd_clear_aca)(struct domain_device *, u8 *lun);
+        int (*lldd_clear_task_set)(struct domain_device *, u8 *lun);
+        int (*lldd_I_T_nexus_reset)(struct domain_device *);
+        int (*lldd_lu_reset)(struct domain_device *, u8 *lun);
+        int (*lldd_query_task)(struct sas_task *);
+        /* Port and Adapter management */
+        int (*lldd_clear_nexus_port)(struct asd_sas_port *);
+        int (*lldd_clear_nexus_ha)(struct sas_ha_struct *);
+        /* Phy management */
+        int (*lldd_control_phy)(struct asd_sas_phy *, enum phy_func, void *);
+};
+extern int sas_register_ha(struct sas_ha_struct *);
+extern int sas_unregister_ha(struct sas_ha_struct *);
+extern int sas_queuecommand(struct scsi_cmnd *,
+                     void (*scsi_done)(struct scsi_cmnd *));
+extern int sas_target_alloc(struct scsi_target *);
+extern int sas_slave_alloc(struct scsi_device *);
+extern int sas_slave_configure(struct scsi_device *);
+extern void sas_slave_destroy(struct scsi_device *);
+extern int sas_change_queue_depth(struct scsi_device *, int new_depth);
+extern int sas_change_queue_type(struct scsi_device *, int qt);
+extern int sas_bios_param(struct scsi_device *,
+                          struct block_device *,
+                          sector_t capacity, int *hsc);
+extern struct scsi_transport_template *
+sas_domain_attach_transport(struct sas_domain_function_template *);
+extern void sas_domain_release_transport(struct scsi_transport_template *);
+int  sas_discover_root_expander(struct domain_device *);
+void sas_init_ex_attr(void);
+int  sas_ex_revalidate_domain(struct domain_device *);
+void sas_unregister_domain_devices(struct asd_sas_port *port);
+void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *);
+int  sas_discover_event(struct asd_sas_port *, enum discover_event ev);
+int  sas_discover_sata(struct domain_device *);
+int  sas_discover_end_dev(struct domain_device *);
+void sas_unregister_dev(struct domain_device *);
+void sas_init_dev(struct domain_device *);
+#endif /* _SASLIB_H_ */
diff --git a/include/scsi/sas.h b/include/scsi/sas.h
new file mode 100644
index 000000000000..2f4b6afa34fc
--- /dev/null
+++ b/include/scsi/sas.h
@@ -0,0 +1,631 @@
+/*
+ * SAS structures and definitions header file
+ *
+ * Copyright (C) 2005 Adaptec, Inc.  All rights reserved.
+ * Copyright (C) 2005 Luben Tuikov <luben_tuikov@adaptec.com>
+ *
+ * This file is licensed under GPLv2.
+ *
+ * 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
+ *
+ */
+#ifndef _SAS_H_
+#define _SAS_H_
+#include <linux/types.h>
+#include <asm/byteorder.h>
+#define SAS_ADDR_SIZE        8
+#define HASHED_SAS_ADDR_SIZE 3
+#define SAS_ADDR(_sa) ((unsigned long long) be64_to_cpu(*(__be64 *)(_sa)))
+#define SMP_REQUEST             0x40
+#define SMP_RESPONSE            0x41
+#define SSP_DATA                0x01
+#define SSP_XFER_RDY            0x05
+#define SSP_COMMAND             0x06
+#define SSP_RESPONSE            0x07
+#define SSP_TASK                0x16
+#define SMP_REPORT_GENERAL       0x00
+#define SMP_REPORT_MANUF_INFO    0x01
+#define SMP_READ_GPIO_REG        0x02
+#define SMP_DISCOVER             0x10
+#define SMP_REPORT_PHY_ERR_LOG   0x11
+#define SMP_REPORT_PHY_SATA      0x12
+#define SMP_REPORT_ROUTE_INFO    0x13
+#define SMP_WRITE_GPIO_REG       0x82
+#define SMP_CONF_ROUTE_INFO      0x90
+#define SMP_PHY_CONTROL          0x91
+#define SMP_PHY_TEST_FUNCTION    0x92
+#define SMP_RESP_FUNC_ACC        0x00
+#define SMP_RESP_FUNC_UNK        0x01
+#define SMP_RESP_FUNC_FAILED     0x02
+#define SMP_RESP_INV_FRM_LEN     0x03
+#define SMP_RESP_NO_PHY          0x10
+#define SMP_RESP_NO_INDEX        0x11
+#define SMP_RESP_PHY_NO_SATA     0x12
+#define SMP_RESP_PHY_UNK_OP      0x13
+#define SMP_RESP_PHY_UNK_TESTF   0x14
+#define SMP_RESP_PHY_TEST_INPROG 0x15
+#define SMP_RESP_PHY_VACANT      0x16
+/* SAM TMFs */
+#define TMF_ABORT_TASK      0x01
+#define TMF_ABORT_TASK_SET  0x02
+#define TMF_CLEAR_TASK_SET  0x04
+#define TMF_LU_RESET        0x08
+#define TMF_CLEAR_ACA       0x40
+#define TMF_QUERY_TASK      0x80
+/* SAS TMF responses */
+#define TMF_RESP_FUNC_COMPLETE   0x00
+#define TMF_RESP_INVALID_FRAME   0x02
+#define TMF_RESP_FUNC_ESUPP      0x04
+#define TMF_RESP_FUNC_FAILED     0x05
+#define TMF_RESP_FUNC_SUCC       0x08
+#define TMF_RESP_NO_LUN          0x09
+#define TMF_RESP_OVERLAPPED_TAG  0x0A
+enum sas_oob_mode {
+        OOB_NOT_CONNECTED,
+        SATA_OOB_MODE,
+        SAS_OOB_MODE
+};
+/* See sas_discover.c if you plan on changing these.
+ */
+enum sas_dev_type {
+        NO_DEVICE   = 0,          /* protocol */
+        SAS_END_DEV = 1,          /* protocol */
+        EDGE_DEV    = 2,          /* protocol */
+        FANOUT_DEV  = 3,          /* protocol */
+        SAS_HA      = 4,
+        SATA_DEV    = 5,
+        SATA_PM     = 7,
+        SATA_PM_PORT= 8,
+};
+/* Partly from IDENTIFY address frame. */
+enum sas_proto {
+        SATA_PROTO    = 1,
+        SAS_PROTO_SMP = 2,        /* protocol */
+        SAS_PROTO_STP = 4,        /* protocol */
+        SAS_PROTO_SSP = 8,        /* protocol */
+        SAS_PROTO_ALL = 0xE,
+};
+/* From the spec; local phys only */
+enum phy_func {
+        PHY_FUNC_NOP,
+        PHY_FUNC_LINK_RESET,              /* Enables the phy */
+        PHY_FUNC_HARD_RESET,
+        PHY_FUNC_DISABLE,
+        PHY_FUNC_CLEAR_ERROR_LOG = 5,
+        PHY_FUNC_CLEAR_AFFIL,
+        PHY_FUNC_TX_SATA_PS_SIGNAL,
+        PHY_FUNC_RELEASE_SPINUP_HOLD = 0x10, /* LOCAL PORT ONLY! */
+        PHY_FUNC_SET_LINK_RATE,
+};
+/* SAS LLDD would need to report only _very_few_ of those, like BROADCAST.
+ * Most of those are here for completeness.
+ */
+enum sas_prim {
+        SAS_PRIM_AIP_NORMAL = 1,
+        SAS_PRIM_AIP_R0     = 2,
+        SAS_PRIM_AIP_R1     = 3,
+        SAS_PRIM_AIP_R2     = 4,
+        SAS_PRIM_AIP_WC     = 5,
+        SAS_PRIM_AIP_WD     = 6,
+        SAS_PRIM_AIP_WP     = 7,
+        SAS_PRIM_AIP_RWP    = 8,
+        SAS_PRIM_BC_CH      = 9,
+        SAS_PRIM_BC_RCH0    = 10,
+        SAS_PRIM_BC_RCH1    = 11,
+        SAS_PRIM_BC_R0      = 12,
+        SAS_PRIM_BC_R1      = 13,
+        SAS_PRIM_BC_R2      = 14,
+        SAS_PRIM_BC_R3      = 15,
+        SAS_PRIM_BC_R4      = 16,
+        SAS_PRIM_NOTIFY_ENSP= 17,
+        SAS_PRIM_NOTIFY_R0  = 18,
+        SAS_PRIM_NOTIFY_R1  = 19,
+        SAS_PRIM_NOTIFY_R2  = 20,
+        SAS_PRIM_CLOSE_CLAF = 21,
+        SAS_PRIM_CLOSE_NORM = 22,
+        SAS_PRIM_CLOSE_R0   = 23,
+        SAS_PRIM_CLOSE_R1   = 24,
+        SAS_PRIM_OPEN_RTRY  = 25,
+        SAS_PRIM_OPEN_RJCT  = 26,
+        SAS_PRIM_OPEN_ACPT  = 27,
+        SAS_PRIM_DONE       = 28,
+        SAS_PRIM_BREAK      = 29,
+        SATA_PRIM_DMAT      = 33,
+        SATA_PRIM_PMNAK     = 34,
+        SATA_PRIM_PMACK     = 35,
+        SATA_PRIM_PMREQ_S   = 36,
+        SATA_PRIM_PMREQ_P   = 37,
+        SATA_SATA_R_ERR     = 38,
+};
+enum sas_open_rej_reason {
+        /* Abandon open */
+        SAS_OREJ_UNKNOWN   = 0,
+        SAS_OREJ_BAD_DEST  = 1,
+        SAS_OREJ_CONN_RATE = 2,
+        SAS_OREJ_EPROTO    = 3,
+        SAS_OREJ_RESV_AB0  = 4,
+        SAS_OREJ_RESV_AB1  = 5,
+        SAS_OREJ_RESV_AB2  = 6,
+        SAS_OREJ_RESV_AB3  = 7,
+        SAS_OREJ_WRONG_DEST= 8,
+        SAS_OREJ_STP_NORES = 9,
+        /* Retry open */
+        SAS_OREJ_NO_DEST   = 10,
+        SAS_OREJ_PATH_BLOCKED = 11,
+        SAS_OREJ_RSVD_CONT0 = 12,
+        SAS_OREJ_RSVD_CONT1 = 13,
+        SAS_OREJ_RSVD_INIT0 = 14,
+        SAS_OREJ_RSVD_INIT1 = 15,
+        SAS_OREJ_RSVD_STOP0 = 16,
+        SAS_OREJ_RSVD_STOP1 = 17,
+        SAS_OREJ_RSVD_RETRY = 18,
+};
+struct  dev_to_host_fis {
+        u8     fis_type;          /* 0x34 */
+        u8     flags;
+        u8     status;
+        u8     error;
+        u8     lbal;
+        union { u8 lbam; u8 byte_count_low; };
+        union { u8 lbah; u8 byte_count_high; };
+        u8     device;
+        u8     lbal_exp;
+        u8     lbam_exp;
+        u8     lbah_exp;
+        u8     _r_a;
+        union { u8  sector_count; u8 interrupt_reason; };
+        u8     sector_count_exp;
+        u8     _r_b;
+        u8     _r_c;
+        u32    _r_d;
+} __attribute__ ((packed));
+struct host_to_dev_fis {
+        u8     fis_type;          /* 0x27 */
+        u8     flags;
+        u8     command;
+        u8     features;
+        u8     lbal;
+        union { u8 lbam; u8 byte_count_low; };
+        union { u8 lbah; u8 byte_count_high; };
+        u8     device;
+        u8     lbal_exp;
+        u8     lbam_exp;
+        u8     lbah_exp;
+        u8     features_exp;
+        union { u8  sector_count; u8 interrupt_reason; };
+        u8     sector_count_exp;
+        u8     _r_a;
+        u8     control;
+        u32    _r_b;
+} __attribute__ ((packed));
+/* Prefer to have code clarity over header file clarity.
+ */
+#ifdef __LITTLE_ENDIAN_BITFIELD
+struct sas_identify_frame {
+        /* Byte 0 */
+        u8  frame_type:4;
+        u8  dev_type:3;
+        u8  _un0:1;
+        /* Byte 1 */
+        u8  _un1;
+        /* Byte 2 */
+        union {
+                struct {
+                        u8  _un20:1;
+                        u8  smp_iport:1;
+                        u8  stp_iport:1;
+                        u8  ssp_iport:1;
+                        u8  _un247:4;
+                };
+                u8 initiator_bits;
+        };
+        /* Byte 3 */
+        union {
+                struct {
+                        u8  _un30:1;
+                        u8 smp_tport:1;
+                        u8 stp_tport:1;
+                        u8 ssp_tport:1;
+                        u8 _un347:4;
+                };
+                u8 target_bits;
+        };
+        /* Byte 4 - 11 */
+        u8 _un4_11[8];
+        /* Byte 12 - 19 */
+        u8 sas_addr[SAS_ADDR_SIZE];
+        /* Byte 20 */
+        u8 phy_id;
+        u8 _un21_27[7];
+        __be32 crc;
+} __attribute__ ((packed));
+struct ssp_frame_hdr {
+        u8     frame_type;
+        u8     hashed_dest_addr[HASHED_SAS_ADDR_SIZE];
+        u8     _r_a;
+        u8     hashed_src_addr[HASHED_SAS_ADDR_SIZE];
+        __be16 _r_b;
+        u8     changing_data_ptr:1;
+        u8     retransmit:1;
+        u8     retry_data_frames:1;
+        u8     _r_c:5;
+        u8     num_fill_bytes:2;
+        u8     _r_d:6;
+        u32    _r_e;
+        __be16 tag;
+        __be16 tptt;
+        __be32 data_offs;
+} __attribute__ ((packed));
+struct ssp_response_iu {
+        u8     _r_a[10];
+        u8     datapres:2;
+        u8     _r_b:6;
+        u8     status;
+        u32    _r_c;
+        __be32 sense_data_len;
+        __be32 response_data_len;
+        u8     resp_data[0];
+        u8     sense_data[0];
+} __attribute__ ((packed));
+/* ---------- SMP ---------- */
+struct report_general_resp {
+        __be16  change_count;
+        __be16  route_indexes;
+        u8      _r_a;
+        u8      num_phys;
+        u8      conf_route_table:1;
+        u8      configuring:1;
+        u8      _r_b:6;
+        u8      _r_c;
+        u8      enclosure_logical_id[8];
+        u8      _r_d[12];
+} __attribute__ ((packed));
+struct discover_resp {
+        u8    _r_a[5];
+        u8    phy_id;
+        __be16 _r_b;
+        u8    _r_c:4;
+        u8    attached_dev_type:3;
+        u8    _r_d:1;
+        u8    linkrate:4;
+        u8    _r_e:4;
+        u8    attached_sata_host:1;
+        u8    iproto:3;
+        u8    _r_f:4;
+        u8    attached_sata_dev:1;
+        u8    tproto:3;
+        u8    _r_g:3;
+        u8    attached_sata_ps:1;
+        u8    sas_addr[8];
+        u8    attached_sas_addr[8];
+        u8    attached_phy_id;
+        u8    _r_h[7];
+        u8    hmin_linkrate:4;
+        u8    pmin_linkrate:4;
+        u8    hmax_linkrate:4;
+        u8    pmax_linkrate:4;
+        u8    change_count;
+        u8    pptv:4;
+        u8    _r_i:3;
+        u8    virtual:1;
+        u8    routing_attr:4;
+        u8    _r_j:4;
+        u8    conn_type;
+        u8    conn_el_index;
+        u8    conn_phy_link;
+        u8    _r_k[8];
+} __attribute__ ((packed));
+struct report_phy_sata_resp {
+        u8    _r_a[5];
+        u8    phy_id;
+        u8    _r_b;
+        u8    affil_valid:1;
+        u8    affil_supp:1;
+        u8    _r_c:6;
+        u32    _r_d;
+        u8    stp_sas_addr[8];
+        struct dev_to_host_fis fis;
+        u32   _r_e;
+        u8    affil_stp_ini_addr[8];
+        __be32 crc;
+} __attribute__ ((packed));
+struct smp_resp {
+        u8    frame_type;
+        u8    function;
+        u8    result;
+        u8    reserved;
+        union {
+                struct report_general_resp  rg;
+                struct discover_resp        disc;
+                struct report_phy_sata_resp rps;
+        };
+} __attribute__ ((packed));
+#elif defined(__BIG_ENDIAN_BITFIELD)
+struct sas_identify_frame {
+        /* Byte 0 */
+        u8  _un0:1;
+        u8  dev_type:3;
+        u8  frame_type:4;
+        /* Byte 1 */
+        u8  _un1;
+        /* Byte 2 */
+        union {
+                struct {
+                        u8  _un247:4;
+                        u8  ssp_iport:1;
+                        u8  stp_iport:1;
+                        u8  smp_iport:1;
+                        u8  _un20:1;
+                };
+                u8 initiator_bits;
+        };
+        /* Byte 3 */
+        union {
+                struct {
+                        u8 _un347:4;
+                        u8 ssp_tport:1;
+                        u8 stp_tport:1;
+                        u8 smp_tport:1;
+                        u8 _un30:1;
+                };
+                u8 target_bits;
+        };
+        /* Byte 4 - 11 */
+        u8 _un4_11[8];
+        /* Byte 12 - 19 */
+        u8 sas_addr[SAS_ADDR_SIZE];
+        /* Byte 20 */
+        u8 phy_id;
+        u8 _un21_27[7];
+        __be32 crc;
+} __attribute__ ((packed));
+struct ssp_frame_hdr {
+        u8     frame_type;
+        u8     hashed_dest_addr[HASHED_SAS_ADDR_SIZE];
+        u8     _r_a;
+        u8     hashed_src_addr[HASHED_SAS_ADDR_SIZE];
+        __be16 _r_b;
+        u8     _r_c:5;
+        u8     retry_data_frames:1;
+        u8     retransmit:1;
+        u8     changing_data_ptr:1;
+        u8     _r_d:6;
+        u8     num_fill_bytes:2;
+        u32    _r_e;
+        __be16 tag;
+        __be16 tptt;
+        __be32 data_offs;
+} __attribute__ ((packed));
+struct ssp_response_iu {
+        u8     _r_a[10];
+        u8     _r_b:6;
+        u8     datapres:2;
+        u8     status;
+        u32    _r_c;
+        __be32 sense_data_len;
+        __be32 response_data_len;
+        u8     resp_data[0];
+        u8     sense_data[0];
+} __attribute__ ((packed));
+/* ---------- SMP ---------- */
+struct report_general_resp {
+        __be16  change_count;
+        __be16  route_indexes;
+        u8      _r_a;
+        u8      num_phys;
+        u8      _r_b:6;
+        u8      configuring:1;
+        u8      conf_route_table:1;
+        u8      _r_c;
+        u8      enclosure_logical_id[8];
+        u8      _r_d[12];
+} __attribute__ ((packed));
+struct discover_resp {
+        u8    _r_a[5];
+        u8    phy_id;
+        __be16 _r_b;
+        u8    _r_d:1;
+        u8    attached_dev_type:3;
+        u8    _r_c:4;
+        u8    _r_e:4;
+        u8    linkrate:4;
+        u8    _r_f:4;
+        u8    iproto:3;
+        u8    attached_sata_host:1;
+        u8    attached_sata_ps:1;
+        u8    _r_g:3;
+        u8    tproto:3;
+        u8    attached_sata_dev:1;
+        u8    sas_addr[8];
+        u8    attached_sas_addr[8];
+        u8    attached_phy_id;
+        u8    _r_h[7];
+        u8    pmin_linkrate:4;
+        u8    hmin_linkrate:4;
+        u8    pmax_linkrate:4;
+        u8    hmax_linkrate:4;
+        u8    change_count;
+        u8    virtual:1;
+        u8    _r_i:3;
+        u8    pptv:4;
+        u8    _r_j:4;
+        u8    routing_attr:4;
+        u8    conn_type;
+        u8    conn_el_index;
+        u8    conn_phy_link;
+        u8    _r_k[8];
+} __attribute__ ((packed));
+struct report_phy_sata_resp {
+        u8    _r_a[5];
+        u8    phy_id;
+        u8    _r_b;
+        u8    _r_c:6;
+        u8    affil_supp:1;
+        u8    affil_valid:1;
+        u32   _r_d;
+        u8    stp_sas_addr[8];
+        struct dev_to_host_fis fis;
+        u32   _r_e;
+        u8    affil_stp_ini_addr[8];
+        __be32 crc;
+} __attribute__ ((packed));
+struct smp_resp {
+        u8    frame_type;
+        u8    function;
+        u8    result;
+        u8    reserved;
+        union {
+                struct report_general_resp  rg;
+                struct discover_resp        disc;
+                struct report_phy_sata_resp rps;
+        };
+} __attribute__ ((packed));
+#else
+#error "Bitfield order not defined!"
+#endif
+#endif /* _SAS_H_ */
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index c60b8ff2f5e4..84a6d5fe0920 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -25,13 +25,6 @@ extern const unsigned char scsi_command_size[8];
 #define COMMAND_SIZE(opcode) scsi_command_size[((opcode) >> 5) & 7]
 /*
- *      SCSI device types
- */
-#define MAX_SCSI_DEVICE_CODE 15
-extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
-/*
 * Special value for scanning to specify scanning or rescanning of all
 * possible channels, (target) ids, or luns on a given shost.
 */
@@ -225,6 +218,9 @@ static inline int scsi_status_is_good(int status)
 #define TYPE_RBC            0x0e
 #define TYPE_NO_LUN         0x7f
+/* Returns a human-readable name for the device */
+extern const char * scsi_device_type(unsigned type);
 /*
 * standard mode-select header prepended to all mode-select commands
 */
@@ -433,4 +429,10 @@ struct scsi_lun {
 /* Used to obtain the PCI location of a device */
 #define SCSI_IOCTL_GET_PCI              0x5387
+/* Pull a u32 out of a SCSI message (using BE SCSI conventions) */
+static inline u32 scsi_to_u32(u8 *ptr)
+{
+        return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
+}
 #endif /* _SCSI_SCSI_H */
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 58e6444eebee..be117f812deb 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -118,20 +118,6 @@ struct scsi_cmnd {
        unsigned long pid;      /* Process ID, starts at 0. Unique per host. */
 };
-/*
- * These are the values that scsi_cmd->state can take.
- */
-#define SCSI_STATE_TIMEOUT         0x1000
-#define SCSI_STATE_FINISHED        0x1001
-#define SCSI_STATE_FAILED          0x1002
-#define SCSI_STATE_QUEUED          0x1003
-#define SCSI_STATE_UNUSED          0x1006
-#define SCSI_STATE_DISCONNECTING   0x1008
-#define SCSI_STATE_INITIALIZING    0x1009
-#define SCSI_STATE_BHQUEUE         0x100a
-#define SCSI_STATE_MLQUEUE         0x100b
 extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
 extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 895d212864cd..b401c82036be 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -298,9 +298,9 @@ extern int scsi_execute_async(struct scsi_device *sdev,
                              void (*done)(void *, char *, int, int),
                              gfp_t gfp);
-static inline void scsi_device_reprobe(struct scsi_device *sdev)
+static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)
 {
-        device_reprobe(&sdev->sdev_gendev);
+        return device_reprobe(&sdev->sdev_gendev);
 }
 static inline unsigned int sdev_channel(struct scsi_device *sdev)
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index b3dd90f3e858..39c6f8cc20c3 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -16,6 +16,7 @@ struct scsi_target;
 struct Scsi_Host;
 struct scsi_host_cmd_pool;
 struct scsi_transport_template;
+struct blk_queue_tags;
 /*
@@ -466,6 +467,12 @@ struct Scsi_Host {
        struct scsi_transport_template *transportt;
        /*
+         * area to keep a shared tag map (if needed, will be
+         * NULL if not)
+         */
+        struct blk_queue_tag    *bqt;
+        /*
         * The following two fields are protected with host_lock;
         * however, eh routines can safely access during eh processing
         * without acquiring the lock.
diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
new file mode 100644
index 000000000000..8c1470cc8209
--- /dev/null
+++ b/include/scsi/scsi_netlink.h
@@ -0,0 +1,87 @@
+/*
+ *  SCSI Transport Netlink Interface
+ *    Used for the posting of outbound SCSI transport events
+ *
+ *  Copyright (C) 2006   James Smart, Emulex Corporation
+ *
+ *  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
+ *
+ */
+#ifndef SCSI_NETLINK_H
+#define SCSI_NETLINK_H
+/*
+ * This file intended to be included by both kernel and user space
+ */
+/* Single Netlink Message type to send all SCSI Transport messages */
+#define SCSI_TRANSPORT_MSG              NLMSG_MIN_TYPE + 1
+/* SCSI Transport Broadcast Groups */
+        /* leaving groups 0 and 1 unassigned */
+#define SCSI_NL_GRP_FC_EVENTS           (1<<2)          /* Group 2 */
+#define SCSI_NL_GRP_CNT                 3
+/* SCSI_TRANSPORT_MSG event message header */
+struct scsi_nl_hdr {
+        uint8_t version;
+        uint8_t transport;
+        uint16_t magic;
+        uint16_t msgtype;
+        uint16_t msglen;
+} __attribute__((aligned(sizeof(uint64_t))));
+/* scsi_nl_hdr->version value */
+#define SCSI_NL_VERSION                         1
+/* scsi_nl_hdr->magic value */
+#define SCSI_NL_MAGIC                           0xA1B2
+/* scsi_nl_hdr->transport value */
+#define SCSI_NL_TRANSPORT                       0
+#define SCSI_NL_TRANSPORT_FC                    1
+#define SCSI_NL_MAX_TRANSPORTS                  2
+/* scsi_nl_hdr->msgtype values are defined in each transport */
+/*
+ * Vendor ID:
+ *   If transports post vendor-unique events, they must pass a well-known
+ *   32-bit vendor identifier. This identifier consists of 8 bits indicating
+ *   the "type" of identifier contained, and 24 bits of id data.
+ *
+ *   Identifiers for each type:
+ *    PCI :  ID data is the 16 bit PCI Registered Vendor ID
+ */
+#define SCSI_NL_VID_TYPE_SHIFT          56
+#define SCSI_NL_VID_TYPE_MASK           ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
+#define SCSI_NL_VID_TYPE_PCI            ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
+#define SCSI_NL_VID_ID_MASK             (~ SCSI_NL_VID_TYPE_MASK)
+#define INIT_SCSI_NL_HDR(hdr, t, mtype, mlen)                   \
+        {                                                       \
+        (hdr)->version = SCSI_NL_VERSION;                       \
+        (hdr)->transport = t;                                   \
+        (hdr)->magic = SCSI_NL_MAGIC;                           \
+        (hdr)->msgtype = mtype;                                 \
+        (hdr)->msglen = mlen;                                   \
+        }
+#endif /* SCSI_NETLINK_H */
diff --git a/include/scsi/scsi_netlink_fc.h b/include/scsi/scsi_netlink_fc.h
new file mode 100644
index 000000000000..cbf76e479761
--- /dev/null
+++ b/include/scsi/scsi_netlink_fc.h
@@ -0,0 +1,71 @@
+/*
+ *  FC Transport Netlink Interface
+ *
+ *  Copyright (C) 2006   James Smart, Emulex Corporation
+ *
+ *  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
+ *
+ */
+#ifndef SCSI_NETLINK_FC_H
+#define SCSI_NETLINK_FC_H
+#include <scsi/scsi_netlink.h>
+/*
+ * This file intended to be included by both kernel and user space
+ */
+/*
+ * FC Transport Message Types
+ */
+        /* kernel -> user */
+#define FC_NL_ASYNC_EVENT                       0x0100
+        /* user -> kernel */
+/* none */
+/*
+ * Message Structures :
+ */
+/* macro to round up message lengths to 8byte boundary */
+#define FC_NL_MSGALIGN(len)             (((len) + 7) & ~7)
+/*
+ * FC Transport Broadcast Event Message :
+ *   FC_NL_ASYNC_EVENT
+ *
+ * Note: if Vendor Unique message, &event_data will be  start of
+ *       vendor unique payload, and the length of the payload is
+ *       per event_datalen
+ *
+ * Note: When specifying vendor_id, be sure to read the Vendor Type and ID
+ *   formatting requirements specified in scsi_netlink.h
+ */
+struct fc_nl_event {
+        struct scsi_nl_hdr snlh;                /* must be 1st element ! */
+        uint64_t seconds;
+        uint64_t vendor_id;
+        uint16_t host_no;
+        uint16_t event_datalen;
+        uint32_t event_num;
+        uint32_t event_code;
+        uint32_t event_data;
+} __attribute__((aligned(sizeof(uint64_t))));
+#endif /* SCSI_NETLINK_FC_H */
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index e47e36a4ef49..c247a28259bc 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -4,7 +4,7 @@
 #include <linux/blkdev.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
+#include <scsi/scsi_host.h>
 #define MSG_SIMPLE_TAG  0x20
 #define MSG_HEAD_TAG    0x21
@@ -13,6 +13,7 @@
 #define SCSI_NO_TAG     (-1)    /* identify no tag in use */
+#ifdef CONFIG_BLOCK
 /**
 * scsi_get_tag_type - get the type of tag the device supports
@@ -66,7 +67,8 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth)
                return;
        if (!blk_queue_tagged(sdev->request_queue))
-                blk_queue_init_tags(sdev->request_queue, depth, NULL);
+                blk_queue_init_tags(sdev->request_queue, depth,
+                                    sdev->host->bqt);
        scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);
 }
@@ -98,7 +100,7 @@ static inline int scsi_populate_tag_msg(struct scsi_cmnd *cmd, char *msg)
        struct scsi_device *sdev = cmd->device;
        if (blk_rq_tagged(req)) {
-                if (sdev->ordered_tags && req->flags & REQ_HARDBARRIER)
+                if (sdev->ordered_tags && req->cmd_flags & REQ_HARDBARRIER)
                        *msg++ = MSG_ORDERED_TAG;
                else
                        *msg++ = MSG_SIMPLE_TAG;
@@ -131,4 +133,16 @@ static inline struct scsi_cmnd *scsi_find_tag(struct scsi_device *sdev, int tag)
        return sdev->current_cmnd;
 }
+/**
+ * scsi_init_shared_tag_map - create a shared tag map
+ * @shost:      the host to share the tag map among all devices
+ * @depth:      the total depth of the map
+ */
+static inline int scsi_init_shared_tag_map(struct Scsi_Host *shost, int depth)
+{
+        shost->bqt = blk_init_tags(depth);
+        return shost->bqt ? 0 : -ENOMEM;
+}
+#endif /* CONFIG_BLOCK */
 #endif /* _SCSI_SCSI_TCQ_H */
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 6d28b0317657..fd352323378b 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -29,6 +29,7 @@
 #include <linux/sched.h>
 #include <scsi/scsi.h>
+#include <scsi/scsi_netlink.h>
 struct scsi_transport_template;
@@ -194,6 +195,7 @@ struct fc_rport {	/* aka fc_starget_attrs */
        u32 roles;
        enum fc_port_state port_state;  /* Will only be ONLINE or UNKNOWN */
        u32 scsi_target_id;
+        u32 fast_io_fail_tmo;
        /* exported data */
        void *dd_data;                  /* Used for driver-specific storage */
@@ -206,6 +208,7 @@ struct fc_rport {	/* aka fc_starget_attrs */
        struct device dev;
        struct work_struct dev_loss_work;
        struct work_struct scan_work;
+        struct work_struct fail_io_work;
        struct work_struct stgt_delete_work;
        struct work_struct rport_delete_work;
 } __attribute__((aligned(sizeof(unsigned long))));
@@ -284,6 +287,30 @@ struct fc_host_statistics {
 /*
+ * FC Event Codes - Polled and Async, following FC HBAAPI v2.0 guidelines
+ */
+/*
+ * fc_host_event_code: If you alter this, you also need to alter
+ * scsi_transport_fc.c (for the ascii descriptions).
+ */
+enum fc_host_event_code  {
+        FCH_EVT_LIP                     = 0x1,
+        FCH_EVT_LINKUP                  = 0x2,
+        FCH_EVT_LINKDOWN                = 0x3,
+        FCH_EVT_LIPRESET                = 0x4,
+        FCH_EVT_RSCN                    = 0x5,
+        FCH_EVT_ADAPTER_CHANGE          = 0x103,
+        FCH_EVT_PORT_UNKNOWN            = 0x200,
+        FCH_EVT_PORT_OFFLINE            = 0x201,
+        FCH_EVT_PORT_ONLINE             = 0x202,
+        FCH_EVT_PORT_FABRIC             = 0x204,
+        FCH_EVT_LINK_UNKNOWN            = 0x500,
+        FCH_EVT_VENDOR_UNIQUE           = 0xffff,
+};
+/*
 * FC Local Port (Host) Attributes
 *
 * Attributes are based on HBAAPI V2.0 definitions.
@@ -312,7 +339,6 @@ struct fc_host_attrs {
        u64 permanent_port_name;
        u32 supported_classes;
        u8  supported_fc4s[FC_FC4_LIST_SIZE];
-        char symbolic_name[FC_SYMBOLIC_NAME_SIZE];
        u32 supported_speeds;
        u32 maxframe_size;
        char serial_number[FC_SERIAL_NUMBER_SIZE];
@@ -324,6 +350,8 @@ struct fc_host_attrs {
        u8  active_fc4s[FC_FC4_LIST_SIZE];
        u32 speed;
        u64 fabric_name;
+        char symbolic_name[FC_SYMBOLIC_NAME_SIZE];
+        char system_hostname[FC_SYMBOLIC_NAME_SIZE];
        /* Private (Transport-managed) Attributes */
        enum fc_tgtid_binding_type  tgtid_bind_type;
@@ -354,8 +382,6 @@ struct fc_host_attrs {
        (((struct fc_host_attrs *)(x)->shost_data)->supported_classes)
 #define fc_host_supported_fc4s(x)       \
        (((struct fc_host_attrs *)(x)->shost_data)->supported_fc4s)
-#define fc_host_symbolic_name(x)        \
-        (((struct fc_host_attrs *)(x)->shost_data)->symbolic_name)
 #define fc_host_supported_speeds(x)     \
        (((struct fc_host_attrs *)(x)->shost_data)->supported_speeds)
 #define fc_host_maxframe_size(x)        \
@@ -374,6 +400,10 @@ struct fc_host_attrs {
        (((struct fc_host_attrs *)(x)->shost_data)->speed)
 #define fc_host_fabric_name(x)  \
        (((struct fc_host_attrs *)(x)->shost_data)->fabric_name)
+#define fc_host_symbolic_name(x)        \
+        (((struct fc_host_attrs *)(x)->shost_data)->symbolic_name)
+#define fc_host_system_hostname(x)      \
+        (((struct fc_host_attrs *)(x)->shost_data)->system_hostname)
 #define fc_host_tgtid_bind_type(x) \
        (((struct fc_host_attrs *)(x)->shost_data)->tgtid_bind_type)
 #define fc_host_rports(x) \
@@ -409,12 +439,17 @@ struct fc_function_template {
        void    (*get_host_active_fc4s)(struct Scsi_Host *);
        void    (*get_host_speed)(struct Scsi_Host *);
        void    (*get_host_fabric_name)(struct Scsi_Host *);
+        void    (*get_host_symbolic_name)(struct Scsi_Host *);
+        void    (*set_host_system_hostname)(struct Scsi_Host *);
        struct fc_host_statistics * (*get_fc_host_stats)(struct Scsi_Host *);
        void    (*reset_fc_host_stats)(struct Scsi_Host *);
        int     (*issue_fc_host_lip)(struct Scsi_Host *);
+        void    (*dev_loss_tmo_callbk)(struct fc_rport *);
+        void    (*terminate_rport_io)(struct fc_rport *);
        /* allocation lengths for host-specific data */
        u32                             dd_fcrport_size;
@@ -445,7 +480,6 @@ struct fc_function_template {
        unsigned long   show_host_permanent_port_name:1;
        unsigned long   show_host_supported_classes:1;
        unsigned long   show_host_supported_fc4s:1;
-        unsigned long   show_host_symbolic_name:1;
        unsigned long   show_host_supported_speeds:1;
        unsigned long   show_host_maxframe_size:1;
        unsigned long   show_host_serial_number:1;
@@ -456,6 +490,8 @@ struct fc_function_template {
        unsigned long   show_host_active_fc4s:1;
        unsigned long   show_host_speed:1;
        unsigned long   show_host_fabric_name:1;
+        unsigned long   show_host_symbolic_name:1;
+        unsigned long   show_host_system_hostname:1;
 };
@@ -491,6 +527,25 @@ fc_remote_port_chkready(struct fc_rport *rport)
        return result;
 }
+static inline u64 wwn_to_u64(u8 *wwn)
+{
+        return (u64)wwn[0] << 56 | (u64)wwn[1] << 48 |
+            (u64)wwn[2] << 40 | (u64)wwn[3] << 32 |
+            (u64)wwn[4] << 24 | (u64)wwn[5] << 16 |
+            (u64)wwn[6] <<  8 | (u64)wwn[7];
+}
+static inline void u64_to_wwn(u64 inm, u8 *wwn)
+{
+        wwn[0] = (inm >> 56) & 0xff;
+        wwn[1] = (inm >> 48) & 0xff;
+        wwn[2] = (inm >> 40) & 0xff;
+        wwn[3] = (inm >> 32) & 0xff;
+        wwn[4] = (inm >> 24) & 0xff;
+        wwn[5] = (inm >> 16) & 0xff;
+        wwn[6] = (inm >> 8) & 0xff;
+        wwn[7] = inm & 0xff;
+}
 struct scsi_transport_template *fc_attach_transport(
                        struct fc_function_template *);
@@ -501,13 +556,14 @@ struct fc_rport *fc_remote_port_add(struct Scsi_Host *shost,
 void fc_remote_port_delete(struct fc_rport  *rport);
 void fc_remote_port_rolechg(struct fc_rport  *rport, u32 roles);
 int scsi_is_fc_rport(const struct device *);
+u32 fc_get_event_number(void);
-static inline u64 wwn_to_u64(u8 *wwn)
+void fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
-{
+                enum fc_host_event_code event_code, u32 event_data);
-        return (u64)wwn[0] << 56 | (u64)wwn[1] << 48 |
+void fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
-            (u64)wwn[2] << 40 | (u64)wwn[3] << 32 |
+                u32 data_len, char * data_buf, u64 vendor_id);
-            (u64)wwn[4] << 24 | (u64)wwn[5] << 16 |
+        /* Note: when specifying vendor_id to fc_host_post_vendor_event()
-            (u64)wwn[6] <<  8 | (u64)wwn[7];
+         *   be sure to read the Vendor Type and ID formatting requirements
-}
+         *   specified in scsi_netlink.h
+         */
 #endif /* SCSI_TRANSPORT_FC_H */
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index 6cc2314098cf..53024377f3b8 100644
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -24,15 +24,23 @@ enum sas_protocol {
 };
 enum sas_linkrate {
-        SAS_LINK_RATE_UNKNOWN,
+        /* These Values are defined in the SAS standard */
-        SAS_PHY_DISABLED,
+        SAS_LINK_RATE_UNKNOWN = 0,
-        SAS_LINK_RATE_FAILED,
+        SAS_PHY_DISABLED = 1,
-        SAS_SATA_SPINUP_HOLD,
+        SAS_PHY_RESET_PROBLEM = 2,
-        SAS_SATA_PORT_SELECTOR,
+        SAS_SATA_SPINUP_HOLD = 3,
-        SAS_LINK_RATE_1_5_GBPS,
+        SAS_SATA_PORT_SELECTOR = 4,
-        SAS_LINK_RATE_3_0_GBPS,
+        SAS_PHY_RESET_IN_PROGRESS = 5,
-        SAS_LINK_RATE_6_0_GBPS,
+        SAS_LINK_RATE_1_5_GBPS = 8,
-        SAS_LINK_VIRTUAL,
+        SAS_LINK_RATE_G1 = SAS_LINK_RATE_1_5_GBPS,
+        SAS_LINK_RATE_3_0_GBPS = 9,
+        SAS_LINK_RATE_G2 = SAS_LINK_RATE_3_0_GBPS,
+        SAS_LINK_RATE_6_0_GBPS = 10,
+        /* These are virtual to the transport class and may never
+         * be signalled normally since the standard defined field
+         * is only 4 bits */
+        SAS_LINK_RATE_FAILED = 0x10,
+        SAS_PHY_VIRTUAL = 0x11,
 };
 struct sas_identify {
@@ -57,9 +65,6 @@ struct sas_phy {
        enum sas_linkrate       maximum_linkrate_hw;
        enum sas_linkrate       maximum_linkrate;
-        /* internal state */
-        unsigned int            local_attached : 1;
        /* link error statistics */
        u32                     invalid_dword_count;
        u32                     running_disparity_error_count;
@@ -145,12 +150,18 @@ struct sas_port {
 #define transport_class_to_sas_port(cdev) \
        dev_to_sas_port((cdev)->dev)
+struct sas_phy_linkrates {
+        enum sas_linkrate maximum_linkrate;
+        enum sas_linkrate minimum_linkrate;
+};
 /* The functions by which the transport class and the driver communicate */
 struct sas_function_template {
        int (*get_linkerrors)(struct sas_phy *);
        int (*get_enclosure_identifier)(struct sas_rphy *, u64 *);
        int (*get_bay_identifier)(struct sas_rphy *);
        int (*phy_reset)(struct sas_phy *, int);
+        int (*set_phy_speed)(struct sas_phy *, struct sas_phy_linkrates *);
 };
@@ -196,4 +207,6 @@ scsi_is_sas_expander_device(struct device *dev)
                rphy->identify.device_type == SAS_EDGE_EXPANDER_DEVICE;
 }
+#define scsi_is_sas_phy_local(phy)      scsi_is_host_device((phy)->dev.parent)
 #endif /* SCSI_TRANSPORT_SAS_H */
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index 302680c0c0de..da180f738477 100644
--- a/include/scsi/scsi_transport_spi.h
+++ b/include/scsi/scsi_transport_spi.h
@@ -53,7 +53,8 @@ struct spi_transport_attrs {
        unsigned int support_ius; /* support Information Units */
        unsigned int support_qas; /* supports quick arbitration and selection */
        /* Private Fields */
-        unsigned int dv_pending:1; /* Internal flag */
+        unsigned int dv_pending:1; /* Internal flag: DV Requested */
+        unsigned int dv_in_progress:1;  /* Internal: DV started */
        struct mutex dv_mutex; /* semaphore to serialise dv */
 };
diff --git a/include/sound/Kbuild b/include/sound/Kbuild
index 3a5a3df61496..fd054a344324 100644
--- a/include/sound/Kbuild
+++ b/include/sound/Kbuild
@@ -1,2 +1,10 @@
-header-y := asound_fm.h hdsp.h hdspm.h sfnt_info.h sscape_ioctl.h
+header-y += asound_fm.h
-unifdef-y := asequencer.h asound.h emu10k1.h sb16_csp.h 
+header-y += hdsp.h
+header-y += hdspm.h
+header-y += sfnt_info.h
+header-y += sscape_ioctl.h
+unifdef-y += asequencer.h
+unifdef-y += asound.h
+unifdef-y += emu10k1.h
+unifdef-y += sb16_csp.h
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 758f8bf133c7..4c43521cc493 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -27,6 +27,7 @@
 #include <linux/bitops.h>
 #include <linux/device.h>
+#include <linux/workqueue.h>
 #include "pcm.h"
 #include "control.h"
 #include "info.h"
@@ -140,6 +141,20 @@
 #define AC97_GP_DRSS_1011       0x0000  /* LR(C) 10+11(+12) */
 #define AC97_GP_DRSS_78         0x0400  /* LR 7+8 */
+/* powerdown bits */
+#define AC97_PD_ADC_STATUS      0x0001  /* ADC status (RO) */
+#define AC97_PD_DAC_STATUS      0x0002  /* DAC status (RO) */
+#define AC97_PD_MIXER_STATUS    0x0004  /* Analog mixer status (RO) */
+#define AC97_PD_VREF_STATUS     0x0008  /* Vref status (RO) */
+#define AC97_PD_PR0             0x0100  /* Power down PCM ADCs and input MUX */
+#define AC97_PD_PR1             0x0200  /* Power down PCM front DAC */
+#define AC97_PD_PR2             0x0400  /* Power down Mixer (Vref still on) */
+#define AC97_PD_PR3             0x0800  /* Power down Mixer (Vref off) */
+#define AC97_PD_PR4             0x1000  /* Power down AC-Link */
+#define AC97_PD_PR5             0x2000  /* Disable internal clock usage */
+#define AC97_PD_PR6             0x4000  /* Headphone amplifier */
+#define AC97_PD_EAPD            0x8000  /* External Amplifer Power Down (EAPD) */
 /* extended audio ID bit defines */
 #define AC97_EI_VRA             0x0001  /* Variable bit rate supported */
 #define AC97_EI_DRA             0x0002  /* Double rate supported */
@@ -359,6 +374,7 @@
 #define AC97_SCAP_INV_EAPD      (1<<7)  /* inverted EAPD */
 #define AC97_SCAP_DETECT_BY_VENDOR (1<<8) /* use vendor registers for read tests */
 #define AC97_SCAP_NO_SPDIF      (1<<9)  /* don't build SPDIF controls */
+#define AC97_SCAP_EAPD_LED      (1<<10) /* EAPD as mute LED */
 /* ac97->flags */
 #define AC97_HAS_PC_BEEP        (1<<0)  /* force PC Speaker usage */
@@ -491,6 +507,12 @@ struct snd_ac97 {
        /* jack-sharing info */
        unsigned char indep_surround;
        unsigned char channel_mode;
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+        unsigned int power_up;  /* power states */
+        struct workqueue_struct *power_workq;
+        struct work_struct power_work;
+#endif
        struct device dev;
 };
@@ -532,6 +554,15 @@ unsigned short snd_ac97_read(struct snd_ac97 *ac97, unsigned short reg);
 void snd_ac97_write_cache(struct snd_ac97 *ac97, unsigned short reg, unsigned short value);
 int snd_ac97_update(struct snd_ac97 *ac97, unsigned short reg, unsigned short value);
 int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value);
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup);
+#else
+static inline int snd_ac97_update_power(struct snd_ac97 *ac97, int reg,
+                                        int powerup)
+{
+        return 0;
+}
+#endif
 #ifdef CONFIG_PM
 void snd_ac97_suspend(struct snd_ac97 *ac97);
 void snd_ac97_resume(struct snd_ac97 *ac97);
@@ -583,6 +614,7 @@ struct ac97_pcm {
                     copy_flag: 1,         /* lowlevel driver must fill all entries */
                     spdif: 1;             /* spdif pcm */
        unsigned short aslots;             /* active slots */
+        unsigned short cur_dbl;            /* current double-rate state */
        unsigned int rates;                /* available rates */
        struct {
                unsigned short slots;      /* driver input: requested AC97 slot numbers */
diff --git a/include/sound/ad1848.h b/include/sound/ad1848.h
index 57af1fe7b309..c8de6f83338f 100644
--- a/include/sound/ad1848.h
+++ b/include/sound/ad1848.h
@@ -179,14 +179,13 @@ enum { AD1848_MIX_SINGLE, AD1848_MIX_DOUBLE, AD1848_MIX_CAPTURE };
 #define AD1848_MIXVAL_DOUBLE(left_reg, right_reg, shift_left, shift_right, mask, invert) \
        ((left_reg) | ((right_reg) << 8) | ((shift_left) << 16) | ((shift_right) << 19) | ((mask) << 24) | ((invert) << 22))
-int snd_ad1848_add_ctl(struct snd_ad1848 *chip, const char *name, int index, int type, unsigned long value);
 /* for ease of use */
 struct ad1848_mix_elem {
        const char *name;
        int index;
        int type;
        unsigned long private_value;
+        unsigned int *tlv;
 };
 #define AD1848_SINGLE(xname, xindex, reg, shift, mask, invert) \
@@ -195,15 +194,26 @@ struct ad1848_mix_elem {
  .type = AD1848_MIX_SINGLE, \
  .private_value = AD1848_MIXVAL_SINGLE(reg, shift, mask, invert) }
+#define AD1848_SINGLE_TLV(xname, xindex, reg, shift, mask, invert, xtlv) \
+{ .name = xname, \
+  .index = xindex, \
+  .type = AD1848_MIX_SINGLE, \
+  .private_value = AD1848_MIXVAL_SINGLE(reg, shift, mask, invert), \
+  .tlv = xtlv }
 #define AD1848_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
 { .name = xname, \
  .index = xindex, \
  .type = AD1848_MIX_DOUBLE, \
  .private_value = AD1848_MIXVAL_DOUBLE(left_reg, right_reg, shift_left, shift_right, mask, invert) }
-static inline int snd_ad1848_add_ctl_elem(struct snd_ad1848 *chip, const struct ad1848_mix_elem *c)
+#define AD1848_DOUBLE_TLV(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert, xtlv) \
-{
+{ .name = xname, \
-        return snd_ad1848_add_ctl(chip, c->name, c->index, c->type, c->private_value);
+  .index = xindex, \
-}
+  .type = AD1848_MIX_DOUBLE, \
+  .private_value = AD1848_MIXVAL_DOUBLE(left_reg, right_reg, shift_left, shift_right, mask, invert), \
+  .tlv = xtlv }
+int snd_ad1848_add_ctl_elem(struct snd_ad1848 *chip, const struct ad1848_mix_elem *c);
 #endif /* __SOUND_AD1848_H */
diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
index 3d9888492026..d0deca669b92 100644
--- a/include/sound/ak4xxx-adda.h
+++ b/include/sound/ak4xxx-adda.h
@@ -39,26 +39,39 @@ struct snd_ak4xxx_ops {
 #define AK4XXX_IMAGE_SIZE       (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
+/* DAC label and channels */
+struct snd_akm4xxx_dac_channel {
+        char *name;             /* mixer volume name */
+        unsigned int num_channels;
+};
+/* ADC labels and channels */
+struct snd_akm4xxx_adc_channel {
+        char *name;             /* capture gain volume label */
+        char *switch_name;      /* capture switch */
+        unsigned int num_channels;
+};
 struct snd_akm4xxx {
        struct snd_card *card;
        unsigned int num_adcs;                  /* AK4524 or AK4528 ADCs */
        unsigned int num_dacs;                  /* AK4524 or AK4528 DACs */
        unsigned char images[AK4XXX_IMAGE_SIZE]; /* saved register image */
-        unsigned char ipga_gain[AK4XXX_MAX_CHIPS][2]; /* saved register image
+        unsigned char volumes[AK4XXX_IMAGE_SIZE]; /* saved volume values */
-                                                       * for IPGA (AK4528)
-                                                       */
        unsigned long private_value[AK4XXX_MAX_CHIPS];  /* helper for driver */
        void *private_data[AK4XXX_MAX_CHIPS];           /* helper for driver */
        /* template should fill the following fields */
        unsigned int idx_offset;                /* control index offset */
        enum {
                SND_AK4524, SND_AK4528, SND_AK4529,
-                SND_AK4355, SND_AK4358, SND_AK4381
+                SND_AK4355, SND_AK4358, SND_AK4381,
+                SND_AK5365
        } type;
-        unsigned int *num_stereo;       /* array of combined counts
-                                         * for the mixer
+        /* (array) information of combined codecs */
-                                         */
+        struct snd_akm4xxx_dac_channel *dac_info;
-        char **channel_names;           /* array of mixer channel names */
+        struct snd_akm4xxx_adc_channel *adc_info;
        struct snd_ak4xxx_ops ops;
 };
@@ -72,9 +85,9 @@ int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak);
        (ak)->images[(chip) * 16 + (reg)]
 #define snd_akm4xxx_set(ak,chip,reg,val) \
        ((ak)->images[(chip) * 16 + (reg)] = (val))
-#define snd_akm4xxx_get_ipga(ak,chip,reg) \
+#define snd_akm4xxx_get_vol(ak,chip,reg) \
-        (ak)->ipga_gain[chip][(reg)-4]
+        (ak)->volumes[(chip) * 16 + (reg)]
-#define snd_akm4xxx_set_ipga(ak,chip,reg,val) \
+#define snd_akm4xxx_set_vol(ak,chip,reg,val) \
-        ((ak)->ipga_gain[chip][(reg)-4] = (val))
+        ((ak)->volumes[(chip) * 16 + (reg)] = (val))
 #endif /* __SOUND_AK4XXX_ADDA_H */
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 41885f48ad91..c1621c650a9a 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -688,7 +688,7 @@ struct snd_timer_tread {
 *                                                                          *
 ****************************************************************************/
-#define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 3)
+#define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 4)
 struct snd_ctl_card_info {
        int card;                       /* card number */
@@ -727,10 +727,15 @@ typedef int __bitwise snd_ctl_elem_iface_t;
 #define SNDRV_CTL_ELEM_ACCESS_WRITE             (1<<1)
 #define SNDRV_CTL_ELEM_ACCESS_READWRITE         (SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE)
 #define SNDRV_CTL_ELEM_ACCESS_VOLATILE          (1<<2)  /* control value may be changed without a notification */
-#define SNDRV_CTL_ELEM_ACCESS_TIMESTAMP         (1<<2)  /* when was control changed */
+#define SNDRV_CTL_ELEM_ACCESS_TIMESTAMP         (1<<3)  /* when was control changed */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_READ          (1<<4)  /* TLV read is possible */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_WRITE         (1<<5)  /* TLV write is possible */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE     (SNDRV_CTL_ELEM_ACCESS_TLV_READ|SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)
+#define SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND       (1<<6)  /* TLV command is possible */
 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE          (1<<8)  /* control does actually nothing, but may be updated */
 #define SNDRV_CTL_ELEM_ACCESS_LOCK              (1<<9)  /* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER             (1<<10) /* write lock owner */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK      (1<<28) /* kernel use a TLV callback */ 
 #define SNDRV_CTL_ELEM_ACCESS_USER              (1<<29) /* user space element */
 #define SNDRV_CTL_ELEM_ACCESS_DINDIRECT         (1<<30) /* indirect access for matrix dimensions in the info structure */
 #define SNDRV_CTL_ELEM_ACCESS_INDIRECT          (1<<31) /* indirect access for element value in the value structure */
@@ -818,6 +823,12 @@ struct snd_ctl_elem_value {
        unsigned char reserved[128-sizeof(struct timespec)];
 };
+struct snd_ctl_tlv {
+        unsigned int numid;     /* control element numeric identification */
+        unsigned int length;    /* in bytes aligned to 4 */
+        unsigned int tlv[0];    /* first TLV */
+};
 enum {
        SNDRV_CTL_IOCTL_PVERSION = _IOR('U', 0x00, int),
        SNDRV_CTL_IOCTL_CARD_INFO = _IOR('U', 0x01, struct snd_ctl_card_info),
@@ -831,6 +842,9 @@ enum {
        SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct snd_ctl_elem_info),
        SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct snd_ctl_elem_info),
        SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct snd_ctl_elem_id),
+        SNDRV_CTL_IOCTL_TLV_READ = _IOWR('U', 0x1a, struct snd_ctl_tlv),
+        SNDRV_CTL_IOCTL_TLV_WRITE = _IOWR('U', 0x1b, struct snd_ctl_tlv),
+        SNDRV_CTL_IOCTL_TLV_COMMAND = _IOWR('U', 0x1c, struct snd_ctl_tlv),
        SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
        SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct snd_hwdep_info),
        SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int),
@@ -855,6 +869,7 @@ enum sndrv_ctl_event_type {
 #define SNDRV_CTL_EVENT_MASK_VALUE      (1<<0)  /* element value was changed */
 #define SNDRV_CTL_EVENT_MASK_INFO       (1<<1)  /* element info was changed */
 #define SNDRV_CTL_EVENT_MASK_ADD        (1<<2)  /* element was added */
+#define SNDRV_CTL_EVENT_MASK_TLV        (1<<3)  /* element TLV tree was changed */
 #define SNDRV_CTL_EVENT_MASK_REMOVE     (~0U)   /* element was removed */
 struct snd_ctl_event {
diff --git a/include/sound/control.h b/include/sound/control.h
index 2489b1eb0110..1de148b0fd94 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -30,6 +30,11 @@ struct snd_kcontrol;
 typedef int (snd_kcontrol_info_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_info * uinfo);
 typedef int (snd_kcontrol_get_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
 typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
+typedef int (snd_kcontrol_tlv_rw_t)(struct snd_kcontrol *kcontrol,
+                                    int op_flag, /* 0=read,1=write,-1=command */
+                                    unsigned int size,
+                                    unsigned int __user *tlv);
 struct snd_kcontrol_new {
        snd_ctl_elem_iface_t iface;     /* interface identifier */
@@ -42,6 +47,10 @@ struct snd_kcontrol_new {
        snd_kcontrol_info_t *info;
        snd_kcontrol_get_t *get;
        snd_kcontrol_put_t *put;
+        union {
+                snd_kcontrol_tlv_rw_t *c;
+                unsigned int *p;
+        } tlv;
        unsigned long private_value;
 };
@@ -58,6 +67,10 @@ struct snd_kcontrol {
        snd_kcontrol_info_t *info;
        snd_kcontrol_get_t *get;
        snd_kcontrol_put_t *put;
+        union {
+                snd_kcontrol_tlv_rw_t *c;
+                unsigned int *p;
+        } tlv;
        unsigned long private_value;
        void *private_data;
        void (*private_free)(struct snd_kcontrol *kcontrol);
diff --git a/include/sound/core.h b/include/sound/core.h
index bab3ff457e40..b056ea925ecf 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -25,8 +25,8 @@
 #include <linux/sched.h>                /* wake_up() */
 #include <linux/mutex.h>                /* struct mutex */
 #include <linux/rwsem.h>                /* struct rw_semaphore */
-#include <linux/workqueue.h>            /* struct workqueue_struct */
 #include <linux/pm.h>                   /* pm_message_t */
+#include <linux/device.h>
 /* forward declarations */
 #ifdef CONFIG_PCI
@@ -71,7 +71,6 @@ struct snd_device_ops {
        int (*dev_free)(struct snd_device *dev);
        int (*dev_register)(struct snd_device *dev);
        int (*dev_disconnect)(struct snd_device *dev);
-        int (*dev_unregister)(struct snd_device *dev);
 };
 struct snd_device {
@@ -131,8 +130,8 @@ struct snd_card {
                                                                state */
        spinlock_t files_lock;          /* lock the files for this card */
        int shutdown;                   /* this card is going down */
+        int free_on_last_close;         /* free in context of file_release */
        wait_queue_head_t shutdown_sleep;
-        struct work_struct free_workq;  /* for free in workqueue */
        struct device *dev;
 #ifdef CONFIG_PM
@@ -188,6 +187,7 @@ struct snd_minor {
        int device;                     /* device number */
        const struct file_operations *f_ops;    /* file operations */
        void *private_data;             /* private data for f_ops->open */
+        struct class_device *class_dev; /* class device for sysfs */
 };
 /* sound.c */
@@ -202,6 +202,8 @@ int snd_register_device(int type, struct snd_card *card, int dev,
                        const char *name);
 int snd_unregister_device(int type, struct snd_card *card, int dev);
 void *snd_lookup_minor_data(unsigned int minor, int type);
+int snd_add_device_sysfs_file(int type, struct snd_card *card, int dev,
+                              const struct class_device_attribute *attr);
 #ifdef CONFIG_SND_OSSEMUL
 int snd_register_oss_device(int type, struct snd_card *card, int dev,
@@ -244,7 +246,7 @@ struct snd_card *snd_card_new(int idx, const char *id,
                         struct module *module, int extra_size);
 int snd_card_disconnect(struct snd_card *card);
 int snd_card_free(struct snd_card *card);
-int snd_card_free_in_thread(struct snd_card *card);
+int snd_card_free_when_closed(struct snd_card *card);
 int snd_card_register(struct snd_card *card);
 int snd_card_info_init(void);
 int snd_card_info_done(void);
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 884bbf54cd36..892e310c504d 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1524,6 +1524,10 @@ struct snd_emu10k1_fx8010_control_gpr {
        unsigned int value[32];         /* initial values */
        unsigned int min;               /* minimum range */
        unsigned int max;               /* maximum range */
+        union {
+                snd_kcontrol_tlv_rw_t *c;
+                unsigned int *p;
+        } tlv;
        unsigned int translation;       /* translation type (EMU10K1_GPR_TRANSLATION*) */
 };
diff --git a/include/sound/info.h b/include/sound/info.h
index 74f6996769c7..97ffc4fb9969 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -71,7 +71,6 @@ struct snd_info_entry {
        mode_t mode;
        long size;
        unsigned short content;
-        unsigned short disconnected: 1;
        union {
                struct snd_info_entry_text text;
                struct snd_info_entry_ops *ops;
@@ -83,6 +82,8 @@ struct snd_info_entry {
        void (*private_free)(struct snd_info_entry *entry);
        struct proc_dir_entry *p;
        struct mutex access;
+        struct list_head children;
+        struct list_head list;
 };
 #if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
@@ -122,8 +123,8 @@ int snd_info_restore_text(struct snd_info_entry * entry);
 int snd_info_card_create(struct snd_card * card);
 int snd_info_card_register(struct snd_card * card);
 int snd_info_card_free(struct snd_card * card);
+void snd_info_card_disconnect(struct snd_card * card);
 int snd_info_register(struct snd_info_entry * entry);
-int snd_info_unregister(struct snd_info_entry * entry);
 /* for card drivers */
 int snd_card_proc_new(struct snd_card *card, const char *name, struct snd_info_entry **entryp);
@@ -156,8 +157,8 @@ static inline void snd_info_free_entry(struct snd_info_entry * entry) { ; }
 static inline int snd_info_card_create(struct snd_card * card) { return 0; }
 static inline int snd_info_card_register(struct snd_card * card) { return 0; }
 static inline int snd_info_card_free(struct snd_card * card) { return 0; }
+static inline void snd_info_card_disconnect(struct snd_card * card) { }
 static inline int snd_info_register(struct snd_info_entry * entry) { return 0; }
-static inline int snd_info_unregister(struct snd_info_entry * entry) { return 0; }
 static inline int snd_card_proc_new(struct snd_card *card, const char *name,
                                    struct snd_info_entry **entryp) { return -EINVAL; }
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index f84d84993a31..afaf3e88e086 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -190,7 +190,7 @@ struct snd_pcm_ops {
 struct snd_pcm_file {
        struct snd_pcm_substream *substream;
-        struct snd_pcm_file *next;
+        int no_compat_mmap;
 };
 struct snd_pcm_hw_rule;
@@ -347,6 +347,7 @@ struct snd_pcm_substream {
        int number;
        char name[32];                  /* substream name */
        int stream;                     /* stream (direction) */
+        char latency_id[20];            /* latency identifier */
        size_t buffer_bytes_max;        /* limit ring buffer size */
        struct snd_dma_buffer dma_buffer;
        unsigned int dma_buf_id;
@@ -384,7 +385,6 @@ struct snd_pcm_substream {
        struct snd_info_entry *proc_prealloc_entry;
 #endif
        /* misc flags */
-        unsigned int no_mmap_ctrl: 1;
        unsigned int hw_opened: 1;
 };
@@ -402,7 +402,6 @@ struct snd_pcm_str {
        /* -- OSS things -- */
        struct snd_pcm_oss_stream oss;
 #endif
-        struct snd_pcm_file *files;
 #ifdef CONFIG_SND_VERBOSE_PROCFS
        struct snd_info_entry *proc_root;
        struct snd_info_entry *proc_info_entry;
diff --git a/include/sound/timer.h b/include/sound/timer.h
index 5ece2bf541dc..d42c083db1da 100644
--- a/include/sound/timer.h
+++ b/include/sound/timer.h
@@ -129,7 +129,6 @@ void snd_timer_notify(struct snd_timer *timer, int event, struct timespec *tstam
 int snd_timer_global_new(char *id, int device, struct snd_timer **rtimer);
 int snd_timer_global_free(struct snd_timer *timer);
 int snd_timer_global_register(struct snd_timer *timer);
-int snd_timer_global_unregister(struct snd_timer *timer);
 int snd_timer_open(struct snd_timer_instance **ti, char *owner, struct snd_timer_id *tid, unsigned int slave_id);
 int snd_timer_close(struct snd_timer_instance *timeri);
diff --git a/include/sound/tlv.h b/include/sound/tlv.h
new file mode 100644
index 000000000000..d93a96b91875
--- /dev/null
+++ b/include/sound/tlv.h
@@ -0,0 +1,60 @@
+#ifndef __SOUND_TLV_H
+#define __SOUND_TLV_H
+/*
+ *  Advanced Linux Sound Architecture - ALSA - Driver
+ *  Copyright (c) 2006 by Jaroslav Kysela <perex@suse.cz>
+ *
+ *
+ *   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
+ *
+ */
+/*
+ * TLV structure is right behind the struct snd_ctl_tlv:
+ *   unsigned int type          - see SNDRV_CTL_TLVT_*
+ *   unsigned int length
+ *   .... data aligned to sizeof(unsigned int), use
+ *        block_length = (length + (sizeof(unsigned int) - 1)) &
+ *                       ~(sizeof(unsigned int) - 1)) ....
+ */
+#define SNDRV_CTL_TLVT_CONTAINER 0      /* one level down - group of TLVs */
+#define SNDRV_CTL_TLVT_DB_SCALE 1       /* dB scale */
+#define SNDRV_CTL_TLVT_DB_LINEAR 2      /* linear volume */
+#define SNDRV_CTL_TLVT_DB_RANGE 3       /* dB range container */
+#define TLV_DB_SCALE_ITEM(min, step, mute)                      \
+        SNDRV_CTL_TLVT_DB_SCALE, 2 * sizeof(unsigned int),      \
+        (min), ((step) & 0xffff) | ((mute) ? 0x10000 : 0)
+#define DECLARE_TLV_DB_SCALE(name, min, step, mute) \
+        unsigned int name[] = { TLV_DB_SCALE_ITEM(min, step, mute) }
+/* linear volume between min_dB and max_dB (.01dB unit) */
+#define TLV_DB_LINEAR_ITEM(min_dB, max_dB)                  \
+        SNDRV_CTL_TLVT_DB_LINEAR, 2 * sizeof(unsigned int), \
+        (min_dB), (max_dB)
+#define DECLARE_TLV_DB_LINEAR(name, min_dB, max_dB)     \
+        unsigned int name[] = { TLV_DB_LINEAR_ITEM(min_dB, max_dB) }
+/* dB range container */
+/* Each item is: <min> <max> <TLV> */
+/* The below assumes that each item TLV is 4 words like DB_SCALE or LINEAR */
+#define TLV_DB_RANGE_HEAD(num)                  \
+        SNDRV_CTL_TLVT_DB_RANGE, 6 * (num) * sizeof(unsigned int)
+#define TLV_DB_GAIN_MUTE        -9999999
+#endif /* __SOUND_TLV_H */
diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index 9821a6194caa..dbca14170615 100644
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -128,6 +128,7 @@ struct snd_vx_hardware {
        unsigned int num_ins;
        unsigned int num_outs;
        unsigned int output_level_max;
+        unsigned int *output_level_db_scale;
 };
 /* hwdep id string */
diff --git a/include/video/Kbuild b/include/video/Kbuild
index 76a60737cc15..a14f9c045b8c 100644
--- a/include/video/Kbuild
+++ b/include/video/Kbuild
@@ -1 +1 @@
-unifdef-y := sisfb.h
+unifdef-y += sisfb.h
author	David Woodhouse <dwmw2@infradead.org>	2006-10-01 12:55:53 -0400
committer	David Woodhouse <dwmw2@infradead.org>	2006-10-01 12:55:53 -0400
commit	8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch)
tree	5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /include
parent	28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff)
parent	82965addad66fce61a92c5f03104ea90b0b87124 (diff)