194 files changed, 1402 insertions, 1462 deletions
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h
index a1a1eca6be45..286e1d844f63 100644
--- a/include/asm-alpha/smp.h
+++ b/include/asm-alpha/smp.h
@@ -51,6 +51,7 @@ int smp_call_function_on_cpu(void (*func) (void *info), void *info,int retry, in
 #else /* CONFIG_SMP */
+#define hard_smp_processor_id()         0
 #define smp_call_function_on_cpu(func,info,retry,wait,cpu)    ({ 0; })
 #endif /* CONFIG_SMP */
diff --git a/include/asm-alpha/thread_info.h b/include/asm-alpha/thread_info.h
index eeb3bef91e11..f4defc2bd3fb 100644
--- a/include/asm-alpha/thread_info.h
+++ b/include/asm-alpha/thread_info.h
@@ -97,7 +97,7 @@ register struct thread_info *__current_thread_info __asm__("$8");
                                 1 << TIF_UAC_SIGBUS)
 #define SET_UNALIGN_CTL(task,value)     ({                                   \
-        (task)->thread_info->flags = (((task)->thread_info->flags &          \
+        task_thread_info(task)->flags = ((task_thread_info(task)->flags &    \
                ~ALPHA_UAC_MASK)                                             \
                | (((value) << ALPHA_UAC_SHIFT)       & (1<<TIF_UAC_NOPRINT))\
                | (((value) << (ALPHA_UAC_SHIFT + 1)) & (1<<TIF_UAC_SIGBUS)) \
@@ -105,11 +105,11 @@ register struct thread_info *__current_thread_info __asm__("$8");
        0; })
 #define GET_UNALIGN_CTL(task,value)     ({                              \
-        put_user(((task)->thread_info->flags & (1 << TIF_UAC_NOPRINT))  \
+        put_user((task_thread_info(task)->flags & (1 << TIF_UAC_NOPRINT))\
                  >> ALPHA_UAC_SHIFT                                    \
-                 | ((task)->thread_info->flags & (1 << TIF_UAC_SIGBUS)) \
+                 | (task_thread_info(task)->flags & (1 << TIF_UAC_SIGBUS))\
                 >> (ALPHA_UAC_SHIFT + 1)                               \
-                 | ((task)->thread_info->flags & (1 << TIF_UAC_NOFIX))  \
+                 | (task_thread_info(task)->flags & (1 << TIF_UAC_NOFIX))\
                 >> (ALPHA_UAC_SHIFT - 1),                              \
                 (int __user *)(value));                                \
        })
diff --git a/include/asm-arm/arch-at91/at91rm9200.h b/include/asm-arm/arch-at91/at91rm9200.h
index a12ac8ab2ad0..802891a9cd81 100644
--- a/include/asm-arm/arch-at91/at91rm9200.h
+++ b/include/asm-arm/arch-at91/at91rm9200.h
@@ -107,185 +107,4 @@
 #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 */
-#define AT91_PA0_PCK3           (1 <<  0)       /* B: PMC Programmable Clock Output 3 */
-#define AT91_PA1_MOSI           (1 <<  1)       /* A: SPI Master-Out Slave-In */
-#define AT91_PA1_PCK0           (1 <<  1)       /* B: PMC Programmable Clock Output 0 */
-#define AT91_PA2_SPCK           (1 <<  2)       /* A: SPI Serial Clock */
-#define AT91_PA2_IRQ4           (1 <<  2)       /* B: External Interrupt 4 */
-#define AT91_PA3_NPCS0          (1 <<  3)       /* A: SPI Peripheral Chip Select 0 */
-#define AT91_PA3_IRQ5           (1 <<  3)       /* B: External Interrupt 5 */
-#define AT91_PA4_NPCS1          (1 <<  4)       /* A: SPI Peripheral Chip Select 1 */
-#define AT91_PA4_PCK1           (1 <<  4)       /* B: PMC Programmable Clock Output 1 */
-#define AT91_PA5_NPCS2          (1 <<  5)       /* A: SPI Peripheral Chip Select 2 */
-#define AT91_PA5_TXD3           (1 <<  5)       /* B: USART Transmit Data 3 */
-#define AT91_PA6_NPCS3          (1 <<  6)       /* A: SPI Peripheral Chip Select 3 */
-#define AT91_PA6_RXD3           (1 <<  6)       /* B: USART Receive Data 3 */
-#define AT91_PA7_ETXCK_EREFCK   (1 <<  7)       /* A: Ethernet Reference Clock / Transmit Clock */
-#define AT91_PA7_PCK2           (1 <<  7)       /* B: PMC Programmable Clock Output 2 */
-#define AT91_PA8_ETXEN          (1 <<  8)       /* A: Ethernet Transmit Enable */
-#define AT91_PA8_MCCDB          (1 <<  8)       /* B: MMC Multimedia Card B Command */
-#define AT91_PA9_ETX0           (1 <<  9)       /* A: Ethernet Transmit Data 0 */
-#define AT91_PA9_MCDB0          (1 <<  9)       /* B: MMC Multimedia Card B Data 0 */
-#define AT91_PA10_ETX1          (1 << 10)       /* A: Ethernet Transmit Data 1 */
-#define AT91_PA10_MCDB1         (1 << 10)       /* B: MMC Multimedia Card B Data 1 */
-#define AT91_PA11_ECRS_ECRSDV   (1 << 11)       /* A: Ethernet Carrier Sense / Data Valid */
-#define AT91_PA11_MCDB2         (1 << 11)       /* B: MMC Multimedia Card B Data 2 */
-#define AT91_PA12_ERX0          (1 << 12)       /* A: Ethernet Receive Data 0 */
-#define AT91_PA12_MCDB3         (1 << 12)       /* B: MMC Multimedia Card B Data 3 */
-#define AT91_PA13_ERX1          (1 << 13)       /* A: Ethernet Receive Data 1 */
-#define AT91_PA13_TCLK0         (1 << 13)       /* B: TC External Clock Input 0 */
-#define AT91_PA14_ERXER         (1 << 14)       /* A: Ethernet Receive Error */
-#define AT91_PA14_TCLK1         (1 << 14)       /* B: TC External Clock Input 1 */
-#define AT91_PA15_EMDC          (1 << 15)       /* A: Ethernet Management Data Clock */
-#define AT91_PA15_TCLK2         (1 << 15)       /* B: TC External Clock Input 2 */
-#define AT91_PA16_EMDIO         (1 << 16)       /* A: Ethernet Management Data I/O */
-#define AT91_PA16_IRQ6          (1 << 16)       /* B: External Interrupt 6 */
-#define AT91_PA17_TXD0          (1 << 17)       /* A: USART Transmit Data 0 */
-#define AT91_PA17_TIOA0         (1 << 17)       /* B: TC I/O Line A 0 */
-#define AT91_PA18_RXD0          (1 << 18)       /* A: USART Receive Data 0 */
-#define AT91_PA18_TIOB0         (1 << 18)       /* B: TC I/O Line B 0 */
-#define AT91_PA19_SCK0          (1 << 19)       /* A: USART Serial Clock 0 */
-#define AT91_PA19_TIOA1         (1 << 19)       /* B: TC I/O Line A 1 */
-#define AT91_PA20_CTS0          (1 << 20)       /* A: USART Clear To Send 0 */
-#define AT91_PA20_TIOB1         (1 << 20)       /* B: TC I/O Line B 1 */
-#define AT91_PA21_RTS0          (1 << 21)       /* A: USART Ready To Send 0 */
-#define AT91_PA21_TIOA2         (1 << 21)       /* B: TC I/O Line A 2 */
-#define AT91_PA22_RXD2          (1 << 22)       /* A: USART Receive Data 2 */
-#define AT91_PA22_TIOB2         (1 << 22)       /* B: TC I/O Line B 2 */
-#define AT91_PA23_TXD2          (1 << 23)       /* A: USART Transmit Data 2 */
-#define AT91_PA23_IRQ3          (1 << 23)       /* B: External Interrupt 3 */
-#define AT91_PA24_SCK2          (1 << 24)       /* A: USART Serial Clock 2 */
-#define AT91_PA24_PCK1          (1 << 24)       /* B: PMC Programmable Clock Output 1 */
-#define AT91_PA25_TWD           (1 << 25)       /* A: TWI Two-wire Serial Data */
-#define AT91_PA25_IRQ2          (1 << 25)       /* B: External Interrupt 2 */
-#define AT91_PA26_TWCK          (1 << 26)       /* A: TWI Two-wire Serial Clock */
-#define AT91_PA26_IRQ1          (1 << 26)       /* B: External Interrupt 1 */
-#define AT91_PA27_MCCK          (1 << 27)       /* A: MMC Multimedia Card Clock */
-#define AT91_PA27_TCLK3         (1 << 27)       /* B: TC External Clock Input 3 */
-#define AT91_PA28_MCCDA         (1 << 28)       /* A: MMC Multimedia Card A Command */
-#define AT91_PA28_TCLK4         (1 << 28)       /* B: TC External Clock Input 4 */
-#define AT91_PA29_MCDA0         (1 << 29)       /* A: MMC Multimedia Card A Data 0 */
-#define AT91_PA29_TCLK5         (1 << 29)       /* B: TC External Clock Input 5 */
-#define AT91_PA30_DRXD          (1 << 30)       /* A: DBGU Receive Data */
-#define AT91_PA30_CTS2          (1 << 30)       /* B: USART Clear To Send 2 */
-#define AT91_PA31_DTXD          (1 << 31)       /* A: DBGU Transmit Data */
-#define AT91_PA31_RTS2          (1 << 31)       /* B: USART Ready To Send 2 */
-#define AT91_PB0_TF0            (1 <<  0)       /* A: SSC Transmit Frame Sync 0 */
-#define AT91_PB0_RTS3           (1 <<  0)       /* B: USART Ready To Send 3 */
-#define AT91_PB1_TK0            (1 <<  1)       /* A: SSC Transmit Clock 0 */
-#define AT91_PB1_CTS3           (1 <<  1)       /* B: USART Clear To Send 3 */
-#define AT91_PB2_TD0            (1 <<  2)       /* A: SSC Transmit Data 0 */
-#define AT91_PB2_SCK3           (1 <<  2)       /* B: USART Serial Clock 3 */
-#define AT91_PB3_RD0            (1 <<  3)       /* A: SSC Receive Data 0 */
-#define AT91_PB3_MCDA1          (1 <<  3)       /* B: MMC Multimedia Card A Data 1 */
-#define AT91_PB4_RK0            (1 <<  4)       /* A: SSC Receive Clock 0 */
-#define AT91_PB4_MCDA2          (1 <<  4)       /* B: MMC Multimedia Card A Data 2 */
-#define AT91_PB5_RF0            (1 <<  5)       /* A: SSC Receive Frame Sync 0 */
-#define AT91_PB5_MCDA3          (1 <<  5)       /* B: MMC Multimedia Card A Data 3 */
-#define AT91_PB6_TF1            (1 <<  6)       /* A: SSC Transmit Frame Sync 1 */
-#define AT91_PB6_TIOA3          (1 <<  6)       /* B: TC I/O Line A 3 */
-#define AT91_PB7_TK1            (1 <<  7)       /* A: SSC Transmit Clock 1 */
-#define AT91_PB7_TIOB3          (1 <<  7)       /* B: TC I/O Line B 3 */
-#define AT91_PB8_TD1            (1 <<  8)       /* A: SSC Transmit Data 1 */
-#define AT91_PB8_TIOA4          (1 <<  8)       /* B: TC I/O Line A 4 */
-#define AT91_PB9_RD1            (1 <<  9)       /* A: SSC Receive Data 1 */
-#define AT91_PB9_TIOB4          (1 <<  9)       /* B: TC I/O Line B 4 */
-#define AT91_PB10_RK1           (1 << 10)       /* A: SSC Receive Clock 1 */
-#define AT91_PB10_TIOA5         (1 << 10)       /* B: TC I/O Line A 5 */
-#define AT91_PB11_RF1           (1 << 11)       /* A: SSC Receive Frame Sync 1 */
-#define AT91_PB11_TIOB5         (1 << 11)       /* B: TC I/O Line B 5 */
-#define AT91_PB12_TF2           (1 << 12)       /* A: SSC Transmit Frame Sync 2 */
-#define AT91_PB12_ETX2          (1 << 12)       /* B: Ethernet Transmit Data 2 */
-#define AT91_PB13_TK2           (1 << 13)       /* A: SSC Transmit Clock 3 */
-#define AT91_PB13_ETX3          (1 << 13)       /* B: Ethernet Transmit Data 3 */
-#define AT91_PB14_TD2           (1 << 14)       /* A: SSC Transmit Data 2 */
-#define AT91_PB14_ETXER         (1 << 14)       /* B: Ethernet Transmit Coding Error */
-#define AT91_PB15_RD2           (1 << 15)       /* A: SSC Receive Data 2 */
-#define AT91_PB15_ERX2          (1 << 15)       /* B: Ethernet Receive Data 2 */
-#define AT91_PB16_RK2           (1 << 16)       /* A: SSC Receive Clock 2 */
-#define AT91_PB16_ERX3          (1 << 16)       /* B: Ethernet Receive Data 3 */
-#define AT91_PB17_RF2           (1 << 17)       /* A: SSC Receive Frame Sync 2 */
-#define AT91_PB17_ERXDV         (1 << 17)       /* B: Ethernet Receive Data Valid */
-#define AT91_PB18_RI1           (1 << 18)       /* A: USART Ring Indicator 1 */
-#define AT91_PB18_ECOL          (1 << 18)       /* B: Ethernet Collision Detected */
-#define AT91_PB19_DTR1          (1 << 19)       /* A: USART Data Terminal Ready 1 */
-#define AT91_PB19_ERXCK         (1 << 19)       /* B: Ethernet Receive Clock */
-#define AT91_PB20_TXD1          (1 << 20)       /* A: USART Transmit Data 1 */
-#define AT91_PB21_RXD1          (1 << 21)       /* A: USART Receive Data 1 */
-#define AT91_PB22_SCK1          (1 << 22)       /* A: USART Serial Clock 1 */
-#define AT91_PB23_DCD1          (1 << 23)       /* A: USART Data Carrier Detect 1 */
-#define AT91_PB24_CTS1          (1 << 24)       /* A: USART Clear To Send 1 */
-#define AT91_PB25_DSR1          (1 << 25)       /* A: USART Data Set Ready 1 */
-#define AT91_PB25_EF100         (1 << 25)       /* B: Ethernet Force 100 Mbit */
-#define AT91_PB26_RTS1          (1 << 26)       /* A: USART Ready To Send 1 */
-#define AT91_PB27_PCK0          (1 << 27)       /* B: PMC Programmable Clock Output 0 */
-#define AT91_PB28_FIQ           (1 << 28)       /* A: Fast Interrupt */
-#define AT91_PB29_IRQ0          (1 << 29)       /* A: External Interrupt 0 */
-#define AT91_PC0_BFCK           (1 <<  0)       /* A: Burst Flash Clock */
-#define AT91_PC1_BFRDY_SMOE     (1 <<  1)       /* A: Burst Flash Ready / SmartMedia Output Enable */
-#define AT91_PC2_BFAVD          (1 <<  2)       /* A: Burst Flash Address Valid */
-#define AT91_PC3_BFBAA_SMWE     (1 <<  3)       /* A: Burst Flash Address Advance / SmartMedia Write Enable */
-#define AT91_PC4_BFOE           (1 <<  4)       /* A: Burst Flash Output Enable */
-#define AT91_PC5_BFWE           (1 <<  5)       /* A: Burst Flash Write Enable */
-#define AT91_PC6_NWAIT          (1 <<  6)       /* A: SMC Wait Signal */
-#define AT91_PC7_A23            (1 <<  7)       /* A: Address Bus 23 */
-#define AT91_PC8_A24            (1 <<  8)       /* A: Address Bus 24 */
-#define AT91_PC9_A25_CFRNW      (1 <<  9)       /* A: Address Bus 25 / Compact Flash Read Not Write */
-#define AT91_PC10_NCS4_CFCS     (1 << 10)       /* A: SMC Chip Select 4 / Compact Flash Chip Select */
-#define AT91_PC11_NCS5_CFCE1    (1 << 11)       /* A: SMC Chip Select 5 / Compact Flash Chip Enable 1 */
-#define AT91_PC12_NCS6_CFCE2    (1 << 12)       /* A: SMC Chip Select 6 / Compact Flash Chip Enable 2 */
-#define AT91_PC13_NCS7          (1 << 13)       /* A: Chip Select 7 */
-#define AT91_PD0_ETX0           (1 <<  0)       /* A: Ethernet Transmit Data 0 */
-#define AT91_PD1_ETX1           (1 <<  1)       /* A: Ethernet Transmit Data 1 */
-#define AT91_PD2_ETX2           (1 <<  2)       /* A: Ethernet Transmit Data 2 */
-#define AT91_PD3_ETX3           (1 <<  3)       /* A: Ethernet Transmit Data 3 */
-#define AT91_PD4_ETXEN          (1 <<  4)       /* A: Ethernet Transmit Enable */
-#define AT91_PD5_ETXER          (1 <<  5)       /* A: Ethernet Transmit Coding Error */
-#define AT91_PD6_DTXD           (1 <<  6)       /* A: DBGU Transmit Data */
-#define AT91_PD7_PCK0           (1 <<  7)       /* A: PMC Programmable Clock Output 0 */
-#define AT91_PD7_TSYNC          (1 <<  7)       /* B: ETM Trace Synchronization Signal */
-#define AT91_PD8_PCK1           (1 <<  8)       /* A: PMC Programmable Clock Output 1 */
-#define AT91_PD8_TCLK           (1 <<  8)       /* B: ETM Trace Clock */
-#define AT91_PD9_PCK2           (1 <<  9)       /* A: PMC Programmable Clock Output 2 */
-#define AT91_PD9_TPS0           (1 <<  9)       /* B: ETM Trace ARM Pipeline Status 0 */
-#define AT91_PD10_PCK3          (1 << 10)       /* A: PMC Programmable Clock Output 3 */
-#define AT91_PD10_TPS1          (1 << 10)       /* B: ETM Trace ARM Pipeline Status 1 */
-#define AT91_PD11_TPS2          (1 << 11)       /* B: ETM Trace ARM Pipeline Status 2 */
-#define AT91_PD12_TPK0          (1 << 12)       /* B: ETM Trace Packet Port 0 */
-#define AT91_PD13_TPK1          (1 << 13)       /* B: ETM Trace Packet Port 1 */
-#define AT91_PD14_TPK2          (1 << 14)       /* B: ETM Trace Packet Port 2 */
-#define AT91_PD15_TD0           (1 << 15)       /* A: SSC Transmit Data 0 */
-#define AT91_PD15_TPK3          (1 << 15)       /* B: ETM Trace Packet Port 3 */
-#define AT91_PD16_TD1           (1 << 16)       /* A: SSC Transmit Data 1 */
-#define AT91_PD16_TPK4          (1 << 16)       /* B: ETM Trace Packet Port 4 */
-#define AT91_PD17_TD2           (1 << 17)       /* A: SSC Transmit Data 2 */
-#define AT91_PD17_TPK5          (1 << 17)       /* B: ETM Trace Packet Port 5 */
-#define AT91_PD18_NPCS1         (1 << 18)       /* A: SPI Peripheral Chip Select 1 */
-#define AT91_PD18_TPK6          (1 << 18)       /* B: ETM Trace Packet Port 6 */
-#define AT91_PD19_NPCS2         (1 << 19)       /* A: SPI Peripheral Chip Select 2 */
-#define AT91_PD19_TPK7          (1 << 19)       /* B: ETM Trace Packet Port 7 */
-#define AT91_PD20_NPCS3         (1 << 20)       /* A: SPI Peripheral Chip Select 3 */
-#define AT91_PD20_TPK8          (1 << 20)       /* B: ETM Trace Packet Port 8 */
-#define AT91_PD21_RTS0          (1 << 21)       /* A: USART Ready To Send 0 */
-#define AT91_PD21_TPK9          (1 << 21)       /* B: ETM Trace Packet Port 9 */
-#define AT91_PD22_RTS1          (1 << 22)       /* A: USART Ready To Send 1 */
-#define AT91_PD22_TPK10         (1 << 22)       /* B: ETM Trace Packet Port 10 */
-#define AT91_PD23_RTS2          (1 << 23)       /* A: USART Ready To Send 2 */
-#define AT91_PD23_TPK11         (1 << 23)       /* B: ETM Trace Packet Port 11 */
-#define AT91_PD24_RTS3          (1 << 24)       /* A: USART Ready To Send 3 */
-#define AT91_PD24_TPK12         (1 << 24)       /* B: ETM Trace Packet Port 12 */
-#define AT91_PD25_DTR1          (1 << 25)       /* A: USART Data Terminal Ready 1 */
-#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-at91/at91sam9260.h b/include/asm-arm/arch-at91/at91sam9260.h
index 2cadebc36af7..0427f8698c07 100644
--- a/include/asm-arm/arch-at91/at91sam9260.h
+++ b/include/asm-arm/arch-at91/at91sam9260.h
@@ -117,13 +117,4 @@
 #define AT91SAM9XE_SRAM_BASE    0x00300000      /* Internal SRAM base address */
-#if 0
-/*
- * PIO pin definitions (peripheral A/B multiplexing).
- */
-// TODO: Add
-#endif
 #endif
diff --git a/include/asm-arm/arch-at91/at91sam9261.h b/include/asm-arm/arch-at91/at91sam9261.h
index 01b58ffe2e27..9eb459570330 100644
--- a/include/asm-arm/arch-at91/at91sam9261.h
+++ b/include/asm-arm/arch-at91/at91sam9261.h
@@ -98,195 +98,4 @@
 #define AT91SAM9261_LCDC_BASE   0x00600000      /* LDC controller */
-#if 0
-/*
- * PIO pin definitions (peripheral A/B multiplexing).
- */
-#define AT91_PA0_SPI0_MISO      (1 <<  0)       /* A: SPI0 Master In Slave */
-#define AT91_PA0_MCDA0          (1 <<  0)       /* B: Multimedia Card A Data 0 */
-#define AT91_PA1_SPI0_MOSI      (1 <<  1)       /* A: SPI0 Master Out Slave */
-#define AT91_PA1_MCCDA          (1 <<  1)       /* B: Multimedia Card A Command */
-#define AT91_PA2_SPI0_SPCK      (1 <<  2)       /* A: SPI0 Serial Clock */
-#define AT91_PA2_MCCK           (1 <<  2)       /* B: Multimedia Card Clock */
-#define AT91_PA3_SPI0_NPCS0     (1 <<  3)       /* A: SPI0 Peripheral Chip Select 0 */
-#define AT91_PA4_SPI0_NPCS1     (1 <<  4)       /* A: SPI0 Peripheral Chip Select 1 */
-#define AT91_PA4_MCDA1          (1 <<  4)       /* B: Multimedia Card A Data 1 */
-#define AT91_PA5_SPI0_NPCS2     (1 <<  5)       /* A: SPI0 Peripheral Chip Select 2 */
-#define AT91_PA5_MCDA2          (1 <<  5)       /* B: Multimedia Card A Data 2 */
-#define AT91_PA6_SPI0_NPCS3     (1 <<  6)       /* A: SPI0 Peripheral Chip Select 3 */
-#define AT91_PA6_MCDA3          (1 <<  6)       /* B: Multimedia Card A Data 3 */
-#define AT91_PA7_TWD            (1 <<  7)       /* A: TWI Two-wire Serial Data */
-#define AT91_PA7_PCK0           (1 <<  7)       /* B: PMC Programmable clock Output 0 */
-#define AT91_PA8_TWCK           (1 <<  8)       /* A: TWI Two-wire Serial Clock */
-#define AT91_PA8_PCK1           (1 <<  8)       /* B: PMC Programmable clock Output 1 */
-#define AT91_PA9_DRXD           (1 <<  9)       /* A: DBGU Debug Receive Data */
-#define AT91_PA9_PCK2           (1 <<  9)       /* B: PMC Programmable clock Output 2 */
-#define AT91_PA10_DTXD          (1 << 10)       /* A: DBGU Debug Transmit Data */
-#define AT91_PA10_PCK3          (1 << 10)       /* B: PMC Programmable clock Output 3 */
-#define AT91_PA11_TSYNC         (1 << 11)       /* A: Trace Synchronization Signal */
-#define AT91_PA11_SCK1          (1 << 11)       /* B: USART1 Serial Clock */
-#define AT91_PA12_TCLK          (1 << 12)       /* A: Trace Clock */
-#define AT91_PA12_RTS1          (1 << 12)       /* B: USART1 Ready To Send */
-#define AT91_PA13_TPS0          (1 << 13)       /* A: Trace ARM Pipeline Status 0 */
-#define AT91_PA13_CTS1          (1 << 13)       /* B: USART1 Clear To Send */
-#define AT91_PA14_TPS1          (1 << 14)       /* A: Trace ARM Pipeline Status 1 */
-#define AT91_PA14_SCK2          (1 << 14)       /* B: USART2 Serial Clock */
-#define AT91_PA15_TPS2          (1 << 15)       /* A: Trace ARM Pipeline Status 2 */
-#define AT91_PA15_RTS2          (1 << 15)       /* B: USART2 Ready To Send */
-#define AT91_PA16_TPK0          (1 << 16)       /* A: Trace Packet Port 0 */
-#define AT91_PA16_CTS2          (1 << 16)       /* B: USART2 Clear To Send */
-#define AT91_PA17_TPK1          (1 << 17)       /* A: Trace Packet Port 1 */
-#define AT91_PA17_TF1           (1 << 17)       /* B: SSC1 Transmit Frame Sync */
-#define AT91_PA18_TPK2          (1 << 18)       /* A: Trace Packet Port 2 */
-#define AT91_PA18_TK1           (1 << 18)       /* B: SSC1 Transmit Clock */
-#define AT91_PA19_TPK3          (1 << 19)       /* A: Trace Packet Port 3 */
-#define AT91_PA19_TD1           (1 << 19)       /* B: SSC1 Transmit Data */
-#define AT91_PA20_TPK4          (1 << 20)       /* A: Trace Packet Port 4 */
-#define AT91_PA20_RD1           (1 << 20)       /* B: SSC1 Receive Data */
-#define AT91_PA21_TPK5          (1 << 21)       /* A: Trace Packet Port 5 */
-#define AT91_PA21_RK1           (1 << 21)       /* B: SSC1 Receive Clock */
-#define AT91_PA22_TPK6          (1 << 22)       /* A: Trace Packet Port 6 */
-#define AT91_PA22_RF1           (1 << 22)       /* B: SSC1 Receive Frame Sync */
-#define AT91_PA23_TPK7          (1 << 23)       /* A: Trace Packet Port 7 */
-#define AT91_PA23_RTS0          (1 << 23)       /* B: USART0 Ready To Send */
-#define AT91_PA24_TPK8          (1 << 24)       /* A: Trace Packet Port 8 */
-#define AT91_PA24_SPI1_NPCS1    (1 << 24)       /* B: SPI1 Peripheral Chip Select 1 */
-#define AT91_PA25_TPK9          (1 << 25)       /* A: Trace Packet Port 9 */
-#define AT91_PA25_SPI1_NPCS2    (1 << 25)       /* B: SPI1 Peripheral Chip Select 2 */
-#define AT91_PA26_TPK10         (1 << 26)       /* A: Trace Packet Port 10 */
-#define AT91_PA26_SPI1_NPCS3    (1 << 26)       /* B: SPI1 Peripheral Chip Select 3 */
-#define AT91_PA27_TPK11         (1 << 27)       /* A: Trace Packet Port 11 */
-#define AT91_PA27_SPI0_NPCS1    (1 << 27)       /* B: SPI0 Peripheral Chip Select 1 */
-#define AT91_PA28_TPK12         (1 << 28)       /* A: Trace Packet Port 12 */
-#define AT91_PA28_SPI0_NPCS2    (1 << 28)       /* B: SPI0 Peripheral Chip Select 2 */
-#define AT91_PA29_TPK13         (1 << 29)       /* A: Trace Packet Port 13 */
-#define AT91_PA29_SPI0_NPCS3    (1 << 29)       /* B: SPI0 Peripheral Chip Select 3 */
-#define AT91_PA30_TPK14         (1 << 30)       /* A: Trace Packet Port 14 */
-#define AT91_PA30_A23           (1 << 30)       /* B: Address Bus bit 23 */
-#define AT91_PA31_TPK15         (1 << 31)       /* A: Trace Packet Port 15 */
-#define AT91_PA31_A24           (1 << 31)       /* B: Address Bus bit 24 */
-#define AT91_PB0_LCDVSYNC       (1 <<  0)       /* A: LCD Vertical Synchronization */
-#define AT91_PB1_LCDHSYNC       (1 <<  1)       /* A: LCD Horizontal Synchronization */
-#define AT91_PB2_LCDDOTCK       (1 <<  2)       /* A: LCD Dot Clock */
-#define AT91_PB2_PCK0           (1 <<  2)       /* B: PMC Programmable clock Output 0 */
-#define AT91_PB3_LCDDEN         (1 <<  3)       /* A: LCD Data Enable */
-#define AT91_PB4_LCDCC          (1 <<  4)       /* A: LCD Contrast Control */
-#define AT91_PB4_LCDD2          (1 <<  4)       /* B: LCD Data Bus Bit 2 */
-#define AT91_PB5_LCDD0          (1 <<  5)       /* A: LCD Data Bus Bit 0 */
-#define AT91_PB5_LCDD3          (1 <<  5)       /* B: LCD Data Bus Bit 3 */
-#define AT91_PB6_LCDD1          (1 <<  6)       /* A: LCD Data Bus Bit 1 */
-#define AT91_PB6_LCDD4          (1 <<  6)       /* B: LCD Data Bus Bit 4 */
-#define AT91_PB7_LCDD2          (1 <<  7)       /* A: LCD Data Bus Bit 2 */
-#define AT91_PB7_LCDD5          (1 <<  7)       /* B: LCD Data Bus Bit 5 */
-#define AT91_PB8_LCDD3          (1 <<  8)       /* A: LCD Data Bus Bit 3 */
-#define AT91_PB8_LCDD6          (1 <<  8)       /* B: LCD Data Bus Bit 6 */
-#define AT91_PB9_LCDD4          (1 <<  9)       /* A: LCD Data Bus Bit 4 */
-#define AT91_PB9_LCDD7          (1 <<  9)       /* B: LCD Data Bus Bit 7 */
-#define AT91_PB10_LCDD5         (1 << 10)       /* A: LCD Data Bus Bit 5 */
-#define AT91_PB10_LCDD10        (1 << 10)       /* B: LCD Data Bus Bit 10 */
-#define AT91_PB11_LCDD6         (1 << 11)       /* A: LCD Data Bus Bit 6 */
-#define AT91_PB11_LCDD11        (1 << 11)       /* B: LCD Data Bus Bit 11 */
-#define AT91_PB12_LCDD7         (1 << 12)       /* A: LCD Data Bus Bit 7 */
-#define AT91_PB12_LCDD12        (1 << 12)       /* B: LCD Data Bus Bit 12 */
-#define AT91_PB13_LCDD8         (1 << 13)       /* A: LCD Data Bus Bit 8 */
-#define AT91_PB13_LCDD13        (1 << 13)       /* B: LCD Data Bus Bit 13 */
-#define AT91_PB14_LCDD9         (1 << 14)       /* A: LCD Data Bus Bit 9 */
-#define AT91_PB14_LCDD14        (1 << 14)       /* B: LCD Data Bus Bit 14 */
-#define AT91_PB15_LCDD10        (1 << 15)       /* A: LCD Data Bus Bit 10 */
-#define AT91_PB15_LCDD15        (1 << 15)       /* B: LCD Data Bus Bit 15 */
-#define AT91_PB16_LCDD11        (1 << 16)       /* A: LCD Data Bus Bit 11 */
-#define AT91_PB16_LCDD19        (1 << 16)       /* B: LCD Data Bus Bit 19 */
-#define AT91_PB17_LCDD12        (1 << 17)       /* A: LCD Data Bus Bit 12 */
-#define AT91_PB17_LCDD20        (1 << 17)       /* B: LCD Data Bus Bit 20 */
-#define AT91_PB18_LCDD13        (1 << 18)       /* A: LCD Data Bus Bit 13 */
-#define AT91_PB18_LCDD21        (1 << 18)       /* B: LCD Data Bus Bit 21 */
-#define AT91_PB19_LCDD14        (1 << 19)       /* A: LCD Data Bus Bit 14 */
-#define AT91_PB19_LCDD22        (1 << 19)       /* B: LCD Data Bus Bit 22 */
-#define AT91_PB20_LCDD15        (1 << 20)       /* A: LCD Data Bus Bit 15 */
-#define AT91_PB20_LCDD23        (1 << 20)       /* B: LCD Data Bus Bit 23 */
-#define AT91_PB21_TF0           (1 << 21)       /* A: SSC0 Transmit Frame Sync */
-#define AT91_PB21_LCDD16        (1 << 21)       /* B: LCD Data Bus Bit 16 */
-#define AT91_PB22_TK0           (1 << 22)       /* A: SSC0 Transmit Clock */
-#define AT91_PB22_LCDD17        (1 << 22)       /* B: LCD Data Bus Bit 17 */
-#define AT91_PB23_TD0           (1 << 23)       /* A: SSC0 Transmit Data */
-#define AT91_PB23_LCDD18        (1 << 23)       /* B: LCD Data Bus Bit 18 */
-#define AT91_PB24_RD0           (1 << 24)       /* A: SSC0 Receive Data */
-#define AT91_PB24_LCDD19        (1 << 24)       /* B: LCD Data Bus Bit 19 */
-#define AT91_PB25_RK0           (1 << 25)       /* A: SSC0 Receive Clock */
-#define AT91_PB25_LCDD20        (1 << 25)       /* B: LCD Data Bus Bit 20 */
-#define AT91_PB26_RF0           (1 << 26)       /* A: SSC0 Receive Frame Sync */
-#define AT91_PB26_LCDD21        (1 << 26)       /* B: LCD Data Bus Bit 21 */
-#define AT91_PB27_SPI1_NPCS1    (1 << 27)       /* A: SPI1 Peripheral Chip Select 1 */
-#define AT91_PB27_LCDD22        (1 << 27)       /* B: LCD Data Bus Bit 22 */
-#define AT91_PB28_SPI1_NPCS0    (1 << 28)       /* A: SPI1 Peripheral Chip Select 0 */
-#define AT91_PB28_LCDD23        (1 << 28)       /* B: LCD Data Bus Bit 23 */
-#define AT91_PB29_SPI1_SPCK     (1 << 29)       /* A: SPI1 Serial Clock */
-#define AT91_PB29_IRQ2          (1 << 29)       /* B: Interrupt input 2 */
-#define AT91_PB30_SPI1_MISO     (1 << 30)       /* A: SPI1 Master In Slave */
-#define AT91_PB30_IRQ1          (1 << 30)       /* B: Interrupt input 1 */
-#define AT91_PB31_SPI1_MOSI     (1 << 31)       /* A: SPI1 Master Out Slave */
-#define AT91_PB31_PCK2          (1 << 31)       /* B: PMC Programmable clock Output 2 */
-#define AT91_PC0_SMOE           (1 << 0)        /* A: SmartMedia Output Enable */
-#define AT91_PC0_NCS6           (1 << 0)        /* B: Chip Select 6 */
-#define AT91_PC1_SMWE           (1 << 1)        /* A: SmartMedia Write Enable */
-#define AT91_PC1_NCS7           (1 << 1)        /* B: Chip Select 7 */
-#define AT91_PC2_NWAIT          (1 << 2)        /* A: NWAIT */
-#define AT91_PC2_IRQ0           (1 << 2)        /* B: Interrupt input 0 */
-#define AT91_PC3_A25_CFRNW      (1 << 3)        /* A: Address Bus[25] / Compact Flash Read Not Write */
-#define AT91_PC4_NCS4_CFCS0     (1 << 4)        /* A: Chip Select 4 / CompactFlash Chip Select 0 */
-#define AT91_PC5_NCS5_CFCS1     (1 << 5)        /* A: Chip Select 5 / CompactFlash Chip Select 1 */
-#define AT91_PC6_CFCE1          (1 << 6)        /* A: CompactFlash Chip Enable 1 */
-#define AT91_PC7_CFCE2          (1 << 7)        /* A: CompactFlash Chip Enable 2 */
-#define AT91_PC8_TXD0           (1 << 8)        /* A: USART0 Transmit Data */
-#define AT91_PC8_PCK2           (1 << 8)        /* B: PMC Programmable clock Output 2 */
-#define AT91_PC9_RXD0           (1 << 9)        /* A: USART0 Receive Data */
-#define AT91_PC9_PCK3           (1 << 9)        /* B: PMC Programmable clock Output 3 */
-#define AT91_PC10_RTS0          (1 << 10)       /* A: USART0 Ready To Send */
-#define AT91_PC10_SCK0          (1 << 10)       /* B: USART0 Serial Clock */
-#define AT91_PC11_CTS0          (1 << 11)       /* A: USART0 Clear To Send */
-#define AT91_PC11_FIQ           (1 << 11)       /* B: AIC Fast Interrupt Input */
-#define AT91_PC12_TXD1          (1 << 12)       /* A: USART1 Transmit Data */
-#define AT91_PC12_NCS6          (1 << 12)       /* B: Chip Select 6 */
-#define AT91_PC13_RXD1          (1 << 13)       /* A: USART1 Receive Data */
-#define AT91_PC13_NCS7          (1 << 13)       /* B: Chip Select 7 */
-#define AT91_PC14_TXD2          (1 << 14)       /* A: USART2 Transmit Data */
-#define AT91_PC14_SPI1_NPCS2    (1 << 14)       /* B: SPI1 Peripheral Chip Select 2 */
-#define AT91_PC15_RXD2          (1 << 15)       /* A: USART2 Receive Data */
-#define AT91_PC15_SPI1_NPCS3    (1 << 15)       /* B: SPI1 Peripheral Chip Select 3 */
-#define AT91_PC16_D16           (1 << 16)       /* A: Data Bus [16] */
-#define AT91_PC16_TCLK0         (1 << 16)       /* B: Timer Counter 0 external clock input */
-#define AT91_PC17_D17           (1 << 17)       /* A: Data Bus [17] */
-#define AT91_PC17_TCLK1         (1 << 17)       /* B: Timer Counter 1 external clock input */
-#define AT91_PC18_D18           (1 << 18)       /* A: Data Bus [18] */
-#define AT91_PC18_TCLK2         (1 << 18)       /* B: Timer Counter 2 external clock input */
-#define AT91_PC19_D19           (1 << 19)       /* A: Data Bus [19] */
-#define AT91_PC19_TIOA0         (1 << 19)       /* B: Timer Counter 0 Multipurpose Timer I/O Pin A */
-#define AT91_PC20_D20           (1 << 20)       /* A: Data Bus [20] */
-#define AT91_PC20_TIOB0         (1 << 20)       /* B: Timer Counter 0 Multipurpose Timer I/O Pin B */
-#define AT91_PC21_D21           (1 << 21)       /* A: Data Bus [21] */
-#define AT91_PC21_TIOA1         (1 << 21)       /* B: Timer Counter 1 Multipurpose Timer I/O Pin A */
-#define AT91_PC22_D22           (1 << 22)       /* A: Data Bus [22] */
-#define AT91_PC22_TIOB1         (1 << 22)       /* B: Timer Counter 1 Multipurpose Timer I/O Pin B */
-#define AT91_PC23_D23           (1 << 23)       /* A: Data Bus [23] */
-#define AT91_PC23_TIOA2         (1 << 23)       /* B: Timer Counter 2 Multipurpose Timer I/O Pin A */
-#define AT91_PC24_D24           (1 << 24)       /* A: Data Bus [24] */
-#define AT91_PC24_TIOB2         (1 << 24)       /* B: Timer Counter 2 Multipurpose Timer I/O Pin B */
-#define AT91_PC25_D25           (1 << 25)       /* A: Data Bus [25] */
-#define AT91_PC25_TF2           (1 << 25)       /* B: SSC2 Transmit Frame Sync */
-#define AT91_PC26_D26           (1 << 26)       /* A: Data Bus [26] */
-#define AT91_PC26_TK2           (1 << 26)       /* B: SSC2 Transmit Clock */
-#define AT91_PC27_D27           (1 << 27)       /* A: Data Bus [27] */
-#define AT91_PC27_TD2           (1 << 27)       /* B: SSC2 Transmit Data */
-#define AT91_PC28_D28           (1 << 28)       /* A: Data Bus [28] */
-#define AT91_PC28_RD2           (1 << 28)       /* B: SSC2 Receive Data */
-#define AT91_PC29_D29           (1 << 29)       /* A: Data Bus [29] */
-#define AT91_PC29_RK2           (1 << 29)       /* B: SSC2 Receive Clock */
-#define AT91_PC30_D30           (1 << 30)       /* A: Data Bus [30] */
-#define AT91_PC30_RF2           (1 << 30)       /* B: SSC2 Receive Frame Sync */
-#define AT91_PC31_D31           (1 << 31)       /* A: Data Bus [31] */
-#define AT91_PC31_PCK1          (1 << 31)       /* B: PMC Programmable clock Output 1 */
-#endif
 #endif
diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/include/asm-arm/arch-at91/at91sam9263.h
index f4af68ae0ea9..115c47ac7ebb 100644
--- a/include/asm-arm/arch-at91/at91sam9263.h
+++ b/include/asm-arm/arch-at91/at91sam9263.h
@@ -119,13 +119,5 @@
 #define AT91SAM9263_DMAC_BASE   0x00800000      /* DMA Controller */
 #define AT91SAM9263_UHP_BASE    0x00a00000      /* USB Host controller */
-#if 0
-/*
- * PIO pin definitions (peripheral A/B multiplexing).
- */
-// TODO: Add
-#endif
 #endif
diff --git a/include/asm-arm/arch-at91/board.h b/include/asm-arm/arch-at91/board.h
index 7a34a5b1fed0..0ce6ee98ed0b 100644
--- a/include/asm-arm/arch-at91/board.h
+++ b/include/asm-arm/arch-at91/board.h
@@ -121,7 +121,7 @@ extern void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data);
 /* AC97 */
 struct atmel_ac97_data {
        u8              reset_pin;      /* reset */
-}
+};
 extern void __init at91_add_device_ac97(struct atmel_ac97_data *data);
 /* LEDs */
diff --git a/include/asm-arm/arch-at91/cpu.h b/include/asm-arm/arch-at91/cpu.h
index d464ca58cdbc..7ef4eebe9f8e 100644
--- a/include/asm-arm/arch-at91/cpu.h
+++ b/include/asm-arm/arch-at91/cpu.h
@@ -68,4 +68,10 @@ static inline unsigned long at91_arch_identify(void)
 #define cpu_is_at91sam9263()    (0)
 #endif
+/*
+ * Since this is ARM, we will never run on any AVR32 CPU. But these
+ * definitions may reduce clutter in common drivers.
+ */
+#define cpu_is_at32ap7000()     (0)
 #endif
diff --git a/include/asm-arm/arch-imx/imx-regs.h b/include/asm-arm/arch-imx/imx-regs.h
index de6494a4dc6b..30de404c61f5 100644
--- a/include/asm-arm/arch-imx/imx-regs.h
+++ b/include/asm-arm/arch-imx/imx-regs.h
@@ -297,7 +297,7 @@
 #define SAR(x)  __REG2( IMX_DMAC_BASE + 0x80, (x) << 6) /* Source Address Registers */
 #define DAR(x)  __REG2( IMX_DMAC_BASE + 0x84, (x) << 6) /* Destination Address Registers */
 #define CNTR(x) __REG2( IMX_DMAC_BASE + 0x88, (x) << 6) /* Count Registers */
-#define CCR(x)  __REG2( IMX_DMAC_BASE + 0x8c, (x) << 6) /*�Control Registers */
+#define CCR(x)  __REG2( IMX_DMAC_BASE + 0x8c, (x) << 6) /* Control Registers */
 #define RSSR(x) __REG2( IMX_DMAC_BASE + 0x90, (x) << 6) /* Request source select Registers */
 #define BLR(x)  __REG2( IMX_DMAC_BASE + 0x94, (x) << 6) /* Burst length Registers */
 #define RTOR(x) __REG2( IMX_DMAC_BASE + 0x98, (x) << 6) /* Request timeout Registers */
diff --git a/include/asm-arm/arch-integrator/platform.h b/include/asm-arm/arch-integrator/platform.h
index 96ad3d2a66d1..83c4c1ceb411 100644
--- a/include/asm-arm/arch-integrator/platform.h
+++ b/include/asm-arm/arch-integrator/platform.h
@@ -17,7 +17,7 @@
 *                 from .s file by awk -f s2h.awk
 */
 /**************************************************************************
- * * Copyright � ARM Limited 1998.  All rights reserved.
+ * * Copyright �� ARM Limited 1998.  All rights reserved.
 * ***********************************************************************/
 /* ************************************************************************
 *
diff --git a/include/asm-arm/arch-iop32x/glantank.h b/include/asm-arm/arch-iop32x/glantank.h
index 3b065618dd00..bf0665acc1c1 100644
--- a/include/asm-arm/arch-iop32x/glantank.h
+++ b/include/asm-arm/arch-iop32x/glantank.h
@@ -1,5 +1,5 @@
 /*
- * include/asm/arch-iop32x/glantank.h
+ * include/asm-arm/arch-iop32x/glantank.h
 *
 * IO-Data GLAN Tank board registers
 */
diff --git a/include/asm-arm/arch-iop32x/n2100.h b/include/asm-arm/arch-iop32x/n2100.h
index fed31a648425..77a8af476629 100644
--- a/include/asm-arm/arch-iop32x/n2100.h
+++ b/include/asm-arm/arch-iop32x/n2100.h
@@ -1,5 +1,5 @@
 /*
- * include/asm/arch-iop32x/n2100.h
+ * include/asm-arm/arch-iop32x/n2100.h
 *
 * Thecus N2100 board registers
 */
diff --git a/include/asm-arm/arch-omap/aic23.h b/include/asm-arm/arch-omap/aic23.h
index 6513065941d0..aec2d6563622 100644
--- a/include/asm-arm/arch-omap/aic23.h
+++ b/include/asm-arm/arch-omap/aic23.h
@@ -110,7 +110,7 @@
 #define TLV320AIC23ID1                  (0x1a)  // cs low
 #define TLV320AIC23ID2                  (0x1b)  // cs high
-void tlv320aic23_power_up(void);
+void aic23_power_up(void);
-void tlv320aic23_power_down(void);
+void aic23_power_down(void);
 #endif /* __ASM_ARCH_AIC23_H */
diff --git a/include/asm-arm/arch-omap/board-apollon.h b/include/asm-arm/arch-omap/board-apollon.h
index de0c5b792c58..dcb587b311f1 100644
--- a/include/asm-arm/arch-omap/board-apollon.h
+++ b/include/asm-arm/arch-omap/board-apollon.h
@@ -30,16 +30,7 @@
 #define __ASM_ARCH_OMAP_APOLLON_H
 /* Placeholder for APOLLON specific defines */
-/* GPMC CS0 */
-#define APOLLON_CS0_BASE                0x00000000
-/* GPMC CS1 */
-#define APOLLON_CS1_BASE                0x08000000
-#define APOLLON_ETHR_START              (APOLLON_CS1_BASE + 0x300)
 #define APOLLON_ETHR_GPIO_IRQ           74
-/* GPMC CS2 - reserved for OneNAND */
-#define APOLLON_CS2_BASE                0x10000000
-/* GPMC CS3 - reserved for NOR or NAND */
-#define APOLLON_CS3_BASE                0x18000000
 #endif /*  __ASM_ARCH_OMAP_APOLLON_H */
diff --git a/include/asm-arm/arch-omap/board-h4.h b/include/asm-arm/arch-omap/board-h4.h
index 7ef664bc9e33..7e0efef4bb65 100644
--- a/include/asm-arm/arch-omap/board-h4.h
+++ b/include/asm-arm/arch-omap/board-h4.h
@@ -30,9 +30,6 @@
 #define __ASM_ARCH_OMAP_H4_H
 /* Placeholder for H4 specific defines */
-/* GPMC CS1 */
-#define OMAP24XX_ETHR_START             0x08000300
 #define OMAP24XX_ETHR_GPIO_IRQ          92
-#define H4_CS0_BASE                     0x04000000
 #endif /*  __ASM_ARCH_OMAP_H4_H */
diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h
index edf1dc6ad919..031672c56377 100644
--- a/include/asm-arm/arch-omap/board.h
+++ b/include/asm-arm/arch-omap/board.h
@@ -4,7 +4,7 @@
 *  Information structures for board-specific data
 *
 *  Copyright (C) 2004  Nokia Corporation
- *  Written by Juha Yrj�l� <juha.yrjola@nokia.com>
+ *  Written by Juha Yrjölä <juha.yrjola@nokia.com>
 */
 #ifndef _OMAP_BOARD_H
@@ -12,6 +12,8 @@
 #include <linux/types.h>
+#include <asm/arch/gpio-switch.h>
 /* Different peripheral ids */
 #define OMAP_TAG_CLOCK          0x4f01
 #define OMAP_TAG_MMC            0x4f02
@@ -99,26 +101,31 @@ struct omap_usb_config {
 struct omap_lcd_config {
        char panel_name[16];
        char ctrl_name[16];
+        s16  nreset_gpio;
+        u8   data_lines;
+};
+struct device;
+struct fb_info;
+struct omap_backlight_config {
+        int default_intensity;
+        int (*set_power)(struct device *dev, int state);
+        int (*check_fb)(struct fb_info *fb);
 };
 struct omap_fbmem_config {
-        u32 fb_sram_start;
+        u32 start;
-        u32 fb_sram_size;
+        u32 size;
-        u32 fb_sdram_start;
+};
-        u32 fb_sdram_size;
-};
+struct omap_pwm_led_platform_data {
+        const char *name;
-/* Cover:
+        int intensity_timer;
- *      high -> closed
+        int blink_timer;
- *      low  -> open
+        void (*set_power)(struct omap_pwm_led_platform_data *self, int on_off);
- * Connection:
+};
- *      high -> connected
- *      low  -> disconnected
+/* See include/asm-arm/arch-omap/gpio-switch.h for definitions */
- */
-#define OMAP_GPIO_SWITCH_TYPE_COVER             0x0000
-#define OMAP_GPIO_SWITCH_TYPE_CONNECTION        0x0001
-#define OMAP_GPIO_SWITCH_FLAG_INVERTED          0x0001
-#define OMAP_GPIO_SWITCH_FLAG_OUTPUT            0x0002
 struct omap_gpio_switch_config {
        char name[12];
        u16 gpio;
diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h
index d591d0585bba..f7774192a41e 100644
--- a/include/asm-arm/arch-omap/dma.h
+++ b/include/asm-arm/arch-omap/dma.h
@@ -2,7 +2,7 @@
 *  linux/include/asm-arm/arch-omap/dma.h
 *
 *  Copyright (C) 2003 Nokia Corporation
- *  Author: Juha Yrj�l� <juha.yrjola@nokia.com>
+ *  Author: Juha Yrjölä <juha.yrjola@nokia.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
diff --git a/include/asm-arm/arch-omap/dsp.h b/include/asm-arm/arch-omap/dsp.h
deleted file mode 100644
index 06dad83dd41f..000000000000
--- a/include/asm-arm/arch-omap/dsp.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * linux/include/asm-arm/arch-omap/dsp.h
- *
- * Header for OMAP DSP driver
- *
- * Copyright (C) 2002-2005 Nokia Corporation
- *
- * Written by Toshihiro Kobayashi <toshihiro.kobayashi@nokia.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.
- *
- * 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
- *
- * 2005/06/01:  DSP Gateway version 3.3
- */
-#ifndef ASM_ARCH_DSP_H
-#define ASM_ARCH_DSP_H
-/*
- * for /dev/dspctl/ctl
- */
-#define OMAP_DSP_IOCTL_RESET                    1
-#define OMAP_DSP_IOCTL_RUN                      2
-#define OMAP_DSP_IOCTL_SETRSTVECT               3
-#define OMAP_DSP_IOCTL_CPU_IDLE                 4
-#define OMAP_DSP_IOCTL_MPUI_WORDSWAP_ON         5
-#define OMAP_DSP_IOCTL_MPUI_WORDSWAP_OFF        6
-#define OMAP_DSP_IOCTL_MPUI_BYTESWAP_ON         7
-#define OMAP_DSP_IOCTL_MPUI_BYTESWAP_OFF        8
-#define OMAP_DSP_IOCTL_GBL_IDLE                 9
-#define OMAP_DSP_IOCTL_DSPCFG                   10
-#define OMAP_DSP_IOCTL_DSPUNCFG                 11
-#define OMAP_DSP_IOCTL_TASKCNT                  12
-#define OMAP_DSP_IOCTL_POLL                     13
-#define OMAP_DSP_IOCTL_REGMEMR                  40
-#define OMAP_DSP_IOCTL_REGMEMW                  41
-#define OMAP_DSP_IOCTL_REGIOR                   42
-#define OMAP_DSP_IOCTL_REGIOW                   43
-#define OMAP_DSP_IOCTL_GETVAR                   44
-#define OMAP_DSP_IOCTL_SETVAR                   45
-#define OMAP_DSP_IOCTL_RUNLEVEL                 50
-#define OMAP_DSP_IOCTL_SUSPEND                  51
-#define OMAP_DSP_IOCTL_RESUME                   52
-#define OMAP_DSP_IOCTL_FBEN                     53
-#define OMAP_DSP_IOCTL_FBDIS                    54
-#define OMAP_DSP_IOCTL_MBSEND                   99
-/*
- * for taskdev
- * (ioctls below should be >= 0x10000)
- */
-#define OMAP_DSP_TASK_IOCTL_BFLSH       0x10000
-#define OMAP_DSP_TASK_IOCTL_SETBSZ      0x10001
-#define OMAP_DSP_TASK_IOCTL_LOCK        0x10002
-#define OMAP_DSP_TASK_IOCTL_UNLOCK      0x10003
-#define OMAP_DSP_TASK_IOCTL_GETNAME     0x10004
-/*
- * for /dev/dspctl/mem
- */
-#define OMAP_DSP_MEM_IOCTL_EXMAP        1
-#define OMAP_DSP_MEM_IOCTL_EXUNMAP      2
-#define OMAP_DSP_MEM_IOCTL_EXMAP_FLUSH  3
-#define OMAP_DSP_MEM_IOCTL_FBEXPORT     5
-#define OMAP_DSP_MEM_IOCTL_MMUITACK     7
-#define OMAP_DSP_MEM_IOCTL_MMUINIT      9
-#define OMAP_DSP_MEM_IOCTL_KMEM_RESERVE 11
-#define OMAP_DSP_MEM_IOCTL_KMEM_RELEASE 12
-struct omap_dsp_mapinfo {
-        unsigned long dspadr;
-        unsigned long size;
-};
-/*
- * for /dev/dspctl/twch
- */
-#define OMAP_DSP_TWCH_IOCTL_MKDEV       1
-#define OMAP_DSP_TWCH_IOCTL_RMDEV       2
-#define OMAP_DSP_TWCH_IOCTL_TADD        11
-#define OMAP_DSP_TWCH_IOCTL_TDEL        12
-#define OMAP_DSP_TWCH_IOCTL_TKILL       13
-#define OMAP_DSP_DEVSTATE_NOTASK        0x00000001
-#define OMAP_DSP_DEVSTATE_ATTACHED      0x00000002
-#define OMAP_DSP_DEVSTATE_GARBAGE       0x00000004
-#define OMAP_DSP_DEVSTATE_INVALID       0x00000008
-#define OMAP_DSP_DEVSTATE_ADDREQ        0x00000100
-#define OMAP_DSP_DEVSTATE_DELREQ        0x00000200
-#define OMAP_DSP_DEVSTATE_ADDFAIL       0x00001000
-#define OMAP_DSP_DEVSTATE_ADDING        0x00010000
-#define OMAP_DSP_DEVSTATE_DELING        0x00020000
-#define OMAP_DSP_DEVSTATE_KILLING       0x00040000
-#define OMAP_DSP_DEVSTATE_STATE_MASK    0x7fffffff
-#define OMAP_DSP_DEVSTATE_STALE         0x80000000
-struct omap_dsp_taddinfo {
-        unsigned char minor;
-        unsigned long taskadr;
-};
-#define OMAP_DSP_TADD_ABORTADR  0xffffffff
-/*
- * error cause definition (for error detection device)
- */
-#define OMAP_DSP_ERRDT_WDT      0x00000001
-#define OMAP_DSP_ERRDT_MMU      0x00000002
-/*
- * mailbox protocol definitions
- */
-struct omap_dsp_mailbox_cmd {
-        unsigned short cmd;
-        unsigned short data;
-};
-struct omap_dsp_reginfo {
-        unsigned short adr;
-        unsigned short val;
-};
-struct omap_dsp_varinfo {
-        unsigned char varid;
-        unsigned short val[0];
-};
-#define OMAP_DSP_MBPROT_REVISION        0x0019
-#define OMAP_DSP_MBCMD_WDSND    0x10
-#define OMAP_DSP_MBCMD_WDREQ    0x11
-#define OMAP_DSP_MBCMD_BKSND    0x20
-#define OMAP_DSP_MBCMD_BKREQ    0x21
-#define OMAP_DSP_MBCMD_BKYLD    0x23
-#define OMAP_DSP_MBCMD_BKSNDP   0x24
-#define OMAP_DSP_MBCMD_BKREQP   0x25
-#define OMAP_DSP_MBCMD_TCTL     0x30
-#define OMAP_DSP_MBCMD_TCTLDATA 0x31
-#define OMAP_DSP_MBCMD_POLL     0x32
-#define OMAP_DSP_MBCMD_WDT      0x50    /* v3.3: obsolete */
-#define OMAP_DSP_MBCMD_RUNLEVEL 0x51
-#define OMAP_DSP_MBCMD_PM       0x52
-#define OMAP_DSP_MBCMD_SUSPEND  0x53
-#define OMAP_DSP_MBCMD_KFUNC    0x54
-#define OMAP_DSP_MBCMD_TCFG     0x60
-#define OMAP_DSP_MBCMD_TADD     0x62
-#define OMAP_DSP_MBCMD_TDEL     0x63
-#define OMAP_DSP_MBCMD_TSTOP    0x65
-#define OMAP_DSP_MBCMD_DSPCFG   0x70
-#define OMAP_DSP_MBCMD_REGRW    0x72
-#define OMAP_DSP_MBCMD_GETVAR   0x74
-#define OMAP_DSP_MBCMD_SETVAR   0x75
-#define OMAP_DSP_MBCMD_ERR      0x78
-#define OMAP_DSP_MBCMD_DBG      0x79
-#define OMAP_DSP_MBCMD_TCTL_TINIT       0x0000
-#define OMAP_DSP_MBCMD_TCTL_TEN         0x0001
-#define OMAP_DSP_MBCMD_TCTL_TDIS        0x0002
-#define OMAP_DSP_MBCMD_TCTL_TCLR        0x0003
-#define OMAP_DSP_MBCMD_TCTL_TCLR_FORCE  0x0004
-#define OMAP_DSP_MBCMD_RUNLEVEL_USER            0x01
-#define OMAP_DSP_MBCMD_RUNLEVEL_SUPER           0x0e
-#define OMAP_DSP_MBCMD_RUNLEVEL_RECOVERY        0x10
-#define OMAP_DSP_MBCMD_PM_DISABLE       0x00
-#define OMAP_DSP_MBCMD_PM_ENABLE        0x01
-#define OMAP_DSP_MBCMD_KFUNC_FBCTL      0x00
-#define OMAP_DSP_MBCMD_KFUNC_AUDIO_PWR  0x01
-#define OMAP_DSP_MBCMD_FBCTL_UPD        0x0000
-#define OMAP_DSP_MBCMD_FBCTL_ENABLE     0x0002
-#define OMAP_DSP_MBCMD_FBCTL_DISABLE    0x0003
-#define OMAP_DSP_MBCMD_AUDIO_PWR_UP     0x0000
-#define OMAP_DSP_MBCMD_AUDIO_PWR_DOWN1  0x0001
-#define OMAP_DSP_MBCMD_AUDIO_PWR_DOWN2  0x0002
-#define OMAP_DSP_MBCMD_TDEL_SAFE        0x0000
-#define OMAP_DSP_MBCMD_TDEL_KILL        0x0001
-#define OMAP_DSP_MBCMD_DSPCFG_REQ       0x00
-#define OMAP_DSP_MBCMD_DSPCFG_SYSADRH   0x28
-#define OMAP_DSP_MBCMD_DSPCFG_SYSADRL   0x29
-#define OMAP_DSP_MBCMD_DSPCFG_PROTREV   0x70
-#define OMAP_DSP_MBCMD_DSPCFG_ABORT     0x78
-#define OMAP_DSP_MBCMD_DSPCFG_LAST      0x80
-#define OMAP_DSP_MBCMD_REGRW_MEMR       0x00
-#define OMAP_DSP_MBCMD_REGRW_MEMW       0x01
-#define OMAP_DSP_MBCMD_REGRW_IOR        0x02
-#define OMAP_DSP_MBCMD_REGRW_IOW        0x03
-#define OMAP_DSP_MBCMD_REGRW_DATA       0x04
-#define OMAP_DSP_MBCMD_VARID_ICRMASK    0x00
-#define OMAP_DSP_MBCMD_VARID_LOADINFO   0x01
-#define OMAP_DSP_TTYP_ARCV      0x0001
-#define OMAP_DSP_TTYP_ASND      0x0002
-#define OMAP_DSP_TTYP_BKMD      0x0004
-#define OMAP_DSP_TTYP_BKDM      0x0008
-#define OMAP_DSP_TTYP_PVMD      0x0010
-#define OMAP_DSP_TTYP_PVDM      0x0020
-#define OMAP_DSP_EID_BADTID     0x10
-#define OMAP_DSP_EID_BADTCN     0x11
-#define OMAP_DSP_EID_BADBID     0x20
-#define OMAP_DSP_EID_BADCNT     0x21
-#define OMAP_DSP_EID_NOTLOCKED  0x22
-#define OMAP_DSP_EID_STVBUF     0x23
-#define OMAP_DSP_EID_BADADR     0x24
-#define OMAP_DSP_EID_BADTCTL    0x30
-#define OMAP_DSP_EID_BADPARAM   0x50
-#define OMAP_DSP_EID_FATAL      0x58
-#define OMAP_DSP_EID_NOMEM      0xc0
-#define OMAP_DSP_EID_NORES      0xc1
-#define OMAP_DSP_EID_IPBFULL    0xc2
-#define OMAP_DSP_EID_WDT        0xd0
-#define OMAP_DSP_EID_TASKNOTRDY 0xe0
-#define OMAP_DSP_EID_TASKBSY    0xe1
-#define OMAP_DSP_EID_TASKERR    0xef
-#define OMAP_DSP_EID_BADCFGTYP  0xf0
-#define OMAP_DSP_EID_DEBUG      0xf8
-#define OMAP_DSP_EID_BADSEQ     0xfe
-#define OMAP_DSP_EID_BADCMD     0xff
-#define OMAP_DSP_TNM_LEN        16
-#define OMAP_DSP_TID_FREE       0xff
-#define OMAP_DSP_TID_ANON       0xfe
-#define OMAP_DSP_BID_NULL       0xffff
-#define OMAP_DSP_BID_PVT        0xfffe
-#endif /* ASM_ARCH_DSP_H */
diff --git a/include/asm-arm/arch-omap/dsp_common.h b/include/asm-arm/arch-omap/dsp_common.h
index 16a459dfa714..c61f868f24ee 100644
--- a/include/asm-arm/arch-omap/dsp_common.h
+++ b/include/asm-arm/arch-omap/dsp_common.h
@@ -1,38 +1,34 @@
 /*
- * linux/include/asm-arm/arch-omap/dsp_common.h
+ * This file is part of OMAP DSP driver (DSP Gateway version 3.3.1)
 *
- * Header for OMAP DSP subsystem control
+ * Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
 *
- * Copyright (C) 2004,2005 Nokia Corporation
+ * Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
 *
- * Written by Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
 *
- * This program is free software; you can redistribute it and/or modify
+ * This program is distributed in the hope that it will be useful, but
- * it under the terms of the GNU General Public License as published by
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
- * the Free Software Foundation; either version 2 of the License, or
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * (at your option) any later version.
+ * General Public License for more details.
- *
- * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
 *
- * 2005/06/03:  DSP Gateway version 3.3
 */
 #ifndef ASM_ARCH_DSP_COMMON_H
 #define ASM_ARCH_DSP_COMMON_H
+#ifdef CONFIG_ARCH_OMAP1
 extern void omap_dsp_request_mpui(void);
 extern void omap_dsp_release_mpui(void);
 extern int omap_dsp_request_mem(void);
 extern int omap_dsp_release_mem(void);
+#endif
-extern void (*omap_dsp_audio_pwr_up_request)(int stage);
-extern void (*omap_dsp_audio_pwr_down_request)(int stage);
 #endif /* ASM_ARCH_DSP_COMMON_H */
diff --git a/include/asm-arm/arch-omap/gpio-switch.h b/include/asm-arm/arch-omap/gpio-switch.h
new file mode 100644
index 000000000000..10da0e07c0cf
--- /dev/null
+++ b/include/asm-arm/arch-omap/gpio-switch.h
@@ -0,0 +1,54 @@
+/*
+ * GPIO switch definitions
+ *
+ * Copyright (C) 2006 Nokia 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_ARCH_OMAP_GPIO_SWITCH_H
+#define __ASM_ARCH_OMAP_GPIO_SWITCH_H
+#include <linux/types.h>
+/* Cover:
+ *      high -> closed
+ *      low  -> open
+ * Connection:
+ *      high -> connected
+ *      low  -> disconnected
+ * Activity:
+ *      high -> active
+ *      low  -> inactive
+ *
+ */
+#define OMAP_GPIO_SWITCH_TYPE_COVER             0x0000
+#define OMAP_GPIO_SWITCH_TYPE_CONNECTION        0x0001
+#define OMAP_GPIO_SWITCH_TYPE_ACTIVITY          0x0002
+#define OMAP_GPIO_SWITCH_FLAG_INVERTED          0x0001
+#define OMAP_GPIO_SWITCH_FLAG_OUTPUT            0x0002
+struct omap_gpio_switch {
+        const char *name;
+        s16 gpio;
+        unsigned flags:4;
+        unsigned type:4;
+        /* Time in ms to debounce when transitioning from
+         * inactive state to active state. */
+        u16 debounce_rising;
+        /* Same for transition from active to inactive state. */
+        u16 debounce_falling;
+        /* notify board-specific code about state changes */
+        void (* notify)(void *data, int state);
+        void *notify_data;
+};
+/* Call at init time only */
+extern void omap_register_gpio_switches(const struct omap_gpio_switch *tbl,
+                                        int count);
+#endif
diff --git a/include/asm-arm/arch-omap/gpio.h b/include/asm-arm/arch-omap/gpio.h
index 590917efc94a..97b397dd7e87 100644
--- a/include/asm-arm/arch-omap/gpio.h
+++ b/include/asm-arm/arch-omap/gpio.h
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 2003-2005 Nokia Corporation
 *
- * Written by Juha Yrj�l� <juha.yrjola@nokia.com>
+ * Written by Juha Yrjölä <juha.yrjola@nokia.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
diff --git a/include/asm-arm/arch-omap/gpmc.h b/include/asm-arm/arch-omap/gpmc.h
index 7c03ef6c14c4..995cc83482eb 100644
--- a/include/asm-arm/arch-omap/gpmc.h
+++ b/include/asm-arm/arch-omap/gpmc.h
@@ -87,5 +87,7 @@ 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 int gpmc_cs_request(int cs, unsigned long size, unsigned long *base);
 extern void gpmc_cs_free(int cs);
+extern int gpmc_cs_set_reserved(int cs, int reserved);
+extern int gpmc_cs_reserved(int cs);
 #endif
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h
index 481048d65214..e225f4f39b34 100644
--- a/include/asm-arm/arch-omap/hardware.h
+++ b/include/asm-arm/arch-omap/hardware.h
@@ -267,6 +267,15 @@
 #define OMAP_LPG2_PMR                   (OMAP_LPG2_BASE + 0x04)
 /*
+ * ----------------------------------------------------------------------------
+ * Pulse-Width Light
+ * ----------------------------------------------------------------------------
+ */
+#define OMAP_PWL_BASE                   0xfffb5800
+#define OMAP_PWL_ENABLE                 (OMAP_PWL_BASE + 0x00)
+#define OMAP_PWL_CLK_ENABLE             (OMAP_PWL_BASE + 0x04)
+/*
 * ---------------------------------------------------------------------------
 * Processor specific defines
 * ---------------------------------------------------------------------------
diff --git a/include/asm-arm/arch-omap/hwa742.h b/include/asm-arm/arch-omap/hwa742.h
new file mode 100644
index 000000000000..577f492f2d3c
--- /dev/null
+++ b/include/asm-arm/arch-omap/hwa742.h
@@ -0,0 +1,12 @@
+#ifndef _HWA742_H
+#define _HWA742_H
+struct hwa742_platform_data {
+        void            (*power_up)(struct device *dev);
+        void            (*power_down)(struct device *dev);
+        unsigned long   (*get_clock_rate)(struct device *dev);
+        unsigned        te_connected:1;
+};
+#endif
diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h
index 78f68e6a4f0c..4aca7e3d7566 100644
--- a/include/asm-arm/arch-omap/io.h
+++ b/include/asm-arm/arch-omap/io.h
@@ -77,6 +77,17 @@
 #define io_p2v(pa)      ((pa) + IO_OFFSET)      /* Works for L3 and L4 */
 #define io_v2p(va)      ((va) - IO_OFFSET)      /* Works for L3 and L4 */
+/* DSP */
+#define DSP_MEM_24XX_PHYS       OMAP24XX_DSP_MEM_BASE   /* 0x58000000 */
+#define DSP_MEM_24XX_VIRT       0xe0000000
+#define DSP_MEM_24XX_SIZE       0x28000
+#define DSP_IPI_24XX_PHYS       OMAP24XX_DSP_IPI_BASE   /* 0x59000000 */
+#define DSP_IPI_24XX_VIRT       0xe1000000
+#define DSP_IPI_24XX_SIZE       SZ_4K
+#define DSP_MMU_24XX_PHYS       OMAP24XX_DSP_MMU_BASE   /* 0x5a000000 */
+#define DSP_MMU_24XX_VIRT       0xe2000000
+#define DSP_MMU_24XX_SIZE       SZ_4K
 #endif
 #ifndef __ASSEMBLER__
diff --git a/include/asm-arm/arch-omap/irqs.h b/include/asm-arm/arch-omap/irqs.h
index c5bb05a69b81..3ede58b51db2 100644
--- a/include/asm-arm/arch-omap/irqs.h
+++ b/include/asm-arm/arch-omap/irqs.h
@@ -37,8 +37,6 @@
 #define INT_DSP_MMU_ABORT       7
 #define INT_HOST                8
 #define INT_ABORT               9
-#define INT_DSP_MAILBOX1        10
-#define INT_DSP_MAILBOX2        11
 #define INT_BRIDGE_PRIV         13
 #define INT_GPIO_BANK1          14
 #define INT_UART3               15
@@ -63,6 +61,8 @@
 #define INT_1510_RES2           2
 #define INT_1510_SPI_TX         4
 #define INT_1510_SPI_RX         5
+#define INT_1510_DSP_MAILBOX1   10
+#define INT_1510_DSP_MAILBOX2   11
 #define INT_1510_RES12          12
 #define INT_1510_LB_MMU         17
 #define INT_1510_RES18          18
@@ -75,6 +75,8 @@
 #define INT_1610_IH2_FIQ        2
 #define INT_1610_McBSP2_TX      4
 #define INT_1610_McBSP2_RX      5
+#define INT_1610_DSP_MAILBOX1   10
+#define INT_1610_DSP_MAILBOX2   11
 #define INT_1610_LCD_LINE       12
 #define INT_1610_GPTIMER1       17
 #define INT_1610_GPTIMER2       18
@@ -131,11 +133,11 @@
 #define INT_RTC_TIMER           (25 + IH2_BASE)
 #define INT_RTC_ALARM           (26 + IH2_BASE)
 #define INT_MEM_STICK           (27 + IH2_BASE)
-#define INT_DSP_MMU             (28 + IH2_BASE)
 /*
 * OMAP-1510 specific IRQ numbers for interrupt handler 2
 */
+#define INT_1510_DSP_MMU        (28 + IH2_BASE)
 #define INT_1510_COM_SPI_RO     (31 + IH2_BASE)
 /*
@@ -146,6 +148,7 @@
 #define INT_1610_USB_OTG        (8 + IH2_BASE)
 #define INT_1610_SoSSI          (9 + IH2_BASE)
 #define INT_1610_SoSSI_MATCH    (19 + IH2_BASE)
+#define INT_1610_DSP_MMU        (28 + IH2_BASE)
 #define INT_1610_McBSP2RX_OF    (31 + IH2_BASE)
 #define INT_1610_STI            (32 + IH2_BASE)
 #define INT_1610_STI_WAKEUP     (33 + IH2_BASE)
@@ -239,10 +242,15 @@
 #define INT_24XX_SDMA_IRQ3      15
 #define INT_24XX_CAM_IRQ        24
 #define INT_24XX_DSS_IRQ        25
+#define INT_24XX_MAIL_U0_MPU    26
+#define INT_24XX_DSP_UMA        27
+#define INT_24XX_DSP_MMU        28
 #define INT_24XX_GPIO_BANK1     29
 #define INT_24XX_GPIO_BANK2     30
 #define INT_24XX_GPIO_BANK3     31
 #define INT_24XX_GPIO_BANK4     32
+#define INT_24XX_GPIO_BANK5     33
+#define INT_24XX_MAIL_U3_MPU    34
 #define INT_24XX_GPTIMER1       37
 #define INT_24XX_GPTIMER2       38
 #define INT_24XX_GPTIMER3       39
@@ -262,6 +270,12 @@
 #define INT_24XX_UART1_IRQ      72
 #define INT_24XX_UART2_IRQ      73
 #define INT_24XX_UART3_IRQ      74
+#define INT_24XX_USB_IRQ_GEN    75
+#define INT_24XX_USB_IRQ_NISO   76
+#define INT_24XX_USB_IRQ_ISO    77
+#define INT_24XX_USB_IRQ_HGEN   78
+#define INT_24XX_USB_IRQ_HSOF   79
+#define INT_24XX_USB_IRQ_OTG    80
 #define INT_24XX_MMC_IRQ        83
 /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730) and
diff --git a/include/asm-arm/arch-omap/lcd_lph8923.h b/include/asm-arm/arch-omap/lcd_lph8923.h
deleted file mode 100644
index 004e67e22ca7..000000000000
--- a/include/asm-arm/arch-omap/lcd_lph8923.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __LCD_LPH8923_H
-#define __LCD_LPH8923_H
-enum lcd_lph8923_test_num {
-        LCD_LPH8923_TEST_RGB_LINES,
-};
-enum lcd_lph8923_test_result {
-        LCD_LPH8923_TEST_SUCCESS,
-        LCD_LPH8923_TEST_INVALID,
-        LCD_LPH8923_TEST_FAILED,
-};
-#endif
diff --git a/include/asm-arm/arch-omap/lcd_mipid.h b/include/asm-arm/arch-omap/lcd_mipid.h
new file mode 100644
index 000000000000..f8fbc4801e52
--- /dev/null
+++ b/include/asm-arm/arch-omap/lcd_mipid.h
@@ -0,0 +1,24 @@
+#ifndef __LCD_MIPID_H
+#define __LCD_MIPID_H
+enum mipid_test_num {
+        MIPID_TEST_RGB_LINES,
+};
+enum mipid_test_result {
+        MIPID_TEST_SUCCESS,
+        MIPID_TEST_INVALID,
+        MIPID_TEST_FAILED,
+};
+#ifdef __KERNEL__
+struct mipid_platform_data {
+        int     nreset_gpio;
+        int     data_lines;
+        void    (*shutdown)(struct mipid_platform_data *pdata);
+};
+#endif
+#endif
diff --git a/include/asm-arm/arch-omap/led.h b/include/asm-arm/arch-omap/led.h
new file mode 100644
index 000000000000..f3acae28e2da
--- /dev/null
+++ b/include/asm-arm/arch-omap/led.h
@@ -0,0 +1,24 @@
+/*
+ *  linux/include/asm-arm/arch-omap/led.h
+ *
+ *  Copyright (C) 2006 Samsung Electronics
+ *  Kyungmin Park <kyungmin.park@samsung.com>
+ *
+ * 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 ASMARM_ARCH_LED_H
+#define ASMARM_ARCH_LED_H
+struct omap_led_config {
+        struct led_classdev     cdev;
+        s16                     gpio;
+};
+struct omap_led_platform_data {
+        s16                     nr_leds;
+        struct omap_led_config  *leds;
+};
+#endif
diff --git a/include/asm-arm/arch-omap/mailbox.h b/include/asm-arm/arch-omap/mailbox.h
new file mode 100644
index 000000000000..4bf0909461f2
--- /dev/null
+++ b/include/asm-arm/arch-omap/mailbox.h
@@ -0,0 +1,73 @@
+/* mailbox.h */
+#ifndef MAILBOX_H
+#define MAILBOX_H
+#include <linux/wait.h>
+#include <linux/workqueue.h>
+#include <linux/blkdev.h>
+typedef u32 mbox_msg_t;
+typedef void (mbox_receiver_t)(mbox_msg_t msg);
+struct omap_mbox;
+typedef int __bitwise omap_mbox_irq_t;
+#define IRQ_TX ((__force omap_mbox_irq_t) 1)
+#define IRQ_RX ((__force omap_mbox_irq_t) 2)
+typedef int __bitwise omap_mbox_type_t;
+#define OMAP_MBOX_TYPE1 ((__force omap_mbox_type_t) 1)
+#define OMAP_MBOX_TYPE2 ((__force omap_mbox_type_t) 2)
+struct omap_mbox_ops {
+        omap_mbox_type_t        type;
+        int             (*startup)(struct omap_mbox *mbox);
+        void            (*shutdown)(struct omap_mbox *mbox);
+        /* fifo */
+        mbox_msg_t      (*fifo_read)(struct omap_mbox *mbox);
+        void            (*fifo_write)(struct omap_mbox *mbox, mbox_msg_t msg);
+        int             (*fifo_empty)(struct omap_mbox *mbox);
+        int             (*fifo_full)(struct omap_mbox *mbox);
+        /* irq */
+        void            (*enable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+        void            (*disable_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+        void            (*ack_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+        int             (*is_irq)(struct omap_mbox *mbox, omap_mbox_irq_t irq);
+};
+struct omap_mbox_queue {
+        spinlock_t              lock;
+        request_queue_t         *queue;
+        struct work_struct      work;
+        int     (*callback)(void *);
+        struct omap_mbox        *mbox;
+};
+struct omap_mbox {
+        char                    *name;
+        unsigned int            irq;
+        struct omap_mbox_queue  *txq, *rxq;
+        struct omap_mbox_ops    *ops;
+        mbox_msg_t              seq_snd, seq_rcv;
+        struct device           dev;
+        struct omap_mbox        *next;
+        void                    *priv;
+        void                    (*err_notify)(void);
+};
+int omap_mbox_msg_send(struct omap_mbox *, mbox_msg_t msg, void *);
+void omap_mbox_init_seq(struct omap_mbox *);
+struct omap_mbox *omap_mbox_get(const char *);
+void omap_mbox_put(struct omap_mbox *);
+int omap_mbox_register(struct omap_mbox *);
+int omap_mbox_unregister(struct omap_mbox *);
+#endif /* MAILBOX_H */
diff --git a/include/asm-arm/arch-omap/mcspi.h b/include/asm-arm/arch-omap/mcspi.h
index 9e7f40a88e1b..1254e4945b6f 100644
--- a/include/asm-arm/arch-omap/mcspi.h
+++ b/include/asm-arm/arch-omap/mcspi.h
@@ -2,7 +2,6 @@
 #define _OMAP2_MCSPI_H
 struct omap2_mcspi_platform_config {
-        unsigned long   base;
        unsigned short  num_cs;
 };
diff --git a/include/asm-arm/arch-omap/memory.h b/include/asm-arm/arch-omap/memory.h
index 48fabc493163..14cba97c18ad 100644
--- a/include/asm-arm/arch-omap/memory.h
+++ b/include/asm-arm/arch-omap/memory.h
@@ -86,5 +86,18 @@
 #endif  /* CONFIG_ARCH_OMAP15XX */
+/* Override the ARM default */
+#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
+#if (CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE == 0)
+#undef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
+#define CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE 2
+#endif
+#define CONSISTENT_DMA_SIZE \
+        (((CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE + 1) & ~1) * 1024 * 1024)
+#endif
 #endif
diff --git a/include/asm-arm/arch-omap/menelaus.h b/include/asm-arm/arch-omap/menelaus.h
index 88cd4c87f0de..82d276a6bd95 100644
--- a/include/asm-arm/arch-omap/menelaus.h
+++ b/include/asm-arm/arch-omap/menelaus.h
@@ -7,10 +7,19 @@
 #ifndef __ASM_ARCH_MENELAUS_H
 #define __ASM_ARCH_MENELAUS_H
-extern void menelaus_mmc_register(void (*callback)(unsigned long data, u8 card_mask),
+extern int menelaus_register_mmc_callback(void (*callback)(void *data, u8 card_mask),
-                                  unsigned long data);
+                                          void *data);
-extern void menelaus_mmc_remove(void);
+extern void menelaus_unregister_mmc_callback(void);
-extern void menelaus_mmc_opendrain(int enable);
+extern int menelaus_set_mmc_opendrain(int slot, int enable);
+extern int menelaus_set_mmc_slot(int slot, int enable, int power, int cd_on);
+extern int menelaus_set_vmem(unsigned int mV);
+extern int menelaus_set_vio(unsigned int mV);
+extern int menelaus_set_vmmc(unsigned int mV);
+extern int menelaus_set_vaux(unsigned int mV);
+extern int menelaus_set_vdcdc(int dcdc, unsigned int mV);
+extern int menelaus_set_slot_sel(int enable);
+extern int menelaus_get_slot_pin_states(void);
 #if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_MENELAUS)
 #define omap_has_menelaus()     1
diff --git a/include/asm-arm/arch-omap/omap16xx.h b/include/asm-arm/arch-omap/omap16xx.h
index f0c7f0fb4dc0..f7f5cdfdccce 100644
--- a/include/asm-arm/arch-omap/omap16xx.h
+++ b/include/asm-arm/arch-omap/omap16xx.h
@@ -159,15 +159,6 @@
 #define UART3_MVR               (OMAP_UART3_BASE + 0x50)
 /*
- * ----------------------------------------------------------------------------
- * Pulse-Width Light
- * ----------------------------------------------------------------------------
- */
-#define OMAP16XX_PWL_BASE       (0xfffb5800)
-#define OMAP16XX_PWL_ENABLE     (OMAP16XX_PWL_BASE + 0x00)
-#define OMAP16XX_PWL_CLK_ENABLE (OMAP16XX_PWL_BASE + 0x04)
-/*
 * ---------------------------------------------------------------------------
 * Watchdog timer
 * ---------------------------------------------------------------------------
@@ -199,5 +190,8 @@
 #define WSPR_DISABLE_0         (0x0000aaaa)
 #define WSPR_DISABLE_1         (0x00005555)
+/* Mailbox */
+#define OMAP16XX_MAILBOX_BASE   (0xfffcf000)
 #endif /*  __ASM_ARCH_OMAP16XX_H */
diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 6e59805fa654..708b2fac77f2 100644
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -20,5 +20,14 @@
 #define OMAP24XX_PRCM_BASE      (L4_24XX_BASE + 0x8000)
 #define OMAP24XX_SDRC_BASE      (L3_24XX_BASE + 0x9000)
+/* DSP SS */
+#define OMAP24XX_DSP_BASE       0x58000000
+#define OMAP24XX_DSP_MEM_BASE   (OMAP24XX_DSP_BASE + 0x0)
+#define OMAP24XX_DSP_IPI_BASE   (OMAP24XX_DSP_BASE + 0x1000000)
+#define OMAP24XX_DSP_MMU_BASE   (OMAP24XX_DSP_BASE + 0x2000000)
+/* Mailbox */
+#define OMAP24XX_MAILBOX_BASE   (L4_24XX_BASE + 0x94000)
 #endif /* __ASM_ARCH_OMAP24XX_H */
diff --git a/include/asm-arm/arch-omap/omapfb.h b/include/asm-arm/arch-omap/omapfb.h
index fccdb3db025f..46d7a4f60854 100644
--- a/include/asm-arm/arch-omap/omapfb.h
+++ b/include/asm-arm/arch-omap/omapfb.h
@@ -24,6 +24,9 @@
 #ifndef __OMAPFB_H
 #define __OMAPFB_H
+#include <asm/ioctl.h>
+#include <asm/types.h>
 /* IOCTL commands. */
 #define OMAP_IOW(num, dtype)    _IOW('O', num, dtype)
@@ -35,26 +38,46 @@
 #define OMAPFB_SYNC_GFX         OMAP_IO(37)
 #define OMAPFB_VSYNC            OMAP_IO(38)
 #define OMAPFB_SET_UPDATE_MODE  OMAP_IOW(40, int)
-#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(41, struct omapfb_update_window_old)
+#define OMAPFB_GET_CAPS         OMAP_IOR(42, struct omapfb_caps)
-#define OMAPFB_GET_CAPS         OMAP_IOR(42, unsigned long)
 #define OMAPFB_GET_UPDATE_MODE  OMAP_IOW(43, int)
 #define OMAPFB_LCD_TEST         OMAP_IOW(45, int)
 #define OMAPFB_CTRL_TEST        OMAP_IOW(46, int)
-#define OMAPFB_UPDATE_WINDOW    OMAP_IOW(47, struct omapfb_update_window)
+#define OMAPFB_UPDATE_WINDOW_OLD OMAP_IOW(47, struct omapfb_update_window_old)
-#define OMAPFB_SETUP_PLANE      OMAP_IOW(48, struct omapfb_setup_plane)
-#define OMAPFB_ENABLE_PLANE     OMAP_IOW(49, struct omapfb_enable_plane)
 #define OMAPFB_SET_COLOR_KEY    OMAP_IOW(50, struct omapfb_color_key)
+#define OMAPFB_GET_COLOR_KEY    OMAP_IOW(51, struct omapfb_color_key)
+#define OMAPFB_SETUP_PLANE      OMAP_IOW(52, struct omapfb_plane_info)
+#define OMAPFB_QUERY_PLANE      OMAP_IOW(53, struct omapfb_plane_info)
+#define OMAPFB_UPDATE_WINDOW    OMAP_IOW(54, struct omapfb_update_window)
+#define OMAPFB_SETUP_MEM        OMAP_IOW(55, struct omapfb_mem_info)
+#define OMAPFB_QUERY_MEM        OMAP_IOW(56, struct omapfb_mem_info)
 #define OMAPFB_CAPS_GENERIC_MASK        0x00000fff
 #define OMAPFB_CAPS_LCDC_MASK           0x00fff000
 #define OMAPFB_CAPS_PANEL_MASK          0xff000000
 #define OMAPFB_CAPS_MANUAL_UPDATE       0x00001000
+#define OMAPFB_CAPS_TEARSYNC            0x00002000
+#define OMAPFB_CAPS_PLANE_RELOCATE_MEM  0x00004000
+#define OMAPFB_CAPS_PLANE_SCALE         0x00008000
+#define OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE 0x00010000
+#define OMAPFB_CAPS_WINDOW_SCALE        0x00020000
+#define OMAPFB_CAPS_WINDOW_OVERLAY      0x00040000
 #define OMAPFB_CAPS_SET_BACKLIGHT       0x01000000
 /* Values from DSP must map to lower 16-bits */
-#define OMAPFB_FORMAT_MASK         0x00ff
+#define OMAPFB_FORMAT_MASK              0x00ff
-#define OMAPFB_FORMAT_FLAG_DOUBLE  0x0100
+#define OMAPFB_FORMAT_FLAG_DOUBLE       0x0100
+#define OMAPFB_FORMAT_FLAG_TEARSYNC     0x0200
+#define OMAPFB_FORMAT_FLAG_FORCE_VSYNC  0x0400
+#define OMAPFB_FORMAT_FLAG_ENABLE_OVERLAY       0x0800
+#define OMAPFB_FORMAT_FLAG_DISABLE_OVERLAY      0x1000
+#define OMAPFB_EVENT_READY      1
+#define OMAPFB_EVENT_DISABLED   2
+#define OMAPFB_MEMTYPE_SDRAM            0
+#define OMAPFB_MEMTYPE_SRAM             1
+#define OMAPFB_MEMTYPE_MAX              1
 enum omapfb_color_format {
        OMAPFB_COLOR_RGB565 = 0,
@@ -64,17 +87,23 @@ enum omapfb_color_format {
        OMAPFB_COLOR_CLUT_4BPP,
        OMAPFB_COLOR_CLUT_2BPP,
        OMAPFB_COLOR_CLUT_1BPP,
+        OMAPFB_COLOR_RGB444,
+        OMAPFB_COLOR_YUY422,
 };
 struct omapfb_update_window {
        __u32 x, y;
        __u32 width, height;
        __u32 format;
+        __u32 out_x, out_y;
+        __u32 out_width, out_height;
+        __u32 reserved[8];
 };
 struct omapfb_update_window_old {
        __u32 x, y;
        __u32 width, height;
+        __u32 format;
 };
 enum omapfb_plane {
@@ -88,18 +117,28 @@ enum omapfb_channel_out {
        OMAPFB_CHANNEL_OUT_DIGIT,
 };
-struct omapfb_setup_plane {
+struct omapfb_plane_info {
-        __u8  plane;
+        __u32 pos_x;
+        __u32 pos_y;
+        __u8  enabled;
        __u8  channel_out;
-        __u32 offset;
+        __u8  mirror;
-        __u32 pos_x, pos_y;
+        __u8  reserved1;
-        __u32 width, height;
+        __u32 out_width;
-        __u32 color_mode;
+        __u32 out_height;
+        __u32 reserved2[12];
 };
-struct omapfb_enable_plane {
+struct omapfb_mem_info {
-        __u8  plane;
+        __u32 size;
-        __u8  enable;
+        __u8  type;
+        __u8  reserved[3];
+};
+struct omapfb_caps {
+        __u32 ctrl;
+        __u32 plane_color;
+        __u32 wnd_color;
 };
 enum omapfb_color_key_type {
@@ -141,6 +180,9 @@ enum omapfb_update_mode {
 #define OMAP_LCDC_PANEL_TFT             0x0100
+#define OMAPFB_PLANE_XRES_MIN           8
+#define OMAPFB_PLANE_YRES_MIN           8
 #ifdef CONFIG_ARCH_OMAP1
 #define OMAPFB_PLANE_NUM                1
 #else
@@ -169,19 +211,19 @@ struct lcd_panel {
        int             pcd;            /* pixel clock divider.
                                           Obsolete use pixel_clock instead */
-        int             (*init)         (struct omapfb_device *fbdev);
+        int             (*init)         (struct lcd_panel *panel,
-        void            (*cleanup)      (void);
+                                         struct omapfb_device *fbdev);
-        int             (*enable)       (void);
+        void            (*cleanup)      (struct lcd_panel *panel);
-        void            (*disable)      (void);
+        int             (*enable)       (struct lcd_panel *panel);
-        unsigned long   (*get_caps)     (void);
+        void            (*disable)      (struct lcd_panel *panel);
-        int             (*set_bklight_level)(unsigned int level);
+        unsigned long   (*get_caps)     (struct lcd_panel *panel);
-        unsigned int    (*get_bklight_level)(void);
+        int             (*set_bklight_level)(struct lcd_panel *panel,
-        unsigned int    (*get_bklight_max)  (void);
+                                             unsigned int level);
-        int             (*run_test)     (int test_num);
+        unsigned int    (*get_bklight_level)(struct lcd_panel *panel);
+        unsigned int    (*get_bklight_max)  (struct lcd_panel *panel);
+        int             (*run_test)     (struct lcd_panel *panel, int test_num);
 };
-struct omapfb_device;
 struct extif_timings {
        int cs_on_time;
        int cs_off_time;
@@ -202,9 +244,10 @@ struct extif_timings {
 };
 struct lcd_ctrl_extif {
-        int  (*init)            (void);
+        int  (*init)            (struct omapfb_device *fbdev);
        void (*cleanup)         (void);
        void (*get_clk_info)    (u32 *clk_period, u32 *max_clk_div);
+        unsigned long (*get_max_tx_rate)(void);
        int  (*convert_timings) (struct extif_timings *timings);
        void (*set_timings)     (const struct extif_timings *timings);
        void (*set_bits_per_cycle)(int bpc);
@@ -213,31 +256,48 @@ struct lcd_ctrl_extif {
        void (*write_data)      (const void *buf, unsigned int len);
        void (*transfer_area)   (int width, int height,
                                 void (callback)(void * data), void *data);
+        int  (*setup_tearsync)  (unsigned pin_cnt,
+                                 unsigned hs_pulse_time, unsigned vs_pulse_time,
+                                 int hs_pol_inv, int vs_pol_inv, int div);
+        int  (*enable_tearsync) (int enable, unsigned line);
        unsigned long           max_transmit_size;
 };
 struct omapfb_notifier_block {
        struct notifier_block   nb;
        void                    *data;
+        int                     plane_idx;
 };
-typedef int (*omapfb_notifier_callback_t)(struct omapfb_notifier_block *,
+typedef int (*omapfb_notifier_callback_t)(struct notifier_block *,
-                                           unsigned long event,
+                                          unsigned long event,
-                                           struct omapfb_device *fbdev);
+                                          void *fbi);
+struct omapfb_mem_region {
+        dma_addr_t      paddr;
+        void            *vaddr;
+        unsigned long   size;
+        u8              type;           /* OMAPFB_PLANE_MEM_* */
+        unsigned        alloc:1;        /* allocated by the driver */
+        unsigned        map:1;          /* kernel mapped by the driver */
+};
+struct omapfb_mem_desc {
+        int                             region_cnt;
+        struct omapfb_mem_region        region[OMAPFB_PLANE_NUM];
+};
 struct lcd_ctrl {
        const char      *name;
        void            *data;
        int             (*init)           (struct omapfb_device *fbdev,
-                                           int ext_mode, int req_vram_size);
+                                           int ext_mode,
+                                           struct omapfb_mem_desc *req_md);
        void            (*cleanup)        (void);
        void            (*bind_client)    (struct omapfb_notifier_block *nb);
-        void            (*get_vram_layout)(unsigned long *size,
+        void            (*get_caps)       (int plane, struct omapfb_caps *caps);
-                                           void **virt_base,
-                                           dma_addr_t *phys_base);
-        int             (*mmap)           (struct vm_area_struct *vma);
-        unsigned long   (*get_caps)       (void);
        int             (*set_update_mode)(enum omapfb_update_mode mode);
        enum omapfb_update_mode (*get_update_mode)(void);
        int             (*setup_plane)    (int plane, int channel_out,
@@ -245,8 +305,16 @@ struct lcd_ctrl {
                                           int screen_width,
                                           int pos_x, int pos_y, int width,
                                           int height, int color_mode);
+        int             (*setup_mem)      (int plane, size_t size,
+                                           int mem_type, unsigned long *paddr);
+        int             (*mmap)           (struct fb_info *info,
+                                           struct vm_area_struct *vma);
+        int             (*set_scale)      (int plane,
+                                           int orig_width, int orig_height,
+                                           int out_width, int out_height);
        int             (*enable_plane)   (int plane, int enable);
-        int             (*update_window)  (struct omapfb_update_window *win,
+        int             (*update_window)  (struct fb_info *fbi,
+                                           struct omapfb_update_window *win,
                                           void (*callback)(void *),
                                           void *callback_data);
        void            (*sync)           (void);
@@ -257,7 +325,7 @@ struct lcd_ctrl {
                                           u16 blue, u16 transp,
                                           int update_hw_mem);
        int             (*set_color_key)  (struct omapfb_color_key *ck);
+        int             (*get_color_key)  (struct omapfb_color_key *ck);
 };
 enum omapfb_state {
@@ -266,19 +334,20 @@ enum omapfb_state {
        OMAPFB_ACTIVE   = 100
 };
+struct omapfb_plane_struct {
+        int                             idx;
+        struct omapfb_plane_info        info;
+        enum omapfb_color_format        color_mode;
+        struct omapfb_device            *fbdev;
+};
 struct omapfb_device {
        int                     state;
        int                     ext_lcdc;               /* Using external
                                                           LCD controller */
        struct mutex            rqueue_mutex;
-        void                    *vram_virt_base;
-        dma_addr_t              vram_phys_base;
-        unsigned long           vram_size;
-        int                     color_mode;
        int                     palette_size;
-        int                     mirror;
        u32                     pseudo_palette[17];
        struct lcd_panel        *panel;                 /* LCD panel */
@@ -286,19 +355,19 @@ struct omapfb_device {
        struct lcd_ctrl         *int_ctrl;              /* internal LCD ctrl */
        struct lcd_ctrl_extif   *ext_if;                /* LCD ctrl external
                                                           interface */
-        struct fb_info          *fb_info;
        struct device           *dev;
+        struct fb_var_screeninfo        new_var;        /* for mode changes */
+        struct omapfb_mem_desc          mem_desc;
+        struct fb_info                  *fb_info[OMAPFB_PLANE_NUM];
 };
 struct omapfb_platform_data {
-        struct omap_lcd_config   lcd;
+        struct omap_lcd_config          lcd;
-        struct omap_fbmem_config fbmem;
+        struct omapfb_mem_desc          mem_desc;
+        void                            *ctrl_platform_data;
 };
-#define OMAPFB_EVENT_READY      1
-#define OMAPFB_EVENT_DISABLED   2
 #ifdef CONFIG_ARCH_OMAP1
 extern struct lcd_ctrl omap1_lcd_ctrl;
 #else
@@ -310,15 +379,16 @@ extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval);
 extern void omapfb_notify_clients(struct omapfb_device *fbdev,
                                  unsigned long event);
 extern int  omapfb_register_client(struct omapfb_notifier_block *nb,
-                                    omapfb_notifier_callback_t callback,
+                                   omapfb_notifier_callback_t callback,
-                                    void *callback_data);
+                                   void *callback_data);
 extern int  omapfb_unregister_client(struct omapfb_notifier_block *nb);
-extern int  omapfb_update_window_async(struct omapfb_update_window *win,
+extern int  omapfb_update_window_async(struct fb_info *fbi,
-                                        void (*callback)(void *),
+                                       struct omapfb_update_window *win,
-                                        void *callback_data);
+                                       void (*callback)(void *),
+                                       void *callback_data);
-/* in arch/arm/plat-omap/devices.c */
+/* in arch/arm/plat-omap/fb.c */
-extern void omapfb_reserve_mem(void);
+extern void omapfb_set_ctrl_platform_data(void *pdata);
 #endif /* __KERNEL__ */
diff --git a/include/asm-arm/arch-omap/sram.h b/include/asm-arm/arch-omap/sram.h
index 6fc0dd57b7c3..bb9bb3fd532f 100644
--- a/include/asm-arm/arch-omap/sram.h
+++ b/include/asm-arm/arch-omap/sram.h
@@ -20,9 +20,6 @@ extern void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val,
                                      u32 mem_type);
 extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);
-extern unsigned long omap_fb_sram_start;
-extern unsigned long omap_fb_sram_size;
 /* Do not use these */
 extern void sram_reprogram_clock(u32 ckctl, u32 dpllctl);
 extern unsigned long sram_reprogram_clock_sz;
diff --git a/include/asm-arm/arch-omap/usb.h b/include/asm-arm/arch-omap/usb.h
index 054fb9a8e0c6..99ae9eabaf71 100644
--- a/include/asm-arm/arch-omap/usb.h
+++ b/include/asm-arm/arch-omap/usb.h
@@ -7,9 +7,27 @@
 /*-------------------------------------------------------------------------*/
-#define OTG_BASE                        0xfffb0400
+#define OMAP1_OTG_BASE                  0xfffb0400
-#define UDC_BASE                        0xfffb4000
+#define OMAP1_UDC_BASE                  0xfffb4000
-#define OMAP_OHCI_BASE                  0xfffba000
+#define OMAP1_OHCI_BASE                 0xfffba000
+#define OMAP2_OHCI_BASE                 0x4805e000
+#define OMAP2_UDC_BASE                  0x4805e200
+#define OMAP2_OTG_BASE                  0x4805e300
+#ifdef CONFIG_ARCH_OMAP1
+#define OTG_BASE                        OMAP1_OTG_BASE
+#define UDC_BASE                        OMAP1_UDC_BASE
+#define OMAP_OHCI_BASE                  OMAP1_OHCI_BASE
+#else
+#define OTG_BASE                        OMAP2_OTG_BASE
+#define UDC_BASE                        OMAP2_UDC_BASE
+#define OMAP_OHCI_BASE                  OMAP2_OHCI_BASE
+#endif
 /*-------------------------------------------------------------------------*/
@@ -28,6 +46,7 @@
 #       define   HST_IDLE_EN            (1 << 14)
 #       define   DEV_IDLE_EN            (1 << 13)
 #       define   OTG_RESET_DONE         (1 << 2)
+#       define   OTG_SOFT_RESET         (1 << 1)
 #define OTG_SYSCON_2_REG                OTG_REG32(0x08)
 #       define   OTG_EN                 (1 << 31)
 #       define   USBX_SYNCHRO           (1 << 30)
@@ -103,6 +122,7 @@
 /*-------------------------------------------------------------------------*/
+/* OMAP1 */
 #define USB_TRANSCEIVER_CTRL_REG        __REG32(0xfffe1000 + 0x0064)
 #       define  CONF_USB2_UNI_R         (1 << 8)
 #       define  CONF_USB1_UNI_R         (1 << 7)
@@ -111,7 +131,17 @@
 #       define  CONF_USB_PWRDN_DM_R     (1 << 2)
 #       define  CONF_USB_PWRDN_DP_R     (1 << 1)
+/* OMAP2 */
+#define CONTROL_DEVCONF_REG             __REG32(L4_24XX_BASE + 0x0274)
+#       define  USB_UNIDIR                      0x0
+#       define  USB_UNIDIR_TLL                  0x1
+#       define  USB_BIDIR                       0x2
+#       define  USB_BIDIR_TLL                   0x3
+#       define  USBT0WRMODEI(x)         ((x) << 22)
+#       define  USBT1WRMODEI(x)         ((x) << 20)
+#       define  USBT2WRMODEI(x)         ((x) << 18)
+#       define  USBT2TLL5PI             (1 << 17)
+#       define  USB0PUENACTLOI          (1 << 16)
+#       define  USBSTANDBYCTRL          (1 << 15)
 #endif  /* __ASM_ARCH_OMAP_USB_H */
diff --git a/include/asm-arm/arch-s3c2410/regs-power.h b/include/asm-arm/arch-s3c2410/regs-power.h
index 6c319ea2afac..94ff96505b6a 100644
--- a/include/asm-arm/arch-s3c2410/regs-power.h
+++ b/include/asm-arm/arch-s3c2410/regs-power.h
@@ -1,4 +1,4 @@
-/* linux/include/asm/arch-s3c2410/regs-power.h
+/* linux/include/asm-arm/arch-s3c2410/regs-power.h
 *
 * Copyright (c) 2003,2004,2005,2006 Simtec Electronics <linux@simtec.co.uk>
 *                    http://armlinux.simtec.co.uk/
diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h b/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
index ff0536d2de42..cd9e26568f85 100644
--- a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
+++ b/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-clock.h
+/* linux/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
 *
 * Copyright (c) 2007 Simtec Electronics
 *      Ben Dooks <ben@simtec.co.uk>
diff --git a/include/asm-arm/arch-s3c2410/regs-watchdog.h b/include/asm-arm/arch-s3c2410/regs-watchdog.h
index f4fff448c7bd..a9c5d491bdb6 100644
--- a/include/asm-arm/arch-s3c2410/regs-watchdog.h
+++ b/include/asm-arm/arch-s3c2410/regs-watchdog.h
@@ -1,4 +1,4 @@
-/* linux/include/asm/arch-s3c2410/regs-watchdog.h
+/* linux/include/asm-arm/arch-s3c2410/regs-watchdog.h
 *
 * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
 *                    http://www.simtec.co.uk/products/SWLINUX/
diff --git a/include/asm-arm/arch-s3c2410/udc.h b/include/asm-arm/arch-s3c2410/udc.h
index e59ec339d614..b8aa6cb69b58 100644
--- a/include/asm-arm/arch-s3c2410/udc.h
+++ b/include/asm-arm/arch-s3c2410/udc.h
@@ -1,4 +1,4 @@
-/* linux/include/asm/arch-s3c2410/udc.h
+/* linux/include/asm-arm/arch-s3c2410/udc.h
 *
 * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
 *
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h
index afad32c76e6c..d1294a46c70c 100644
--- a/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@@ -102,6 +102,14 @@
 //# endif
 #endif
+#if defined(CONFIG_CPU_V7)
+//# ifdef _CACHE
+#  define MULTI_CACHE 1
+//# else
+//#  define _CACHE v7
+//# endif
+#endif
 #if !defined(_CACHE) && !defined(MULTI_CACHE)
 #error Unknown cache maintainence model
 #endif
@@ -418,11 +426,19 @@ static inline void flush_anon_page(struct vm_area_struct *vma,
 */
 #define flush_icache_page(vma,page)     do { } while (0)
-#define __cacheid_present(val)          (val != read_cpuid(CPUID_ID))
+#define __cacheid_present(val)                  (val != read_cpuid(CPUID_ID))
-#define __cacheid_vivt(val)             ((val & (15 << 25)) != (14 << 25))
+#define __cacheid_type_v7(val)                  ((val & (7 << 29)) == (4 << 29))
-#define __cacheid_vipt(val)             ((val & (15 << 25)) == (14 << 25))
-#define __cacheid_vipt_nonaliasing(val) ((val & (15 << 25 | 1 << 23)) == (14 << 25))
+#define __cacheid_vivt_prev7(val)               ((val & (15 << 25)) != (14 << 25))
-#define __cacheid_vipt_aliasing(val)    ((val & (15 << 25 | 1 << 23)) == (14 << 25 | 1 << 23))
+#define __cacheid_vipt_prev7(val)               ((val & (15 << 25)) == (14 << 25))
+#define __cacheid_vipt_nonaliasing_prev7(val)   ((val & (15 << 25 | 1 << 23)) == (14 << 25))
+#define __cacheid_vipt_aliasing_prev7(val)      ((val & (15 << 25 | 1 << 23)) == (14 << 25 | 1 << 23))
+#define __cacheid_vivt(val)                     (__cacheid_type_v7(val) ? 0 : __cacheid_vivt_prev7(val))
+#define __cacheid_vipt(val)                     (__cacheid_type_v7(val) ? 1 : __cacheid_vipt_prev7(val))
+#define __cacheid_vipt_nonaliasing(val)         (__cacheid_type_v7(val) ? 1 : __cacheid_vipt_nonaliasing_prev7(val))
+#define __cacheid_vipt_aliasing(val)            (__cacheid_type_v7(val) ? 0 : __cacheid_vipt_aliasing_prev7(val))
+#define __cacheid_vivt_asid_tagged_instr(val)   (__cacheid_type_v7(val) ? ((val & (3 << 14)) == (1 << 14)) : 0)
 #if defined(CONFIG_CPU_CACHE_VIVT) && !defined(CONFIG_CPU_CACHE_VIPT)
@@ -430,6 +446,7 @@ static inline void flush_anon_page(struct vm_area_struct *vma,
 #define cache_is_vipt()                 0
 #define cache_is_vipt_nonaliasing()     0
 #define cache_is_vipt_aliasing()        0
+#define icache_is_vivt_asid_tagged()    0
 #elif defined(CONFIG_CPU_CACHE_VIPT)
@@ -447,6 +464,12 @@ static inline void flush_anon_page(struct vm_area_struct *vma,
                __cacheid_vipt_aliasing(__val);                         \
        })
+#define icache_is_vivt_asid_tagged()                                    \
+        ({                                                              \
+                unsigned int __val = read_cpuid(CPUID_CACHETYPE);       \
+                __cacheid_vivt_asid_tagged_instr(__val);                \
+        })
 #else
 #define cache_is_vivt()                                                 \
@@ -475,6 +498,13 @@ static inline void flush_anon_page(struct vm_area_struct *vma,
                 __cacheid_vipt_aliasing(__val);                        \
        })
+#define icache_is_vivt_asid_tagged()                                    \
+        ({                                                              \
+                unsigned int __val = read_cpuid(CPUID_CACHETYPE);       \
+                __cacheid_present(__val) &&                             \
+                 __cacheid_vivt_asid_tagged_instr(__val);               \
+        })
 #endif
 #endif
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h
index abfb75b654c7..c8b5d0db0cf0 100644
--- a/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@ -445,7 +445,7 @@ extern void dmabounce_unregister_dev(struct device *);
 *
 * The dmabounce routines call this function whenever a dma-mapping
 * is requested to determine whether a given buffer needs to be bounced
- * or not. The function must return 0 if the the buffer is OK for
+ * or not. The function must return 0 if the buffer is OK for
 * DMA access and 1 if the buffer needs to be bounced.
 *
 */
diff --git a/include/asm-arm/glue.h b/include/asm-arm/glue.h
index 0cc5d3b10ce2..22274ce81375 100644
--- a/include/asm-arm/glue.h
+++ b/include/asm-arm/glue.h
@@ -38,6 +38,7 @@
 *        v5tej_early   - ARMv5 with Thumb and Java early abort handler
 *        xscale        - ARMv5 with Thumb with Xscale extensions
 *        v6_early      - ARMv6 generic early abort handler
+ *        v7_early      - ARMv7 generic early abort handler
 */
 #undef CPU_ABORT_HANDLER
 #undef MULTI_ABORT
@@ -106,6 +107,14 @@
 # endif
 #endif
+#ifdef CONFIG_CPU_ABRT_EV7
+# ifdef CPU_ABORT_HANDLER
+#  define MULTI_ABORT 1
+# else
+#  define CPU_ABORT_HANDLER v7_early_abort
+# endif
+#endif
 #ifndef CPU_ABORT_HANDLER
 #error Unknown data abort handler type
 #endif
diff --git a/include/asm-arm/mmu_context.h b/include/asm-arm/mmu_context.h
index f8755c818b54..4981ad419198 100644
--- a/include/asm-arm/mmu_context.h
+++ b/include/asm-arm/mmu_context.h
@@ -36,8 +36,9 @@ void __check_kvm_seq(struct mm_struct *mm);
 * The context ID is used by debuggers and trace logic, and
 * should be unique within all running processes.
 */
-#define ASID_BITS       8
+#define ASID_BITS               8
-#define ASID_MASK       ((~0) << ASID_BITS)
+#define ASID_MASK               ((~0) << ASID_BITS)
+#define ASID_FIRST_VERSION      (1 << ASID_BITS)
 extern unsigned int cpu_last_asid;
@@ -96,8 +97,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
 #ifdef CONFIG_MMU
        unsigned int cpu = smp_processor_id();
-        if (prev != next) {
+        if (!cpu_test_and_set(cpu, next->cpu_vm_mask) || prev != next) {
-                cpu_set(cpu, next->cpu_vm_mask);
                check_context(next);
                cpu_switch_mm(next->pgd, next);
                if (cache_is_vivt())
diff --git a/include/asm-arm/proc-fns.h b/include/asm-arm/proc-fns.h
index ea7e54c319be..5599d4e5e708 100644
--- a/include/asm-arm/proc-fns.h
+++ b/include/asm-arm/proc-fns.h
@@ -193,6 +193,14 @@
 #   define CPU_NAME cpu_v6
 #  endif
 # endif
+# ifdef CONFIG_CPU_V7
+#  ifdef CPU_NAME
+#   undef  MULTI_CPU
+#   define MULTI_CPU
+#  else
+#   define CPU_NAME cpu_v7
+#  endif
+# endif
 #endif
 #ifndef __ASSEMBLY__
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index f2da3b6e3a83..6f8e6a69dc5f 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -14,6 +14,7 @@
 #define CPU_ARCH_ARMv5TE        6
 #define CPU_ARCH_ARMv5TEJ       7
 #define CPU_ARCH_ARMv6          8
+#define CPU_ARCH_ARMv7          9
 /*
 * CR1 bits (CP#15 CR1)
@@ -155,7 +156,11 @@ extern unsigned int user_debug;
 #define vectors_high()  (0)
 #endif
-#if defined(CONFIG_CPU_XSC3) || __LINUX_ARM_ARCH__ >= 6
+#if __LINUX_ARM_ARCH__ >= 7
+#define isb() __asm__ __volatile__ ("isb" : : : "memory")
+#define dsb() __asm__ __volatile__ ("dsb" : : : "memory")
+#define dmb() __asm__ __volatile__ ("dmb" : : : "memory")
+#elif defined(CONFIG_CPU_XSC3) || __LINUX_ARM_ARCH__ == 6
 #define isb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \
                                    : : "r" (0) : "memory")
 #define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \
diff --git a/include/asm-arm26/io.h b/include/asm-arm26/io.h
index 2aa033bd0678..a5a7a4d5e09c 100644
--- a/include/asm-arm26/io.h
+++ b/include/asm-arm26/io.h
@@ -321,7 +321,7 @@ DECLARE_IO(int,l,"")
 #define mmiowb()
-/* the following macro is depreciated */
+/* the following macro is deprecated */
 #define ioaddr(port)                    __ioaddr((port))
 /*
diff --git a/include/asm-arm26/memory.h b/include/asm-arm26/memory.h
index a65f10b80dfb..7c1e5be39060 100644
--- a/include/asm-arm26/memory.h
+++ b/include/asm-arm26/memory.h
@@ -60,7 +60,7 @@ static inline void *phys_to_virt(unsigned long x)
 /*
 * Virtual <-> DMA view memory address translations
 * Again, these are *only* valid on the kernel direct mapped RAM
- * memory.  Use of these is *depreciated*.
+ * memory.  Use of these is *deprecated*.
 */
 #define virt_to_bus(x)          ((unsigned long)(x))
 #define bus_to_virt(x)          ((void *)((unsigned long)(x)))
@@ -93,7 +93,7 @@ static inline void *phys_to_virt(unsigned long x)
 #define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
 /*
- * We should really eliminate virt_to_bus() here - it's depreciated.
+ * We should really eliminate virt_to_bus() here - it's deprecated.
 */
 #define page_to_bus(page)       (page_address(page))
diff --git a/include/asm-arm26/setup.h b/include/asm-arm26/setup.h
index 1a867b4e8d53..10fd07c76662 100644
--- a/include/asm-arm26/setup.h
+++ b/include/asm-arm26/setup.h
@@ -70,7 +70,7 @@ struct tag_ramdisk {
 /* describes where the compressed ramdisk image lives */
 /*
 * this one accidentally used virtual addresses - as such,
- * its depreciated.
+ * it's deprecated.
 */
 #define ATAG_INITRD     0x54410005
diff --git a/include/asm-avr32/arch-at32ap/cpu.h b/include/asm-avr32/arch-at32ap/cpu.h
new file mode 100644
index 000000000000..2bdc5bd6f793
--- /dev/null
+++ b/include/asm-avr32/arch-at32ap/cpu.h
@@ -0,0 +1,33 @@
+/*
+ * AVR32 and (fake) AT91 CPU identification
+ *
+ * Copyright (C) 2007 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_ARCH_CPU_H
+#define __ASM_ARCH_CPU_H
+/*
+ * Only AT32AP7000 is defined for now. We can identify the specific
+ * chip at runtime, but I'm not sure if it's really worth it.
+ */
+#ifdef CONFIG_CPU_AT32AP7000
+# define cpu_is_at32ap7000()    (1)
+#else
+# define cpu_is_at32ap7000()    (0)
+#endif
+/*
+ * Since this is AVR32, we will never run on any AT91 CPU. But these
+ * definitions may reduce clutter in common drivers.
+ */
+#define cpu_is_at91rm9200()     (0)
+#define cpu_is_at91sam9xe()     (0)
+#define cpu_is_at91sam9260()    (0)
+#define cpu_is_at91sam9261()    (0)
+#define cpu_is_at91sam9263()    (0)
+#endif /* __ASM_ARCH_CPU_H */
diff --git a/include/asm-avr32/setup.h b/include/asm-avr32/setup.h
index 1ff1a217015d..b0828d43e110 100644
--- a/include/asm-avr32/setup.h
+++ b/include/asm-avr32/setup.h
@@ -110,7 +110,7 @@ struct tagtable {
        int     (*parse)(struct tag *);
 };
-#define __tag __attribute_used__ __attribute__((__section__(".taglist")))
+#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
 #define __tagtable(tag, fn)                                             \
        static struct tagtable __tagtable_##fn __tag = { tag, fn }
diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h
index 8f5120471819..2418cce624cc 100644
--- a/include/asm-avr32/unistd.h
+++ b/include/asm-avr32/unistd.h
@@ -295,8 +295,10 @@
 #define __NR_shmdt              276
 #define __NR_shmctl             277
+#define __NR_utimensat          278
 #ifdef __KERNEL__
-#define NR_syscalls             278
+#define NR_syscalls             279
 #define __ARCH_WANT_IPC_PARSE_VERSION
diff --git a/include/asm-blackfin/processor.h b/include/asm-blackfin/processor.h
index 997465c93e82..0336ff132c16 100644
--- a/include/asm-blackfin/processor.h
+++ b/include/asm-blackfin/processor.h
@@ -58,10 +58,10 @@ do {									\
        (_regs)->pc = (_pc);                                            \
        if (current->mm)                                                \
                (_regs)->p5 = current->mm->start_data;                  \
-        current->thread_info->l1_task_info.stack_start                  \
+        task_thread_info(current)->l1_task_info.stack_start             \
                = (void *)current->mm->context.stack_start;             \
-        current->thread_info->l1_task_info.lowest_sp = (void *)(_usp);          \
+        task_thread_info(current)->l1_task_info.lowest_sp = (void *)(_usp); \
-        memcpy(L1_SCRATCH_TASK_INFO, &current->thread_info->l1_task_info,       \
+        memcpy(L1_SCRATCH_TASK_INFO, &task_thread_info(current)->l1_task_info, \
                sizeof(*L1_SCRATCH_TASK_INFO));                         \
        wrusp(_usp);                                                    \
 } while(0)
diff --git a/include/asm-blackfin/system.h b/include/asm-blackfin/system.h
index b5bf6e7cb5e8..5e5f1a0566c0 100644
--- a/include/asm-blackfin/system.h
+++ b/include/asm-blackfin/system.h
@@ -239,9 +239,9 @@ asmlinkage struct task_struct *resume(struct task_struct *prev, struct task_stru
 #define switch_to(prev,next,last) \
 do {    \
-        memcpy (&prev->thread_info->l1_task_info, L1_SCRATCH_TASK_INFO, \
+        memcpy (&task_thread_info(prev)->l1_task_info, L1_SCRATCH_TASK_INFO, \
                sizeof *L1_SCRATCH_TASK_INFO); \
-        memcpy (L1_SCRATCH_TASK_INFO, &next->thread_info->l1_task_info, \
+        memcpy (L1_SCRATCH_TASK_INFO, &task_thread_info(next)->l1_task_info, \
                sizeof *L1_SCRATCH_TASK_INFO); \
        (last) = resume (prev, next);   \
 } while (0)
diff --git a/include/asm-frv/tlb.h b/include/asm-frv/tlb.h
index f94fe5cb9b3a..cd458eb6d75e 100644
--- a/include/asm-frv/tlb.h
+++ b/include/asm-frv/tlb.h
@@ -3,7 +3,11 @@
 #include <asm/tlbflush.h>
+#ifdef CONFIG_MMU
+extern void check_pgt_cache(void);
+#else
 #define check_pgt_cache() do {} while(0)
+#endif
 /*
 * we don't need any special per-pte or per-vma handling...
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
index 584c0417ae4d..d0ea6789b31e 100644
--- a/include/asm-frv/unistd.h
+++ b/include/asm-frv/unistd.h
@@ -186,8 +186,8 @@
 #define __NR_rt_sigtimedwait    177
 #define __NR_rt_sigqueueinfo    178
 #define __NR_rt_sigsuspend      179
-#define __NR_pread              180
+#define __NR_pread64            180
-#define __NR_pwrite             181
+#define __NR_pwrite64           181
 #define __NR_chown              182
 #define __NR_getcwd             183
 #define __NR_capget             184
@@ -316,10 +316,20 @@
 #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_move_pages         317
+#define __NR_getcpu             318
+#define __NR_epoll_pwait        319
 #ifdef __KERNEL__
-#define NR_syscalls 310
+#define NR_syscalls 320
 #define __ARCH_WANT_IPC_PARSE_VERSION
 /* #define __ARCH_WANT_OLD_READDIR */
diff --git a/include/asm-generic/bitops/atomic.h b/include/asm-generic/bitops/atomic.h
index 78339319ba02..cd8a9641bd66 100644
--- a/include/asm-generic/bitops/atomic.h
+++ b/include/asm-generic/bitops/atomic.h
@@ -58,7 +58,7 @@ extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
 * 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,
+ * on non x86 architectures, so if you are writing portable code,
 * make sure not to rely on its reordering guarantees.
 *
 * Note that @nr may be almost arbitrarily large; this function is not
diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h
index 273b50629357..a20fe9822f60 100644
--- a/include/asm-i386/bitops.h
+++ b/include/asm-i386/bitops.h
@@ -27,7 +27,7 @@
 * 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,
+ * on non x86 architectures, so if you are writing portable code,
 * make sure not to rely on its reordering guarantees.
 *
 * Note that @nr may be almost arbitrarily large; this function is not
diff --git a/include/asm-i386/boot.h b/include/asm-i386/boot.h
index e7686d0a8413..bd024ab4fe53 100644
--- a/include/asm-i386/boot.h
+++ b/include/asm-i386/boot.h
@@ -12,7 +12,7 @@
 #define EXTENDED_VGA    0xfffe          /* 80x50 mode */
 #define ASK_VGA         0xfffd          /* ask for it at bootup */
-/* Physical address where kenrel should be loaded. */
+/* Physical address where kernel should be loaded. */
 #define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
                                + (CONFIG_PHYSICAL_ALIGN - 1)) \
                                & ~(CONFIG_PHYSICAL_ALIGN - 1))
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 3503ad66945e..118e9812778f 100644
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -122,21 +122,21 @@ static inline int pfn_valid(int pfn)
        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0)
 #define alloc_bootmem_node(pgdat, x)                                    \
 ({                                                                      \
-        struct pglist_data  __attribute__ ((unused))                    \
+        struct pglist_data  __maybe_unused                      \
                                *__alloc_bootmem_node__pgdat = (pgdat); \
        __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES,        \
                                                __pa(MAX_DMA_ADDRESS)); \
 })
 #define alloc_bootmem_pages_node(pgdat, x)                              \
 ({                                                                      \
-        struct pglist_data  __attribute__ ((unused))                    \
+        struct pglist_data  __maybe_unused                      \
                                *__alloc_bootmem_node__pgdat = (pgdat); \
        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE,              \
                                                __pa(MAX_DMA_ADDRESS))  \
 })
 #define alloc_bootmem_low_pages_node(pgdat, x)                          \
 ({                                                                      \
-        struct pglist_data  __attribute__ ((unused))                    \
+        struct pglist_data  __maybe_unused                      \
                                *__alloc_bootmem_node__pgdat = (pgdat); \
        __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0);          \
 })
diff --git a/include/asm-i386/msr.h b/include/asm-i386/msr.h
index 26861df52cc4..df21ea049369 100644
--- a/include/asm-i386/msr.h
+++ b/include/asm-i386/msr.h
@@ -86,62 +86,50 @@ static inline unsigned long long native_read_pmc(void)
 #define rdmsr(msr,val1,val2)                                            \
        do {                                                            \
-                unsigned long long __val = native_read_msr(msr);        \
+                u64 __val = native_read_msr(msr);                       \
-                val1 = __val;                                           \
+                (val1) = (u32)__val;                                    \
-                val2 = __val >> 32;                                     \
+                (val2) = (u32)(__val >> 32);                            \
        } while(0)
-#define wrmsr(msr,val1,val2)                                            \
+static inline void wrmsr(u32 __msr, u32 __low, u32 __high)
-        native_write_msr(msr, ((unsigned long long)val2 << 32) | val1)
-#define rdmsrl(msr,val)                                 \
-        do {                                            \
-                (val) = native_read_msr(msr);           \
-        } while(0)
-static inline void wrmsrl (unsigned long msr, unsigned long long val)
 {
-        unsigned long lo, hi;
+        native_write_msr(__msr, ((u64)__high << 32) | __low);
-        lo = (unsigned long) val;
-        hi = val >> 32;
-        wrmsr (msr, lo, hi);
 }
+#define rdmsrl(msr,val)                                                 \
+        ((val) = native_read_msr(msr))
+#define wrmsrl(msr,val) native_write_msr(msr, val)
 /* wrmsr with exception handling */
-#define wrmsr_safe(msr,val1,val2)                                               \
+static inline int wrmsr_safe(u32 __msr, u32 __low, u32 __high)
-        (native_write_msr_safe(msr, ((unsigned long long)val2 << 32) | val1))
+{
+        return native_write_msr_safe(__msr, ((u64)__high << 32) | __low);
+}
 /* rdmsr with exception handling */
 #define rdmsr_safe(msr,p1,p2)                                           \
        ({                                                              \
                int __err;                                              \
-                unsigned long long __val = native_read_msr_safe(msr, &__err);\
+                u64 __val = native_read_msr_safe(msr, &__err);          \
-                (*p1) = __val;                                          \
+                (*p1) = (u32)__val;                                     \
-                (*p2) = __val >> 32;                                    \
+                (*p2) = (u32)(__val >> 32);                             \
                __err;                                                  \
        })
-#define rdtsc(low,high)                                         \
-        do {                                                    \
-                u64 _l = native_read_tsc();                     \
-                (low) = (u32)_l;                                \
-                (high) = _l >> 32;                              \
-        } while(0)
 #define rdtscl(low)                                             \
-        do {                                                    \
+        ((low) = (u32)native_read_tsc())
-                (low) = native_read_tsc();                      \
-        } while(0)
-#define rdtscll(val) ((val) = native_read_tsc())
+#define rdtscll(val)                                            \
+        ((val) = native_read_tsc())
 #define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
 #define rdpmc(counter,low,high)                                 \
        do {                                                    \
                u64 _l = native_read_pmc();                     \
-                low = (u32)_l;                                  \
+                (low)  = (u32)_l;                               \
-                high = _l >> 32;                                \
+                (high) = (u32)(_l >> 32);                       \
        } while(0)
 #endif  /* !CONFIG_PARAVIRT */
diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h
index e2e7f98723c5..bc5c12c13581 100644
--- a/include/asm-i386/paravirt.h
+++ b/include/asm-i386/paravirt.h
@@ -560,11 +560,6 @@ static inline u64 paravirt_read_tsc(void)
 {
        return PVOP_CALL0(u64, read_tsc);
 }
-#define rdtsc(low,high) do {                    \
-        u64 _l = paravirt_read_tsc();           \
-        low = (u32)_l;                          \
-        high = _l >> 32;                        \
-} while(0)
 #define rdtscl(low) do {                        \
        u64 _l = paravirt_read_tsc();           \
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h
index 090abc1da32a..0c7132787062 100644
--- a/include/asm-i386/smp.h
+++ b/include/asm-i386/smp.h
@@ -124,20 +124,6 @@ static inline int num_booting_cpus(void)
        return cpus_weight(cpu_callout_map);
 }
-#ifdef CONFIG_X86_LOCAL_APIC
-#ifdef APIC_DEFINITION
-extern int hard_smp_processor_id(void);
-#else
-#include <mach_apicdef.h>
-static inline int hard_smp_processor_id(void)
-{
-        /* we don't want to mark this access volatile - bad code generation */
-        return GET_APIC_ID(*(unsigned long *)(APIC_BASE+APIC_ID));
-}
-#endif
-#endif
 extern int safe_smp_processor_id(void);
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
@@ -152,10 +138,31 @@ extern unsigned int num_processors;
 #define NO_PROC_ID              0xFF            /* No processor magic marker */
-#endif
+#endif /* CONFIG_SMP */
 #ifndef __ASSEMBLY__
+#ifdef CONFIG_X86_LOCAL_APIC
+#ifdef APIC_DEFINITION
+extern int hard_smp_processor_id(void);
+#else
+#include <mach_apicdef.h>
+static inline int hard_smp_processor_id(void)
+{
+        /* we don't want to mark this access volatile - bad code generation */
+        return GET_APIC_ID(*(unsigned long *)(APIC_BASE+APIC_ID));
+}
+#endif /* APIC_DEFINITION */
+#else /* CONFIG_X86_LOCAL_APIC */
+#ifndef CONFIG_SMP
+#define hard_smp_processor_id()         0
+#endif
+#endif /* CONFIG_X86_LOCAL_APIC */
 extern u8 apicid_2_node[];
 #ifdef CONFIG_X86_LOCAL_APIC
diff --git a/include/asm-i386/sync_bitops.h b/include/asm-i386/sync_bitops.h
index 7d72351bea75..cbce08a2d135 100644
--- a/include/asm-i386/sync_bitops.h
+++ b/include/asm-i386/sync_bitops.h
@@ -24,7 +24,7 @@
 * 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,
+ * on non-x86 architectures, so if you are writing portable code,
 * make sure not to rely on its reordering guarantees.
 *
 * Note that @nr may be almost arbitrarily large; this function is not
diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h
index bf01d4b342bd..4cb0f91ae64f 100644
--- a/include/asm-i386/thread_info.h
+++ b/include/asm-i386/thread_info.h
@@ -172,7 +172,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TS_USEDFPU              0x0001  /* FPU was used by this task this quantum (SMP) */
 #define TS_POLLING              0x0002  /* True if in idle loop and not sleeping */
-#define tsk_is_polling(t) ((t)->thread_info->status & TS_POLLING)
+#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
 #endif /* __KERNEL__ */
diff --git a/include/asm-ia64/hw_irq.h b/include/asm-ia64/hw_irq.h
index 27f9df6b9145..c054d7a9aaa7 100644
--- a/include/asm-ia64/hw_irq.h
+++ b/include/asm-ia64/hw_irq.h
@@ -66,6 +66,7 @@ extern int ia64_last_device_vector;
 #define IA64_PERFMON_VECTOR             0xee    /* performanc monitor interrupt vector */
 #define IA64_TIMER_VECTOR               0xef    /* use highest-prio group 15 interrupt for timer */
 #define IA64_MCA_WAKEUP_VECTOR          0xf0    /* MCA wakeup (must be >MCA_RENDEZ_VECTOR) */
+#define IA64_IPI_LOCAL_TLB_FLUSH        0xfc    /* SMP flush local TLB */
 #define IA64_IPI_RESCHEDULE             0xfd    /* SMP reschedule */
 #define IA64_IPI_VECTOR                 0xfe    /* inter-processor interrupt vector */
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h
index 20f98f1751a1..421cb6b62a7c 100644
--- a/include/asm-ia64/iosapic.h
+++ b/include/asm-ia64/iosapic.h
@@ -83,7 +83,7 @@ extern int gsi_to_irq (unsigned int gsi);
 extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity,
                                  unsigned long trigger);
 extern void iosapic_unregister_intr (unsigned int irq);
-extern void __init iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,
+extern void __devinit iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,
                                      unsigned long polarity,
                                      unsigned long trigger);
 extern int __init iosapic_register_platform_intr (u32 int_type,
diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index 60fd4ae014f6..c60024989ebd 100644
--- a/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@ -38,6 +38,8 @@ ia64_get_lid (void)
        return lid.f.id << 8 | lid.f.eid;
 }
+#define hard_smp_processor_id()         ia64_get_lid()
 #ifdef CONFIG_SMP
 #define XTP_OFFSET              0x1e0008
@@ -110,8 +112,6 @@ max_xtp (void)
                writeb(0x0f, ipi_base_addr + XTP_OFFSET); /* Set XTP to max */
 }
-#define hard_smp_processor_id()         ia64_get_lid()
 /* Upping and downing of CPUs */
 extern int __cpu_disable (void);
 extern void __cpu_die (unsigned int cpu);
@@ -128,7 +128,7 @@ extern void unlock_ipi_calllock(void);
 extern void identify_siblings (struct cpuinfo_ia64 *);
 extern int is_multithreading_enabled(void);
-#else
+#else /* CONFIG_SMP */
 #define cpu_logical_id(i)               0
 #define cpu_physical_id(i)              ia64_get_lid()
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index 2c4004eb5a68..291e8ceed6e6 100644
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -106,6 +106,7 @@
 /* interrupt handling */
 #define SAL_INTR_ALLOC          1
 #define SAL_INTR_FREE           2
+#define SAL_INTR_REDIRECT       3
 /*
 * operations available on the generic SN_SAL_SYSCTL_OP
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h
index 91698599f918..7d0241db622b 100644
--- a/include/asm-ia64/thread_info.h
+++ b/include/asm-ia64/thread_info.h
@@ -85,6 +85,7 @@ struct thread_info {
 #define TIF_SYSCALL_TRACE       3       /* syscall trace active */
 #define TIF_SYSCALL_AUDIT       4       /* syscall auditing active */
 #define TIF_SINGLESTEP          5       /* restore singlestep on return to user mode */
+#define TIF_RESTORE_SIGMASK     6       /* restore signal mask in do_signal() */
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17
 #define TIF_MCA_INIT            18      /* this task is processing MCA or INIT */
@@ -96,6 +97,7 @@ struct thread_info {
 #define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
 #define _TIF_SYSCALL_TRACEAUDIT (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP)
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
+#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
@@ -104,12 +106,12 @@ struct thread_info {
 #define _TIF_FREEZE             (1 << TIF_FREEZE)
 /* "work to do on user-return" bits */
-#define TIF_ALLWORK_MASK        (_TIF_NOTIFY_RESUME|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)
+#define TIF_ALLWORK_MASK        (_TIF_NOTIFY_RESUME|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_RESTORE_SIGMASK)
 /* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */
 #define TIF_WORK_MASK           (TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))
 #define TS_POLLING              1       /* true if in idle loop and not sleeping */
-#define tsk_is_polling(t) ((t)->thread_info->status & TS_POLLING)
+#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
 #endif /* _ASM_IA64_THREAD_INFO_H */
diff --git a/include/asm-ia64/tlbflush.h b/include/asm-ia64/tlbflush.h
index cf9acb9bb1fb..e37f9fbf33af 100644
--- a/include/asm-ia64/tlbflush.h
+++ b/include/asm-ia64/tlbflush.h
@@ -27,9 +27,11 @@ extern void local_flush_tlb_all (void);
 #ifdef CONFIG_SMP
  extern void smp_flush_tlb_all (void);
  extern void smp_flush_tlb_mm (struct mm_struct *mm);
+  extern void smp_flush_tlb_cpumask (cpumask_t xcpumask);
 # define flush_tlb_all()        smp_flush_tlb_all()
 #else
 # define flush_tlb_all()        local_flush_tlb_all()
+# define smp_flush_tlb_cpumask(m) local_flush_tlb_all()
 #endif
 static inline void
@@ -94,6 +96,15 @@ flush_tlb_pgtables (struct mm_struct *mm, unsigned long start, unsigned long end
         */
 }
+/*
+ * Flush the local TLB. Invoked from another cpu using an IPI.
+ */
+#ifdef CONFIG_SMP
+void smp_local_flush_tlb(void);
+#else
+#define smp_local_flush_tlb()
+#endif
 #define flush_tlb_kernel_range(start, end)      flush_tlb_all() /* XXX fix me */
 #endif /* _ASM_IA64_TLBFLUSH_H */
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index a9e1fa4cac4d..861c8ec87b09 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -283,7 +283,8 @@
 #define __NR_readlinkat                 1291
 #define __NR_fchmodat                   1292
 #define __NR_faccessat                  1293
-/* 1294, 1295 reserved for pselect/ppoll */
+#define __NR_pselect6                   1294
+#define __NR_ppoll                      1295
 #define __NR_unshare                    1296
 #define __NR_splice                     1297
 #define __NR_set_robust_list            1298
@@ -300,6 +301,7 @@
 #define NR_syscalls                     281 /* length of syscall table */
 #define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #ifdef CONFIG_IA32_SUPPORT
 # define __ARCH_WANT_SYS_FADVISE64
@@ -310,6 +312,7 @@
 # define __ARCH_WANT_SYS_OLDUMOUNT
 # define __ARCH_WANT_SYS_SIGPENDING
 # define __ARCH_WANT_SYS_SIGPROCMASK
+# define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
 # define __ARCH_WANT_COMPAT_SYS_TIME
 #endif
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h
index abd937ac5239..078e1a51a042 100644
--- a/include/asm-m32r/smp.h
+++ b/include/asm-m32r/smp.h
@@ -108,6 +108,10 @@ extern unsigned long send_IPI_mask_phys(cpumask_t, int, int);
 #define IPI_SHIFT       (0)
 #define NR_IPIS         (8)
-#endif  /* CONFIG_SMP */
+#else   /* CONFIG_SMP */
+#define hard_smp_processor_id()         0
+#endif /* CONFIG_SMP */
 #endif  /* _ASM_M32R_SMP_H */
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 06cdece35865..f62f5c9abba6 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -136,7 +136,7 @@ extern void  __xchg_called_with_bad_pointer(void);
        "add3   "reg0", "addr", #0x2000;                \n\t"   \
        "ld     "reg0", @"reg0";                        \n\t"   \
        "unlock "reg0", @"reg1";                        \n\t"
-        /* FIXME: This workaround code cannot handle kenrel modules
+        /* FIXME: This workaround code cannot handle kernel modules
         * correctly under SMP environment.
         */
 #else   /* CONFIG_CHIP_M32700_TS1 */
diff --git a/include/asm-m68k/atarihw.h b/include/asm-m68k/atarihw.h
index f28acd0fd689..6211363a345f 100644
--- a/include/asm-m68k/atarihw.h
+++ b/include/asm-m68k/atarihw.h
@@ -2,7 +2,7 @@
 ** linux/atarihw.h -- This header defines some macros and pointers for
 **                    the various Atari custom hardware registers.
 **
-** Copyright 1994 by Bj�rn Brauel
+** Copyright 1994 by Bj��rn Brauel
 **
 ** 5/1/94 Roman Hodek:
 **   Added definitions for TT specific chips.
diff --git a/include/asm-m68k/atariints.h b/include/asm-m68k/atariints.h
index 0ed454fc24bb..ce6c445805bd 100644
--- a/include/asm-m68k/atariints.h
+++ b/include/asm-m68k/atariints.h
@@ -1,7 +1,7 @@
 /*
 ** atariints.h -- Atari Linux interrupt handling structs and prototypes
 **
-** Copyright 1994 by Bj�rn Brauel
+** Copyright 1994 by Bj��rn Brauel
 **
 ** 5/2/94 Roman Hodek:
 **   TT interrupt definitions added.
diff --git a/include/asm-m68k/scatterlist.h b/include/asm-m68k/scatterlist.h
index 8e612266da51..24887a2d9c7b 100644
--- a/include/asm-m68k/scatterlist.h
+++ b/include/asm-m68k/scatterlist.h
@@ -1,6 +1,8 @@
 #ifndef _M68K_SCATTERLIST_H
 #define _M68K_SCATTERLIST_H
+#include <linux/types.h>
 struct scatterlist {
        struct page *page;
        unsigned int offset;
diff --git a/include/asm-m68k/thread_info.h b/include/asm-m68k/thread_info.h
index c4d622a57dfb..d635a3752488 100644
--- a/include/asm-m68k/thread_info.h
+++ b/include/asm-m68k/thread_info.h
@@ -37,17 +37,17 @@ struct thread_info {
 #define init_stack              (init_thread_union.stack)
 #define task_thread_info(tsk)   (&(tsk)->thread.info)
-#define task_stack_page(tsk)    ((void *)(tsk)->thread_info)
+#define task_stack_page(tsk)    ((tsk)->stack)
 #define current_thread_info()   task_thread_info(current)
 #define __HAVE_THREAD_FUNCTIONS
 #define setup_thread_stack(p, org) ({                   \
-        *(struct task_struct **)(p)->thread_info = (p); \
+        *(struct task_struct **)(p)->stack = (p);       \
        task_thread_info(p)->task = (p);                \
 })
-#define end_of_stack(p) ((unsigned long *)(p)->thread_info + 1)
+#define end_of_stack(p) ((unsigned long *)(p)->stack + 1)
 /* entry.S relies on these definitions!
 * bits 0-7 are tested at every exception exit
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index c7c945baf1ee..dbf834f4dac4 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -254,7 +254,7 @@ extern void free_init_pages(const char *what,
 extern char arcs_cmdline[CL_SIZE];
 /*
- * Registers a0, a1, a3 and a4 as passed to the kenrel entry by firmware
+ * Registers a0, a1, a3 and a4 as passed to the kernel entry by firmware
 */
 extern unsigned long fw_arg0, fw_arg1, fw_arg2, fw_arg3;
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 30f23a2b46ca..3713d256d369 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -55,7 +55,7 @@ do {									\
        if (cpu_has_dsp)                                                \
                __save_dsp(prev);                                       \
        next->thread.emulated_fp = 0;                                   \
-        (last) = resume(prev, next, next->thread_info);                 \
+        (last) = resume(prev, next, task_thread_info(next));            \
        if (cpu_has_dsp)                                                \
                __restore_dsp(current);                                 \
 } while(0)
diff --git a/include/asm-parisc/compat.h b/include/asm-parisc/compat.h
index fe8579023531..11f4222597a0 100644
--- a/include/asm-parisc/compat.h
+++ b/include/asm-parisc/compat.h
@@ -152,7 +152,7 @@ static __inline__ void __user *compat_alloc_user_space(long len)
 static inline int __is_compat_task(struct task_struct *t)
 {
-        return test_ti_thread_flag(t->thread_info, TIF_32BIT);
+        return test_ti_thread_flag(task_thread_info(t), TIF_32BIT);
 }
 static inline int is_compat_task(void)
diff --git a/include/asm-powerpc/mmu-hash64.h b/include/asm-powerpc/mmu-hash64.h
index 6739457d8bc0..e2ca55bcfe0b 100644
--- a/include/asm-powerpc/mmu-hash64.h
+++ b/include/asm-powerpc/mmu-hash64.h
@@ -350,10 +350,13 @@ typedef unsigned long mm_context_id_t;
 typedef struct {
        mm_context_id_t id;
-        u16 user_psize;                 /* page size index */
+        u16 user_psize;         /* page size index */
-        u16 sllp;                       /* SLB entry page size encoding */
-#ifdef CONFIG_HUGETLB_PAGE
+#ifdef CONFIG_PPC_MM_SLICES
-        u16 low_htlb_areas, high_htlb_areas;
+        u64 low_slices_psize;   /* SLB page size encodings */
+        u64 high_slices_psize;  /* 4 bits per slice for now */
+#else
+        u16 sllp;               /* SLB page size encoding */
 #endif
        unsigned long vdso_base;
 } mm_context_t;
diff --git a/include/asm-powerpc/paca.h b/include/asm-powerpc/paca.h
index cf95274f735e..c6a5b1735666 100644
--- a/include/asm-powerpc/paca.h
+++ b/include/asm-powerpc/paca.h
@@ -83,8 +83,8 @@ struct paca_struct {
        mm_context_t context;
        u16 vmalloc_sllp;
-        u16 slb_cache[SLB_CACHE_ENTRIES];
        u16 slb_cache_ptr;
+        u16 slb_cache[SLB_CACHE_ENTRIES];
        /*
         * then miscellaneous read-write fields
diff --git a/include/asm-powerpc/page_64.h b/include/asm-powerpc/page_64.h
index eab779c21995..3448a3d4bc64 100644
--- a/include/asm-powerpc/page_64.h
+++ b/include/asm-powerpc/page_64.h
@@ -88,57 +88,55 @@ extern unsigned int HPAGE_SHIFT;
 #endif /* __ASSEMBLY__ */
-#ifdef CONFIG_HUGETLB_PAGE
+#ifdef CONFIG_PPC_MM_SLICES
-#define HTLB_AREA_SHIFT         40
+#define SLICE_LOW_SHIFT         28
-#define HTLB_AREA_SIZE          (1UL << HTLB_AREA_SHIFT)
+#define SLICE_HIGH_SHIFT        40
-#define GET_HTLB_AREA(x)        ((x) >> HTLB_AREA_SHIFT)
-#define LOW_ESID_MASK(addr, len)    \
+#define SLICE_LOW_TOP           (0x100000000ul)
-        (((1U << (GET_ESID(min((addr)+(len)-1, 0x100000000UL))+1)) \
+#define SLICE_NUM_LOW           (SLICE_LOW_TOP >> SLICE_LOW_SHIFT)
-          - (1U << GET_ESID(min((addr), 0x100000000UL)))) & 0xffff)
+#define SLICE_NUM_HIGH          (PGTABLE_RANGE >> SLICE_HIGH_SHIFT)
-#define HTLB_AREA_MASK(addr, len)   (((1U << (GET_HTLB_AREA(addr+len-1)+1)) \
-                                      - (1U << GET_HTLB_AREA(addr))) & 0xffff)
-#define ARCH_HAS_HUGEPAGE_ONLY_RANGE
+#define GET_LOW_SLICE_INDEX(addr)       ((addr) >> SLICE_LOW_SHIFT)
-#define ARCH_HAS_HUGETLB_FREE_PGD_RANGE
+#define GET_HIGH_SLICE_INDEX(addr)      ((addr) >> SLICE_HIGH_SHIFT)
-#define ARCH_HAS_PREPARE_HUGEPAGE_RANGE
-#define ARCH_HAS_SETCLEAR_HUGE_PTE
-#define touches_hugepage_low_range(mm, addr, len) \
+#ifndef __ASSEMBLY__
-        (((addr) < 0x100000000UL) \
-         && (LOW_ESID_MASK((addr), (len)) & (mm)->context.low_htlb_areas))
+struct slice_mask {
-#define touches_hugepage_high_range(mm, addr, len) \
+        u16 low_slices;
-        ((((addr) + (len)) > 0x100000000UL) \
+        u16 high_slices;
-          && (HTLB_AREA_MASK((addr), (len)) & (mm)->context.high_htlb_areas))
+};
-#define __within_hugepage_low_range(addr, len, segmask) \
+struct mm_struct;
-        ( (((addr)+(len)) <= 0x100000000UL) \
-          && ((LOW_ESID_MASK((addr), (len)) | (segmask)) == (segmask)))
-#define within_hugepage_low_range(addr, len) \
-        __within_hugepage_low_range((addr), (len), \
-                                    current->mm->context.low_htlb_areas)
-#define __within_hugepage_high_range(addr, len, zonemask) \
-        ( ((addr) >= 0x100000000UL) \
-          && ((HTLB_AREA_MASK((addr), (len)) | (zonemask)) == (zonemask)))
-#define within_hugepage_high_range(addr, len) \
-        __within_hugepage_high_range((addr), (len), \
-                                    current->mm->context.high_htlb_areas)
-#define is_hugepage_only_range(mm, addr, len) \
-        (touches_hugepage_high_range((mm), (addr), (len)) || \
-          touches_hugepage_low_range((mm), (addr), (len)))
-#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
-#define in_hugepage_area(context, addr) \
+extern unsigned long slice_get_unmapped_area(unsigned long addr,
-        (cpu_has_feature(CPU_FTR_16M_PAGE) && \
+                                             unsigned long len,
-         ( ( (addr) >= 0x100000000UL) \
+                                             unsigned long flags,
-           ? ((1 << GET_HTLB_AREA(addr)) & (context).high_htlb_areas) \
+                                             unsigned int psize,
-           : ((1 << GET_ESID(addr)) & (context).low_htlb_areas) ) )
+                                             int topdown,
+                                             int use_cache);
-#else /* !CONFIG_HUGETLB_PAGE */
+extern unsigned int get_slice_psize(struct mm_struct *mm,
+                                    unsigned long addr);
-#define in_hugepage_area(mm, addr)      0
+extern void slice_init_context(struct mm_struct *mm, unsigned int psize);
+extern void slice_set_user_psize(struct mm_struct *mm, unsigned int psize);
+#define ARCH_HAS_HUGEPAGE_ONLY_RANGE
+extern int is_hugepage_only_range(struct mm_struct *m,
+                                  unsigned long addr,
+                                  unsigned long len);
+#endif /* __ASSEMBLY__ */
+#else
+#define slice_init()
+#endif /* CONFIG_PPC_MM_SLICES */
+#ifdef CONFIG_HUGETLB_PAGE
+#define ARCH_HAS_HUGETLB_FREE_PGD_RANGE
+#define ARCH_HAS_SETCLEAR_HUGE_PTE
+#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
 #endif /* !CONFIG_HUGETLB_PAGE */
diff --git a/include/asm-powerpc/pgalloc-64.h b/include/asm-powerpc/pgalloc-64.h
index 30b50cf56e2c..d9a3a8ca58a1 100644
--- a/include/asm-powerpc/pgalloc-64.h
+++ b/include/asm-powerpc/pgalloc-64.h
@@ -14,18 +14,11 @@
 extern struct kmem_cache *pgtable_cache[];
-#ifdef CONFIG_PPC_64K_PAGES
+#define PGD_CACHE_NUM           0
-#define PTE_CACHE_NUM   0
+#define PUD_CACHE_NUM           1
-#define PMD_CACHE_NUM   1
+#define PMD_CACHE_NUM           1
-#define PGD_CACHE_NUM   2
+#define HUGEPTE_CACHE_NUM       2
-#define HUGEPTE_CACHE_NUM 3
+#define PTE_NONCACHE_NUM        3  /* from GFP rather than kmem_cache */
-#else
-#define PTE_CACHE_NUM   0
-#define PMD_CACHE_NUM   1
-#define PUD_CACHE_NUM   1
-#define PGD_CACHE_NUM   0
-#define HUGEPTE_CACHE_NUM 2
-#endif
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
@@ -91,8 +84,7 @@ static inline void pmd_free(pmd_t *pmd)
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                          unsigned long address)
 {
-        return kmem_cache_alloc(pgtable_cache[PTE_CACHE_NUM],
+        return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
-                                GFP_KERNEL|__GFP_REPEAT);
 }
 static inline struct page *pte_alloc_one(struct mm_struct *mm,
@@ -103,12 +95,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
 static inline void pte_free_kernel(pte_t *pte)
 {
-        kmem_cache_free(pgtable_cache[PTE_CACHE_NUM], pte);
+        free_page((unsigned long)pte);
 }
 static inline void pte_free(struct page *ptepage)
 {
-        pte_free_kernel(page_address(ptepage));
+        __free_page(ptepage);
 }
 #define PGF_CACHENUM_MASK       0x3
@@ -130,14 +122,17 @@ static inline void pgtable_free(pgtable_free_t pgf)
        void *p = (void *)(pgf.val & ~PGF_CACHENUM_MASK);
        int cachenum = pgf.val & PGF_CACHENUM_MASK;
-        kmem_cache_free(pgtable_cache[cachenum], p);
+        if (cachenum == PTE_NONCACHE_NUM)
+                free_page((unsigned long)p);
+        else
+                kmem_cache_free(pgtable_cache[cachenum], p);
 }
 extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf);
 #define __pte_free_tlb(tlb, ptepage)    \
        pgtable_free_tlb(tlb, pgtable_free_cache(page_address(ptepage), \
-                PTE_CACHE_NUM, PTE_TABLE_SIZE-1))
+                PTE_NONCACHE_NUM, PTE_TABLE_SIZE-1))
 #define __pmd_free_tlb(tlb, pmd)        \
        pgtable_free_tlb(tlb, pgtable_free_cache(pmd, \
                PMD_CACHE_NUM, PMD_TABLE_SIZE-1))
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h
index 1744d6ac12a2..add5481fd7c7 100644
--- a/include/asm-powerpc/pgtable-4k.h
+++ b/include/asm-powerpc/pgtable-4k.h
@@ -80,7 +80,11 @@
 #define pte_iterate_hashed_end() } while(0)
-#define pte_pagesize_index(pte) MMU_PAGE_4K
+#ifdef CONFIG_PPC_HAS_HASH_64K
+#define pte_pagesize_index(mm, addr, pte)       get_slice_psize(mm, addr)
+#else
+#define pte_pagesize_index(mm, addr, pte)       MMU_PAGE_4K
+#endif
 /*
 * 4-level page tables related bits
diff --git a/include/asm-powerpc/pgtable-64k.h b/include/asm-powerpc/pgtable-64k.h
index 16ef4978520d..31cbd3d7fce8 100644
--- a/include/asm-powerpc/pgtable-64k.h
+++ b/include/asm-powerpc/pgtable-64k.h
@@ -35,6 +35,11 @@
 #define _PAGE_HPTE_SUB0 0x08000000 /* combo only: first sub page */
 #define _PAGE_COMBO     0x10000000 /* this is a combo 4k page */
 #define _PAGE_4K_PFN    0x20000000 /* PFN is for a single 4k page */
+/* Note the full page bits must be in the same location as for normal
+ * 4k pages as the same asssembly will be used to insert 64K pages
+ * wether the kernel has CONFIG_PPC_64K_PAGES or not
+ */
 #define _PAGE_F_SECOND  0x00008000 /* full page: hidx bits */
 #define _PAGE_F_GIX     0x00007000 /* full page: hidx bits */
@@ -88,7 +93,7 @@
 #define pte_iterate_hashed_end() } while(0); } } while(0)
-#define pte_pagesize_index(pte) \
+#define pte_pagesize_index(mm, addr, pte)       \
        (((pte) & _PAGE_COMBO)? MMU_PAGE_4K: MMU_PAGE_64K)
 #define remap_4k_pfn(vma, addr, pfn, prot)                              \
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index d74b2965bb82..6dcd7a811fe1 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -64,7 +64,7 @@ struct pci_dev *pci_get_device_by_addr(unsigned long addr);
 * eeh_slot_error_detail -- record and EEH error condition to the log
 * @severity: 1 if temporary, 2 if permanent failure.
 *
- * Obtains the the EEH error details from the RTAS subsystem,
+ * Obtains the EEH error details from the RTAS subsystem,
 * and then logs these details with the RTAS error log system.
 */
 void eeh_slot_error_detail (struct pci_dn *pdn, int severity);
diff --git a/include/asm-powerpc/smp.h b/include/asm-powerpc/smp.h
index 01717f266dc9..d037f50580e2 100644
--- a/include/asm-powerpc/smp.h
+++ b/include/asm-powerpc/smp.h
@@ -83,6 +83,7 @@ extern void __cpu_die(unsigned int cpu);
 #else
 /* for UP */
+#define hard_smp_processor_id()         0
 #define smp_setup_cpu_maps()
 #endif /* CONFIG_SMP */
diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h
index 02e56a6685a2..c48ae185c874 100644
--- a/include/asm-powerpc/spu_csa.h
+++ b/include/asm-powerpc/spu_csa.h
@@ -235,6 +235,12 @@ struct spu_priv2_collapsed {
 */
 struct spu_state {
        struct spu_lscsa *lscsa;
+#ifdef CONFIG_SPU_FS_64K_LS
+        int             use_big_pages;
+        /* One struct page per 64k page */
+#define SPU_LSCSA_NUM_BIG_PAGES (sizeof(struct spu_lscsa) / 0x10000)
+        struct page     *lscsa_pages[SPU_LSCSA_NUM_BIG_PAGES];
+#endif
        struct spu_problem_collapsed prob;
        struct spu_priv1_collapsed priv1;
        struct spu_priv2_collapsed priv2;
@@ -247,12 +253,14 @@ struct spu_state {
        spinlock_t register_lock;
 };
-extern void spu_init_csa(struct spu_state *csa);
+extern int spu_init_csa(struct spu_state *csa);
 extern void spu_fini_csa(struct spu_state *csa);
 extern int spu_save(struct spu_state *prev, struct spu *spu);
 extern int spu_restore(struct spu_state *new, struct spu *spu);
 extern int spu_switch(struct spu_state *prev, struct spu_state *new,
                      struct spu *spu);
+extern int spu_alloc_lscsa(struct spu_state *csa);
+extern void spu_free_lscsa(struct spu_state *csa);
 #endif /* !__SPU__ */
 #endif /* __KERNEL__ */
diff --git a/include/asm-ppc/hydra.h b/include/asm-ppc/hydra.h
index 833a8aff2a80..1ad4eed07fbe 100644
--- a/include/asm-ppc/hydra.h
+++ b/include/asm-ppc/hydra.h
@@ -8,7 +8,7 @@
 *      Macintosh Technology in the Common Hardware Reference Platform
 *      Apple Computer, Inc.
 *
- *      � Copyright 1995 Apple Computer, Inc. All rights reserved.
+ *      �� Copyright 1995 Apple Computer, Inc. All rights reserved.
 *
 *  It's available online from http://chrp.apple.com/MacTech.pdf.
 *  You can obtain paper copies of this book from computer bookstores or by
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h
index 0a28e6d6ef40..76e424f718c6 100644
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
@@ -110,6 +110,7 @@ static inline void smp_send_stop(void)
        __load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
 }
+#define hard_smp_processor_id()         0
 #define smp_cpu_not_running(cpu)        1
 #define smp_setup_cpu_possible_map()    do { } while (0)
 #endif
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index 794c36daf06d..46f925c815ac 100644
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
@@ -1,12 +1,12 @@
 #ifndef __ASM_SH_BUG_H
 #define __ASM_SH_BUG_H
+#define TRAPA_BUG_OPCODE        0xc33e  /* trapa #0x3e */
 #ifdef CONFIG_BUG
 #define HAVE_ARCH_BUG
 #define HAVE_ARCH_WARN_ON
-#define TRAPA_BUG_OPCODE        0xc33e  /* trapa #0x3e */
 /**
 * _EMIT_BUG_ENTRY
 * %1 - __FILE__
diff --git a/include/asm-sh/cpu-features.h b/include/asm-sh/cpu-features.h
index 4bccd7c032f9..86308aa39731 100644
--- a/include/asm-sh/cpu-features.h
+++ b/include/asm-sh/cpu-features.h
@@ -20,5 +20,6 @@
 #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 */
+#define CPU_HAS_OP32            0x0100  /* 32-bit instruction support */
 #endif /* __ASM_SH_CPU_FEATURES_H */
diff --git a/include/asm-sh/cpu-sh3/dma.h b/include/asm-sh/cpu-sh3/dma.h
index 954801b46022..3a66dc458023 100644
--- a/include/asm-sh/cpu-sh3/dma.h
+++ b/include/asm-sh/cpu-sh3/dma.h
@@ -26,7 +26,7 @@ enum {
        XMIT_SZ_128BIT,
 };
-static unsigned int ts_shift[] __attribute__ ((used)) = {
+static unsigned int ts_shift[] __maybe_unused = {
        [XMIT_SZ_8BIT]          = 0,
        [XMIT_SZ_16BIT]         = 1,
        [XMIT_SZ_32BIT]         = 2,
diff --git a/include/asm-sh/cpu-sh4/dma-sh7780.h b/include/asm-sh/cpu-sh4/dma-sh7780.h
index 6c90d28331b2..71b426a6e482 100644
--- a/include/asm-sh/cpu-sh4/dma-sh7780.h
+++ b/include/asm-sh/cpu-sh4/dma-sh7780.h
@@ -28,7 +28,7 @@ enum {
 /*
 * The DMA count is defined as the number of bytes to transfer.
 */
-static unsigned int __attribute__ ((used)) ts_shift[] = {
+static unsigned int ts_shift[] __maybe_unused = {
        [XMIT_SZ_8BIT]          = 0,
        [XMIT_SZ_16BIT]         = 1,
        [XMIT_SZ_32BIT]         = 2,
diff --git a/include/asm-sh/cpu-sh4/dma.h b/include/asm-sh/cpu-sh4/dma.h
index c135e9cebd9c..36e26a964765 100644
--- a/include/asm-sh/cpu-sh4/dma.h
+++ b/include/asm-sh/cpu-sh4/dma.h
@@ -53,7 +53,7 @@ enum {
 /*
 * The DMA count is defined as the number of bytes to transfer.
 */
-static unsigned int ts_shift[] __attribute__ ((used)) = {
+static unsigned int ts_shift[] __maybe_unused = {
        [XMIT_SZ_64BIT]         = 3,
        [XMIT_SZ_8BIT]          = 0,
        [XMIT_SZ_16BIT]         = 1,
diff --git a/include/asm-sh/dmabrg.h b/include/asm-sh/dmabrg.h
new file mode 100644
index 000000000000..c5edba216cf1
--- /dev/null
+++ b/include/asm-sh/dmabrg.h
@@ -0,0 +1,23 @@
+/*
+ * SH7760 DMABRG (USB/Audio) support
+ */
+#ifndef _DMABRG_H_
+#define _DMABRG_H_
+/* IRQ sources */
+#define DMABRGIRQ_USBDMA        0
+#define DMABRGIRQ_USBDMAERR     1
+#define DMABRGIRQ_A0TXF         2
+#define DMABRGIRQ_A0TXH         3
+#define DMABRGIRQ_A0RXF         4
+#define DMABRGIRQ_A0RXH         5
+#define DMABRGIRQ_A1TXF         6
+#define DMABRGIRQ_A1TXH         7
+#define DMABRGIRQ_A1RXF         8
+#define DMABRGIRQ_A1RXH         9
+extern int dmabrg_request_irq(unsigned int, void(*)(void *), void *);
+extern void dmabrg_free_irq(unsigned int);
+#endif
diff --git a/include/asm-sh/edosk7705.h b/include/asm-sh/edosk7705.h
index a1089a65bc36..5bdc9d9be3de 100644
--- a/include/asm-sh/edosk7705.h
+++ b/include/asm-sh/edosk7705.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sh/edosk7705/io.h
+ * include/asm-sh/edosk7705.h
 *
 * Modified version of io_se.h for the EDOSK7705 specific functions.
 *
diff --git a/include/asm-sh/kdebug.h b/include/asm-sh/kdebug.h
index 493c20629747..16578b7c9da1 100644
--- a/include/asm-sh/kdebug.h
+++ b/include/asm-sh/kdebug.h
@@ -2,20 +2,6 @@
 #define __ASM_SH_KDEBUG_H
 #include <linux/notifier.h>
-#include <asm-generic/kdebug.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 shdie_chain;
 /* Grossly misnamed. */
 enum die_val {
@@ -23,14 +9,7 @@ enum die_val {
        DIE_PAGE_FAULT,
 };
-static inline int notify_die(enum die_val val, struct pt_regs *regs,
+int register_page_fault_notifier(struct notifier_block *nb);
-                             int trap, int sig)
+int unregister_page_fault_notifier(struct notifier_block *nb);
-{
-        struct die_args args = {
-                .regs = regs,
-                .trapnr = trap,
-        };
-        return atomic_notifier_call_chain(&shdie_chain, val, &args);
-}
 #endif /* __ASM_SH_KDEBUG_H */
diff --git a/include/asm-sh/pgalloc.h b/include/asm-sh/pgalloc.h
index 888e4529e6fe..18b613c57cf5 100644
--- a/include/asm-sh/pgalloc.h
+++ b/include/asm-sh/pgalloc.h
@@ -1,6 +1,12 @@
 #ifndef __ASM_SH_PGALLOC_H
 #define __ASM_SH_PGALLOC_H
+#include <linux/quicklist.h>
+#include <asm/page.h>
+#define QUICK_PGD 0     /* We preserve special mappings over free */
+#define QUICK_PT 1      /* Other page table pages that are zero on free */
 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
                                       pte_t *pte)
 {
@@ -13,48 +19,49 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
        set_pmd(pmd, __pmd((unsigned long)page_address(pte)));
 }
+static inline void pgd_ctor(void *x)
+{
+        pgd_t *pgd = x;
+        memcpy(pgd + USER_PTRS_PER_PGD,
+               swapper_pg_dir + USER_PTRS_PER_PGD,
+               (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
+}
 /*
 * Allocate and free page tables.
 */
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
-        pgd_t *pgd = (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT);
+        return quicklist_alloc(QUICK_PGD, GFP_KERNEL | __GFP_REPEAT, pgd_ctor);
-        if (pgd) {
-                memset(pgd, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));
-                memcpy(pgd + USER_PTRS_PER_PGD,
-                       swapper_pg_dir + USER_PTRS_PER_PGD,
-                       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
-        }
-        return pgd;
 }
 static inline void pgd_free(pgd_t *pgd)
 {
-        free_page((unsigned long)pgd);
+        quicklist_free(QUICK_PGD, NULL, pgd);
 }
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                          unsigned long address)
 {
-        return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
+        return quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL);
 }
 static inline struct page *pte_alloc_one(struct mm_struct *mm,
                                         unsigned long address)
 {
-        return alloc_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
+        void *pg = quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL);
+        return pg ? virt_to_page(pg) : NULL;
 }
 static inline void pte_free_kernel(pte_t *pte)
 {
-        free_page((unsigned long)pte);
+        quicklist_free(QUICK_PT, NULL, pte);
 }
 static inline void pte_free(struct page *pte)
 {
-        __free_page(pte);
+        quicklist_free_page(QUICK_PT, NULL, pte);
 }
 #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
@@ -66,6 +73,11 @@ static inline void pte_free(struct page *pte)
 #define pmd_free(x)                     do { } while (0)
 #define __pmd_free_tlb(tlb,x)           do { } while (0)
-#define check_pgt_cache()               do { } while (0)
+static inline void check_pgt_cache(void)
+{
+        quicklist_trim(QUICK_PGD, NULL, 25, 16);
+        quicklist_trim(QUICK_PT, NULL, 25, 16);
+}
 #endif /* __ASM_SH_PGALLOC_H */
diff --git a/include/asm-sh/snapgear.h b/include/asm-sh/snapgear.h
index 6b5e4ddc073a..2d712e72c9e5 100644
--- a/include/asm-sh/snapgear.h
+++ b/include/asm-sh/snapgear.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-sh/snapgear/io.h
+ * include/asm-sh/snapgear.h
 *
 * Modified version of io_se.h for the snapgear-specific functions.
 *
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index e7e96ee0c8a5..82f3e229e621 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -255,6 +255,15 @@ static inline void *set_exception_table_evt(unsigned int evt, void *handler)
        return set_exception_table_vec(evt >> 5, handler);
 }
+/*
+ * SH-2A has both 16 and 32-bit opcodes, do lame encoding checks.
+ */
+#ifdef CONFIG_CPU_SH2A
+extern unsigned int instruction_size(unsigned int insn);
+#else
+#define instruction_size(insn)  (2)
+#endif
 /* XXX
 * disable hlt during certain critical i/o operations
 */
diff --git a/include/asm-sh/timer.h b/include/asm-sh/timer.h
index 17b5e76a4c31..701ba84c7049 100644
--- a/include/asm-sh/timer.h
+++ b/include/asm-sh/timer.h
@@ -2,12 +2,14 @@
 #define __ASM_SH_TIMER_H
 #include <linux/sysdev.h>
+#include <linux/clocksource.h>
 #include <asm/cpu/timer.h>
 struct sys_timer_ops {
        int (*init)(void);
        int (*start)(void);
        int (*stop)(void);
+        cycle_t (*read)(void);
 #ifndef CONFIG_GENERIC_TIME
        unsigned long (*get_offset)(void);
 #endif
@@ -18,29 +20,8 @@ struct sys_timer {
        struct sys_device       dev;
        struct sys_timer_ops    *ops;
-#ifdef CONFIG_NO_IDLE_HZ
-        struct dyn_tick_timer   *dyn_tick;
-#endif
 };
-#ifdef CONFIG_NO_IDLE_HZ
-#define DYN_TICK_ENABLED        (1 << 1)
-struct dyn_tick_timer {
-        spinlock_t      lock;
-        unsigned int    state;                  /* Current state */
-        int             (*enable)(void);        /* Enables dynamic tick */
-        int             (*disable)(void);       /* Disables dynamic tick */
-        void            (*reprogram)(unsigned long); /* Reprograms the timer */
-        int             (*handler)(int, void *);
-};
-void timer_dyn_reprogram(void);
-#else
-#define timer_dyn_reprogram()   do { } while (0)
-#endif
 #define TICK_SIZE (tick_nsec / 1000)
 extern struct sys_timer tmu_timer, cmt_timer, mtu2_timer;
@@ -58,5 +39,7 @@ struct sys_timer *get_sys_timer(void);
 /* arch/sh/kernel/time.c */
 void handle_timer_tick(void);
+extern unsigned long sh_hpt_frequency;
+extern struct clocksource clocksource_sh;
 #endif /* __ASM_SH_TIMER_H */
diff --git a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
index 49be50a36b77..af71e379a5ee 100644
--- a/include/asm-sh/unistd.h
+++ b/include/asm-sh/unistd.h
@@ -85,7 +85,7 @@
 #define __NR_sigpending          73
 #define __NR_sethostname         74
 #define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
+#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
 #define __NR_getrusage           77
 #define __NR_gettimeofday        78
 #define __NR_settimeofday        79
@@ -328,8 +328,9 @@
 #define __NR_move_pages         317
 #define __NR_getcpu             318
 #define __NR_epoll_pwait        319
+#define __NR_utimensat          320
-#define NR_syscalls 320
+#define NR_syscalls 321
 #ifdef __KERNEL__
diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h
index b9da9a600e35..b3f492208fd2 100644
--- a/include/asm-sparc/smp.h
+++ b/include/asm-sparc/smp.h
@@ -165,6 +165,7 @@ void smp_setup_cpu_possible_map(void);
 #else /* SMP */
+#define hard_smp_processor_id()         0
 #define smp_setup_cpu_possible_map() do { } while (0)
 #endif /* !(SMP) */
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index e43ed1d63a9d..da9bdc5e5526 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -326,8 +326,9 @@
 #define __NR_move_pages         307
 #define __NR_getcpu             308
 #define __NR_epoll_pwait        309
+#define __NR_utimensat          310
-#define NR_SYSCALLS             310
+#define NR_SYSCALLS             311
 #ifdef __KERNEL__
 #define __ARCH_WANT_IPC_PARSE_VERSION
diff --git a/include/asm-sparc64/kdebug.h b/include/asm-sparc64/kdebug.h
index f8032e73f384..627e3396a5f0 100644
--- a/include/asm-sparc64/kdebug.h
+++ b/include/asm-sparc64/kdebug.h
@@ -7,8 +7,19 @@
 struct pt_regs;
-extern int register_page_fault_notifier(struct notifier_block *);
+/*
-extern int unregister_page_fault_notifier(struct notifier_block *);
+ * These are only here because kprobes.c wants them to implement a
+ * blatant layering violation.  Will hopefully go away soon once all
+ * architectures are updated.
+ */
+static inline int register_page_fault_notifier(struct notifier_block *nb)
+{
+        return 0;
+}
+static inline int unregister_page_fault_notifier(struct notifier_block *nb)
+{
+        return 0;
+}
 extern void bad_trap(struct pt_regs *, long);
@@ -20,7 +31,6 @@ enum die_val {
        DIE_DIE,
        DIE_TRAP,
        DIE_TRAP_TL1,
-        DIE_GPF,
        DIE_CALL,
        DIE_PAGE_FAULT,
 };
diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h
index becc38fa06c5..a331b7b0dff2 100644
--- a/include/asm-sparc64/kprobes.h
+++ b/include/asm-sparc64/kprobes.h
@@ -43,4 +43,5 @@ struct kprobe_ctlblk {
 extern int kprobe_exceptions_notify(struct notifier_block *self,
                                    unsigned long val, void *data);
+extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
 #endif /* _SPARC64_KPROBES_H */
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h
deleted file mode 100644
index c008cecca149..000000000000
--- a/include/asm-sparc64/pbm.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* pbm.h: UltraSparc PCI controller software state.
- *
- * Copyright (C) 1997, 1998, 1999, 2007 David S. Miller (davem@davemloft.net)
- */
-#ifndef __SPARC64_PBM_H
-#define __SPARC64_PBM_H
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/ioport.h>
-#include <linux/spinlock.h>
-#include <linux/msi.h>
-#include <asm/io.h>
-#include <asm/page.h>
-#include <asm/oplib.h>
-#include <asm/prom.h>
-#include <asm/of_device.h>
-#include <asm/iommu.h>
-/* The abstraction used here is that there are PCI controllers,
- * each with one (Sabre) or two (PSYCHO/SCHIZO) PCI bus modules
- * underneath.  Each PCI bus module uses an IOMMU (shared by both
- * PBMs of a controller, or per-PBM), and if a streaming buffer
- * is present, each PCI bus module has it's own. (ie. the IOMMU
- * might be shared between PBMs, the STC is never shared)
- * Furthermore, each PCI bus module controls it's own autonomous
- * PCI bus.
- */
-extern void pci_iommu_table_init(struct iommu *iommu, int tsbsize, u32 dma_offset, u32 dma_addr_mask);
-#define PCI_STC_FLUSHFLAG_INIT(STC) \
-        (*((STC)->strbuf_flushflag) = 0UL)
-#define PCI_STC_FLUSHFLAG_SET(STC) \
-        (*((STC)->strbuf_flushflag) != 0UL)
-/* There can be quite a few ranges and interrupt maps on a PCI
- * segment.  Thus...
- */
-#define PROM_PCIRNG_MAX         64
-#define PROM_PCIIMAP_MAX        64
-struct pci_controller_info;
-struct pci_pbm_info {
-        /* PCI controller we sit under. */
-        struct pci_controller_info      *parent;
-        /* Physical address base of controller registers. */
-        unsigned long                   controller_regs;
-        /* Physical address base of PBM registers. */
-        unsigned long                   pbm_regs;
-        /* Physical address of DMA sync register, if any.  */
-        unsigned long                   sync_reg;
-        /* Opaque 32-bit system bus Port ID. */
-        u32                             portid;
-        /* Opaque 32-bit handle used for hypervisor calls.  */
-        u32                             devhandle;
-        /* Chipset version information. */
-        int                             chip_type;
-#define PBM_CHIP_TYPE_SABRE             1
-#define PBM_CHIP_TYPE_PSYCHO            2
-#define PBM_CHIP_TYPE_SCHIZO            3
-#define PBM_CHIP_TYPE_SCHIZO_PLUS       4
-#define PBM_CHIP_TYPE_TOMATILLO         5
-        int                             chip_version;
-        int                             chip_revision;
-        /* Name used for top-level resources. */
-        char                            *name;
-        /* OBP specific information. */
-        struct device_node              *prom_node;
-        u64                             ino_bitmap;
-        /* PBM I/O and Memory space resources. */
-        struct resource                 io_space;
-        struct resource                 mem_space;
-        /* Base of PCI Config space, can be per-PBM or shared. */
-        unsigned long                   config_space;
-        /* State of 66MHz capabilities on this PBM. */
-        int                             is_66mhz_capable;
-        int                             all_devs_66mhz;
-#ifdef CONFIG_PCI_MSI
-        /* MSI info.  */
-        u32                             msiq_num;
-        u32                             msiq_ent_count;
-        u32                             msiq_first;
-        u32                             msiq_first_devino;
-        u32                             msi_num;
-        u32                             msi_first;
-        u32                             msi_data_mask;
-        u32                             msix_data_width;
-        u64                             msi32_start;
-        u64                             msi64_start;
-        u32                             msi32_len;
-        u32                             msi64_len;
-        void                            *msi_queues;
-        unsigned long                   *msi_bitmap;
-#endif /* !(CONFIG_PCI_MSI) */
-        /* This PBM's streaming buffer. */
-        struct strbuf                   stc;
-        /* IOMMU state, potentially shared by both PBM segments. */
-        struct iommu                    *iommu;
-        /* Now things for the actual PCI bus probes. */
-        unsigned int                    pci_first_busno;
-        unsigned int                    pci_last_busno;
-        struct pci_bus                  *pci_bus;
-};
-struct pci_controller_info {
-        /* List of all PCI controllers. */
-        struct pci_controller_info      *next;
-        /* Each controller gets a unique index, used mostly for
-         * error logging purposes.
-         */
-        int                             index;
-        /* The PCI bus modules controlled by us. */
-        struct pci_pbm_info             pbm_A;
-        struct pci_pbm_info             pbm_B;
-        /* Operations which are controller specific. */
-        void (*scan_bus)(struct pci_controller_info *);
-#ifdef CONFIG_PCI_MSI
-        int (*setup_msi_irq)(unsigned int *virt_irq_p, struct pci_dev *pdev,
-                             struct msi_desc *entry);
-        void (*teardown_msi_irq)(unsigned int virt_irq, struct pci_dev *pdev);
-#endif
-        /* Now things for the actual PCI bus probes. */
-        struct pci_ops                  *pci_ops;
-        unsigned int                    pci_first_busno;
-        unsigned int                    pci_last_busno;
-};
-#endif /* !(__SPARC64_PBM_H) */
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
index cca54804b722..869d16fb907b 100644
--- a/include/asm-sparc64/smp.h
+++ b/include/asm-sparc64/smp.h
@@ -48,6 +48,7 @@ extern unsigned char boot_cpu_id;
 #else
+#define hard_smp_processor_id()         0
 #define smp_setup_cpu_possible_map() do { } while (0)
 #define boot_cpu_id     (0)
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index e2dcb87e0c62..fcd627594f4c 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -328,8 +328,9 @@
 #define __NR_move_pages         307
 #define __NR_getcpu             308
 #define __NR_epoll_pwait        309
+#define __NR_utimensat          310
-#define NR_SYSCALLS             310
+#define NR_SYSCALLS             311
 #ifdef __KERNEL__
 /* sysconf options, for SunOS compatibility */
diff --git a/include/asm-um/required-features.h b/include/asm-um/required-features.h
new file mode 100644
index 000000000000..dfb967b2d2f3
--- /dev/null
+++ b/include/asm-um/required-features.h
@@ -0,0 +1,9 @@
+#ifndef __UM_REQUIRED_FEATURES_H
+#define __UM_REQUIRED_FEATURES_H
+/*
+ * Nothing to see, just need something for the i386 and x86_64 asm
+ * headers to include.
+ */
+#endif
diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h
index ca552261ed1f..84f8cf29324e 100644
--- a/include/asm-um/smp.h
+++ b/include/asm-um/smp.h
@@ -24,6 +24,10 @@ extern inline void smp_cpus_done(unsigned int maxcpus)
 extern struct task_struct *idle_threads[NR_CPUS];
+#else
+#define hard_smp_processor_id()         0
 #endif
 #endif
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h
index d5704421456b..3f303d2365ed 100644
--- a/include/asm-x86_64/smp.h
+++ b/include/asm-x86_64/smp.h
@@ -57,12 +57,6 @@ static inline int num_booting_cpus(void)
 #define raw_smp_processor_id() read_pda(cpunumber)
-static inline int hard_smp_processor_id(void)
-{
-        /* we don't want to mark this access volatile - bad code generation */
-        return GET_APIC_ID(*(unsigned int *)(APIC_BASE+APIC_ID));
-}
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
 extern void prefill_possible_map(void);
@@ -71,7 +65,13 @@ extern unsigned __cpuinitdata disabled_cpus;
 #define NO_PROC_ID              0xFF            /* No processor magic marker */
-#endif
+#endif /* CONFIG_SMP */
+static inline int hard_smp_processor_id(void)
+{
+        /* we don't want to mark this access volatile - bad code generation */
+        return GET_APIC_ID(*(unsigned int *)(APIC_BASE+APIC_ID));
+}
 /*
 * Some lowlevel functions might want to know about
diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h
index b7b8021e8c43..ead9f9a56234 100644
--- a/include/asm-x86_64/system.h
+++ b/include/asm-x86_64/system.h
@@ -39,7 +39,7 @@
                       [threadrsp] "i" (offsetof(struct task_struct, thread.rsp)), \
                       [ti_flags] "i" (offsetof(struct thread_info, flags)),\
                       [tif_fork] "i" (TIF_FORK),                         \
-                       [thread_info] "i" (offsetof(struct task_struct, thread_info)), \
+                       [thread_info] "i" (offsetof(struct task_struct, stack)), \
                       [pda_pcurrent] "i" (offsetof(struct x8664_pda, pcurrent))   \
                     : "memory", "cc" __EXTRA_CLOBBER)
    
diff --git a/include/asm-x86_64/thread_info.h b/include/asm-x86_64/thread_info.h
index 74a6c74397f7..10bb5a8ed688 100644
--- a/include/asm-x86_64/thread_info.h
+++ b/include/asm-x86_64/thread_info.h
@@ -162,7 +162,7 @@ static inline struct thread_info *stack_thread_info(void)
 #define TS_COMPAT               0x0002  /* 32bit syscall active */
 #define TS_POLLING              0x0004  /* true if in idle loop and not sleeping */
-#define tsk_is_polling(t) ((t)->thread_info->status & TS_POLLING)
+#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
 #endif /* __KERNEL__ */
diff --git a/include/asm-xtensa/platform-iss/simcall.h b/include/asm-xtensa/platform-iss/simcall.h
index 6acb572759a6..b7952c06a2b7 100644
--- a/include/asm-xtensa/platform-iss/simcall.h
+++ b/include/asm-xtensa/platform-iss/simcall.h
@@ -1,5 +1,5 @@
 /*
- * include/asm-xtensa/platform-iss/hardware.h
+ * include/asm-xtensa/platform-iss/simcall.h
 *
 * 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
diff --git a/include/linux/aio.h b/include/linux/aio.h
index a30ef13c9e62..43dc2ebfaa0e 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -226,7 +226,8 @@ int FASTCALL(io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
                __put_ioctx(kioctx);                                    \
 } while (0)
-#define in_aio() !is_sync_wait(current->io_wait)
+#define in_aio() (unlikely(!is_sync_wait(current->io_wait)))
 /* may be used for debugging */
 #define warn_if_async()                                                 \
 do {                                                                    \
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a686eabe22d6..db5b00a792f5 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -854,7 +854,7 @@ static inline void put_dev_sector(Sector p)
 struct work_struct;
 int kblockd_schedule_work(struct work_struct *work);
-void kblockd_flush(void);
+void kblockd_flush_work(struct work_struct *work);
 #define MODULE_ALIAS_BLOCKDEV(major,minor) \
        MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 2665ca04cf8f..bf297b03a4e4 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -49,6 +49,7 @@ struct clocksource;
 * @shift:              cycle to nanosecond divisor (power of two)
 * @flags:              flags describing special properties
 * @vread:              vsyscall based read
+ * @resume:             resume function for the clocksource, if necessary
 * @cycle_interval:     Used internally by timekeeping core, please ignore.
 * @xtime_interval:     Used internally by timekeeping core, please ignore.
 */
@@ -65,6 +66,7 @@ struct clocksource {
        u32 shift;
        unsigned long flags;
        cycle_t (*vread)(void);
+        void (*resume)(void);
        /* timekeeping specific data, ignore */
        cycle_t cycle_interval;
@@ -209,6 +211,7 @@ static inline void clocksource_calculate_interval(struct clocksource *c,
 extern int clocksource_register(struct clocksource*);
 extern struct clocksource* clocksource_get_next(void);
 extern void clocksource_change_rating(struct clocksource *cs, int rating);
+extern void clocksource_resume(void);
 #ifdef CONFIG_GENERIC_TIME_VSYSCALL
 extern void update_vsyscall(struct timespec *ts, struct clocksource *c);
diff --git a/include/linux/compat.h b/include/linux/compat.h
index ccd863dd77fa..70a157a130bb 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -253,5 +253,8 @@ asmlinkage long compat_sys_epoll_pwait(int epfd,
                        const compat_sigset_t __user *sigmask,
                        compat_size_t sigsetsize);
+asmlinkage long compat_sys_utimensat(unsigned int dfd, char __user *filename,
+                                struct compat_timespec __user *t, int flags);
 #endif /* CONFIG_COMPAT */
 #endif /* _LINUX_COMPAT_H */
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index a9f794716a81..03ec2311fb29 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -40,3 +40,4 @@
 #define  noinline                       __attribute__((noinline))
 #define __attribute_pure__              __attribute__((pure))
 #define __attribute_const__             __attribute__((__const__))
+#define __maybe_unused                  __attribute__((unused))
diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h
index ecd621fd27d2..a9e2863c2dbf 100644
--- a/include/linux/compiler-gcc3.h
+++ b/include/linux/compiler-gcc3.h
@@ -4,9 +4,11 @@
 #include <linux/compiler-gcc.h>
 #if __GNUC_MINOR__ >= 3
-# define __attribute_used__     __attribute__((__used__))
+# define __used                 __attribute__((__used__))
+# define __attribute_used__     __used                          /* deprecated */
 #else
-# define __attribute_used__     __attribute__((__unused__))
+# define __used                 __attribute__((__unused__))
+# define __attribute_used__     __used                          /* deprecated */
 #endif
 #if __GNUC_MINOR__ >= 4
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index fd0cc7c4a636..a03e9398a6c2 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -12,7 +12,8 @@
 # define __inline               __inline        __attribute__((always_inline))
 #endif
-#define __attribute_used__      __attribute__((__used__))
+#define __used                  __attribute__((__used__))
+#define __attribute_used__      __used                  /* deprecated */
 #define __must_check            __attribute__((warn_unused_result))
 #define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
 #define __always_inline         inline __attribute__((always_inline))
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 3b6949b41745..498c35920762 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -108,15 +108,30 @@ extern void __chk_io_ptr(const void __iomem *);
 * 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.
 *
- * As of gcc 3.3, static functions that are not marked with attribute((used))
+ * As of gcc 3.4, static functions that are not marked with attribute((used))
- * may be elided from the assembly file.  As of gcc 3.3, static data not so
+ * may be elided from the assembly file.  As of gcc 3.4, static data not so
 * marked will not be elided, but this may change in a future gcc version.
 *
+ * NOTE: Because distributions shipped with a backported unit-at-a-time
+ * compiler in gcc 3.3, we must define __used to be __attribute__((used))
+ * for gcc >=3.3 instead of 3.4.
+ *
 * In prior versions of gcc, such functions and data would be emitted, but
 * would be warned about except with attribute((unused)).
+ *
+ * Mark functions that are referenced only in inline assembly as __used so
+ * the code is emitted even though it appears to be unreferenced.
 */
 #ifndef __attribute_used__
-# define __attribute_used__     /* unimplemented */
+# define __attribute_used__     /* deprecated */
+#endif
+#ifndef __used
+# define __used                 /* unimplemented */
+#endif
+#ifndef __maybe_unused
+# define __maybe_unused         /* unimplemented */
 #endif
 /*
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index 4395e5206746..7894dd0f3b77 100644
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -54,7 +54,7 @@ struct ext3_block_alloc_info {
        /*
         * Was i_next_alloc_goal in ext3_inode_info
         * is the *physical* companion to i_next_alloc_block.
-         * it the the physical block number of the block which was most-recentl
+         * it the physical block number of the block which was most-recentl
         * allocated to this file.  This give us the goal (target) for the next
         * allocation when we detect linearly ascending requests.
         */
diff --git a/include/linux/ext4_fs_i.h b/include/linux/ext4_fs_i.h
index bb42379cb7fd..d5b177e5b395 100644
--- a/include/linux/ext4_fs_i.h
+++ b/include/linux/ext4_fs_i.h
@@ -52,7 +52,7 @@ struct ext4_block_alloc_info {
        /*
         * Was i_next_alloc_goal in ext4_inode_info
         * is the *physical* companion to i_next_alloc_block.
-         * it the the physical block number of the block which was most-recentl
+         * it the physical block number of the block which was most-recentl
         * allocated to this file.  This give us the goal (target) for the next
         * allocation when we detect linearly ascending requests.
         */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index dff7a728948c..c654d0e9ce33 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -868,7 +868,7 @@ struct fb_info {
 #define fb_writeq sbus_writeq
 #define fb_memset sbus_memset_io
-#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || (defined(__sh__) && !defined(__SH5__)) || defined(__powerpc__)
+#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || (defined(__sh__) && !defined(__SH5__)) || defined(__powerpc__) || defined(__avr32__)
 #define fb_readb __raw_readb
 #define fb_readw __raw_readw
diff --git a/include/linux/futex.h b/include/linux/futex.h
index 820125c628c1..899fc7f20edd 100644
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
@@ -3,6 +3,8 @@
 #include <linux/sched.h>
+union ktime;
 /* Second argument to futex syscall */
@@ -15,6 +17,19 @@
 #define FUTEX_LOCK_PI           6
 #define FUTEX_UNLOCK_PI         7
 #define FUTEX_TRYLOCK_PI        8
+#define FUTEX_CMP_REQUEUE_PI    9
+#define FUTEX_PRIVATE_FLAG      128
+#define FUTEX_CMD_MASK          ~FUTEX_PRIVATE_FLAG
+#define FUTEX_WAIT_PRIVATE      (FUTEX_WAIT | FUTEX_PRIVATE_FLAG)
+#define FUTEX_WAKE_PRIVATE      (FUTEX_WAKE | FUTEX_PRIVATE_FLAG)
+#define FUTEX_REQUEUE_PRIVATE   (FUTEX_REQUEUE | FUTEX_PRIVATE_FLAG)
+#define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG)
+#define FUTEX_WAKE_OP_PRIVATE   (FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG)
+#define FUTEX_LOCK_PI_PRIVATE   (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)
+#define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)
+#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG)
 /*
 * Support for robust futexes: the kernel cleans up held futexes at
@@ -83,9 +98,14 @@ struct robust_list_head {
 #define FUTEX_OWNER_DIED        0x40000000
 /*
+ * Some processes have been requeued on this PI-futex
+ */
+#define FUTEX_WAITER_REQUEUED   0x20000000
+/*
 * The rest of the robust-futex field is for the TID:
 */
-#define FUTEX_TID_MASK          0x3fffffff
+#define FUTEX_TID_MASK          0x0fffffff
 /*
 * This limit protects against a deliberately circular list.
@@ -94,7 +114,7 @@ struct robust_list_head {
 #define ROBUST_LIST_LIMIT       2048
 #ifdef __KERNEL__
-long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout,
+long do_futex(u32 __user *uaddr, int op, u32 val, union ktime *timeout,
              u32 __user *uaddr2, u32 val2, u32 val3);
 extern int
@@ -106,9 +126,20 @@ handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi);
 * Don't rearrange members without looking at hash_futex().
 *
 * offset is aligned to a multiple of sizeof(u32) (== 4) by definition.
- * We set bit 0 to indicate if it's an inode-based key.
+ * We use the two low order bits of offset to tell what is the kind of key :
- */
+ *  00 : Private process futex (PTHREAD_PROCESS_PRIVATE)
+ *       (no reference on an inode or mm)
+ *  01 : Shared futex (PTHREAD_PROCESS_SHARED)
+ *      mapped on a file (reference on the underlying inode)
+ *  10 : Shared futex (PTHREAD_PROCESS_SHARED)
+ *       (but private mapping on an mm, and reference taken on it)
+*/
+#define FUT_OFF_INODE    1 /* We set bit 0 if key has a reference on inode */
+#define FUT_OFF_MMSHARED 2 /* We set bit 1 if key has a reference on mm */
 union futex_key {
+        u32 __user *uaddr;
        struct {
                unsigned long pgoff;
                struct inode *inode;
@@ -125,7 +156,8 @@ union futex_key {
                int offset;
        } both;
 };
-int get_futex_key(u32 __user *uaddr, union futex_key *key);
+int get_futex_key(u32 __user *uaddr, struct rw_semaphore *shared,
+                  union futex_key *key);
 void get_futex_key_refs(union futex_key *key);
 void drop_futex_key_refs(union futex_key *key);
diff --git a/include/linux/generic_acl.h b/include/linux/generic_acl.h
index 80764f40be75..886f5faa08cb 100644
--- a/include/linux/generic_acl.h
+++ b/include/linux/generic_acl.h
@@ -1,5 +1,5 @@
 /*
- * fs/generic_acl.c
+ * include/linux/generic_acl.h
 *
 * (C) 2005 Andreas Gruenbacher <agruen@suse.de>
 *
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 2c65da7cabb2..f589559cf070 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -413,6 +413,7 @@ char *disk_name (struct gendisk *hd, int part, char *buf);
 extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev);
 extern void add_partition(struct gendisk *, int, sector_t, sector_t, int);
 extern void delete_partition(struct gendisk *, int);
+extern void printk_all_partitions(void);
 extern struct gendisk *alloc_disk_node(int minors, int node_id);
 extern struct gendisk *alloc_disk(int minors);
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 97a36c3d96e2..0d2ef0b082a6 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -176,10 +176,6 @@ extern void FASTCALL(free_cold_page(struct page *page));
 #define free_page(addr) free_pages((addr),0)
 void page_alloc_init(void);
-#ifdef CONFIG_NUMA
+void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp);
-void drain_node_pages(int node);
-#else
-static inline void drain_node_pages(int node) { };
-#endif
 #endif /* __LINUX_GFP_H */
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index a515eb0afdfb..98e2cce996a4 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -94,17 +94,26 @@ static inline void clear_highpage(struct page *page)
 /*
 * Same but also flushes aliased cache contents to RAM.
+ *
+ * This must be a macro because KM_USER0 and friends aren't defined if
+ * !CONFIG_HIGHMEM
 */
-static inline void memclear_highpage_flush(struct page *page, unsigned int offset, unsigned int size)
+#define zero_user_page(page, offset, size, km_type)             \
+        do {                                                    \
+                void *kaddr;                                    \
+                                                                \
+                BUG_ON((offset) + (size) > PAGE_SIZE);          \
+                                                                \
+                kaddr = kmap_atomic(page, km_type);             \
+                memset((char *)kaddr + (offset), 0, (size));    \
+                flush_dcache_page(page);                        \
+                kunmap_atomic(kaddr, (km_type));                \
+        } while (0)
+static inline void __deprecated memclear_highpage_flush(struct page *page,
+                        unsigned int offset, unsigned int size)
 {
-        void *kaddr;
+        zero_user_page(page, offset, size, KM_USER0);
-        BUG_ON(offset + size > PAGE_SIZE);
-        kaddr = kmap_atomic(page, KM_USER0);
-        memset((char *)kaddr + offset, 0, size);
-        flush_dcache_page(page);
-        kunmap_atomic(kaddr, KM_USER0);
 }
 #ifndef __HAVE_ARCH_COPY_USER_HIGHPAGE
diff --git a/include/linux/i2c-algo-bit.h b/include/linux/i2c-algo-bit.h
index 9ee0f800592f..111334f5b922 100644
--- a/include/linux/i2c-algo-bit.h
+++ b/include/linux/i2c-algo-bit.h
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-/* With some changes from Ky�sti M�lkki <kmalkki@cc.hut.fi> and even
+/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
   Frodo Looijaard <frodol@dds.nl> */
 #ifndef _LINUX_I2C_ALGO_BIT_H
diff --git a/include/linux/i2c-algo-pcf.h b/include/linux/i2c-algo-pcf.h
index 994eb86f882c..77afbb60fd11 100644
--- a/include/linux/i2c-algo-pcf.h
+++ b/include/linux/i2c-algo-pcf.h
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-/* With some changes from Ky�sti M�lkki <kmalkki@cc.hut.fi> and even
+/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
   Frodo Looijaard <frodol@dds.nl> */
 #ifndef _LINUX_I2C_ALGO_PCF_H
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 418dfb5adadd..df4e6a510310 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -223,8 +223,9 @@ typedef struct hw_regs_s {
 /*
 * Register new hardware with ide
 */
-int ide_register_hw(hw_regs_t *hw, struct hwif_s **hwifp);
+int ide_register_hw(hw_regs_t *, int, struct hwif_s **);
-int ide_register_hw_with_fixup(hw_regs_t *, struct hwif_s **, void (*)(struct hwif_s *));
+int ide_register_hw_with_fixup(hw_regs_t *, int, struct hwif_s **,
+                               void (*)(struct hwif_s *));
 /*
 * Set up hw_regs_t structure before calling ide_register_hw (optional)
@@ -559,9 +560,10 @@ typedef struct ide_drive_s {
        struct ide_drive_s      *next;  /* circular list of hwgroup drives */
        void            *driver_data;   /* extra driver data */
        struct hd_driveid       *id;    /* drive model identification info */
+#ifdef CONFIG_IDE_PROC_FS
        struct proc_dir_entry *proc;    /* /proc/ide/ directory entry */
        struct ide_settings_s *settings;/* /proc/ide/ drive settings */
+#endif
        struct hwif_s           *hwif;  /* actually (ide_hwif_t *) */
        unsigned long sleep;            /* sleep until this time */
@@ -601,16 +603,12 @@ typedef struct ide_drive_s {
        unsigned remap_0_to_1   : 1;    /* 0=noremap, 1=remap 0->1 (for EZDrive) */
        unsigned blocked        : 1;    /* 1=powermanagment told us not to do anything, so sleep nicely */
        unsigned vdma           : 1;    /* 1=doing PIO over DMA 0=doing normal DMA */
-        unsigned addressing;            /*      : 3;
-                                         *  0=28-bit
-                                         *  1=48-bit
-                                         *  2=48-bit doing 28-bit
-                                         *  3=64-bit
-                                         */
        unsigned scsi           : 1;    /* 0=default, 1=ide-scsi emulation */
        unsigned sleeping       : 1;    /* 1=sleeping & sleep field valid */
        unsigned post_reset     : 1;
+        unsigned udma33_warned  : 1;
+        u8      addressing;     /* 0=28-bit, 1=48-bit, 2=48-bit doing 28-bit */
        u8      quirk_list;     /* considered quirky, set for a specific host */
        u8      init_speed;     /* transfer rate set at boot */
        u8      current_speed;  /* current transfer rate set */
@@ -717,11 +715,8 @@ typedef struct hwif_s {
        int     (*quirkproc)(ide_drive_t *);
        /* driver soft-power interface */
        int     (*busproc)(ide_drive_t *, int);
-//      /* host rate limiter */
-//      u8      (*ratemask)(ide_drive_t *);
-//      /* device rate limiter */
-//      u8      (*ratefilter)(ide_drive_t *, u8);
 #endif
+        u8 (*udma_filter)(ide_drive_t *);
        void (*ata_input_data)(ide_drive_t *, void *, u32);
        void (*ata_output_data)(ide_drive_t *, void *, u32);
@@ -866,16 +861,22 @@ typedef struct hwgroup_s {
        unsigned char cmd_buf[4];
 } ide_hwgroup_t;
-/* structure attached to the request for IDE_TASK_CMDS */
+typedef struct ide_driver_s ide_driver_t;
+extern struct semaphore ide_setting_sem;
+int set_io_32bit(ide_drive_t *, int);
+int set_pio_mode(ide_drive_t *, int);
+int set_using_dma(ide_drive_t *, int);
+#ifdef CONFIG_IDE_PROC_FS
 /*
 * configurable drive settings
 */
 #define TYPE_INT        0
-#define TYPE_INTA       1
+#define TYPE_BYTE       1
-#define TYPE_BYTE       2
+#define TYPE_SHORT      2
-#define TYPE_SHORT      3
 #define SETTING_READ    (1 << 0)
 #define SETTING_WRITE   (1 << 1)
@@ -885,8 +886,6 @@ typedef int (ide_procset_t)(ide_drive_t *, int);
 typedef struct ide_settings_s {
        char                    *name;
        int                     rw;
-        int                     read_ioctl;
-        int                     write_ioctl;
        int                     data_type;
        int                     min;
        int                     max;
@@ -898,12 +897,7 @@ typedef struct ide_settings_s {
        struct ide_settings_s   *next;
 } ide_settings_t;
-extern struct semaphore ide_setting_sem;
+int ide_add_setting(ide_drive_t *, const char *, int, int, int, int, int, int, void *, ide_procset_t *set);
-extern int ide_add_setting(ide_drive_t *drive, const char *name, int rw, int read_ioctl, int write_ioctl, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set);
-extern ide_settings_t *ide_find_setting_by_name(ide_drive_t *drive, char *name);
-extern int ide_read_setting(ide_drive_t *t, ide_settings_t *setting);
-extern int ide_write_setting(ide_drive_t *drive, ide_settings_t *setting, int val);
-extern void ide_add_generic_settings(ide_drive_t *drive);
 /*
 * /proc/ide interface
@@ -915,15 +909,15 @@ typedef struct {
        write_proc_t    *write_proc;
 } ide_proc_entry_t;
-#ifdef CONFIG_PROC_FS
+void proc_ide_create(void);
-extern struct proc_dir_entry *proc_ide_root;
+void proc_ide_destroy(void);
+void ide_proc_register_port(ide_hwif_t *);
+void ide_proc_unregister_port(ide_hwif_t *);
+void ide_proc_register_driver(ide_drive_t *, ide_driver_t *);
+void ide_proc_unregister_driver(ide_drive_t *, ide_driver_t *);
+void ide_add_generic_settings(ide_drive_t *);
-extern void proc_ide_create(void);
-extern void proc_ide_destroy(void);
-extern void create_proc_ide_interfaces(void);
-void destroy_proc_ide_interface(ide_hwif_t *);
-extern void ide_add_proc_entries(struct proc_dir_entry *, ide_proc_entry_t *, void *);
-extern void ide_remove_proc_entries(struct proc_dir_entry *, ide_proc_entry_t *);
 read_proc_t proc_ide_read_capacity;
 read_proc_t proc_ide_read_geometry;
@@ -947,8 +941,13 @@ void ide_pci_create_host_proc(const char *, get_info_t *);
        return len;                     \
 }
 #else
-static inline void create_proc_ide_interfaces(void) { ; }
+static inline void proc_ide_create(void) { ; }
-static inline void destroy_proc_ide_interface(ide_hwif_t *hwif) { ; }
+static inline void proc_ide_destroy(void) { ; }
+static inline void ide_proc_register_port(ide_hwif_t *hwif) { ; }
+static inline void ide_proc_unregister_port(ide_hwif_t *hwif) { ; }
+static inline void ide_proc_register_driver(ide_drive_t *drive, ide_driver_t *driver) { ; }
+static inline void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver) { ; }
+static inline void ide_add_generic_settings(ide_drive_t *drive) { ; }
 #define PROC_IDE_READ_RETURN(page,start,off,count,eof,len) return 0;
 #endif
@@ -991,7 +990,7 @@ enum {
 * The gendriver.owner field should be set to the module owner of this driver.
 * The gendriver.name field should be set to the name of this driver
 */
-typedef struct ide_driver_s {
+struct ide_driver_s {
        const char                      *version;
        u8                              media;
        unsigned supports_dsc_overlap   : 1;
@@ -999,12 +998,14 @@ typedef struct ide_driver_s {
        int             (*end_request)(ide_drive_t *, int, int);
        ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8);
        ide_startstop_t (*abort)(ide_drive_t *, struct request *rq);
-        ide_proc_entry_t        *proc;
        struct device_driver    gen_driver;
        int             (*probe)(ide_drive_t *);
        void            (*remove)(ide_drive_t *);
        void            (*shutdown)(ide_drive_t *);
-} ide_driver_t;
+#ifdef CONFIG_IDE_PROC_FS
+        ide_proc_entry_t        *proc;
+#endif
+};
 #define to_ide_driver(drv) container_of(drv, ide_driver_t, gen_driver)
@@ -1204,9 +1205,14 @@ void ide_init_disk(struct gendisk *, ide_drive_t *);
 extern int ideprobe_init(void);
+#ifdef CONFIG_IDEPCI_PCIBUS_ORDER
 extern void ide_scan_pcibus(int scan_direction) __init;
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner, const char *mod_name);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE, KBUILD_MODNAME)
+#else
+#define ide_pci_register_driver(d) pci_register_driver(d)
+#endif
 void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);
 extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);
@@ -1214,9 +1220,6 @@ extern void default_hwif_iops(ide_hwif_t *);
 extern void default_hwif_mmiops(ide_hwif_t *);
 extern void default_hwif_transport(ide_hwif_t *);
-void ide_register_subdriver(ide_drive_t *, ide_driver_t *);
-void ide_unregister_subdriver(ide_drive_t *, ide_driver_t *);
 #define ON_BOARD                1
 #define NEVER_BOARD             0
@@ -1257,6 +1260,7 @@ typedef struct ide_pci_device_s {
        unsigned int            extra;
        struct ide_pci_device_s *next;
        u8                      flags;
+        u8                      udma_mask;
 } ide_pci_device_t;
 extern int ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
@@ -1278,6 +1282,8 @@ int ide_in_drive_list(struct hd_driveid *, const struct drive_list_entry *);
 int __ide_dma_bad_drive(ide_drive_t *);
 int __ide_dma_good_drive(ide_drive_t *);
 int ide_use_dma(ide_drive_t *);
+u8 ide_max_dma_mode(ide_drive_t *);
+int ide_tune_dma(ide_drive_t *);
 void ide_dma_off(ide_drive_t *);
 void ide_dma_verbose(ide_drive_t *);
 int ide_set_dma(ide_drive_t *);
@@ -1304,6 +1310,8 @@ extern int __ide_dma_timeout(ide_drive_t *);
 #else
 static inline int ide_use_dma(ide_drive_t *drive) { return 0; }
+static inline u8 ide_max_dma_mode(ide_drive_t *drive) { return 0; }
+static inline int ide_tune_dma(ide_drive_t *drive) { return 0; }
 static inline void ide_dma_off(ide_drive_t *drive) { ; }
 static inline void ide_dma_verbose(ide_drive_t *drive) { ; }
 static inline int ide_set_dma(ide_drive_t *drive) { return 1; }
@@ -1348,8 +1356,7 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data)
 }
 /* ide-lib.c */
-extern u8 ide_dma_speed(ide_drive_t *drive, u8 mode);
+u8 ide_rate_filter(ide_drive_t *, u8);
-extern u8 ide_rate_filter(u8 mode, u8 speed); 
 extern int ide_dma_enable(ide_drive_t *drive);
 extern char *ide_xfer_verbose(u8 xfer_rate);
 extern void ide_toggle_bounce(ide_drive_t *drive, int on);
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 795102309bf1..45170b2fa253 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -95,7 +95,7 @@ extern struct group_info init_groups;
 #define INIT_TASK(tsk)  \
 {                                                                       \
        .state          = 0,                                            \
-        .thread_info    = &init_thread_info,                            \
+        .stack          = &init_thread_info,                            \
        .usage          = ATOMIC_INIT(2),                               \
        .flags          = 0,                                            \
        .lock_depth     = -1,                                           \
diff --git a/include/linux/irda.h b/include/linux/irda.h
index 09d8f105a5a8..945ba3110874 100644
--- a/include/linux/irda.h
+++ b/include/linux/irda.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/linux/kthread.h b/include/linux/kthread.h
index 1c65e7a9f186..00dd957e245b 100644
--- a/include/linux/kthread.h
+++ b/include/linux/kthread.h
@@ -30,4 +30,7 @@ void kthread_bind(struct task_struct *k, unsigned int cpu);
 int kthread_stop(struct task_struct *k);
 int kthread_should_stop(void);
+int kthreadd(void *unused);
+extern struct task_struct *kthreadd_task;
 #endif /* _LINUX_KTHREAD_H */
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 81bb9c7a4eb3..c762954bda14 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -43,7 +43,7 @@
 * plain scalar nanosecond based representation can be selected by the
 * config switch CONFIG_KTIME_SCALAR.
 */
-typedef union {
+union ktime {
        s64     tv64;
 #if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR)
        struct {
@@ -54,7 +54,9 @@ typedef union {
 # endif
        } tv;
 #endif
-} ktime_t;
+};
+typedef union ktime ktime_t;            /* Kill this */
 #define KTIME_MAX                       ((s64)~((u64)1 << 63))
 #if (BITS_PER_LONG == 64)
diff --git a/include/linux/mca.h b/include/linux/mca.h
index 5cff2923092b..37972704617f 100644
--- a/include/linux/mca.h
+++ b/include/linux/mca.h
@@ -94,6 +94,7 @@ struct mca_bus {
 struct mca_driver {
        const short             *id_table;
        void                    *driver_data;
+        int                     integrated_id;
        struct device_driver    driver;
 };
 #define to_mca_driver(mdriver) container_of(mdriver, struct mca_driver, driver)
@@ -125,6 +126,7 @@ extern enum MCA_AdapterStatus mca_device_status(struct mca_device *mca_dev);
 extern struct bus_type mca_bus_type;
 extern int mca_register_driver(struct mca_driver *drv);
+extern int mca_register_driver_integrated(struct mca_driver *, int);
 extern void mca_unregister_driver(struct mca_driver *drv);
 /* WARNING: only called by the boot time device setup */
diff --git a/include/linux/meye.h b/include/linux/meye.h
index 11ec45e9a132..39fd9c8ddd4b 100644
--- a/include/linux/meye.h
+++ b/include/linux/meye.h
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2001-2003 Stelian Pop <stelian@popies.net>
 *
- * Copyright (C) 2001-2002 Alc�ve <www.alcove.com>
+ * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
 *
 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
 *
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 2f1544e83042..d09b1345a3a1 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -83,6 +83,9 @@ struct per_cpu_pages {
 struct per_cpu_pageset {
        struct per_cpu_pages pcp[2];    /* 0: hot.  1: cold */
+#ifdef CONFIG_NUMA
+        s8 expire;
+#endif
 #ifdef CONFIG_SMP
        s8 stat_threshold;
        s8 vm_stat_diff[NR_VM_ZONE_STAT_ITEMS];
diff --git a/include/linux/module.h b/include/linux/module.h
index 6d3dc9c4ff96..792d483c9af7 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -356,6 +356,9 @@ struct module
           keeping pointers to this stuff */
        char *args;
 };
+#ifndef MODULE_ARCH_INIT
+#define MODULE_ARCH_INIT {}
+#endif
 /* FIXME: It'd be nice to isolate modules during init, too, so they
   aren't used before they (may) fail.  But presently too much code
diff --git a/include/linux/mount.h b/include/linux/mount.h
index dab69afee2fa..6d3047d8c91c 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -33,7 +33,7 @@ struct mnt_namespace;
 #define MNT_SHARED      0x1000  /* if the vfsmount is a shared mount */
 #define MNT_UNBINDABLE  0x2000  /* if the vfsmount is a unbindable mount */
-#define MNT_PNODE_MASK  0x3000  /* propogation flag mask */
+#define MNT_PNODE_MASK  0x3000  /* propagation flag mask */
 struct vfsmount {
        struct list_head mnt_hash;
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 45d482ce8397..fd64ccfbce02 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -9,10 +9,6 @@
 #ifndef __MTD_MTD_H__
 #define __MTD_MTD_H__
-#ifndef __KERNEL__
-#error This is a kernel header. Perhaps include mtd-user.h instead?
-#endif
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/uio.h>
@@ -137,9 +133,6 @@ struct mtd_info {
        int numeraseregions;
        struct mtd_erase_region_info *eraseregions;
-        /* This really shouldn't be here. It can go away in 2.5 */
-        u_int32_t bank_size;
        int (*erase) (struct mtd_info *mtd, struct erase_info *instr);
        /* This stuff for eXecute-In-Place */
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index cf197ad62da6..d2365c8dcacc 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -560,6 +560,7 @@ extern int nand_do_read(struct mtd_info *mtd, loff_t from, size_t len,
 * @chip_delay:         R/B delay value in us
 * @options:            Option flags, e.g. 16bit buswidth
 * @ecclayout:          ecc layout info structure
+ * @part_probe_types:   NULL-terminated array of probe types
 * @priv:               hardware controller specific settings
 */
 struct platform_nand_chip {
@@ -570,6 +571,7 @@ struct platform_nand_chip {
        struct nand_ecclayout   *ecclayout;
        int                     chip_delay;
        unsigned int            options;
+        const char              **part_probe_types;
        void                    *priv;
 };
@@ -578,6 +580,8 @@ struct platform_nand_chip {
 * @hwcontrol:          platform specific hardware control structure
 * @dev_ready:          platform specific function to read ready/busy pin
 * @select_chip:        platform specific chip select function
+ * @cmd_ctrl:           platform specific function for controlling
+ *                      ALE/CLE/nCE. Also used to write command and address
 * @priv:               private data to transport driver specific settings
 *
 * All fields are optional and depend on the hardware driver requirements
@@ -586,9 +590,21 @@ struct platform_nand_ctrl {
        void            (*hwcontrol)(struct mtd_info *mtd, int cmd);
        int             (*dev_ready)(struct mtd_info *mtd);
        void            (*select_chip)(struct mtd_info *mtd, int chip);
+        void            (*cmd_ctrl)(struct mtd_info *mtd, int dat,
+                                    unsigned int ctrl);
        void            *priv;
 };
+/**
+ * struct platform_nand_data - container structure for platform-specific data
+ * @chip:               chip level chip structure
+ * @ctrl:               controller level device structure
+ */
+struct platform_nand_data {
+        struct platform_nand_chip       chip;
+        struct platform_nand_ctrl       ctrl;
+};
 /* Some helpers to access the data structures */
 static inline
 struct platform_nand_chip *get_platform_nandchip(struct mtd_info *mtd)
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index b81bc2adaeff..0d50ea3df689 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -121,11 +121,12 @@ static inline int fastcall mutex_is_locked(struct mutex *lock)
 * Also see Documentation/mutex-design.txt.
 */
 extern void fastcall mutex_lock(struct mutex *lock);
-extern int fastcall mutex_lock_interruptible(struct mutex *lock);
+extern int __must_check fastcall mutex_lock_interruptible(struct mutex *lock);
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 extern void mutex_lock_nested(struct mutex *lock, unsigned int subclass);
-extern int mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass);
+extern int __must_check mutex_lock_interruptible_nested(struct mutex *lock,
+                                        unsigned int subclass);
 #else
 # define mutex_lock_nested(lock, subclass) mutex_lock(lock)
 # define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
diff --git a/include/linux/nfs4_acl.h b/include/linux/nfs4_acl.h
index 409b6e02f337..c9c05a78e9bb 100644
--- a/include/linux/nfs4_acl.h
+++ b/include/linux/nfs4_acl.h
@@ -44,7 +44,6 @@
 #define NFS4_ACL_MAX 170
 struct nfs4_acl *nfs4_acl_new(int);
-void nfs4_acl_add_ace(struct nfs4_acl *, u32, u32, u32, int, uid_t);
 int nfs4_acl_get_whotype(char *, u32);
 int nfs4_acl_write_who(int who, char *p);
 int nfs4_acl_permission(struct nfs4_acl *acl, uid_t owner, gid_t group,
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 10a43ed0527e..9431101bf876 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -112,32 +112,40 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
 #ifdef __KERNEL__
-extern int atomic_notifier_chain_register(struct atomic_notifier_head *,
+extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh,
-                struct notifier_block *);
+                struct notifier_block *nb);
-extern int blocking_notifier_chain_register(struct blocking_notifier_head *,
+extern int blocking_notifier_chain_register(struct blocking_notifier_head *nh,
-                struct notifier_block *);
+                struct notifier_block *nb);
-extern int raw_notifier_chain_register(struct raw_notifier_head *,
+extern int raw_notifier_chain_register(struct raw_notifier_head *nh,
-                struct notifier_block *);
+                struct notifier_block *nb);
-extern int srcu_notifier_chain_register(struct srcu_notifier_head *,
+extern int srcu_notifier_chain_register(struct srcu_notifier_head *nh,
-                struct notifier_block *);
+                struct notifier_block *nb);
-extern int atomic_notifier_chain_unregister(struct atomic_notifier_head *,
+extern int atomic_notifier_chain_unregister(struct atomic_notifier_head *nh,
-                struct notifier_block *);
+                struct notifier_block *nb);
-extern int blocking_notifier_chain_unregister(struct blocking_notifier_head *,
+extern int blocking_notifier_chain_unregister(struct blocking_notifier_head *nh,
-                struct notifier_block *);
+                struct notifier_block *nb);
-extern int raw_notifier_chain_unregister(struct raw_notifier_head *,
+extern int raw_notifier_chain_unregister(struct raw_notifier_head *nh,
-                struct notifier_block *);
+                struct notifier_block *nb);
-extern int srcu_notifier_chain_unregister(struct srcu_notifier_head *,
+extern int srcu_notifier_chain_unregister(struct srcu_notifier_head *nh,
-                struct notifier_block *);
+                struct notifier_block *nb);
-extern int atomic_notifier_call_chain(struct atomic_notifier_head *,
+extern int atomic_notifier_call_chain(struct atomic_notifier_head *nh,
                unsigned long val, void *v);
-extern int blocking_notifier_call_chain(struct blocking_notifier_head *,
+extern int __atomic_notifier_call_chain(struct atomic_notifier_head *nh,
+        unsigned long val, void *v, int nr_to_call, int *nr_calls);
+extern int blocking_notifier_call_chain(struct blocking_notifier_head *nh,
                unsigned long val, void *v);
-extern int raw_notifier_call_chain(struct raw_notifier_head *,
+extern int __blocking_notifier_call_chain(struct blocking_notifier_head *nh,
+        unsigned long val, void *v, int nr_to_call, int *nr_calls);
+extern int raw_notifier_call_chain(struct raw_notifier_head *nh,
                unsigned long val, void *v);
-extern int srcu_notifier_call_chain(struct srcu_notifier_head *,
+extern int __raw_notifier_call_chain(struct raw_notifier_head *nh,
+        unsigned long val, void *v, int nr_to_call, int *nr_calls);
+extern int srcu_notifier_call_chain(struct srcu_notifier_head *nh,
                unsigned long val, void *v);
+extern int __srcu_notifier_call_chain(struct srcu_notifier_head *nh,
+        unsigned long val, void *v, int nr_to_call, int *nr_calls);
 #define NOTIFY_DONE             0x0000          /* Don't care */
 #define NOTIFY_OK               0x0001          /* Suits me */
@@ -186,6 +194,20 @@ extern int srcu_notifier_call_chain(struct srcu_notifier_head *,
 #define CPU_DOWN_PREPARE        0x0005 /* CPU (unsigned)v going down */
 #define CPU_DOWN_FAILED         0x0006 /* CPU (unsigned)v NOT going down */
 #define CPU_DEAD                0x0007 /* CPU (unsigned)v dead */
+#define CPU_LOCK_ACQUIRE        0x0008 /* Acquire all hotcpu locks */
+#define CPU_LOCK_RELEASE        0x0009 /* Release all hotcpu locks */
+/* Used for CPU hotplug events occuring while tasks are frozen due to a suspend
+ * operation in progress
+ */
+#define CPU_TASKS_FROZEN        0x0010
+#define CPU_ONLINE_FROZEN       (CPU_ONLINE | CPU_TASKS_FROZEN)
+#define CPU_UP_PREPARE_FROZEN   (CPU_UP_PREPARE | CPU_TASKS_FROZEN)
+#define CPU_UP_CANCELED_FROZEN  (CPU_UP_CANCELED | CPU_TASKS_FROZEN)
+#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)
+#define CPU_DOWN_FAILED_FROZEN  (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)
+#define CPU_DEAD_FROZEN         (CPU_DEAD | CPU_TASKS_FROZEN)
 #endif /* __KERNEL__ */
 #endif /* _LINUX_NOTIFIER_H */
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 6e8fa3049e5d..87545e0f0b58 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -107,26 +107,11 @@ typedef int __bitwise suspend_state_t;
 #define PM_SUSPEND_ON           ((__force suspend_state_t) 0)
 #define PM_SUSPEND_STANDBY      ((__force suspend_state_t) 1)
 #define PM_SUSPEND_MEM          ((__force suspend_state_t) 3)
-#define PM_SUSPEND_DISK         ((__force suspend_state_t) 4)
+#define PM_SUSPEND_MAX          ((__force suspend_state_t) 4)
-#define PM_SUSPEND_MAX          ((__force suspend_state_t) 5)
-typedef int __bitwise suspend_disk_method_t;
-/* invalid must be 0 so struct pm_ops initialisers can leave it out */
-#define PM_DISK_INVALID         ((__force suspend_disk_method_t) 0)
-#define PM_DISK_PLATFORM        ((__force suspend_disk_method_t) 1)
-#define PM_DISK_SHUTDOWN        ((__force suspend_disk_method_t) 2)
-#define PM_DISK_REBOOT          ((__force suspend_disk_method_t) 3)
-#define PM_DISK_TEST            ((__force suspend_disk_method_t) 4)
-#define PM_DISK_TESTPROC        ((__force suspend_disk_method_t) 5)
-#define PM_DISK_MAX             ((__force suspend_disk_method_t) 6)
 /**
 * struct pm_ops - Callbacks for managing platform dependent suspend states.
 * @valid: Callback to determine whether the given state can be entered.
- *      If %CONFIG_SOFTWARE_SUSPEND is set then %PM_SUSPEND_DISK is
- *      always valid and never passed to this call. If not assigned,
- *      no suspend states are valid.
 *      Valid states are advertised in /sys/power/state but can still
 *      be rejected by prepare or enter if the conditions aren't right.
 *      There is a %pm_valid_only_mem function available that can be assigned
@@ -140,24 +125,12 @@ typedef int __bitwise suspend_disk_method_t;
 *
 * @finish: Called when the system has left the given state and all devices
 *      are resumed. The return value is ignored.
- *
- * @pm_disk_mode: The generic code always allows one of the shutdown methods
- *      %PM_DISK_SHUTDOWN, %PM_DISK_REBOOT, %PM_DISK_TEST and
- *      %PM_DISK_TESTPROC. If this variable is set, the mode it is set
- *      to is allowed in addition to those modes and is also made default.
- *      When this mode is sent selected, the @prepare call will be called
- *      before suspending to disk (if present), the @enter call should be
- *      present and will be called after all state has been saved and the
- *      machine is ready to be powered off; the @finish callback is called
- *      after state has been restored. All these calls are called with
- *      %PM_SUSPEND_DISK as the state.
 */
 struct pm_ops {
        int (*valid)(suspend_state_t state);
        int (*prepare)(suspend_state_t state);
        int (*enter)(suspend_state_t state);
        int (*finish)(suspend_state_t state);
-        suspend_disk_method_t pm_disk_mode;
 };
 /**
@@ -276,8 +249,6 @@ extern void device_power_up(void);
 extern void device_resume(void);
 #ifdef CONFIG_PM
-extern suspend_disk_method_t pm_disk_mode;
 extern int device_suspend(pm_message_t state);
 extern int device_prepare_suspend(pm_message_t state);
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index 0deb842541ac..f9e77d2ee320 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -87,10 +87,10 @@ do {									\
 * management of their lifetimes must be completely managed by API users.
 *
 * For API usage, in general,
- * - any function _modifying_ the the tree or tags (inserting or deleting
+ * - any function _modifying_ the tree or tags (inserting or deleting
 *   items, setting or clearing tags must exclude other modifications, and
 *   exclude any functions reading the tree.
- * - any function _reading_ the the tree or tags (looking up items or tags,
+ * - any function _reading_ the tree or tags (looking up items or tags,
 *   gang lookups) must exclude modifications to the tree, but may occur
 *   concurrently with other readers.
 *
diff --git a/include/linux/relay.h b/include/linux/relay.h
index 759a0f97bec2..6cd8c4425fc7 100644
--- a/include/linux/relay.h
+++ b/include/linux/relay.h
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <linux/sched.h>
+#include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/list.h>
 #include <linux/fs.h>
@@ -38,7 +39,7 @@ struct rchan_buf
        size_t subbufs_consumed;        /* count of sub-buffers consumed */
        struct rchan *chan;             /* associated channel */
        wait_queue_head_t read_wait;    /* reader wait queue */
-        struct delayed_work wake_readers; /* reader wake-up work struct */
+        struct timer_list timer;        /* reader wake-up timer */
        struct dentry *dentry;          /* channel file dentry */
        struct kref kref;               /* channel buffer refcount */
        struct page **page_array;       /* array of current buffer pages */
diff --git a/include/linux/rslib.h b/include/linux/rslib.h
index ace25acfdc97..746580c1939c 100644
--- a/include/linux/rslib.h
+++ b/include/linux/rslib.h
@@ -34,6 +34,7 @@
 * @prim:       Primitive element, index form
 * @iprim:      prim-th root of 1, index form
 * @gfpoly:     The primitive generator polynominal
+ * @gffunc:     Function to generate the field, if non-canonical representation
 * @users:      Users of this structure
 * @list:       List entry for the rs control list
 */
@@ -48,6 +49,7 @@ struct rs_control {
        int             prim;
        int             iprim;
        int             gfpoly;
+        int             (*gffunc)(int);
        int             users;
        struct list_head list;
 };
@@ -77,6 +79,8 @@ int decode_rs16(struct rs_control *rs, uint16_t *data, uint16_t *par, int len,
 /* Create or get a matching rs control structure */
 struct rs_control *init_rs(int symsize, int gfpoly, int fcr, int prim,
                           int nroots);
+struct rs_control *init_rs_non_canonical(int symsize, int (*func)(int),
+                                         int fcr, int prim, int nroots);
 /* Release a rs control structure */
 void free_rs(struct rs_control *rs);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 3d95c480f58d..17b72d88c4cb 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -817,7 +817,7 @@ struct prio_array;
 struct task_struct {
        volatile long state;    /* -1 unrunnable, 0 runnable, >0 stopped */
-        struct thread_info *thread_info;
+        void *stack;
        atomic_t usage;
        unsigned int flags;     /* per process flags, defined below */
        unsigned int ptrace;
@@ -1317,6 +1317,7 @@ extern int in_egroup_p(gid_t);
 extern void proc_caches_init(void);
 extern void flush_signals(struct task_struct *);
+extern void ignore_signals(struct task_struct *);
 extern void flush_signal_handlers(struct task_struct *, int force_default);
 extern int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info);
@@ -1512,8 +1513,8 @@ static inline void unlock_task_sighand(struct task_struct *tsk,
 #ifndef __HAVE_THREAD_FUNCTIONS
-#define task_thread_info(task) (task)->thread_info
+#define task_thread_info(task)  ((struct thread_info *)(task)->stack)
-#define task_stack_page(task) ((void*)((task)->thread_info))
+#define task_stack_page(task)   ((task)->stack)
 static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
 {
@@ -1523,7 +1524,7 @@ static inline void setup_thread_stack(struct task_struct *p, struct task_struct
 static inline unsigned long *end_of_stack(struct task_struct *p)
 {
-        return (unsigned long *)(p->thread_info + 1);
+        return (unsigned long *)(task_thread_info(p) + 1);
 }
 #endif
diff --git a/include/linux/security.h b/include/linux/security.h
index 47e82c120f9a..9eb9e0fe0331 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -322,7 +322,7 @@ struct request_sock;
 *      @dir contains the inode structure of parent of the new file.
 *      @dentry contains the dentry structure of the new file.
 *      @mode contains the mode of the new file.
- *      @dev contains the the device number.
+ *      @dev contains the device number.
 *      Return 0 if permission is granted.
 * @inode_rename:
 *      Check for permission to rename a file or directory.
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 14749056dd63..3fa0fab4a04b 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -243,6 +243,131 @@ extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
 extern struct kmem_cache *sighand_cachep;
+/*
+ * In POSIX a signal is sent either to a specific thread (Linux task)
+ * or to the process as a whole (Linux thread group).  How the signal
+ * is sent determines whether it's to one thread or the whole group,
+ * which determines which signal mask(s) are involved in blocking it
+ * from being delivered until later.  When the signal is delivered,
+ * either it's caught or ignored by a user handler or it has a default
+ * effect that applies to the whole thread group (POSIX process).
+ *
+ * The possible effects an unblocked signal set to SIG_DFL can have are:
+ *   ignore     - Nothing Happens
+ *   terminate  - kill the process, i.e. all threads in the group,
+ *                similar to exit_group.  The group leader (only) reports
+ *                WIFSIGNALED status to its parent.
+ *   coredump   - write a core dump file describing all threads using
+ *                the same mm and then kill all those threads
+ *   stop       - stop all the threads in the group, i.e. TASK_STOPPED state
+ *
+ * SIGKILL and SIGSTOP cannot be caught, blocked, or ignored.
+ * Other signals when not blocked and set to SIG_DFL behaves as follows.
+ * The job control signals also have other special effects.
+ *
+ *      +--------------------+------------------+
+ *      |  POSIX signal      |  default action  |
+ *      +--------------------+------------------+
+ *      |  SIGHUP            |  terminate       |
+ *      |  SIGINT            |  terminate       |
+ *      |  SIGQUIT           |  coredump        |
+ *      |  SIGILL            |  coredump        |
+ *      |  SIGTRAP           |  coredump        |
+ *      |  SIGABRT/SIGIOT    |  coredump        |
+ *      |  SIGBUS            |  coredump        |
+ *      |  SIGFPE            |  coredump        |
+ *      |  SIGKILL           |  terminate(+)    |
+ *      |  SIGUSR1           |  terminate       |
+ *      |  SIGSEGV           |  coredump        |
+ *      |  SIGUSR2           |  terminate       |
+ *      |  SIGPIPE           |  terminate       |
+ *      |  SIGALRM           |  terminate       |
+ *      |  SIGTERM           |  terminate       |
+ *      |  SIGCHLD           |  ignore          |
+ *      |  SIGCONT           |  ignore(*)       |
+ *      |  SIGSTOP           |  stop(*)(+)      |
+ *      |  SIGTSTP           |  stop(*)         |
+ *      |  SIGTTIN           |  stop(*)         |
+ *      |  SIGTTOU           |  stop(*)         |
+ *      |  SIGURG            |  ignore          |
+ *      |  SIGXCPU           |  coredump        |
+ *      |  SIGXFSZ           |  coredump        |
+ *      |  SIGVTALRM         |  terminate       |
+ *      |  SIGPROF           |  terminate       |
+ *      |  SIGPOLL/SIGIO     |  terminate       |
+ *      |  SIGSYS/SIGUNUSED  |  coredump        |
+ *      |  SIGSTKFLT         |  terminate       |
+ *      |  SIGWINCH          |  ignore          |
+ *      |  SIGPWR            |  terminate       |
+ *      |  SIGRTMIN-SIGRTMAX |  terminate       |
+ *      +--------------------+------------------+
+ *      |  non-POSIX signal  |  default action  |
+ *      +--------------------+------------------+
+ *      |  SIGEMT            |  coredump        |
+ *      +--------------------+------------------+
+ *
+ * (+) For SIGKILL and SIGSTOP the action is "always", not just "default".
+ * (*) Special job control effects:
+ * When SIGCONT is sent, it resumes the process (all threads in the group)
+ * from TASK_STOPPED state and also clears any pending/queued stop signals
+ * (any of those marked with "stop(*)").  This happens regardless of blocking,
+ * catching, or ignoring SIGCONT.  When any stop signal is sent, it clears
+ * any pending/queued SIGCONT signals; this happens regardless of blocking,
+ * catching, or ignored the stop signal, though (except for SIGSTOP) the
+ * default action of stopping the process may happen later or never.
+ */
+#ifdef SIGEMT
+#define SIGEMT_MASK     rt_sigmask(SIGEMT)
+#else
+#define SIGEMT_MASK     0
+#endif
+#if SIGRTMIN > BITS_PER_LONG
+#define rt_sigmask(sig) (1ULL << ((sig)-1))
+#else
+#define rt_sigmask(sig) sigmask(sig)
+#endif
+#define siginmask(sig, mask) (rt_sigmask(sig) & (mask))
+#define SIG_KERNEL_ONLY_MASK (\
+        rt_sigmask(SIGKILL)   |  rt_sigmask(SIGSTOP))
+#define SIG_KERNEL_STOP_MASK (\
+        rt_sigmask(SIGSTOP)   |  rt_sigmask(SIGTSTP)   | \
+        rt_sigmask(SIGTTIN)   |  rt_sigmask(SIGTTOU)   )
+#define SIG_KERNEL_COREDUMP_MASK (\
+        rt_sigmask(SIGQUIT)   |  rt_sigmask(SIGILL)    | \
+        rt_sigmask(SIGTRAP)   |  rt_sigmask(SIGABRT)   | \
+        rt_sigmask(SIGFPE)    |  rt_sigmask(SIGSEGV)   | \
+        rt_sigmask(SIGBUS)    |  rt_sigmask(SIGSYS)    | \
+        rt_sigmask(SIGXCPU)   |  rt_sigmask(SIGXFSZ)   | \
+        SIGEMT_MASK                                    )
+#define SIG_KERNEL_IGNORE_MASK (\
+        rt_sigmask(SIGCONT)   |  rt_sigmask(SIGCHLD)   | \
+        rt_sigmask(SIGWINCH)  |  rt_sigmask(SIGURG)    )
+#define sig_kernel_only(sig) \
+        (((sig) < SIGRTMIN) && siginmask(sig, SIG_KERNEL_ONLY_MASK))
+#define sig_kernel_coredump(sig) \
+        (((sig) < SIGRTMIN) && siginmask(sig, SIG_KERNEL_COREDUMP_MASK))
+#define sig_kernel_ignore(sig) \
+        (((sig) < SIGRTMIN) && siginmask(sig, SIG_KERNEL_IGNORE_MASK))
+#define sig_kernel_stop(sig) \
+        (((sig) < SIGRTMIN) && siginmask(sig, SIG_KERNEL_STOP_MASK))
+#define sig_needs_tasklist(sig) ((sig) == SIGCONT)
+#define sig_user_defined(t, signr) \
+        (((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_DFL) &&  \
+         ((t)->sighand->action[(signr)-1].sa.sa_handler != SIG_IGN))
+#define sig_fatal(t, signr) \
+        (!siginmask(signr, SIG_KERNEL_IGNORE_MASK|SIG_KERNEL_STOP_MASK) && \
+         (t)->sighand->action[(signr)-1].sa.sa_handler == SIG_DFL)
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SIGNAL_H */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 7ba23ec8211b..3f70149eabbb 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -83,7 +83,6 @@ void smp_prepare_boot_cpu(void);
 *      These macros fold the SMP functionality into a single CPU system
 */
 #define raw_smp_processor_id()                  0
-#define hard_smp_processor_id()                 0
 static inline int up_smp_call_function(void)
 {
        return 0;
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index f56d24734950..34d4b075f7b8 100644
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
- * Copyright (C) 2001-2002 Alc�ve <www.alcove.com>
+ * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
 *
 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
 *
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 35fa4d5aadd0..4a7ae8ab6eb8 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -396,4 +396,23 @@ char *		   svc_print_addr(struct svc_rqst *, char *, size_t);
 #define RPC_MAX_ADDRBUFLEN      (63U)
+/*
+ * When we want to reduce the size of the reserved space in the response
+ * buffer, we need to take into account the size of any checksum data that
+ * may be at the end of the packet. This is difficult to determine exactly
+ * for all cases without actually generating the checksum, so we just use a
+ * static value.
+ */
+static inline void
+svc_reserve_auth(struct svc_rqst *rqstp, int space)
+{
+        int                     added_space = 0;
+        switch(rqstp->rq_authop->flavour) {
+                case RPC_AUTH_GSS:
+                        added_space = RPC_MAX_AUTH_SIZE;
+        }
+        return svc_reserve(rqstp, space + added_space);
+}
 #endif /* SUNRPC_SVC_H */
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index 7909687557bf..e21dd93ac4b7 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -37,7 +37,8 @@ struct svc_sock {
        atomic_t                sk_reserved;    /* space on outq that is reserved */
-        spinlock_t              sk_defer_lock;  /* protects sk_deferred */
+        spinlock_t              sk_lock;        /* protects sk_deferred and
+                                                 * sk_info_authunix */
        struct list_head        sk_deferred;    /* deferred requests that need to
                                                 * be revisted */
        struct mutex            sk_mutex;       /* to serialize sending data */
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 9d2aa1a12aa0..9c7cb6430666 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -32,18 +32,51 @@ static inline int pm_prepare_console(void) { return 0; }
 static inline void pm_restore_console(void) {}
 #endif
+/**
+ * struct hibernation_ops - hibernation platform support
+ *
+ * The methods in this structure allow a platform to override the default
+ * mechanism of shutting down the machine during a hibernation transition.
+ *
+ * All three methods must be assigned.
+ *
+ * @prepare: prepare system for hibernation
+ * @enter: shut down system after state has been saved to disk
+ * @finish: finish/clean up after state has been reloaded
+ */
+struct hibernation_ops {
+        int (*prepare)(void);
+        int (*enter)(void);
+        void (*finish)(void);
+};
 #if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND)
 /* kernel/power/snapshot.c */
-extern void __init register_nosave_region(unsigned long, unsigned long);
+extern void __register_nosave_region(unsigned long b, unsigned long e, int km);
+static inline void register_nosave_region(unsigned long b, unsigned long e)
+{
+        __register_nosave_region(b, e, 0);
+}
+static inline void register_nosave_region_late(unsigned long b, unsigned long e)
+{
+        __register_nosave_region(b, e, 1);
+}
 extern int swsusp_page_is_forbidden(struct page *);
 extern void swsusp_set_page_free(struct page *);
 extern void swsusp_unset_page_free(struct page *);
 extern unsigned long get_safe_page(gfp_t gfp_mask);
+extern void hibernation_set_ops(struct hibernation_ops *ops);
+extern int hibernate(void);
 #else
 static inline void register_nosave_region(unsigned long b, unsigned long e) {}
+static inline void register_nosave_region_late(unsigned long b, unsigned long e) {}
 static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
 static inline void swsusp_set_page_free(struct page *p) {}
 static inline void swsusp_unset_page_free(struct page *p) {}
+static inline void hibernation_set_ops(struct hibernation_ops *ops) {}
+static inline int hibernate(void) { return -ENOSYS; }
 #endif /* defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND) */
 void save_processor_state(void);
diff --git a/include/linux/svga.h b/include/linux/svga.h
index e1cc552e04fe..13ad0b82ac28 100644
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -113,6 +113,8 @@ void svga_tilefill(struct fb_info *info, struct fb_tilerect *rect);
 void svga_tileblit(struct fb_info *info, struct fb_tileblit *blit);
 void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor);
 int svga_get_tilemax(struct fb_info *info);
+void svga_get_caps(struct fb_info *info, struct fb_blit_caps *caps,
+                   struct fb_var_screeninfo *var);
 int svga_compute_pll(const struct svga_pll *pll, u32 f_wanted, u16 *m, u16 *n, u16 *r, int node);
 int svga_check_timings(const struct svga_timing_regs *tm, struct fb_var_screeninfo *var, int node);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 1912c6cbef55..3139f4412297 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -576,6 +576,8 @@ asmlinkage long sys_fstatat64(int dfd, char __user *filename,
                               struct stat64 __user *statbuf, int flag);
 asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *buf,
                               int bufsiz);
+asmlinkage long sys_utimensat(int dfd, char __user *filename,
+                                struct timespec __user *utimes, int flags);
 asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename,
                                     struct compat_timeval __user *t);
 asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,
diff --git a/include/linux/tifm.h b/include/linux/tifm.h
index 2a196982601f..6b3a31805c72 100644
--- a/include/linux/tifm.h
+++ b/include/linux/tifm.h
@@ -63,6 +63,7 @@ enum {
 #define TIFM_CTRL_LED             0x00000040
 #define TIFM_CTRL_FAST_CLK        0x00000100
+#define TIFM_CTRL_POWER_MASK      0x00000007
 #define TIFM_SOCK_STATE_OCCUPIED  0x00000008
 #define TIFM_SOCK_STATE_POWERED   0x00000080
diff --git a/include/linux/usb.h b/include/linux/usb.h
index cfbd2bb8fa2c..94bd38a6d947 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -126,7 +126,7 @@ enum usb_interface_condition {
 * Each interface may have alternate settings.  The initial configuration
 * of a device sets altsetting 0, but the device driver can change
 * that setting using usb_set_interface().  Alternate settings are often
- * used to control the the use of periodic endpoints, such as by having
+ * used to control the use of periodic endpoints, such as by having
 * different endpoints use different amounts of reserved USB bandwidth.
 * All standards-conformant USB devices that use isochronous endpoints
 * will use them in non-default settings.
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index acb1f105870c..d9325cf8a134 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -212,8 +212,6 @@ extern void dec_zone_state(struct zone *, enum zone_stat_item);
 extern void __dec_zone_state(struct zone *, enum zone_stat_item);
 void refresh_cpu_vm_stats(int);
-void refresh_vm_stats(void);
 #else /* CONFIG_SMP */
 /*
@@ -260,7 +258,6 @@ static inline void __dec_zone_page_state(struct page *page,
 #define mod_zone_page_state __mod_zone_page_state
 static inline void refresh_cpu_vm_stats(int cpu) { }
-static inline void refresh_vm_stats(void) { }
 #endif
 #endif /* _LINUX_VMSTAT_H */
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index f16ba1e0687d..d555f31c0746 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -24,15 +24,13 @@ typedef void (*work_func_t)(struct work_struct *work);
 struct work_struct {
        atomic_long_t data;
 #define WORK_STRUCT_PENDING 0           /* T if work item pending execution */
-#define WORK_STRUCT_NOAUTOREL 1         /* F if work item automatically released on exec */
 #define WORK_STRUCT_FLAG_MASK (3UL)
 #define WORK_STRUCT_WQ_DATA_MASK (~WORK_STRUCT_FLAG_MASK)
        struct list_head entry;
        work_func_t func;
 };
-#define WORK_DATA_INIT(autorelease) \
+#define WORK_DATA_INIT()        ATOMIC_LONG_INIT(0)
-        ATOMIC_LONG_INIT((autorelease) << WORK_STRUCT_NOAUTOREL)
 struct delayed_work {
        struct work_struct work;
@@ -44,14 +42,8 @@ struct execute_work {
 };
 #define __WORK_INITIALIZER(n, f) {                              \
-        .data = WORK_DATA_INIT(0),                              \
+        .data = WORK_DATA_INIT(),                               \
-        .entry  = { &(n).entry, &(n).entry },                   \
+        .entry  = { &(n).entry, &(n).entry },                   \
-        .func = (f),                                            \
-        }
-#define __WORK_INITIALIZER_NAR(n, f) {                          \
-        .data = WORK_DATA_INIT(1),                              \
-        .entry  = { &(n).entry, &(n).entry },                   \
        .func = (f),                                            \
        }
@@ -60,23 +52,12 @@ struct execute_work {
        .timer = TIMER_INITIALIZER(NULL, 0, 0),                 \
        }
-#define __DELAYED_WORK_INITIALIZER_NAR(n, f) {                  \
-        .work = __WORK_INITIALIZER_NAR((n).work, (f)),          \
-        .timer = TIMER_INITIALIZER(NULL, 0, 0),                 \
-        }
 #define DECLARE_WORK(n, f)                                      \
        struct work_struct n = __WORK_INITIALIZER(n, f)
-#define DECLARE_WORK_NAR(n, f)                                  \
-        struct work_struct n = __WORK_INITIALIZER_NAR(n, f)
 #define DECLARE_DELAYED_WORK(n, f)                              \
        struct delayed_work n = __DELAYED_WORK_INITIALIZER(n, f)
-#define DECLARE_DELAYED_WORK_NAR(n, f)                  \
-        struct dwork_struct n = __DELAYED_WORK_INITIALIZER_NAR(n, f)
 /*
 * initialize a work item's function pointer
 */
@@ -95,16 +76,9 @@ struct execute_work {
 * assignment of the work data initializer allows the compiler
 * to generate better code.
 */
-#define INIT_WORK(_work, _func)                                 \
+#define INIT_WORK(_work, _func)                                         \
-        do {                                                    \
-                (_work)->data = (atomic_long_t) WORK_DATA_INIT(0);      \
-                INIT_LIST_HEAD(&(_work)->entry);                \
-                PREPARE_WORK((_work), (_func));                 \
-        } while (0)
-#define INIT_WORK_NAR(_work, _func)                                     \
        do {                                                            \
-                (_work)->data = (atomic_long_t) WORK_DATA_INIT(1);      \
+                (_work)->data = (atomic_long_t) WORK_DATA_INIT();       \
                INIT_LIST_HEAD(&(_work)->entry);                        \
                PREPARE_WORK((_work), (_func));                         \
        } while (0)
@@ -115,12 +89,6 @@ struct execute_work {
                init_timer(&(_work)->timer);                    \
        } while (0)
-#define INIT_DELAYED_WORK_NAR(_work, _func)                     \
-        do {                                                    \
-                INIT_WORK_NAR(&(_work)->work, (_func));         \
-                init_timer(&(_work)->timer);                    \
-        } while (0)
 #define INIT_DELAYED_WORK_DEFERRABLE(_work, _func)                      \
        do {                                                    \
                INIT_WORK(&(_work)->work, (_func));             \
@@ -143,24 +111,10 @@ struct execute_work {
        work_pending(&(w)->work)
 /**
- * work_release - Release a work item under execution
+ * work_clear_pending - for internal use only, mark a work item as not pending
- * @work: The work item to release
+ * @work: The work item in question
- *
- * This is used to release a work item that has been initialised with automatic
- * release mode disabled (WORK_STRUCT_NOAUTOREL is set).  This gives the work
- * function the opportunity to grab auxiliary data from the container of the
- * work_struct before clearing the pending bit as the work_struct may be
- * subject to deallocation the moment the pending bit is cleared.
- *
- * In such a case, this should be called in the work function after it has
- * fetched any data it may require from the containter of the work_struct.
- * After this function has been called, the work_struct may be scheduled for
- * further execution or it may be deallocated unless other precautions are
- * taken.
- *
- * This should also be used to release a delayed work item.
 */
-#define work_release(work) \
+#define work_clear_pending(work) \
        clear_bit(WORK_STRUCT_PENDING, work_data_bits(work))
@@ -174,27 +128,28 @@ extern struct workqueue_struct *__create_workqueue(const char *name,
 extern void destroy_workqueue(struct workqueue_struct *wq);
 extern int FASTCALL(queue_work(struct workqueue_struct *wq, struct work_struct *work));
-extern int FASTCALL(queue_delayed_work(struct workqueue_struct *wq, struct delayed_work *work, unsigned long delay));
+extern int FASTCALL(queue_delayed_work(struct workqueue_struct *wq,
+                        struct delayed_work *work, unsigned long delay));
 extern int queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
-        struct delayed_work *work, unsigned long delay);
+                        struct delayed_work *work, unsigned long delay);
 extern void FASTCALL(flush_workqueue(struct workqueue_struct *wq));
+extern void flush_scheduled_work(void);
 extern int FASTCALL(schedule_work(struct work_struct *work));
-extern int FASTCALL(run_scheduled_work(struct work_struct *work));
+extern int FASTCALL(schedule_delayed_work(struct delayed_work *work,
-extern int FASTCALL(schedule_delayed_work(struct delayed_work *work, unsigned long delay));
+                                        unsigned long delay));
+extern int schedule_delayed_work_on(int cpu, struct delayed_work *work,
-extern int schedule_delayed_work_on(int cpu, struct delayed_work *work, unsigned long delay);
+                                        unsigned long delay);
 extern int schedule_on_each_cpu(work_func_t func);
-extern void flush_scheduled_work(void);
 extern int current_is_keventd(void);
 extern int keventd_up(void);
 extern void init_workqueues(void);
-void cancel_rearming_delayed_work(struct delayed_work *work);
-void cancel_rearming_delayed_workqueue(struct workqueue_struct *,
-                                       struct delayed_work *);
 int execute_in_process_context(work_func_t fn, struct execute_work *);
+extern void cancel_work_sync(struct work_struct *work);
 /*
 * Kill off a pending schedule_delayed_work().  Note that the work callback
 * function may still be running on return from cancel_delayed_work(), unless
@@ -207,8 +162,18 @@ static inline int cancel_delayed_work(struct delayed_work *work)
        ret = del_timer(&work->timer);
        if (ret)
-                work_release(&work->work);
+                work_clear_pending(&work->work);
        return ret;
 }
+extern void cancel_rearming_delayed_work(struct delayed_work *work);
+/* Obsolete. use cancel_rearming_delayed_work() */
+static inline
+void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,
+                                        struct delayed_work *work)
+{
+        cancel_rearming_delayed_work(work);
+}
 #endif
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index d56b2923d61a..bbd85cd61ed5 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -1291,6 +1291,8 @@ extern u8 ieee80211_get_channel_flags(struct ieee80211_device *ieee,
 extern const struct ieee80211_channel *ieee80211_get_channel(struct
                                                             ieee80211_device
                                                             *ieee, u8 channel);
+extern u32 ieee80211_channel_to_freq(struct ieee80211_device * ieee,
+                                      u8 channel);
 /* ieee80211_wx.c */
 extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
diff --git a/include/net/irda/af_irda.h b/include/net/irda/af_irda.h
index 7a209f61c482..0df574931522 100644
--- a/include/net/irda/af_irda.h
+++ b/include/net/irda/af_irda.h
@@ -17,7 +17,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h
index 89fe534045f1..36bee441aa56 100644
--- a/include/net/irda/irda.h
+++ b/include/net/irda/irda.h
@@ -17,7 +17,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/include/net/irda/iriap.h b/include/net/irda/iriap.h
index 2007c5a0a43f..fcc896491a95 100644
--- a/include/net/irda/iriap.h
+++ b/include/net/irda/iriap.h
@@ -17,7 +17,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/iriap_event.h b/include/net/irda/iriap_event.h
index 4ca3d2071b03..89747f06d9eb 100644
--- a/include/net/irda/iriap_event.h
+++ b/include/net/irda/iriap_event.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irias_object.h b/include/net/irda/irias_object.h
index c41196b87955..83f78081799c 100644
--- a/include/net/irda/irias_object.h
+++ b/include/net/irda/irias_object.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/include/net/irda/irlan_client.h b/include/net/irda/irlan_client.h
index 736dabe211e3..fa8455eda280 100644
--- a/include/net/irda/irlan_client.h
+++ b/include/net/irda/irlan_client.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irlan_common.h b/include/net/irda/irlan_common.h
index 9592c374b41d..73cacb3ac16c 100644
--- a/include/net/irda/irlan_common.h
+++ b/include/net/irda/irlan_common.h
@@ -17,7 +17,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irlan_eth.h b/include/net/irda/irlan_eth.h
index 9a9b3619d305..0062347600b9 100644
--- a/include/net/irda/irlan_eth.h
+++ b/include/net/irda/irlan_eth.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/include/net/irda/irlan_event.h b/include/net/irda/irlan_event.h
index b9baac9eb8b6..6d9539f05806 100644
--- a/include/net/irda/irlan_event.h
+++ b/include/net/irda/irlan_event.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irlan_filter.h b/include/net/irda/irlan_filter.h
index 1720539ac2c1..a5a2539485bd 100644
--- a/include/net/irda/irlan_filter.h
+++ b/include/net/irda/irlan_filter.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/include/net/irda/irlan_provider.h b/include/net/irda/irlan_provider.h
index ca51d5b7c999..92f3b0e1029b 100644
--- a/include/net/irda/irlan_provider.h
+++ b/include/net/irda/irlan_provider.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h
index e77eb88d9226..f0248fb8e196 100644
--- a/include/net/irda/irlap.h
+++ b/include/net/irda/irlap.h
@@ -18,7 +18,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h
index e212b9bc2503..3ffc1d0f93d6 100644
--- a/include/net/irda/irlmp.h
+++ b/include/net/irda/irlmp.h
@@ -18,7 +18,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irlmp_event.h b/include/net/irda/irlmp_event.h
index 03c6f81a502a..e03ae4ae3963 100644
--- a/include/net/irda/irlmp_event.h
+++ b/include/net/irda/irlmp_event.h
@@ -18,7 +18,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irlmp_frame.h b/include/net/irda/irlmp_frame.h
index c463f8bca856..1906eb71422e 100644
--- a/include/net/irda/irlmp_frame.h
+++ b/include/net/irda/irlmp_frame.h
@@ -17,7 +17,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/irmod.h b/include/net/irda/irmod.h
index 72b446c1e22c..86f0dbb8ee5d 100644
--- a/include/net/irda/irmod.h
+++ b/include/net/irda/irmod.h
@@ -17,7 +17,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charg.
 *     
diff --git a/include/net/irda/irqueue.h b/include/net/irda/irqueue.h
index 335b0ace9665..37f512bd6733 100644
--- a/include/net/irda/irqueue.h
+++ b/include/net/irda/irqueue.h
@@ -21,7 +21,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h
index a899e5837be8..cf80c1af5854 100644
--- a/include/net/irda/irttp.h
+++ b/include/net/irda/irttp.h
@@ -18,7 +18,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/parameters.h b/include/net/irda/parameters.h
index 3a605d37ddbf..c0d938847bd3 100644
--- a/include/net/irda/parameters.h
+++ b/include/net/irda/parameters.h
@@ -26,7 +26,7 @@
 *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
 *     MA 02111-1307 USA
 *
- *     Michel D�nzer <daenzer@debian.org>, 10/2001
+ *     Michel Dänzer <daenzer@debian.org>, 10/2001
 *     - simplify irda_pv_t to avoid endianness issues
 *     
 ********************************************************************/
diff --git a/include/net/irda/timer.h b/include/net/irda/timer.h
index cb61568547d1..cb2615ccf761 100644
--- a/include/net/irda/timer.h
+++ b/include/net/irda/timer.h
@@ -18,7 +18,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/net/irda/wrapper.h b/include/net/irda/wrapper.h
index 98768b3f9e31..2942ad6ab932 100644
--- a/include/net/irda/wrapper.h
+++ b/include/net/irda/wrapper.h
@@ -17,7 +17,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index ad0182ef7809..2e6bdc4e7a0a 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -314,8 +314,7 @@ struct scsi_core {
        struct list_head  task_queue;
        int               task_queue_size;
-        struct semaphore  queue_thread_sema;
+        struct task_struct *queue_thread;
-        int               queue_thread_kill;
 };
 struct sas_ha_event {