86 files changed, 687 insertions, 649 deletions
diff --git a/include/asm-arm/arch-pxa/regs-ssp.h b/include/asm-arm/arch-pxa/regs-ssp.h
index 991cb688db75..0255328c3c18 100644
--- a/include/asm-arm/arch-pxa/regs-ssp.h
+++ b/include/asm-arm/arch-pxa/regs-ssp.h
@@ -85,6 +85,7 @@
 #define SSCR1_RSRE              (1 << 20)       /* Receive Service Request Enable */
 #define SSCR1_TINTE             (1 << 19)       /* Receiver Time-out Interrupt enable */
 #define SSCR1_PINTE             (1 << 18)       /* Peripheral Trailing Byte Interupt Enable */
+#define SSCR1_IFS               (1 << 16)       /* Invert Frame Signal */
 #define SSCR1_STRF              (1 << 15)       /* Select FIFO or EFWR */
 #define SSCR1_EFWR              (1 << 14)       /* Enable FIFO Write/Read */
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index c59fad18e73b..bcc8aed7c9a9 100644
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -17,7 +17,7 @@ struct sys_timer;
 struct machine_desc {
        /*
         * Note! The first four elements are used
-         * by assembler code in head-armv.S
+         * by assembler code in head.S, head-common.S
         */
        unsigned int            nr;             /* architecture number  */
        unsigned int            phys_io;        /* start of physical io */
diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h
index e8c986667532..f184eb8c047c 100644
--- a/include/asm-frv/unistd.h
+++ b/include/asm-frv/unistd.h
@@ -328,9 +328,11 @@
 #define __NR_epoll_pwait        319
 #define __NR_utimensat          320
 #define __NR_signalfd           321
-/* #define __NR_timerfd         322 removed */
+#define __NR_timerfd_create     322
 #define __NR_eventfd            323
 #define __NR_fallocate          324
+#define __NR_timerfd_settime    325
+#define __NR_timerfd_gettime    326
 #ifdef __KERNEL__
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h
index 4b8d31cda1a0..b0e63c672ebd 100644
--- a/include/asm-generic/percpu.h
+++ b/include/asm-generic/percpu.h
@@ -32,6 +32,8 @@ extern unsigned long __per_cpu_offset[NR_CPUS];
 */
 #ifndef __my_cpu_offset
 #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id())
+#endif
+#ifdef CONFIG_DEBUG_PREEMPT
 #define my_cpu_offset per_cpu_offset(smp_processor_id())
 #else
 #define my_cpu_offset __my_cpu_offset
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index f784d2f34149..f054778e916c 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -238,6 +238,9 @@
                *(.kprobes.text)                                        \
                VMLINUX_SYMBOL(__kprobes_text_end) = .;
+/* Section used for early init (in .S files) */
+#define HEAD_TEXT  *(.head.text)
 /* init and exit section handling */
 #define INIT_DATA                                                       \
        *(.init.data)                                                   \
diff --git a/include/asm-h8300/hardirq.h b/include/asm-h8300/hardirq.h
index 18fa7931e09f..9d7f7a7462b2 100644
--- a/include/asm-h8300/hardirq.h
+++ b/include/asm-h8300/hardirq.h
@@ -12,6 +12,8 @@ typedef struct {
 #include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
+extern void ack_bad_irq(unsigned int irq);
 #define HARDIRQ_BITS    8
 /*
diff --git a/include/asm-h8300/irq.h b/include/asm-h8300/irq.h
index 56eec28cc2c4..13d7c601cd0a 100644
--- a/include/asm-h8300/irq.h
+++ b/include/asm-h8300/irq.h
@@ -3,7 +3,7 @@
 #include <asm/ptrace.h>
-#if defined(__H8300H__)
+#if defined(CONFIG_CPU_H8300H)
 #define NR_IRQS 64
 #define EXT_IRQ0 12
 #define EXT_IRQ1 13
@@ -14,14 +14,6 @@
 #define EXT_IRQ6 18
 #define EXT_IRQ7 19
 #define EXT_IRQS 5
-#include <asm/regs306x.h>
-#define h8300_clear_isr(irq)                                                \
-do {                                                                        \
-        if (irq >= EXT_IRQ0 && irq <= EXT_IRQ5)                             \
-                *(volatile unsigned char *)ISR &= ~(1 << (irq - EXT_IRQ0)); \
-} while(0)
 #define IER_REGS *(volatile unsigned char *)IER
 #endif
 #if defined(CONFIG_CPU_H8S)
@@ -44,13 +36,6 @@ do {                                                                        \
 #define EXT_IRQ15 31
 #define EXT_IRQS 15
-#include <asm/regs267x.h>
-#define h8300_clear_isr(irq)                                                 \
-do {                                                                         \
-        if (irq >= EXT_IRQ0 && irq <= EXT_IRQ15)                             \
-                *(volatile unsigned short *)ISR &= ~(1 << (irq - EXT_IRQ0)); \
-} while(0)
 #define IER_REGS *(volatile unsigned short *)IER
 #endif
@@ -59,4 +44,6 @@ static __inline__ int irq_canonicalize(int irq)
        return irq;
 }
+typedef void (*h8300_vector)(void);
 #endif /* _H8300_IRQ_H_ */
diff --git a/include/asm-h8300/uaccess.h b/include/asm-h8300/uaccess.h
index ebe58c6c8387..a22350ec271a 100644
--- a/include/asm-h8300/uaccess.h
+++ b/include/asm-h8300/uaccess.h
@@ -91,7 +91,7 @@ extern int __put_user_bad(void);
 #define get_user(x, ptr)                                        \
 ({                                                              \
    int __gu_err = 0;                                           \
-    typeof(*(ptr)) __gu_val = 0;                                \
+    uint32_t __gu_val = 0;                              \
    switch (sizeof(*(ptr))) {                                   \
    case 1:                                                     \
    case 2:                                                     \
@@ -106,7 +106,7 @@ extern int __put_user_bad(void);
        __gu_err = __get_user_bad();                            \
        break;                                                  \
    }                                                           \
-    (x) = __gu_val;                                             \
+    (x) = (typeof(*(ptr)))__gu_val;                             \
    __gu_err;                                                   \
 })
 #define __get_user(x, ptr) get_user(x, ptr)
diff --git a/include/asm-mips/mach-db1x00/db1200.h b/include/asm-mips/mach-db1x00/db1200.h
index 050eae87ff01..a6bdac61ab49 100644
--- a/include/asm-mips/mach-db1x00/db1200.h
+++ b/include/asm-mips/mach-db1x00/db1200.h
@@ -25,6 +25,7 @@
 #define __ASM_DB1200_H
 #include <linux/types.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>
 // This is defined in au1000.h with bogus value
 #undef AU1X00_EXTERNAL_INT
diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/include/asm-mips/mach-db1x00/db1x00.h
index 0f5f4c29f4e8..e7a88ba35833 100644
--- a/include/asm-mips/mach-db1x00/db1x00.h
+++ b/include/asm-mips/mach-db1x00/db1x00.h
@@ -28,6 +28,7 @@
 #ifndef __ASM_DB1X00_H
 #define __ASM_DB1X00_H
+#include <asm/mach-au1x00/au1xxx_psc.h>
 #ifdef CONFIG_MIPS_DB1550
diff --git a/include/asm-mips/mach-ip27/dma-coherence.h b/include/asm-mips/mach-ip27/dma-coherence.h
index 3fdbbf68e952..ed7e6222dc15 100644
--- a/include/asm-mips/mach-ip27/dma-coherence.h
+++ b/include/asm-mips/mach-ip27/dma-coherence.h
@@ -35,7 +35,7 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
 static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
 {
-        return dma_addr & (0xffUL << 56);
+        return dma_addr & ~(0xffUL << 56);
 }
 static inline void plat_unmap_dma_mem(dma_addr_t dma_addr)
diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/include/asm-mips/mach-pb1x00/pb1200.h
index d9f384acfea9..ed5fd7390678 100644
--- a/include/asm-mips/mach-pb1x00/pb1200.h
+++ b/include/asm-mips/mach-pb1x00/pb1200.h
@@ -25,6 +25,7 @@
 #define __ASM_PB1200_H
 #include <linux/types.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>
 // This is defined in au1000.h with bogus value
 #undef AU1X00_EXTERNAL_INT
diff --git a/include/asm-mips/mach-pb1x00/pb1550.h b/include/asm-mips/mach-pb1x00/pb1550.h
index 9a4955ce3b4a..c2ab0e2df4ae 100644
--- a/include/asm-mips/mach-pb1x00/pb1550.h
+++ b/include/asm-mips/mach-pb1x00/pb1550.h
@@ -28,6 +28,7 @@
 #define __ASM_PB1550_H
 #include <linux/types.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>
 #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
 #define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX
diff --git a/include/asm-mips/qemu.h b/include/asm-mips/qemu.h
deleted file mode 100644
index 487ced4a40de..000000000000
--- a/include/asm-mips/qemu.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2005 by Ralf Baechle (ralf@linux-mips.org)
- */
-#ifndef __ASM_QEMU_H
-#define __ASM_QEMU_H
-/*
- * Interrupt numbers
- */
-#define Q_PIC_IRQ_BASE          0
-#define Q_COUNT_COMPARE_IRQ     23
-/*
- * Qemu clock rate.  Unlike on real MIPS this has no relation to the
- * instruction issue rate, so the choosen value is pure fiction, just needs
- * to match the value in Qemu itself.
- */
-#define QEMU_C0_COUNTER_CLOCK   100000000
-/*
- * Magic qemu system control location.
- */
-#define QEMU_RESTART_REG        0xBFBF0000
-#define QEMU_HALT_REG           0xBFBF0004
-#endif /* __ASM_QEMU_H */
diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h
index e716447e5e03..8c1eb02c6d16 100644
--- a/include/asm-mips/sni.h
+++ b/include/asm-mips/sni.h
@@ -228,7 +228,14 @@ extern void sni_pcimt_irq_init(void);
 extern void sni_cpu_time_init(void);
 /* eisa init for RM200/400 */
+#ifdef CONFIG_EISA
 extern int sni_eisa_root_init(void);
+#else
+static inline int sni_eisa_root_init(void)
+{
+        return 0;
+}
+#endif
 /* common irq stuff */
 extern void (*sni_hwint)(void);
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
index fa9a587b3bf1..4964c82f85f9 100644
--- a/include/asm-mips/unistd.h
+++ b/include/asm-mips/unistd.h
@@ -341,16 +341,19 @@
 #define __NR_timerfd                    (__NR_Linux + 318)
 #define __NR_eventfd                    (__NR_Linux + 319)
 #define __NR_fallocate                  (__NR_Linux + 320)
+#define __NR_timerfd_create             (__NR_Linux + 321)
+#define __NR_timerfd_gettime            (__NR_Linux + 322)
+#define __NR_timerfd_settime            (__NR_Linux + 323)
 /*
 * Offset of the last Linux o32 flavoured syscall
 */
-#define __NR_Linux_syscalls             320
+#define __NR_Linux_syscalls             323
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         320
+#define __NR_O32_Linux_syscalls         323
 #if _MIPS_SIM == _MIPS_SIM_ABI64
@@ -638,16 +641,19 @@
 #define __NR_timerfd                    (__NR_Linux + 277)
 #define __NR_eventfd                    (__NR_Linux + 278)
 #define __NR_fallocate                  (__NR_Linux + 279)
+#define __NR_timerfd_create             (__NR_Linux + 280)
+#define __NR_timerfd_gettime            (__NR_Linux + 281)
+#define __NR_timerfd_settime            (__NR_Linux + 282)
 /*
 * Offset of the last Linux 64-bit flavoured syscall
 */
-#define __NR_Linux_syscalls             279
+#define __NR_Linux_syscalls             282
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          279
+#define __NR_64_Linux_syscalls          282
 #if _MIPS_SIM == _MIPS_SIM_NABI32
@@ -939,16 +945,19 @@
 #define __NR_timerfd                    (__NR_Linux + 281)
 #define __NR_eventfd                    (__NR_Linux + 282)
 #define __NR_fallocate                  (__NR_Linux + 283)
+#define __NR_timerfd_create             (__NR_Linux + 284)
+#define __NR_timerfd_gettime            (__NR_Linux + 285)
+#define __NR_timerfd_settime            (__NR_Linux + 286)
 /*
 * Offset of the last N32 flavoured syscall
 */
-#define __NR_Linux_syscalls             283
+#define __NR_Linux_syscalls             286
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         283
+#define __NR_N32_Linux_syscalls         286
 #ifdef __KERNEL__
diff --git a/include/asm-mn10300/param.h b/include/asm-mn10300/param.h
index 54b883ec3906..789b1df41fcb 100644
--- a/include/asm-mn10300/param.h
+++ b/include/asm-mn10300/param.h
@@ -12,7 +12,7 @@
 #define _ASM_PARAM_H
 #ifdef __KERNEL__
-#define HZ              1000            /* Internal kernel timer frequency */
+#define HZ              CONFIG_HZ       /* Internal kernel timer frequency */
 #define USER_HZ         100             /* .. some user interfaces are in
                                         * "ticks" */
 #define CLOCKS_PER_SEC  (USER_HZ)       /* like times() */
diff --git a/include/asm-mn10300/socket.h b/include/asm-mn10300/socket.h
index 99ca648b94c5..80af9c4ccad7 100644
--- a/include/asm-mn10300/socket.h
+++ b/include/asm-mn10300/socket.h
@@ -52,4 +52,6 @@
 #define SO_TIMESTAMPNS          35
 #define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
+#define SO_MARK                 36
 #endif /* _ASM_SOCKET_H */
diff --git a/include/asm-powerpc/percpu.h b/include/asm-powerpc/percpu.h
index ccb0523eb3b4..f879252b7ea6 100644
--- a/include/asm-powerpc/percpu.h
+++ b/include/asm-powerpc/percpu.h
@@ -13,7 +13,7 @@
 #include <asm/paca.h>
 #define __per_cpu_offset(cpu) (paca[cpu].data_offset)
-#define __my_cpu_offset get_paca()->data_offset
+#define __my_cpu_offset local_paca->data_offset
 #define per_cpu_offset(x) (__per_cpu_offset(x))
 #endif /* CONFIG_SMP */
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index f07c99ba5d13..e3c845b0f764 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -98,9 +98,8 @@
 #define MFC_PRIV_ATTN_EVENT                 0x00000800
 #define MFC_MULTI_SRC_EVENT                 0x00001000
-/* Flags indicating progress during context switch. */
+/* Flag indicating progress during context switch. */
 #define SPU_CONTEXT_SWITCH_PENDING      0UL
-#define SPU_CONTEXT_SWITCH_ACTIVE       1UL
 struct spu_context;
 struct spu_runqueue;
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h
index ab83c844d04c..965394e69452 100644
--- a/include/asm-s390/bitops.h
+++ b/include/asm-s390/bitops.h
@@ -456,16 +456,18 @@ static inline unsigned long __ffz_word_loop(const unsigned long *addr,
        asm volatile(
 #ifndef __s390x__
-                "       ahi     %1,31\n"
+                "       ahi     %1,-1\n"
-                "       srl     %1,5\n"
+                "       sra     %1,5\n"
+                "       jz      1f\n"
                "0:     c       %2,0(%0,%3)\n"
                "       jne     1f\n"
                "       la      %0,4(%0)\n"
                "       brct    %1,0b\n"
                "1:\n"
 #else
-                "       aghi    %1,63\n"
+                "       aghi    %1,-1\n"
-                "       srlg    %1,%1,6\n"
+                "       srag    %1,%1,6\n"
+                "       jz      1f\n"
                "0:     cg      %2,0(%0,%3)\n"
                "       jne     1f\n"
                "       la      %0,8(%0)\n"
@@ -491,16 +493,18 @@ static inline unsigned long __ffs_word_loop(const unsigned long *addr,
        asm volatile(
 #ifndef __s390x__
-                "       ahi     %1,31\n"
+                "       ahi     %1,-1\n"
-                "       srl     %1,5\n"
+                "       sra     %1,5\n"
+                "       jz      1f\n"
                "0:     c       %2,0(%0,%3)\n"
                "       jne     1f\n"
                "       la      %0,4(%0)\n"
                "       brct    %1,0b\n"
                "1:\n"
 #else
-                "       aghi    %1,63\n"
+                "       aghi    %1,-1\n"
-                "       srlg    %1,%1,6\n"
+                "       srag    %1,%1,6\n"
+                "       jz      1f\n"
                "0:     cg      %2,0(%0,%3)\n"
                "       jne     1f\n"
                "       la      %0,8(%0)\n"
diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h
index 8617c3a5143b..6da197803efc 100644
--- a/include/asm-sparc64/ptrace.h
+++ b/include/asm-sparc64/ptrace.h
@@ -102,12 +102,14 @@ do {	current_thread_info()->syscall_noerror = 1; \
 } while (0)
 #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV))
 #define instruction_pointer(regs) ((regs)->tpc)
+#define regs_return_value(regs) ((regs)->u_regs[UREG_I0])
 #ifdef CONFIG_SMP
 extern unsigned long profile_pc(struct pt_regs *);
 #else
 #define profile_pc(regs) instruction_pointer(regs)
 #endif
 extern void show_regs(struct pt_regs *);
+extern void __show_regs(struct pt_regs *);
 #endif
 #else /* __ASSEMBLY__ */
diff --git a/include/asm-sparc64/reboot.h b/include/asm-sparc64/reboot.h
new file mode 100644
index 000000000000..3f3f43f5be5e
--- /dev/null
+++ b/include/asm-sparc64/reboot.h
@@ -0,0 +1,6 @@
+#ifndef _SPARC64_REBOOT_H
+#define _SPARC64_REBOOT_H
+extern void machine_alt_power_off(void);
+#endif /* _SPARC64_REBOOT_H */
diff --git a/include/asm-sparc64/syscalls.h b/include/asm-sparc64/syscalls.h
new file mode 100644
index 000000000000..45a43f637a14
--- /dev/null
+++ b/include/asm-sparc64/syscalls.h
@@ -0,0 +1,13 @@
+#ifndef _SPARC64_SYSCALLS_H
+#define _SPARC64_SYSCALLS_H
+struct pt_regs;
+extern asmlinkage long sparc_do_fork(unsigned long clone_flags,
+                                     unsigned long stack_start,
+                                     struct pt_regs *regs,
+                                     unsigned long stack_size);
+extern asmlinkage int sparc_execve(struct pt_regs *regs);
+#endif /* _SPARC64_SYSCALLS_H */
diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
index 1faefa6d3708..ed91a5d8d4f0 100644
--- a/include/asm-sparc64/system.h
+++ b/include/asm-sparc64/system.h
@@ -117,6 +117,7 @@ do {	__asm__ __volatile__("ba,pt	%%xcc, 1f\n\t" \
 extern void sun_do_break(void);
 extern int stop_a_enabled;
+extern void fault_in_user_windows(void);
 extern void synchronize_user_stack(void);
 extern void __flushw_user(void);
diff --git a/include/asm-x86/desc_64.h b/include/asm-x86/desc_64.h
deleted file mode 100644
index 8b137891791f..000000000000
--- a/include/asm-x86/desc_64.h
+++ /dev/null
@@ -1 +0,0 @@
diff --git a/include/asm-x86/i387.h b/include/asm-x86/i387.h
index 6b1895ccd6b7..f377b76b2f34 100644
--- a/include/asm-x86/i387.h
+++ b/include/asm-x86/i387.h
@@ -20,7 +20,6 @@
 #include <asm/uaccess.h>
 extern void fpu_init(void);
-extern unsigned int mxcsr_feature_mask;
 extern void mxcsr_feature_mask_init(void);
 extern void init_fpu(struct task_struct *child);
 extern asmlinkage void math_state_restore(void);
diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h
index bd4740a60f29..0a0b77bc736a 100644
--- a/include/asm-x86/pgtable_64.h
+++ b/include/asm-x86/pgtable_64.h
@@ -188,6 +188,7 @@ static inline unsigned long pmd_bad(pmd_t pmd)
 #define pgd_offset(mm, addr) ((mm)->pgd + pgd_index(addr))
 #define pgd_offset_k(address) (init_level4_pgt + pgd_index(address))
 #define pgd_present(pgd) (pgd_val(pgd) & _PAGE_PRESENT)
+static inline int pgd_large(pgd_t pgd) { return 0; }
 #define mk_kernel_pgd(address) ((pgd_t){ (address) | _KERNPG_TABLE })
 /* PUD - Level3 access */
@@ -246,6 +247,7 @@ static inline int pud_large(pud_t pte)
 #define __swp_entry_to_pte(x)           ((pte_t) { .pte = (x).val })
 extern int kern_addr_valid(unsigned long addr); 
+extern void cleanup_highmap(void);
 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot)         \
                remap_pfn_range(vma, vaddr, pfn, size, prot)
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 149920dcd341..45a2f0ab33d0 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -302,10 +302,6 @@ union i387_union {
 };
 #ifdef CONFIG_X86_32
-/*
- * the following now lives in the per cpu area:
- * extern       int cpu_llc_id[NR_CPUS];
- */
 DECLARE_PER_CPU(u8, cpu_llc_id);
 #else
 DECLARE_PER_CPU(struct orig_ist, orig_ist);
@@ -671,7 +667,6 @@ extern void init_gdt(int cpu);
 extern unsigned int machine_id;
 extern unsigned int machine_submodel_id;
 extern unsigned int BIOS_revision;
-extern unsigned int mca_pentium_flag;
 /* Boot loader type from the setup header */
 extern int bootloader_type;
diff --git a/include/asm-xtensa/cacheflush.h b/include/asm-xtensa/cacheflush.h
index b773c57e75a5..94c4c53a099e 100644
--- a/include/asm-xtensa/cacheflush.h
+++ b/include/asm-xtensa/cacheflush.h
@@ -70,6 +70,8 @@ extern void __flush_invalidate_dcache_page_alias(unsigned long, unsigned long);
 #endif
 #if (ICACHE_WAY_SIZE > PAGE_SIZE)
 extern void __invalidate_icache_page_alias(unsigned long, unsigned long);
+#else
+# define __invalidate_icache_page_alias(v,p)    do { } while(0)
 #endif
 /*
diff --git a/include/asm-xtensa/coprocessor.h b/include/asm-xtensa/coprocessor.h
index aa2121034558..1cbcf9001a41 100644
--- a/include/asm-xtensa/coprocessor.h
+++ b/include/asm-xtensa/coprocessor.h
@@ -5,81 +5,173 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (C) 2003 - 2005 Tensilica Inc.
+ * Copyright (C) 2003 - 2007 Tensilica Inc.
 */
 #ifndef _XTENSA_COPROCESSOR_H
 #define _XTENSA_COPROCESSOR_H
-#include <asm/variant/core.h>
+#include <linux/stringify.h>
 #include <asm/variant/tie.h>
+#include <asm/types.h>
+#ifdef __ASSEMBLY__
+# include <asm/variant/tie-asm.h>
+.macro  xchal_sa_start  a b
+        .set .Lxchal_pofs_, 0
+        .set .Lxchal_ofs_, 0
+.endm
+.macro  xchal_sa_align  ptr minofs maxofs ofsalign totalign
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + .Lxchal_pofs_ + \totalign - 1
+        .set    .Lxchal_ofs_, (.Lxchal_ofs_ & -\totalign) - .Lxchal_pofs_
+.endm
+#define _SELECT (  XTHAL_SAS_TIE | XTHAL_SAS_OPT \
+                 | XTHAL_SAS_CC \
+                 | XTHAL_SAS_CALR | XTHAL_SAS_CALE )
+.macro save_xtregs_opt ptr clb at1 at2 at3 at4 offset
+        .if XTREGS_OPT_SIZE > 0
+                addi    \clb, \ptr, \offset
+                xchal_ncp_store \clb \at1 \at2 \at3 \at4 select=_SELECT
+        .endif
+.endm
+.macro load_xtregs_opt ptr clb at1 at2 at3 at4 offset
+        .if XTREGS_OPT_SIZE > 0
+                addi    \clb, \ptr, \offset
+                xchal_ncp_load \clb \at1 \at2 \at3 \at4 select=_SELECT
+        .endif
+.endm
+#undef _SELECT
+#define _SELECT (  XTHAL_SAS_TIE | XTHAL_SAS_OPT \
+                 | XTHAL_SAS_NOCC \
+                 | XTHAL_SAS_CALR | XTHAL_SAS_CALE | XTHAL_SAS_GLOB )
+.macro save_xtregs_user ptr clb at1 at2 at3 at4 offset
+        .if XTREGS_USER_SIZE > 0
+                addi    \clb, \ptr, \offset
+                xchal_ncp_store \clb \at1 \at2 \at3 \at4 select=_SELECT
+        .endif
+.endm
+.macro load_xtregs_user ptr clb at1 at2 at3 at4 offset
+        .if XTREGS_USER_SIZE > 0
+                addi    \clb, \ptr, \offset
+                xchal_ncp_load \clb \at1 \at2 \at3 \at4 select=_SELECT
+        .endif
+.endm
+#undef _SELECT
+#endif  /* __ASSEMBLY__ */
-#if !XCHAL_HAVE_CP
-#define XTENSA_CP_EXTRA_OFFSET  0
-#define XTENSA_CP_EXTRA_ALIGN   1       /* must be a power of 2 */
-#define XTENSA_CP_EXTRA_SIZE    0
-#else
-#define XTOFS(last_start,last_size,align) \
-        ((last_start+last_size+align-1) & -align)
-#define XTENSA_CP_EXTRA_OFFSET  0
-#define XTENSA_CP_EXTRA_ALIGN   XCHAL_EXTRA_SA_ALIGN
-#define XTENSA_CPE_CP0_OFFSET   \
-        XTOFS(XTENSA_CP_EXTRA_OFFSET, XCHAL_EXTRA_SA_SIZE, XCHAL_CP0_SA_ALIGN)
-#define XTENSA_CPE_CP1_OFFSET   \
-        XTOFS(XTENSA_CPE_CP0_OFFSET, XCHAL_CP0_SA_SIZE, XCHAL_CP1_SA_ALIGN)
-#define XTENSA_CPE_CP2_OFFSET   \
-        XTOFS(XTENSA_CPE_CP1_OFFSET, XCHAL_CP1_SA_SIZE, XCHAL_CP2_SA_ALIGN)
-#define XTENSA_CPE_CP3_OFFSET   \
-        XTOFS(XTENSA_CPE_CP2_OFFSET, XCHAL_CP2_SA_SIZE, XCHAL_CP3_SA_ALIGN)
-#define XTENSA_CPE_CP4_OFFSET   \
-        XTOFS(XTENSA_CPE_CP3_OFFSET, XCHAL_CP3_SA_SIZE, XCHAL_CP4_SA_ALIGN)
-#define XTENSA_CPE_CP5_OFFSET   \
-        XTOFS(XTENSA_CPE_CP4_OFFSET, XCHAL_CP4_SA_SIZE, XCHAL_CP5_SA_ALIGN)
-#define XTENSA_CPE_CP6_OFFSET   \
-        XTOFS(XTENSA_CPE_CP5_OFFSET, XCHAL_CP5_SA_SIZE, XCHAL_CP6_SA_ALIGN)
-#define XTENSA_CPE_CP7_OFFSET   \
-        XTOFS(XTENSA_CPE_CP6_OFFSET, XCHAL_CP6_SA_SIZE, XCHAL_CP7_SA_ALIGN)
-#define XTENSA_CP_EXTRA_SIZE    \
-        XTOFS(XTENSA_CPE_CP7_OFFSET, XCHAL_CP7_SA_SIZE, 16)
-#if XCHAL_CP_NUM > 0
-# ifndef __ASSEMBLY__
 /*
- * Tasks that own contents of (last user) each coprocessor.
+ * XTENSA_HAVE_COPROCESSOR(x) returns 1 if coprocessor x is configured.
- * Entries are 0 for not-owned or non-existent coprocessors.
+ *
- * Note: The size of this structure is fixed to 8 bytes in entry.S
+ * XTENSA_HAVE_IO_PORT(x) returns 1 if io-port x is configured.
+ *
 */
-typedef struct {
-        struct task_struct *owner;      /* owner */
-        int offset;                     /* offset in cpextra space. */
-} coprocessor_info_t;
-# else
-#  define COPROCESSOR_INFO_OWNER 0
-#  define COPROCESSOR_INFO_OFFSET 4
-#  define COPROCESSOR_INFO_SIZE 8
-# endif
-#endif
-#endif  /* XCHAL_HAVE_CP */
+#define XTENSA_HAVE_COPROCESSOR(x)                                      \
+        ((XCHAL_CP_MASK ^ XCHAL_CP_PORT_MASK) & (1 << (x)))
+#define XTENSA_HAVE_COPROCESSORS                                        \
+        (XCHAL_CP_MASK ^ XCHAL_CP_PORT_MASK)
+#define XTENSA_HAVE_IO_PORT(x)                                          \
+        (XCHAL_CP_PORT_MASK & (1 << (x)))
+#define XTENSA_HAVE_IO_PORTS                                            \
+        XCHAL_CP_PORT_MASK
 #ifndef __ASSEMBLY__
-# if XCHAL_CP_NUM > 0
-struct task_struct;
-extern void release_coprocessors (struct task_struct*);
-extern void save_coprocessor_registers(void*, int);
-# else
-#  define release_coprocessors(task)
-# endif
-typedef unsigned char cp_state_t[XTENSA_CP_EXTRA_SIZE]
-        __attribute__ ((aligned (XTENSA_CP_EXTRA_ALIGN)));
-#endif  /* !__ASSEMBLY__ */
+#if XCHAL_HAVE_CP
+#define RSR_CPENABLE(x) do {                                              \
+        __asm__ __volatile__("rsr %0," __stringify(CPENABLE) : "=a" (x)); \
+        } while(0);
+#define WSR_CPENABLE(x) do {                                              \
+        __asm__ __volatile__("wsr %0," __stringify(CPENABLE) "; rsync"    \
+                             :: "a" (x));                                 \
+        } while(0);
+#endif /* XCHAL_HAVE_CP */
+/*
+ * Additional registers.
+ * We define three types of additional registers:
+ *  ext: extra registers that are used by the compiler
+ *  cpn: optional registers that can be used by a user application
+ *  cpX: coprocessor registers that can only be used if the corresponding
+ *       CPENABLE bit is set.
+ */
+#define XCHAL_SA_REG(list,cc,abi,type,y,name,z,align,size,...)  \
+        __REG ## list (cc, abi, type, name, size, align)
+#define __REG0(cc,abi,t,name,s,a)       __REG0_ ## cc (abi,name)
+#define __REG1(cc,abi,t,name,s,a)       __REG1_ ## cc (name)
+#define __REG2(cc,abi,type,...)         __REG2_ ## type (__VA_ARGS__)
+#define __REG0_0(abi,name)
+#define __REG0_1(abi,name)              __REG0_1 ## abi (name)
+#define __REG0_10(name) __u32 name;
+#define __REG0_11(name) __u32 name;
+#define __REG0_12(name)
+#define __REG1_0(name)  __u32 name;
+#define __REG1_1(name)
+#define __REG2_0(n,s,a) __u32 name;
+#define __REG2_1(n,s,a) unsigned char n[s] __attribute__ ((aligned(a)));
+#define __REG2_2(n,s,a) unsigned char n[s] __attribute__ ((aligned(a)));
+typedef struct { XCHAL_NCP_SA_LIST(0) } xtregs_opt_t
+        __attribute__ ((aligned (XCHAL_NCP_SA_ALIGN)));
+typedef struct { XCHAL_NCP_SA_LIST(1) } xtregs_user_t
+        __attribute__ ((aligned (XCHAL_NCP_SA_ALIGN)));
+#if XTENSA_HAVE_COPROCESSORS
+typedef struct { XCHAL_CP0_SA_LIST(2) } xtregs_cp0_t
+        __attribute__ ((aligned (XCHAL_CP0_SA_ALIGN)));
+typedef struct { XCHAL_CP1_SA_LIST(2) } xtregs_cp1_t
+        __attribute__ ((aligned (XCHAL_CP1_SA_ALIGN)));
+typedef struct { XCHAL_CP2_SA_LIST(2) } xtregs_cp2_t
+        __attribute__ ((aligned (XCHAL_CP2_SA_ALIGN)));
+typedef struct { XCHAL_CP3_SA_LIST(2) } xtregs_cp3_t
+        __attribute__ ((aligned (XCHAL_CP3_SA_ALIGN)));
+typedef struct { XCHAL_CP4_SA_LIST(2) } xtregs_cp4_t
+        __attribute__ ((aligned (XCHAL_CP4_SA_ALIGN)));
+typedef struct { XCHAL_CP5_SA_LIST(2) } xtregs_cp5_t
+        __attribute__ ((aligned (XCHAL_CP5_SA_ALIGN)));
+typedef struct { XCHAL_CP6_SA_LIST(2) } xtregs_cp6_t
+        __attribute__ ((aligned (XCHAL_CP6_SA_ALIGN)));
+typedef struct { XCHAL_CP7_SA_LIST(2) } xtregs_cp7_t
+        __attribute__ ((aligned (XCHAL_CP7_SA_ALIGN)));
+extern struct thread_info* coprocessor_owner[XCHAL_CP_MAX];
+extern void coprocessor_save(void*, int);
+extern void coprocessor_load(void*, int);
+extern void coprocessor_flush(struct thread_info*, int);
+extern void coprocessor_restore(struct thread_info*, int);
+extern void coprocessor_release_all(struct thread_info*);
+extern void coprocessor_flush_all(struct thread_info*);
+static inline void coprocessor_clear_cpenable(void)
+{
+        unsigned long i = 0;
+        WSR_CPENABLE(i);
+}
+#endif  /* XTENSA_HAVE_COPROCESSORS */
+#endif  /* !__ASSEMBLY__ */
 #endif  /* _XTENSA_COPROCESSOR_H */
diff --git a/include/asm-xtensa/elf.h b/include/asm-xtensa/elf.h
index 467384542502..ca6e5101a2cb 100644
--- a/include/asm-xtensa/elf.h
+++ b/include/asm-xtensa/elf.h
@@ -72,115 +72,32 @@
 /* ELF register definitions. This is needed for core dump support.  */
-/*
- * elf_gregset_t contains the application-level state in the following order:
- * Processor info:      config_version, cpuxy
- * Processor state:     pc, ps, exccause, excvaddr, wb, ws,
- *                      lbeg, lend, lcount, sar
- * GP regs:             ar0 - arXX
- */
 typedef unsigned long elf_greg_t;
 typedef struct {
-        elf_greg_t xchal_config_id0;
-        elf_greg_t xchal_config_id1;
-        elf_greg_t cpux;
-        elf_greg_t cpuy;
        elf_greg_t pc;
        elf_greg_t ps;
-        elf_greg_t exccause;
-        elf_greg_t excvaddr;
-        elf_greg_t windowbase;
-        elf_greg_t windowstart;
        elf_greg_t lbeg;
        elf_greg_t lend;
        elf_greg_t lcount;
        elf_greg_t sar;
-        elf_greg_t syscall;
+        elf_greg_t windowstart;
-        elf_greg_t ar[64];
+        elf_greg_t windowbase;
+        elf_greg_t reserved[8+48];
+        elf_greg_t a[64];
 } xtensa_gregset_t;
 #define ELF_NGREG       (sizeof(xtensa_gregset_t) / sizeof(elf_greg_t))
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-/*
+#define ELF_NFPREG      18
- *  Compute the size of the coprocessor and extra state layout (register info)
- *  table (in bytes).
- *  This is actually the maximum size of the table, as opposed to the size,
- *  which is available from the _xtensa_reginfo_table_size global variable.
- *
- *  (See also arch/xtensa/kernel/coprocessor.S)
- *
- */
-#ifndef XCHAL_EXTRA_SA_CONTENTS_LIBDB_NUM
-# define XTENSA_CPE_LTABLE_SIZE         0
-#else
-# define XTENSA_CPE_SEGMENT(num)        (num ? (1+num) : 0)
-# define XTENSA_CPE_LTABLE_ENTRIES      \
-                ( XTENSA_CPE_SEGMENT(XCHAL_EXTRA_SA_CONTENTS_LIBDB_NUM) \
-                + XTENSA_CPE_SEGMENT(XCHAL_CP0_SA_CONTENTS_LIBDB_NUM)   \
-                + XTENSA_CPE_SEGMENT(XCHAL_CP1_SA_CONTENTS_LIBDB_NUM)   \
-                + XTENSA_CPE_SEGMENT(XCHAL_CP2_SA_CONTENTS_LIBDB_NUM)   \
-                + XTENSA_CPE_SEGMENT(XCHAL_CP3_SA_CONTENTS_LIBDB_NUM)   \
-                + XTENSA_CPE_SEGMENT(XCHAL_CP4_SA_CONTENTS_LIBDB_NUM)   \
-                + XTENSA_CPE_SEGMENT(XCHAL_CP5_SA_CONTENTS_LIBDB_NUM)   \
-                + XTENSA_CPE_SEGMENT(XCHAL_CP6_SA_CONTENTS_LIBDB_NUM)   \
-                + XTENSA_CPE_SEGMENT(XCHAL_CP7_SA_CONTENTS_LIBDB_NUM)   \
-                + 1             /* final entry */                       \
-                )
-# define XTENSA_CPE_LTABLE_SIZE         (XTENSA_CPE_LTABLE_ENTRIES * 8)
-#endif
-/*
- * Instantiations of the elf_fpregset_t type contain, in most
- * architectures, the floating point (FPU) register set.
- * For Xtensa, this type is extended to contain all custom state,
- * ie. coprocessor and "extra" (non-coprocessor) state (including,
- * for example, TIE-defined states and register files; as well
- * as other optional processor state).
- * This includes FPU state if a floating-point coprocessor happens
- * to have been configured within the Xtensa processor.
- *
- * TOTAL_FPREGS_SIZE is the required size (without rounding)
- * of elf_fpregset_t.  It provides space for the following:
- *
- *  a)  32-bit mask of active coprocessors for this task (similar
- *      to CPENABLE in single-threaded Xtensa processor systems)
- *
- *  b)  table describing the layout of custom states (ie. of
- *      individual registers, etc) within the save areas
- *
- *  c)  save areas for each coprocessor and for non-coprocessor
- *      ("extra") state
- *
- * Note that save areas may require up to 16-byte alignment when
- * accessed by save/restore sequences.  We do not need to ensure
- * such alignment in an elf_fpregset_t structure because custom
- * state is not directly loaded/stored into it; rather, save area
- * contents are copied to elf_fpregset_t from the active save areas
- * (see 'struct task_struct' definition in processor.h for that)
- * using memcpy().  But we do allow space for such alignment,
- * to allow optimizations of layout and copying.
- */
-#if 0
-#define TOTAL_FPREGS_SIZE                                               \
-        (4 + XTENSA_CPE_LTABLE_SIZE + XTENSA_CP_EXTRA_SIZE)
-#define ELF_NFPREG                                                      \
-        ((TOTAL_FPREGS_SIZE + sizeof(elf_fpreg_t) - 1) / sizeof(elf_fpreg_t))
-#else
-#define TOTAL_FPREGS_SIZE       0
-#define ELF_NFPREG              0
-#endif
 typedef unsigned int elf_fpreg_t;
 typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #define ELF_CORE_COPY_REGS(_eregs, _pregs)                              \
-        xtensa_elf_core_copy_regs (&_eregs, _pregs);
+        xtensa_elf_core_copy_regs ((xtensa_gregset_t*)&(_eregs), _pregs);
 extern void xtensa_elf_core_copy_regs (xtensa_gregset_t *, struct pt_regs *);
@@ -257,6 +174,21 @@ extern void xtensa_elf_core_copy_regs (xtensa_gregset_t *, struct pt_regs *);
       _r->areg[12]=0; _r->areg[13]=0;   _r->areg[14]=0; _r->areg[15]=0; \
  } while (0)
+typedef struct {
+        xtregs_opt_t    opt;
+        xtregs_user_t   user;
+#if XTENSA_HAVE_COPROCESSORS
+        xtregs_cp0_t    cp0;
+        xtregs_cp1_t    cp1;
+        xtregs_cp2_t    cp2;
+        xtregs_cp3_t    cp3;
+        xtregs_cp4_t    cp4;
+        xtregs_cp5_t    cp5;
+        xtregs_cp6_t    cp6;
+        xtregs_cp7_t    cp7;
+#endif
+} elf_xtregs_t;
 #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)
 struct task_struct;
diff --git a/include/asm-xtensa/module.h b/include/asm-xtensa/module.h
index ffb25bfdf6a1..d9b34bee4d42 100644
--- a/include/asm-xtensa/module.h
+++ b/include/asm-xtensa/module.h
@@ -15,9 +15,11 @@
 struct mod_arch_specific
 {
-        /* Module support is not completely implemented. */
+        /* No special elements, yet. */
 };
+#define MODULE_ARCH_VERMAGIC "xtensa-" __stringify(XCHAL_CORE_ID) " "
 #define Elf_Shdr Elf32_Shdr
 #define Elf_Sym Elf32_Sym
 #define Elf_Ehdr Elf32_Ehdr
diff --git a/include/asm-xtensa/pgalloc.h b/include/asm-xtensa/pgalloc.h
index 8d1544eb461e..4f4a7987eded 100644
--- a/include/asm-xtensa/pgalloc.h
+++ b/include/asm-xtensa/pgalloc.h
@@ -47,7 +47,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
        return kmem_cache_alloc(pgtable_cache, GFP_KERNEL|__GFP_REPEAT);
 }
-static inline pte_token_t pte_alloc_one(struct mm_struct *mm,
+static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
                                        unsigned long addr)
 {
        struct page *page;
diff --git a/include/asm-xtensa/pgtable.h b/include/asm-xtensa/pgtable.h
index c0fcc1c9660c..c8b024a48b4d 100644
--- a/include/asm-xtensa/pgtable.h
+++ b/include/asm-xtensa/pgtable.h
@@ -66,11 +66,9 @@
 */
 #define VMALLOC_START           0xC0000000
-#define VMALLOC_END             0xC6FEFFFF
+#define VMALLOC_END             0xC7FEFFFF
-#define TLBTEMP_BASE_1          0xC6FF0000
+#define TLBTEMP_BASE_1          0xC7FF0000
-#define TLBTEMP_BASE_2          0xC6FF8000
+#define TLBTEMP_BASE_2          0xC7FF8000
-#define MODULE_START            0xC7000000
-#define MODULE_END              0xC7FFFFFF
 /*
 * Xtensa Linux config PTE layout (when present):
diff --git a/include/asm-xtensa/processor.h b/include/asm-xtensa/processor.h
index 96408f436624..4918a4e96d42 100644
--- a/include/asm-xtensa/processor.h
+++ b/include/asm-xtensa/processor.h
@@ -103,10 +103,6 @@ struct thread_struct {
        unsigned long dbreaka[XCHAL_NUM_DBREAK];
        unsigned long dbreakc[XCHAL_NUM_DBREAK];
-        /* Allocate storage for extra state and coprocessor state. */
-        unsigned char cp_save[XTENSA_CP_EXTRA_SIZE]
-                __attribute__ ((aligned(XTENSA_CP_EXTRA_ALIGN)));
        /* Make structure 16 bytes aligned. */
        int align[0] __attribute__ ((aligned(16)));
 };
@@ -162,21 +158,16 @@ struct thread_struct {
 struct task_struct;
 struct mm_struct;
-// FIXME: do we need release_thread for CP??
 /* Free all resources held by a thread. */
 #define release_thread(thread) do { } while(0)
-// FIXME: do we need prepare_to_copy (lazy status) for CP??
 /* Prepare to copy thread state - unlazy all lazy status */
-#define prepare_to_copy(tsk)    do { } while (0)
+extern void prepare_to_copy(struct task_struct*);
-/*
+/* Create a kernel thread without removing it from tasklists */
- * create a kernel thread without removing it from tasklists
- */
 extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 /* Copy and release all segment info associated with a VM */
 #define copy_segments(p, mm)    do { } while(0)
 #define release_segments(mm)    do { } while(0)
 #define forget_segments()       do { } while (0)
diff --git a/include/asm-xtensa/ptrace.h b/include/asm-xtensa/ptrace.h
index 77ff02d307bb..422c73e26937 100644
--- a/include/asm-xtensa/ptrace.h
+++ b/include/asm-xtensa/ptrace.h
@@ -53,33 +53,30 @@
 /* Registers used by strace */
-#define REG_A_BASE      0xfc000000
+#define REG_A_BASE      0x0000
-#define REG_AR_BASE     0x04000000
+#define REG_AR_BASE     0x0100
-#define REG_PC          0x14000000
+#define REG_PC          0x0020
-#define REG_PS          0x080000e6
+#define REG_PS          0x02e6
-#define REG_WB          0x08000048
+#define REG_WB          0x0248
-#define REG_WS          0x08000049
+#define REG_WS          0x0249
-#define REG_LBEG        0x08000000
+#define REG_LBEG        0x0200
-#define REG_LEND        0x08000001
+#define REG_LEND        0x0201
-#define REG_LCOUNT      0x08000002
+#define REG_LCOUNT      0x0202
-#define REG_SAR         0x08000003
+#define REG_SAR         0x0203
-#define REG_DEPC        0x080000c0
-#define REG_EXCCAUSE    0x080000e8
+#define SYSCALL_NR      0x00ff
-#define REG_EXCVADDR    0x080000ee
-#define SYSCALL_NR      0x1
-#define AR_REGNO_TO_A_REGNO(ar, wb) (ar - wb*4) & ~(XCHAL_NUM_AREGS - 1)
 /* Other PTRACE_ values defined in <linux/ptrace.h> using values 0-9,16,17,24 */
-#define PTRACE_GETREGS            12
+#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS            13
+#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS          14
+#define PTRACE_GETXTREGS        18
-#define PTRACE_SETFPREGS          15
+#define PTRACE_SETXTREGS        19
-#define PTRACE_GETFPREGSIZE       18
 #ifndef __ASSEMBLY__
+#ifdef __KERNEL__
 /*
 * This struct defines the way the registers are stored on the
 * kernel stack during a system call or other kernel entry.
@@ -102,6 +99,9 @@ struct pt_regs {
        unsigned long icountlevel;      /*  60 */
        int reserved[1];                /*  64 */
+        /* Additional configurable registers that are used by the compiler. */
+        xtregs_opt_t xtregs_opt;
        /* Make sure the areg field is 16 bytes aligned. */
        int align[0] __attribute__ ((aligned(16)));
@@ -111,8 +111,6 @@ struct pt_regs {
        unsigned long areg[16];         /* 128 (64) */
 };
-#ifdef __KERNEL__
 #include <asm/variant/core.h>
 # define task_pt_regs(tsk) ((struct pt_regs*) \
diff --git a/include/asm-xtensa/regs.h b/include/asm-xtensa/regs.h
index c913d259faaa..d4baed246928 100644
--- a/include/asm-xtensa/regs.h
+++ b/include/asm-xtensa/regs.h
@@ -100,7 +100,14 @@
 #define EXCCAUSE_DTLB_SIZE_RESTRICTION          27
 #define EXCCAUSE_LOAD_CACHE_ATTRIBUTE           28
 #define EXCCAUSE_STORE_CACHE_ATTRIBUTE          29
-#define EXCCAUSE_FLOATING_POINT                 40
+#define EXCCAUSE_COPROCESSOR0_DISABLED          32
+#define EXCCAUSE_COPROCESSOR1_DISABLED          33
+#define EXCCAUSE_COPROCESSOR2_DISABLED          34
+#define EXCCAUSE_COPROCESSOR3_DISABLED          35
+#define EXCCAUSE_COPROCESSOR4_DISABLED          36
+#define EXCCAUSE_COPROCESSOR5_DISABLED          37
+#define EXCCAUSE_COPROCESSOR6_DISABLED          38
+#define EXCCAUSE_COPROCESSOR7_DISABLED          39
 /*  PS register fields.  */
diff --git a/include/asm-xtensa/sigcontext.h b/include/asm-xtensa/sigcontext.h
index e3381cee5059..03383af8c3b7 100644
--- a/include/asm-xtensa/sigcontext.h
+++ b/include/asm-xtensa/sigcontext.h
@@ -13,9 +13,6 @@
 struct sigcontext {
-        unsigned long   oldmask;
-        /* CPU registers */
        unsigned long sc_pc;
        unsigned long sc_ps;
        unsigned long sc_lbeg;
@@ -25,6 +22,7 @@ struct sigcontext {
        unsigned long sc_acclo;
        unsigned long sc_acchi;
        unsigned long sc_a[16];
+        void *sc_xtregs;
 };
 #endif /* _XTENSA_SIGCONTEXT_H */
diff --git a/include/asm-xtensa/stat.h b/include/asm-xtensa/stat.h
index 149f4bce092f..c4992038cee0 100644
--- a/include/asm-xtensa/stat.h
+++ b/include/asm-xtensa/stat.h
@@ -5,25 +5,23 @@
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2007 Tensilica Inc.
 */
 #ifndef _XTENSA_STAT_H
 #define _XTENSA_STAT_H
-#include <linux/types.h>
 #define STAT_HAVE_NSEC 1
 struct stat {
        unsigned long   st_dev;
-        ino_t           st_ino;
+        unsigned long   st_ino;
-        mode_t          st_mode;
+        unsigned int    st_mode;
-        nlink_t         st_nlink;
+        unsigned int    st_nlink;
-        uid_t           st_uid;
+        unsigned int    st_uid;
-        gid_t           st_gid;
+        unsigned int    st_gid;
-        unsigned int    st_rdev;
+        unsigned long   st_rdev;
-        off_t           st_size;
+        long            st_size;
        unsigned long   st_blksize;
        unsigned long   st_blocks;
        unsigned long   st_atime;
@@ -36,8 +34,6 @@ struct stat {
        unsigned long   __unused5;
 };
-/* This matches struct stat64 in glibc-2.3 */
 struct stat64  {
        unsigned long long st_dev;      /* Device */
        unsigned long long st_ino;      /* File serial number */
@@ -47,20 +43,14 @@ struct stat64  {
        unsigned int  st_gid;           /* Group ID of the file's group. */
        unsigned long long st_rdev;     /* Device number, if device. */
        long long st_size;              /* Size of file, in bytes. */
-        long st_blksize;                /* Optimal block size for I/O. */
+        unsigned long st_blksize;       /* Optimal block size for I/O. */
        unsigned long __unused2;
-#ifdef __XTENSA_EB__
+        unsigned long long st_blocks;   /* Number 512-byte blocks allocated. */
-        unsigned long __unused3;
+        unsigned long st_atime;         /* Time of last access. */
-        long st_blocks;                 /* Number 512-byte blocks allocated. */
-#else
-        long st_blocks;                 /* Number 512-byte blocks allocated. */
-        unsigned long __unused3;
-#endif
-        long st_atime;                  /* Time of last access. */
        unsigned long st_atime_nsec;
-        long st_mtime;                  /* Time of last modification. */
+        unsigned long st_mtime;         /* Time of last modification. */
        unsigned long st_mtime_nsec;
-        long st_ctime;                  /* Time of last status change. */
+        unsigned long st_ctime;         /* Time of last status change. */
        unsigned long st_ctime_nsec;
        unsigned long __unused4;
        unsigned long __unused5;
diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h
index e0cb9116d8ab..62b1e8f3c13c 100644
--- a/include/asm-xtensa/system.h
+++ b/include/asm-xtensa/system.h
@@ -46,42 +46,6 @@ static inline int irqs_disabled(void)
        return flags & 0xf;
 }
-#define RSR_CPENABLE(x) do {                                              \
-        __asm__ __volatile__("rsr %0," __stringify(CPENABLE) : "=a" (x)); \
-        } while(0);
-#define WSR_CPENABLE(x) do {                                              \
-        __asm__ __volatile__("wsr %0," __stringify(CPENABLE)";rsync"      \
-                             :: "a" (x));} while(0);
-#define clear_cpenable() __clear_cpenable()
-static inline void __clear_cpenable(void)
-{
-#if XCHAL_HAVE_CP
-        unsigned long i = 0;
-        WSR_CPENABLE(i);
-#endif
-}
-static inline void enable_coprocessor(int i)
-{
-#if XCHAL_HAVE_CP
-        int cp;
-        RSR_CPENABLE(cp);
-        cp |= 1 << i;
-        WSR_CPENABLE(cp);
-#endif
-}
-static inline void disable_coprocessor(int i)
-{
-#if XCHAL_HAVE_CP
-        int cp;
-        RSR_CPENABLE(cp);
-        cp &= ~(1 << i);
-        WSR_CPENABLE(cp);
-#endif
-}
 #define smp_read_barrier_depends() do { } while(0)
 #define read_barrier_depends() do { } while(0)
@@ -111,7 +75,6 @@ extern void *_switch_to(void *last, void *next);
 #define switch_to(prev,next,last)               \
 do {                                            \
-        clear_cpenable();                       \
        (last) = _switch_to(prev, next);        \
 } while(0)
@@ -244,7 +207,7 @@ static inline void spill_registers(void)
                "wsr    a13," __stringify(SAR) "\n\t"
                "wsr    a14," __stringify(PS) "\n\t"
                :: "a" (&a0), "a" (&ps)
-                : "a2", "a3", "a12", "a13", "a14", "a15", "memory");
+                : "a2", "a3", "a4", "a7", "a11", "a12", "a13", "a14", "a15", "memory");
 }
 #define arch_align_stack(x) (x)
diff --git a/include/asm-xtensa/thread_info.h b/include/asm-xtensa/thread_info.h
index 52c958285bcb..a2c640682ed9 100644
--- a/include/asm-xtensa/thread_info.h
+++ b/include/asm-xtensa/thread_info.h
@@ -27,6 +27,21 @@
 #ifndef __ASSEMBLY__
+#if XTENSA_HAVE_COPROCESSORS
+typedef struct xtregs_coprocessor {
+        xtregs_cp0_t cp0;
+        xtregs_cp1_t cp1;
+        xtregs_cp2_t cp2;
+        xtregs_cp3_t cp3;
+        xtregs_cp4_t cp4;
+        xtregs_cp5_t cp5;
+        xtregs_cp6_t cp6;
+        xtregs_cp7_t cp7;
+} xtregs_coprocessor_t;
+#endif
 struct thread_info {
        struct task_struct      *task;          /* main task structure */
        struct exec_domain      *exec_domain;   /* execution domain */
@@ -38,7 +53,13 @@ struct thread_info {
        mm_segment_t            addr_limit;     /* thread address space */
        struct restart_block    restart_block;
+        unsigned long           cpenable;
+        /* Allocate storage for extra user states and coprocessor states. */
+#if XTENSA_HAVE_COPROCESSORS
+        xtregs_coprocessor_t    xtregs_cp;
+#endif
+        xtregs_user_t           xtregs_user;
 };
 #else /* !__ASSEMBLY__ */
diff --git a/include/asm-xtensa/timex.h b/include/asm-xtensa/timex.h
index a5fca59fba9e..b83a8181d448 100644
--- a/include/asm-xtensa/timex.h
+++ b/include/asm-xtensa/timex.h
@@ -63,10 +63,10 @@ extern cycles_t cacheflush_time;
 * Register access.
 */
-#define WSR_CCOUNT(r)     __asm__("wsr %0,"__stringify(CCOUNT) :: "a" (r))
+#define WSR_CCOUNT(r)     asm volatile ("wsr %0,"__stringify(CCOUNT) :: "a" (r))
-#define RSR_CCOUNT(r)     __asm__("rsr %0,"__stringify(CCOUNT) : "=a" (r))
+#define RSR_CCOUNT(r)     asm volatile ("rsr %0,"__stringify(CCOUNT) : "=a" (r))
-#define WSR_CCOMPARE(x,r) __asm__("wsr %0,"__stringify(CCOMPARE)"+"__stringify(x) :: "a"(r))
+#define WSR_CCOMPARE(x,r) asm volatile ("wsr %0,"__stringify(CCOMPARE)"+"__stringify(x) :: "a"(r))
-#define RSR_CCOMPARE(x,r) __asm__("rsr %0,"__stringify(CCOMPARE)"+"__stringify(x) : "=a"(r))
+#define RSR_CCOMPARE(x,r) asm volatile ("rsr %0,"__stringify(CCOMPARE)"+"__stringify(x) : "=a"(r))
 static inline unsigned long get_ccount (void)
 {
diff --git a/include/asm-xtensa/uaccess.h b/include/asm-xtensa/uaccess.h
index d6352da05b10..b8528426ab1f 100644
--- a/include/asm-xtensa/uaccess.h
+++ b/include/asm-xtensa/uaccess.h
@@ -26,6 +26,7 @@
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor.h>
+#include <asm/types.h>
 /*
 * These assembly macros mirror the C macros that follow below.  They
@@ -118,7 +119,7 @@
 *      <at>    destroyed (actually, (TASK_SIZE + 1 - size))
 */
        .macro  user_ok aa, as, at, error
-        movi    \at, (TASK_SIZE+1)
+        movi    \at, __XTENSA_UL_CONST(TASK_SIZE)
        bgeu    \as, \at, \error
        sub     \at, \at, \as
        bgeu    \aa, \at, \error
@@ -226,20 +227,21 @@ extern long __put_user_bad(void);
        __pu_err;                                               \
 })
-#define __put_user_size(x,ptr,size,retval)                      \
+#define __put_user_size(x,ptr,size,retval)                              \
-do {                                                            \
+do {                                                                    \
-        retval = 0;                                             \
+        int __cb;                                                       \
-        switch (size) {                                         \
+        retval = 0;                                                     \
-        case 1: __put_user_asm(x,ptr,retval,1,"s8i");  break;   \
+        switch (size) {                                                 \
-        case 2: __put_user_asm(x,ptr,retval,2,"s16i"); break;   \
+        case 1: __put_user_asm(x,ptr,retval,1,"s8i",__cb);  break;      \
-        case 4: __put_user_asm(x,ptr,retval,4,"s32i"); break;   \
+        case 2: __put_user_asm(x,ptr,retval,2,"s16i",__cb); break;      \
-        case 8: {                                               \
+        case 4: __put_user_asm(x,ptr,retval,4,"s32i",__cb); break;      \
-                     __typeof__(*ptr) __v64 = x;                \
+        case 8: {                                                       \
-                     retval = __copy_to_user(ptr,&__v64,8);     \
+                     __typeof__(*ptr) __v64 = x;                        \
-                     break;                                     \
+                     retval = __copy_to_user(ptr,&__v64,8);             \
-                }                                               \
+                     break;                                             \
-        default: __put_user_bad();                              \
+                }                                                       \
-        }                                                       \
+        default: __put_user_bad();                                      \
+        }                                                               \
 } while (0)
@@ -267,14 +269,14 @@ do {								\
 #define __check_align_1  ""
 #define __check_align_2                         \
-        "   _bbci.l %2,  0, 1f          \n"     \
+        "   _bbci.l %3,  0, 1f          \n"     \
-        "   movi    %0, %3              \n"     \
+        "   movi    %0, %4              \n"     \
        "   _j      2f                  \n"
 #define __check_align_4                         \
-        "   _bbsi.l %2,  0, 0f          \n"     \
+        "   _bbsi.l %3,  0, 0f          \n"     \
-        "   _bbci.l %2,  1, 1f          \n"     \
+        "   _bbci.l %3,  1, 1f          \n"     \
-        "0: movi    %0, %3              \n"     \
+        "0: movi    %0, %4              \n"     \
        "   _j      2f                  \n"
@@ -286,24 +288,24 @@ do {								\
 * WARNING: If you modify this macro at all, verify that the
 * __check_align_* macros still work.
 */
-#define __put_user_asm(x, addr, err, align, insn) \
+#define __put_user_asm(x, addr, err, align, insn, cb)   \
-   __asm__ __volatile__(                        \
+   __asm__ __volatile__(                                \
-        __check_align_##align                   \
+        __check_align_##align                           \
-        "1: "insn"  %1, %2, 0           \n"     \
+        "1: "insn"  %2, %3, 0           \n"             \
-        "2:                             \n"     \
+        "2:                             \n"             \
-        "   .section  .fixup,\"ax\"     \n"     \
+        "   .section  .fixup,\"ax\"     \n"             \
-        "   .align 4                    \n"     \
+        "   .align 4                    \n"             \
-        "4:                             \n"     \
+        "4:                             \n"             \
-        "   .long  2b                   \n"     \
+        "   .long  2b                   \n"             \
-        "5:                             \n"     \
+        "5:                             \n"             \
-        "   l32r   %2, 4b               \n"     \
+        "   l32r   %1, 4b               \n"             \
-        "   movi   %0, %3               \n"     \
+        "   movi   %0, %4               \n"             \
-        "   jx     %2                   \n"     \
+        "   jx     %1                   \n"             \
-        "   .previous                   \n"     \
+        "   .previous                   \n"             \
-        "   .section  __ex_table,\"a\"  \n"     \
+        "   .section  __ex_table,\"a\"  \n"             \
-        "   .long       1b, 5b          \n"     \
+        "   .long       1b, 5b          \n"             \
-        "   .previous"                          \
+        "   .previous"                                  \
-        :"=r" (err)                             \
+        :"=r" (err), "=r" (cb)                          \
        :"r" ((int)(x)), "r" (addr), "i" (-EFAULT), "0" (err))
 #define __get_user_nocheck(x,ptr,size)                          \
@@ -328,11 +330,12 @@ extern long __get_user_bad(void);
 #define __get_user_size(x,ptr,size,retval)                              \
 do {                                                                    \
+        int __cb;                                                       \
        retval = 0;                                                     \
        switch (size) {                                                 \
-          case 1: __get_user_asm(x,ptr,retval,1,"l8ui");  break;        \
+          case 1: __get_user_asm(x,ptr,retval,1,"l8ui",__cb);  break;   \
-          case 2: __get_user_asm(x,ptr,retval,2,"l16ui"); break;        \
+          case 2: __get_user_asm(x,ptr,retval,2,"l16ui",__cb); break;   \
-          case 4: __get_user_asm(x,ptr,retval,4,"l32i");  break;        \
+          case 4: __get_user_asm(x,ptr,retval,4,"l32i",__cb);  break;   \
          case 8: retval = __copy_from_user(&x,ptr,8);    break;        \
          default: (x) = __get_user_bad();                              \
        }                                                               \
@@ -343,25 +346,25 @@ do {									\
 * WARNING: If you modify this macro at all, verify that the
 * __check_align_* macros still work.
 */
-#define __get_user_asm(x, addr, err, align, insn) \
+#define __get_user_asm(x, addr, err, align, insn, cb) \
   __asm__ __volatile__(                        \
        __check_align_##align                   \
-        "1: "insn"  %1, %2, 0           \n"     \
+        "1: "insn"  %2, %3, 0           \n"     \
        "2:                             \n"     \
        "   .section  .fixup,\"ax\"     \n"     \
        "   .align 4                    \n"     \
        "4:                             \n"     \
        "   .long  2b                   \n"     \
        "5:                             \n"     \
-        "   l32r   %2, 4b               \n"     \
+        "   l32r   %1, 4b               \n"     \
-        "   movi   %1, 0                \n"     \
+        "   movi   %2, 0                \n"     \
-        "   movi   %0, %3               \n"     \
+        "   movi   %0, %4               \n"     \
-        "   jx     %2                   \n"     \
+        "   jx     %1                   \n"     \
        "   .previous                   \n"     \
        "   .section  __ex_table,\"a\"  \n"     \
        "   .long       1b, 5b          \n"     \
        "   .previous"                          \
-        :"=r" (err), "=r" (x)                   \
+        :"=r" (err), "=r" (cb), "=r" (x)        \
        :"r" (addr), "i" (-EFAULT), "0" (err))
diff --git a/include/asm-xtensa/variant-fsf/tie-asm.h b/include/asm-xtensa/variant-fsf/tie-asm.h
new file mode 100644
index 000000000000..68a73bf4ffc5
--- /dev/null
+++ b/include/asm-xtensa/variant-fsf/tie-asm.h
@@ -0,0 +1,70 @@
+/*
+ * This header file contains assembly-language definitions (assembly
+ * macros, etc.) for this specific Xtensa processor's TIE extensions
+ * and options.  It is customized to this Xtensa processor configuration.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1999-2008 Tensilica Inc.
+ */
+#ifndef _XTENSA_CORE_TIE_ASM_H
+#define _XTENSA_CORE_TIE_ASM_H
+/*  Selection parameter values for save-area save/restore macros:  */
+/*  Option vs. TIE:  */
+#define XTHAL_SAS_TIE   0x0001  /* custom extension or coprocessor */
+#define XTHAL_SAS_OPT   0x0002  /* optional (and not a coprocessor) */
+/*  Whether used automatically by compiler:  */
+#define XTHAL_SAS_NOCC  0x0004  /* not used by compiler w/o special opts/code */
+#define XTHAL_SAS_CC    0x0008  /* used by compiler without special opts/code */
+/*  ABI handling across function calls:  */
+#define XTHAL_SAS_CALR  0x0010  /* caller-saved */
+#define XTHAL_SAS_CALE  0x0020  /* callee-saved */
+#define XTHAL_SAS_GLOB  0x0040  /* global across function calls (in thread) */
+/*  Misc  */
+#define XTHAL_SAS_ALL   0xFFFF  /* include all default NCP contents */
+/* Macro to save all non-coprocessor (extra) custom TIE and optional state
+ * (not including zero-overhead loop registers).
+ * Save area ptr (clobbered):  ptr  (1 byte aligned)
+ * Scratch regs  (clobbered):  at1..at4  (only first XCHAL_NCP_NUM_ATMPS needed)
+ */
+        .macro xchal_ncp_store  ptr at1 at2 at3 at4  continue=0 ofs=-1 select=XTHAL_SAS_ALL
+        xchal_sa_start  \continue, \ofs
+        .ifeq (XTHAL_SAS_OPT | XTHAL_SAS_CC | XTHAL_SAS_GLOB) & ~\select
+        xchal_sa_align  \ptr, 0, 1024-4, 4, 4
+        rur     \at1, THREADPTR         // threadptr option
+        s32i    \at1, \ptr, .Lxchal_ofs_ + 0
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + 4
+        .endif
+        .endm   // xchal_ncp_store
+/* Macro to save all non-coprocessor (extra) custom TIE and optional state
+ * (not including zero-overhead loop registers).
+ * Save area ptr (clobbered):  ptr  (1 byte aligned)
+ * Scratch regs  (clobbered):  at1..at4  (only first XCHAL_NCP_NUM_ATMPS needed)
+ */
+        .macro xchal_ncp_load  ptr at1 at2 at3 at4  continue=0 ofs=-1 select=XTHAL_SAS_ALL
+        xchal_sa_start  \continue, \ofs
+        .ifeq (XTHAL_SAS_OPT | XTHAL_SAS_CC | XTHAL_SAS_GLOB) & ~\select
+        xchal_sa_align  \ptr, 0, 1024-4, 4, 4
+        l32i    \at1, \ptr, .Lxchal_ofs_ + 0
+        wur     \at1, THREADPTR         // threadptr option
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + 4
+        .endif
+        .endm   // xchal_ncp_load
+#define XCHAL_NCP_NUM_ATMPS     1
+#define XCHAL_SA_NUM_ATMPS      1
+#endif /*_XTENSA_CORE_TIE_ASM_H*/
diff --git a/include/asm-xtensa/variant-fsf/tie.h b/include/asm-xtensa/variant-fsf/tie.h
index a73c71664918..bf4020116df5 100644
--- a/include/asm-xtensa/variant-fsf/tie.h
+++ b/include/asm-xtensa/variant-fsf/tie.h
@@ -1,22 +1,77 @@
 /*
- * Xtensa processor core configuration information.
+ * This header file describes this specific Xtensa processor's TIE extensions
+ * that extend basic Xtensa core functionality.  It is customized to this
+ * Xtensa processor configuration.
 *
 * This file is subject to the terms and conditions of the GNU General Public
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 *
- * Copyright (C) 1999-2006 Tensilica Inc.
+ * Copyright (C) 1999-2007 Tensilica Inc.
 */
-#ifndef XTENSA_TIE_H
+#ifndef _XTENSA_CORE_TIE_H
-#define XTENSA_TIE_H
+#define _XTENSA_CORE_TIE_H
-/*----------------------------------------------------------------------
-                        COPROCESSORS and EXTRA STATE
-  ----------------------------------------------------------------------*/
 #define XCHAL_CP_NUM                    0       /* number of coprocessors */
-#define XCHAL_CP_MASK                   0x00
+#define XCHAL_CP_MAX                    0       /* max CP ID + 1 (0 if none) */
+#define XCHAL_CP_MASK                   0x00    /* bitmask of all CPs by ID */
+#define XCHAL_CP_PORT_MASK              0x00    /* bitmask of only port CPs */
+/*  Basic parameters of each coprocessor:  */
+#define XCHAL_CP7_NAME                  "XTIOP"
+#define XCHAL_CP7_IDENT                 XTIOP
+#define XCHAL_CP7_SA_SIZE               0       /* size of state save area */
+#define XCHAL_CP7_SA_ALIGN              1       /* min alignment of save area */
+#define XCHAL_CP_ID_XTIOP               7       /* coprocessor ID (0..7) */
+/*  Filler info for unassigned coprocessors, to simplify arrays etc:  */
+#define XCHAL_NCP_SA_SIZE               0
+#define XCHAL_NCP_SA_ALIGN              1
+#define XCHAL_CP0_SA_SIZE               0
+#define XCHAL_CP0_SA_ALIGN              1
+#define XCHAL_CP1_SA_SIZE               0
+#define XCHAL_CP1_SA_ALIGN              1
+#define XCHAL_CP2_SA_SIZE               0
+#define XCHAL_CP2_SA_ALIGN              1
+#define XCHAL_CP3_SA_SIZE               0
+#define XCHAL_CP3_SA_ALIGN              1
+#define XCHAL_CP4_SA_SIZE               0
+#define XCHAL_CP4_SA_ALIGN              1
+#define XCHAL_CP5_SA_SIZE               0
+#define XCHAL_CP5_SA_ALIGN              1
+#define XCHAL_CP6_SA_SIZE               0
+#define XCHAL_CP6_SA_ALIGN              1
+/*  Save area for non-coprocessor optional and custom (TIE) state:  */
+#define XCHAL_NCP_SA_SIZE               0
+#define XCHAL_NCP_SA_ALIGN              1
+/*  Total save area for optional and custom state (NCP + CPn):  */
+#define XCHAL_TOTAL_SA_SIZE             0       /* with 16-byte align padding */
+#define XCHAL_TOTAL_SA_ALIGN            1       /* actual minimum alignment */
+#define XCHAL_NCP_SA_NUM        0
+#define XCHAL_NCP_SA_LIST(s)
+#define XCHAL_CP0_SA_NUM        0
+#define XCHAL_CP0_SA_LIST(s)
+#define XCHAL_CP1_SA_NUM        0
+#define XCHAL_CP1_SA_LIST(s)
+#define XCHAL_CP2_SA_NUM        0
+#define XCHAL_CP2_SA_LIST(s)
+#define XCHAL_CP3_SA_NUM        0
+#define XCHAL_CP3_SA_LIST(s)
+#define XCHAL_CP4_SA_NUM        0
+#define XCHAL_CP4_SA_LIST(s)
+#define XCHAL_CP5_SA_NUM        0
+#define XCHAL_CP5_SA_LIST(s)
+#define XCHAL_CP6_SA_NUM        0
+#define XCHAL_CP6_SA_LIST(s)
+#define XCHAL_CP7_SA_NUM        0
+#define XCHAL_CP7_SA_LIST(s)
+/* Byte length of instruction from its first nibble (op0 field), per FLIX.  */
+#define XCHAL_OP0_FORMAT_LENGTHS        3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3
-#endif /*XTENSA_CONFIG_TIE_H*/
+#endif /*_XTENSA_CORE_TIE_H*/
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 5cae9b5960ea..aada32fffec2 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -70,7 +70,6 @@ header-y += fuse.h
 header-y += genetlink.h
 header-y += gen_stats.h
 header-y += gigaset_dev.h
-header-y += hdsmart.h
 header-y += hysdn_if.h
 header-y += i2o-dev.h
 header-y += i8k.h
@@ -211,6 +210,7 @@ unifdef-y += hayesesp.h
 unifdef-y += hdlcdrv.h
 unifdef-y += hdlc.h
 unifdef-y += hdreg.h
+unifdef-y += hdsmart.h
 unifdef-y += hiddev.h
 unifdef-y += hpet.h
 unifdef-y += i2c.h
diff --git a/include/linux/aio.h b/include/linux/aio.h
index a9931e2e5624..0d0b7f629bd3 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -105,7 +105,6 @@ struct kiocb {
        wait_queue_t            ki_wait;
        loff_t                  ki_pos;
-        atomic_t                ki_bio_count;   /* num bio used for this iocb */
        void                    *private;
        /* State that we remember to be able to restart/retry  */
        unsigned short          ki_opcode;
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 78bbacaed8c4..1c622e2b0504 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -659,6 +659,11 @@ static inline int atapi_command_packet_set(const u16 *dev_id)
        return (dev_id[0] >> 8) & 0x1f;
 }
+static inline int atapi_id_dmadir(const u16 *dev_id)
+{
+        return ata_id_major_version(dev_id) >= 7 && (dev_id[62] & 0x8000);
+}
 static inline int is_multi_taskfile(struct ata_taskfile *tf)
 {
        return (tf->command == ATA_CMD_READ_MULTI) ||
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 4da441337d6e..4c59bdccd3ee 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -326,7 +326,6 @@ extern struct bio *bio_map_kern(struct request_queue *, void *, unsigned int,
                                gfp_t);
 extern void bio_set_pages_dirty(struct bio *bio);
 extern void bio_check_pages_dirty(struct bio *bio);
-extern void bio_release_pages(struct bio *bio);
 extern struct bio *bio_copy_user(struct request_queue *, unsigned long, unsigned int, int);
 extern int bio_uncopy_user(struct bio *);
 void zero_fill_bio(struct bio *bio);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e1888cc5b8ae..6fe67d1939c2 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -216,6 +216,7 @@ struct request {
        unsigned int cmd_len;
        unsigned char cmd[BLK_MAX_CDB];
+        unsigned int raw_data_len;
        unsigned int data_len;
        unsigned int sense_len;
        void *data;
@@ -258,6 +259,7 @@ struct bio_vec;
 typedef int (merge_bvec_fn) (struct request_queue *, struct bio *, struct bio_vec *);
 typedef void (prepare_flush_fn) (struct request_queue *, struct request *);
 typedef void (softirq_done_fn)(struct request *);
+typedef int (dma_drain_needed_fn)(struct request *);
 enum blk_queue_state {
        Queue_down,
@@ -294,6 +296,7 @@ struct request_queue
        merge_bvec_fn           *merge_bvec_fn;
        prepare_flush_fn        *prepare_flush_fn;
        softirq_done_fn         *softirq_done_fn;
+        dma_drain_needed_fn     *dma_drain_needed;
        /*
         * Dispatch queue sorting
@@ -698,8 +701,9 @@ extern void blk_queue_max_hw_segments(struct request_queue *, unsigned short);
 extern void blk_queue_max_segment_size(struct request_queue *, unsigned int);
 extern void blk_queue_hardsect_size(struct request_queue *, unsigned short);
 extern void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b);
-extern int blk_queue_dma_drain(struct request_queue *q, void *buf,
+extern int blk_queue_dma_drain(struct request_queue *q,
-                               unsigned int size);
+                               dma_drain_needed_fn *dma_drain_needed,
+                               void *buf, unsigned int size);
 extern void blk_queue_segment_boundary(struct request_queue *, unsigned long);
 extern void blk_queue_prep_rq(struct request_queue *, prep_rq_fn *pfn);
 extern void blk_queue_merge_bvec(struct request_queue *, merge_bvec_fn *);
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index ff9055fc3d2a..028ba3b523b1 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -175,7 +175,7 @@ struct css_set {
 *
 *
 * When reading/writing to a file:
- *      - the cgroup to use in file->f_dentry->d_parent->d_fsdata
+ *      - the cgroup to use is file->f_dentry->d_parent->d_fsdata
 *      - the 'cftype' of the file is file->f_dentry->d_fsdata
 */
@@ -186,15 +186,15 @@ struct cftype {
        char name[MAX_CFTYPE_NAME];
        int private;
        int (*open) (struct inode *inode, struct file *file);
-        ssize_t (*read) (struct cgroup *cont, struct cftype *cft,
+        ssize_t (*read) (struct cgroup *cgrp, struct cftype *cft,
                         struct file *file,
                         char __user *buf, size_t nbytes, loff_t *ppos);
        /*
         * read_uint() is a shortcut for the common case of returning a
         * single integer. Use it in place of read()
         */
-        u64 (*read_uint) (struct cgroup *cont, struct cftype *cft);
+        u64 (*read_uint) (struct cgroup *cgrp, struct cftype *cft);
-        ssize_t (*write) (struct cgroup *cont, struct cftype *cft,
+        ssize_t (*write) (struct cgroup *cgrp, struct cftype *cft,
                          struct file *file,
                          const char __user *buf, size_t nbytes, loff_t *ppos);
@@ -203,7 +203,7 @@ struct cftype {
         * a single integer (as parsed by simple_strtoull) from
         * userspace. Use in place of write(); return 0 or error.
         */
-        int (*write_uint) (struct cgroup *cont, struct cftype *cft, u64 val);
+        int (*write_uint) (struct cgroup *cgrp, struct cftype *cft, u64 val);
        int (*release) (struct inode *inode, struct file *file);
 };
@@ -218,41 +218,41 @@ struct cgroup_scanner {
 /* Add a new file to the given cgroup directory. Should only be
 * called by subsystems from within a populate() method */
-int cgroup_add_file(struct cgroup *cont, struct cgroup_subsys *subsys,
+int cgroup_add_file(struct cgroup *cgrp, struct cgroup_subsys *subsys,
                       const struct cftype *cft);
 /* Add a set of new files to the given cgroup directory. Should
 * only be called by subsystems from within a populate() method */
-int cgroup_add_files(struct cgroup *cont,
+int cgroup_add_files(struct cgroup *cgrp,
                        struct cgroup_subsys *subsys,
                        const struct cftype cft[],
                        int count);
-int cgroup_is_removed(const struct cgroup *cont);
+int cgroup_is_removed(const struct cgroup *cgrp);
-int cgroup_path(const struct cgroup *cont, char *buf, int buflen);
+int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen);
-int cgroup_task_count(const struct cgroup *cont);
+int cgroup_task_count(const struct cgroup *cgrp);
 /* Return true if the cgroup is a descendant of the current cgroup */
-int cgroup_is_descendant(const struct cgroup *cont);
+int cgroup_is_descendant(const struct cgroup *cgrp);
 /* Control Group subsystem type. See Documentation/cgroups.txt for details */
 struct cgroup_subsys {
        struct cgroup_subsys_state *(*create)(struct cgroup_subsys *ss,
-                                                  struct cgroup *cont);
+                                                  struct cgroup *cgrp);
-        void (*pre_destroy)(struct cgroup_subsys *ss, struct cgroup *cont);
+        void (*pre_destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
-        void (*destroy)(struct cgroup_subsys *ss, struct cgroup *cont);
+        void (*destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
        int (*can_attach)(struct cgroup_subsys *ss,
-                          struct cgroup *cont, struct task_struct *tsk);
+                          struct cgroup *cgrp, struct task_struct *tsk);
-        void (*attach)(struct cgroup_subsys *ss, struct cgroup *cont,
+        void (*attach)(struct cgroup_subsys *ss, struct cgroup *cgrp,
-                        struct cgroup *old_cont, struct task_struct *tsk);
+                        struct cgroup *old_cgrp, struct task_struct *tsk);
        void (*fork)(struct cgroup_subsys *ss, struct task_struct *task);
        void (*exit)(struct cgroup_subsys *ss, struct task_struct *task);
        int (*populate)(struct cgroup_subsys *ss,
-                        struct cgroup *cont);
+                        struct cgroup *cgrp);
-        void (*post_clone)(struct cgroup_subsys *ss, struct cgroup *cont);
+        void (*post_clone)(struct cgroup_subsys *ss, struct cgroup *cgrp);
        void (*bind)(struct cgroup_subsys *ss, struct cgroup *root);
        int subsys_id;
        int active;
@@ -273,9 +273,9 @@ struct cgroup_subsys {
 #undef SUBSYS
 static inline struct cgroup_subsys_state *cgroup_subsys_state(
-        struct cgroup *cont, int subsys_id)
+        struct cgroup *cgrp, int subsys_id)
 {
-        return cont->subsys[subsys_id];
+        return cgrp->subsys[subsys_id];
 }
 static inline struct cgroup_subsys_state *task_subsys_state(
@@ -290,8 +290,6 @@ static inline struct cgroup* task_cgroup(struct task_struct *task,
        return task_subsys_state(task, subsys_id)->cgroup;
 }
-int cgroup_path(const struct cgroup *cont, char *buf, int buflen);
 int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *ss);
 /* A cgroup_iter should be treated as an opaque object */
@@ -313,10 +311,10 @@ struct cgroup_iter {
 *    - cgroup_scan_tasks() holds the css_set_lock when calling the test_task()
 *      callback, but not while calling the process_task() callback.
 */
-void cgroup_iter_start(struct cgroup *cont, struct cgroup_iter *it);
+void cgroup_iter_start(struct cgroup *cgrp, struct cgroup_iter *it);
-struct task_struct *cgroup_iter_next(struct cgroup *cont,
+struct task_struct *cgroup_iter_next(struct cgroup *cgrp,
                                        struct cgroup_iter *it);
-void cgroup_iter_end(struct cgroup *cont, struct cgroup_iter *it);
+void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it);
 int cgroup_scan_tasks(struct cgroup_scanner *scan);
 int cgroup_attach_task(struct cgroup *, struct task_struct *);
diff --git a/include/linux/efs_dir.h b/include/linux/efs_dir.h
deleted file mode 100644
index a09ec010569c..000000000000
--- a/include/linux/efs_dir.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * efs_dir.h
- *
- * Copyright (c) 1999 Al Smith
- */
-#ifndef __EFS_DIR_H__
-#define __EFS_DIR_H__
-#define EFS_DIRBSIZE_BITS       EFS_BLOCKSIZE_BITS
-#define EFS_DIRBSIZE            (1 << EFS_DIRBSIZE_BITS)
-struct efs_dentry {
-        __be32          inode;
-        unsigned char   namelen;
-        char            name[3];
-};
-#define EFS_DENTSIZE    (sizeof(struct efs_dentry) - 3 + 1)
-#define EFS_MAXNAMELEN  ((1 << (sizeof(char) * 8)) - 1)
-#define EFS_DIRBLK_HEADERSIZE   4
-#define EFS_DIRBLK_MAGIC        0xbeef  /* moo */
-struct efs_dir {
-        __be16  magic;
-        unsigned char   firstused;
-        unsigned char   slots;
-        unsigned char   space[EFS_DIRBSIZE - EFS_DIRBLK_HEADERSIZE];
-};
-#define EFS_MAXENTS \
-        ((EFS_DIRBSIZE - EFS_DIRBLK_HEADERSIZE) / \
-         (EFS_DENTSIZE + sizeof(char)))
-#define EFS_SLOTAT(dir, slot) EFS_REALOFF((dir)->space[slot])
-#define EFS_REALOFF(offset) ((offset << 1))
-#endif /* __EFS_DIR_H__ */
diff --git a/include/linux/efs_fs.h b/include/linux/efs_fs.h
deleted file mode 100644
index a695d63a07af..000000000000
--- a/include/linux/efs_fs.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * efs_fs.h
- *
- * Copyright (c) 1999 Al Smith
- *
- * Portions derived from work (c) 1995,1996 Christian Vogelgsang.
- */
-#ifndef __EFS_FS_H__
-#define __EFS_FS_H__
-#define EFS_VERSION "1.0a"
-static const char cprt[] = "EFS: "EFS_VERSION" - (c) 1999 Al Smith <Al.Smith@aeschi.ch.eu.org>";
-#include <asm/uaccess.h>
-/* 1 block is 512 bytes */
-#define EFS_BLOCKSIZE_BITS      9
-#define EFS_BLOCKSIZE           (1 << EFS_BLOCKSIZE_BITS)
-#include <linux/fs.h>
-#include <linux/efs_fs_i.h>
-#include <linux/efs_fs_sb.h>
-#include <linux/efs_dir.h>
-static inline struct efs_inode_info *INODE_INFO(struct inode *inode)
-{
-        return container_of(inode, struct efs_inode_info, vfs_inode);
-}
-static inline struct efs_sb_info *SUPER_INFO(struct super_block *sb)
-{
-        return sb->s_fs_info;
-}
-struct statfs;
-struct fid;
-extern const struct inode_operations efs_dir_inode_operations;
-extern const struct file_operations efs_dir_operations;
-extern const struct address_space_operations efs_symlink_aops;
-extern struct inode *efs_iget(struct super_block *, unsigned long);
-extern efs_block_t efs_map_block(struct inode *, efs_block_t);
-extern int efs_get_block(struct inode *, sector_t, struct buffer_head *, int);
-extern struct dentry *efs_lookup(struct inode *, struct dentry *, struct nameidata *);
-extern struct dentry *efs_fh_to_dentry(struct super_block *sb, struct fid *fid,
-                int fh_len, int fh_type);
-extern struct dentry *efs_fh_to_parent(struct super_block *sb, struct fid *fid,
-                int fh_len, int fh_type);
-extern struct dentry *efs_get_parent(struct dentry *);
-extern int efs_bmap(struct inode *, int);
-#endif /* __EFS_FS_H__ */
diff --git a/include/linux/efs_fs_i.h b/include/linux/efs_fs_i.h
deleted file mode 100644
index 617c474ca659..000000000000
--- a/include/linux/efs_fs_i.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * efs_fs_i.h
- *
- * Copyright (c) 1999 Al Smith
- *
- * Portions derived from IRIX header files (c) 1988 Silicon Graphics
- */
-#ifndef __EFS_FS_I_H__
-#define __EFS_FS_I_H__
-typedef int32_t         efs_block_t;
-typedef uint32_t        efs_ino_t;
-#define EFS_DIRECTEXTENTS       12
-/*
- * layout of an extent, in memory and on disk. 8 bytes exactly.
- */
-typedef union extent_u {
-        unsigned char raw[8];
-        struct extent_s {
-                unsigned int    ex_magic:8;     /* magic # (zero) */
-                unsigned int    ex_bn:24;       /* basic block */
-                unsigned int    ex_length:8;    /* numblocks in this extent */
-                unsigned int    ex_offset:24;   /* logical offset into file */
-        } cooked;
-} efs_extent;
-typedef struct edevs {
-        __be16          odev;
-        __be32          ndev;
-} efs_devs;
-/*
- * extent based filesystem inode as it appears on disk.  The efs inode
- * is exactly 128 bytes long.
- */
-struct  efs_dinode {
-        __be16          di_mode;        /* mode and type of file */
-        __be16          di_nlink;       /* number of links to file */
-        __be16          di_uid;         /* owner's user id */
-        __be16          di_gid;         /* owner's group id */
-        __be32          di_size;        /* number of bytes in file */
-        __be32          di_atime;       /* time last accessed */
-        __be32          di_mtime;       /* time last modified */
-        __be32          di_ctime;       /* time created */
-        __be32          di_gen;         /* generation number */
-        __be16          di_numextents;  /* # of extents */
-        u_char          di_version;     /* version of inode */
-        u_char          di_spare;       /* spare - used by AFS */
-        union di_addr {
-                efs_extent      di_extents[EFS_DIRECTEXTENTS];
-                efs_devs        di_dev; /* device for IFCHR/IFBLK */
-        } di_u;
-};
-/* efs inode storage in memory */
-struct efs_inode_info {
-        int             numextents;
-        int             lastextent;
-        efs_extent      extents[EFS_DIRECTEXTENTS];
-        struct inode    vfs_inode;
-};
-#endif  /* __EFS_FS_I_H__ */
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 98ffb6ead434..b84b848431f2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1590,7 +1590,6 @@ extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
 extern struct block_device *open_by_devnum(dev_t, unsigned);
-extern const struct address_space_operations def_blk_aops;
 #else
 static inline void bd_forget(struct inode *inode) {}
 #endif
diff --git a/include/linux/futex.h b/include/linux/futex.h
index 90048fb28a38..586ab56a3ec3 100644
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
@@ -167,6 +167,7 @@ union futex_key {
 #ifdef CONFIG_FUTEX
 extern void exit_robust_list(struct task_struct *curr);
 extern void exit_pi_state_list(struct task_struct *curr);
+extern int futex_cmpxchg_enabled;
 #else
 static inline void exit_robust_list(struct task_struct *curr)
 {
diff --git a/include/linux/hdsmart.h b/include/linux/hdsmart.h
index e69192159d40..4f4faf9d4238 100644
--- a/include/linux/hdsmart.h
+++ b/include/linux/hdsmart.h
@@ -17,7 +17,7 @@
 #ifndef _LINUX_HDSMART_H
 #define _LINUX_HDSMART_H
-#ifndef __KERNEL
+#ifndef __KERNEL__
 #define OFFLINE_FULL_SCAN               0
 #define SHORT_SELF_TEST                 1
 #define EXTEND_SELF_TEST                2
@@ -121,6 +121,6 @@ typedef struct ata_smart_selftestlog_s {
        unsigned char                   resevered[2];
        unsigned char                   chksum;
 } __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ *
+#endif /* __KERNEL__ */
 #endif  /* _LINUX_HDSMART_H */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 76014f8f3c60..365e0df3646b 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -271,9 +271,16 @@ extern void i2c_unregister_device(struct i2c_client *);
 * This is done at arch_initcall time, before declaring any i2c adapters.
 * Modules for add-on boards must use other calls.
 */
+#ifdef CONFIG_I2C_BOARDINFO
 extern int
 i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned n);
+#else
+static inline int
+i2c_register_board_info(int busnum, struct i2c_board_info const *info, unsigned n)
+{
+        return 0;
+}
+#endif
 /*
 * The following structs are for those who like to implement new bus drivers:
@@ -598,7 +605,7 @@ I2C_CLIENT_MODULE_PARM(probe, "List of adapter,address pairs to scan "	\
                       "additionally");                                 \
 I2C_CLIENT_MODULE_PARM(ignore, "List of adapter,address pairs not to "  \
                       "scan");                                         \
-const static struct i2c_client_address_data addr_data = {               \
+static const struct i2c_client_address_data addr_data = {               \
        .normal_i2c     = normal_i2c,                                   \
        .probe          = probe,                                        \
        .ignore         = ignore,                                       \
diff --git a/include/linux/init.h b/include/linux/init.h
index a404a0055dd7..fb58c0493cf2 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -42,6 +42,7 @@
   discard it in modules) */
 #define __init          __section(.init.text) __cold
 #define __initdata      __section(.init.data)
+#define __initconst     __section(.init.rodata)
 #define __exitdata      __section(.exit.data)
 #define __exit_call     __used __section(.exitcall.exit)
@@ -106,6 +107,7 @@
 #define __memexitconst   __section(.memexit.rodata)
 /* For assembly routines */
+#define __HEAD          .section        ".head.text","ax"
 #define __INIT          .section        ".init.text","ax"
 #define __FINIT         .previous
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 593b222d9dcc..1b4ccf25b4d2 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -50,6 +50,7 @@ struct cfq_io_context {
        sector_t seek_mean;
        struct list_head queue_list;
+        struct hlist_node cic_list;
        void (*dtor)(struct io_context *); /* destructor */
        void (*exit)(struct io_context *); /* called on task exit */
@@ -77,6 +78,7 @@ struct io_context {
        struct as_io_context *aic;
        struct radix_tree_root radix_root;
+        struct hlist_head cic_list;
        void *ioc_data;
 };
diff --git a/include/linux/libata.h b/include/linux/libata.h
index bc5a8d0c7090..a05f60013642 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -138,6 +138,7 @@ enum {
        ATA_DFLAG_AN            = (1 << 7), /* AN configured */
        ATA_DFLAG_HIPM          = (1 << 8), /* device supports HIPM */
        ATA_DFLAG_DIPM          = (1 << 9), /* device supports DIPM */
+        ATA_DFLAG_DMADIR        = (1 << 10), /* device requires DMADIR */
        ATA_DFLAG_CFG_MASK      = (1 << 12) - 1,
        ATA_DFLAG_PIO           = (1 << 12), /* device limited to PIO mode */
@@ -278,7 +279,6 @@ enum {
        /* size of buffer to pad xfers ending on unaligned boundaries */
        ATA_DMA_PAD_SZ          = 4,
-        ATA_DMA_PAD_BUF_SZ      = ATA_DMA_PAD_SZ * ATA_MAX_QUEUE,
        /* ering size */
        ATA_ERING_SIZE          = 32,
@@ -457,24 +457,18 @@ struct ata_queued_cmd {
        unsigned long           flags;          /* ATA_QCFLAG_xxx */
        unsigned int            tag;
        unsigned int            n_elem;
-        unsigned int            mapped_n_elem;
        int                     dma_dir;
-        unsigned int            pad_len;
        unsigned int            sect_size;
        unsigned int            nbytes;
-        unsigned int            raw_nbytes;
        unsigned int            curbytes;
        struct scatterlist      *cursg;
        unsigned int            cursg_ofs;
-        struct scatterlist      *last_sg;
-        struct scatterlist      saved_last_sg;
        struct scatterlist      sgent;
-        struct scatterlist      extra_sg[2];
        struct scatterlist      *sg;
@@ -619,9 +613,6 @@ struct ata_port {
        struct ata_prd          *prd;    /* our SG list */
        dma_addr_t              prd_dma; /* and its DMA mapping */
-        void                    *pad;   /* array of DMA pad buffers */
-        dma_addr_t              pad_dma;
        struct ata_ioports      ioaddr; /* ATA cmd/ctl/dma register blocks */
        u8                      ctl;    /* cache of ATA control register */
@@ -1207,7 +1198,7 @@ static inline struct ata_link *ata_port_next_link(struct ata_link *link)
                return ap->pmp_link;
        }
-        if (++link - ap->pmp_link < ap->nr_pmp_links)
+        if (++link < ap->nr_pmp_links + ap->pmp_link)
                return link;
        return NULL;
 }
@@ -1363,12 +1354,9 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
        qc->flags = 0;
        qc->cursg = NULL;
        qc->cursg_ofs = 0;
-        qc->nbytes = qc->raw_nbytes = qc->curbytes = 0;
+        qc->nbytes = qc->curbytes = 0;
        qc->n_elem = 0;
-        qc->mapped_n_elem = 0;
        qc->err_mask = 0;
-        qc->pad_len = 0;
-        qc->last_sg = NULL;
        qc->sect_size = ATA_SECT_SIZE;
        ata_tf_init(qc->dev, &qc->tf);
@@ -1423,19 +1411,6 @@ static inline unsigned int __ac_err_mask(u8 status)
        return mask;
 }
-static inline int ata_pad_alloc(struct ata_port *ap, struct device *dev)
-{
-        ap->pad_dma = 0;
-        ap->pad = dmam_alloc_coherent(dev, ATA_DMA_PAD_BUF_SZ,
-                                      &ap->pad_dma, GFP_KERNEL);
-        return (ap->pad == NULL) ? -ENOMEM : 0;
-}
-static inline void ata_pad_free(struct ata_port *ap, struct device *dev)
-{
-        dmam_free_coherent(dev, ATA_DMA_PAD_BUF_SZ, ap->pad, ap->pad_dma);
-}
 static inline struct ata_port *ata_shost_to_port(struct Scsi_Host *host)
 {
        return *(struct ata_port **)&host->hostdata[0];
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 925d57b236aa..04075628cb9a 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -20,9 +20,6 @@
 #ifndef _LINUX_MEMCONTROL_H
 #define _LINUX_MEMCONTROL_H
-#include <linux/rcupdate.h>
-#include <linux/mm.h>
 struct mem_cgroup;
 struct page_cgroup;
 struct page;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 26c7124b841a..3f3ccfe42de0 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -235,6 +235,7 @@ static inline int get_page_unless_zero(struct page *page)
 struct page *vmalloc_to_page(const void *addr);
 unsigned long vmalloc_to_pfn(const void *addr);
+#ifdef CONFIG_MMU
 /* Determine if an address is within the vmalloc range */
 static inline int is_vmalloc_addr(const void *x)
 {
@@ -242,6 +243,7 @@ static inline int is_vmalloc_addr(const void *x)
        return addr >= VMALLOC_START && addr < VMALLOC_END;
 }
+#endif
 static inline struct page *compound_head(struct page *page)
 {
@@ -1171,12 +1173,18 @@ static inline void enable_debug_pagealloc(void)
 {
        debug_pagealloc_enabled = 1;
 }
+#ifdef CONFIG_HIBERNATION
+extern bool kernel_page_present(struct page *page);
+#endif /* CONFIG_HIBERNATION */
 #else
 static inline void
 kernel_map_pages(struct page *page, int numpages, int enable) {}
 static inline void enable_debug_pagealloc(void)
 {
 }
+#ifdef CONFIG_HIBERNATION
+static inline bool kernel_page_present(struct page *page) { return true; }
+#endif /* CONFIG_HIBERNATION */
 #endif
 extern struct vm_area_struct *get_gate_vma(struct task_struct *tsk);
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index d74e79bacd2d..b74b615492e8 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -51,7 +51,7 @@ enum nf_inet_hooks {
 };
 union nf_inet_addr {
-        u_int32_t       all[4];
+        __u32           all[4];
        __be32          ip;
        __be32          ip6[4];
        struct in_addr  in;
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 91fef0cae42f..3aff513d12c8 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -30,7 +30,6 @@ header-y += xt_mark.h
 header-y += xt_multiport.h
 header-y += xt_owner.h
 header-y += xt_pkttype.h
-header-y += xt_policy.h
 header-y += xt_rateest.h
 header-y += xt_realm.h
 header-y += xt_sctp.h
@@ -47,3 +46,4 @@ unifdef-y += nfnetlink.h
 unifdef-y += nfnetlink_compat.h
 unifdef-y += x_tables.h
 unifdef-y += xt_physdev.h
+unifdef-y += xt_policy.h
diff --git a/include/linux/netfilter/xt_hashlimit.h b/include/linux/netfilter/xt_hashlimit.h
index 58b818ee41ca..51b18d83b477 100644
--- a/include/linux/netfilter/xt_hashlimit.h
+++ b/include/linux/netfilter/xt_hashlimit.h
@@ -61,7 +61,6 @@ struct xt_hashlimit_mtinfo1 {
        /* Used internally by the kernel */
        struct xt_hashlimit_htable *hinfo __attribute__((aligned(8)));
-        struct xt_hashlimit_mtinfo1 *master __attribute__((aligned(8)));
 };
 #endif /*_XT_HASHLIMIT_H*/
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index bbad43fb8181..b5b30f1c1e59 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -266,7 +266,7 @@ static inline void SetPageUptodate(struct page *page)
 #define PG_head_tail_mask ((1L << PG_compound) | (1L << PG_reclaim))
-#define PageTail(page)  ((page->flags & PG_head_tail_mask) \
+#define PageTail(page)  (((page)->flags & PG_head_tail_mask)    \
                                == PG_head_tail_mask)
 static inline void __SetPageTail(struct page *page)
@@ -279,7 +279,7 @@ static inline void __ClearPageTail(struct page *page)
        page->flags &= ~PG_head_tail_mask;
 }
-#define PageHead(page)  ((page->flags & PG_head_tail_mask) \
+#define PageHead(page)  (((page)->flags & PG_head_tail_mask)    \
                                == (1L << PG_compound))
 #define __SetPageHead(page)     __SetPageCompound(page)
 #define __ClearPageHead(page)   __ClearPageCompound(page)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index df6dd79a0d3b..effdb558a588 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1351,6 +1351,7 @@
 #define PCI_DEVICE_ID_VIA_8231_4        0x8235
 #define PCI_DEVICE_ID_VIA_8365_1        0x8305
 #define PCI_DEVICE_ID_VIA_CX700         0x8324
+#define PCI_DEVICE_ID_VIA_CX700_IDE     0x0581
 #define PCI_DEVICE_ID_VIA_VX800         0x8353
 #define PCI_DEVICE_ID_VIA_8371_1        0x8391
 #define PCI_DEVICE_ID_VIA_82C598_1      0x8598
@@ -2373,6 +2374,12 @@
 #define PCI_DEVICE_ID_INTEL_MCH_PC1     0x359a
 #define PCI_DEVICE_ID_INTEL_E7525_MCH   0x359e
 #define PCI_DEVICE_ID_INTEL_IOAT_CNB    0x360b
+#define PCI_DEVICE_ID_INTEL_ICH10_0     0x3a14
+#define PCI_DEVICE_ID_INTEL_ICH10_1     0x3a16
+#define PCI_DEVICE_ID_INTEL_ICH10_2     0x3a18
+#define PCI_DEVICE_ID_INTEL_ICH10_3     0x3a1a
+#define PCI_DEVICE_ID_INTEL_ICH10_4     0x3a30
+#define PCI_DEVICE_ID_INTEL_ICH10_5     0x3a60
 #define PCI_DEVICE_ID_INTEL_IOAT_SNB    0x402f
 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB   0x65ff
 #define PCI_DEVICE_ID_INTEL_TOLAPAI_0   0x5031
diff --git a/include/linux/pm.h b/include/linux/pm.h
index eccf59ea2a77..015b735811b4 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -143,6 +143,9 @@ typedef struct pm_message {
 *              the upcoming system state (such as PCI_D3hot), and enable
 *              wakeup events as appropriate.
 *
+ * HIBERNATE    Enter a low power device state appropriate for the hibernation
+ *              state (eg. ACPI S4) and enable wakeup events as appropriate.
+ *
 * FREEZE       Quiesce operations so that a consistent image can be saved;
 *              but do NOT otherwise enter a low power device state, and do
 *              NOT emit system wakeup events.
@@ -166,11 +169,15 @@ typedef struct pm_message {
 #define PM_EVENT_ON 0
 #define PM_EVENT_FREEZE 1
 #define PM_EVENT_SUSPEND 2
-#define PM_EVENT_PRETHAW 3
+#define PM_EVENT_HIBERNATE 4
+#define PM_EVENT_PRETHAW 8
+#define PM_EVENT_SLEEP  (PM_EVENT_SUSPEND | PM_EVENT_HIBERNATE)
 #define PMSG_FREEZE     ((struct pm_message){ .event = PM_EVENT_FREEZE, })
 #define PMSG_PRETHAW    ((struct pm_message){ .event = PM_EVENT_PRETHAW, })
 #define PMSG_SUSPEND    ((struct pm_message){ .event = PM_EVENT_SUSPEND, })
+#define PMSG_HIBERNATE  ((struct pm_message){ .event = PM_EVENT_HIBERNATE, })
 #define PMSG_ON         ((struct pm_message){ .event = PM_EVENT_ON, })
 struct dev_pm_info {
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 412672a79e8a..bbd8d0027e2f 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -232,6 +232,8 @@ typedef unsigned char *sk_buff_data_t;
 *      @mark: Generic packet mark
 *      @nfct: Associated connection, if any
 *      @ipvs_property: skbuff is owned by ipvs
+ *      @peeked: this packet has been seen already, so stats have been
+ *              done for it, don't do them again
 *      @nf_trace: netfilter packet trace flag
 *      @nfctinfo: Relationship of this skb to the connection
 *      @nfct_reasm: netfilter conntrack re-assembly pointer
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 9d5da8b2ccf9..20add65215af 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -282,6 +282,13 @@ struct ssb_bus {
        struct ssb_boardinfo boardinfo;
        /* Contents of the SPROM. */
        struct ssb_sprom sprom;
+        /* If the board has a cardbus slot, this is set to true. */
+        bool has_cardbus_slot;
+#ifdef CONFIG_SSB_EMBEDDED
+        /* Lock for GPIO register access. */
+        spinlock_t gpio_lock;
+#endif /* EMBEDDED */
        /* Internal-only stuff follows. Do not touch. */
        struct list_head list;
@@ -294,8 +301,13 @@ struct ssb_bus {
 /* The initialization-invariants. */
 struct ssb_init_invariants {
+        /* Versioning information about the PCB. */
        struct ssb_boardinfo boardinfo;
+        /* The SPROM information. That's either stored in an
+         * EEPROM or NVRAM on the board. */
        struct ssb_sprom sprom;
+        /* If the board has a cardbus slot, this is set to true. */
+        bool has_cardbus_slot;
 };
 /* Type of function to fetch the invariants. */
 typedef int (*ssb_invariants_func_t)(struct ssb_bus *bus,
diff --git a/include/linux/ssb/ssb_driver_chipcommon.h b/include/linux/ssb/ssb_driver_chipcommon.h
index 4cb995494662..536851b946f6 100644
--- a/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -51,9 +51,12 @@
 #define  SSB_CHIPCO_CAP_JTAGM           0x00400000      /* JTAG master present */
 #define  SSB_CHIPCO_CAP_BROM            0x00800000      /* Internal boot ROM active */
 #define  SSB_CHIPCO_CAP_64BIT           0x08000000      /* 64-bit Backplane */
+#define  SSB_CHIPCO_CAP_PMU             0x10000000      /* PMU available (rev >= 20) */
+#define  SSB_CHIPCO_CAP_ECI             0x20000000      /* ECI available (rev >= 20) */
 #define SSB_CHIPCO_CORECTL              0x0008
 #define  SSB_CHIPCO_CORECTL_UARTCLK0    0x00000001      /* Drive UART with internal clock */
 #define  SSB_CHIPCO_CORECTL_SE          0x00000002      /* sync clk out enable (corerev >= 3) */
+#define  SSB_CHIPCO_CORECTL_UARTCLKEN   0x00000008      /* UART clock enable (rev >= 21) */
 #define SSB_CHIPCO_BIST                 0x000C
 #define SSB_CHIPCO_OTPS                 0x0010          /* OTP status */
 #define  SSB_CHIPCO_OTPS_PROGFAIL       0x80000000
@@ -357,6 +360,11 @@ struct ssb_chipcommon {
        u16 fast_pwrup_delay;
 };
+static inline bool ssb_chipco_available(struct ssb_chipcommon *cc)
+{
+        return (cc->dev != NULL);
+}
 extern void ssb_chipcommon_init(struct ssb_chipcommon *cc);
 #include <linux/pm.h>
@@ -382,11 +390,13 @@ extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
 extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
                                          u32 ticks);
+/* Chipcommon GPIO pin access. */
 u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask);
+u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
-void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
+u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value);
+u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value);
-void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value);
+u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value);
+u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value);
 #ifdef CONFIG_SSB_SERIAL
 extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
diff --git a/include/linux/ssb/ssb_driver_extif.h b/include/linux/ssb/ssb_driver_extif.h
index a9164357b5ae..91161f0aa22b 100644
--- a/include/linux/ssb/ssb_driver_extif.h
+++ b/include/linux/ssb/ssb_driver_extif.h
@@ -171,11 +171,15 @@ extern void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
 extern void ssb_extif_timing_init(struct ssb_extif *extif,
                                  unsigned long ns);
-u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
+extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
+                                         u32 ticks);
-void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
-void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value);
+/* Extif GPIO pin access */
+u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
+u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
+u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value);
+u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value);
+u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value);
 #ifdef CONFIG_SSB_SERIAL
 extern int ssb_extif_serial_init(struct ssb_extif *extif,
@@ -200,5 +204,11 @@ void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
 {
 }
+static inline
+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
+                                  u32 ticks)
+{
+}
 #endif /* CONFIG_SSB_DRIVER_EXTIF */
 #endif /* LINUX_SSB_EXTIFCORE_H_ */
diff --git a/include/linux/ssb/ssb_driver_pci.h b/include/linux/ssb/ssb_driver_pci.h
index 9cfffb7b1a27..5e25bac4ed31 100644
--- a/include/linux/ssb/ssb_driver_pci.h
+++ b/include/linux/ssb/ssb_driver_pci.h
@@ -51,6 +51,11 @@
 #define  SSB_PCICORE_SBTOPCI1_MASK      0xFC000000
 #define SSB_PCICORE_SBTOPCI2            0x0108  /* Backplane to PCI translation 2 (sbtopci2) */
 #define  SSB_PCICORE_SBTOPCI2_MASK      0xC0000000
+#define SSB_PCICORE_PCICFG0             0x0400  /* PCI config space 0 (rev >= 8) */
+#define SSB_PCICORE_PCICFG1             0x0500  /* PCI config space 1 (rev >= 8) */
+#define SSB_PCICORE_PCICFG2             0x0600  /* PCI config space 2 (rev >= 8) */
+#define SSB_PCICORE_PCICFG3             0x0700  /* PCI config space 3 (rev >= 8) */
+#define SSB_PCICORE_SPROM(wordoffset)   (0x0800 + ((wordoffset) * 2)) /* SPROM shadow area (72 bytes) */
 /* SBtoPCIx */
 #define SSB_PCICORE_SBTOPCI_MEM         0x00000000
diff --git a/include/linux/ssb/ssb_embedded.h b/include/linux/ssb/ssb_embedded.h
new file mode 100644
index 000000000000..8d8dedff059d
--- /dev/null
+++ b/include/linux/ssb/ssb_embedded.h
@@ -0,0 +1,18 @@
+#ifndef LINUX_SSB_EMBEDDED_H_
+#define LINUX_SSB_EMBEDDED_H_
+#include <linux/types.h>
+#include <linux/ssb/ssb.h>
+extern int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks);
+/* Generic GPIO API */
+u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask);
+u32 ssb_gpio_out(struct ssb_bus *bus, u32 mask, u32 value);
+u32 ssb_gpio_outen(struct ssb_bus *bus, u32 mask, u32 value);
+u32 ssb_gpio_control(struct ssb_bus *bus, u32 mask, u32 value);
+u32 ssb_gpio_intmask(struct ssb_bus *bus, u32 mask, u32 value);
+u32 ssb_gpio_polarity(struct ssb_bus *bus, u32 mask, u32 value);
+#endif /* LINUX_SSB_EMBEDDED_H_ */
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 52e3d5fd5be4..9385a566aed8 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -12,6 +12,7 @@
 #ifndef __LINUX_VIDEODEV_H
 #define __LINUX_VIDEODEV_H
+#include <linux/ioctl.h>
 #include <linux/videodev2.h>
 #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 439474f24e34..17a80177a674 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -62,6 +62,7 @@
 #define __user
 #include <sys/time.h>
 #endif
+#include <linux/ioctl.h>
 #include <linux/types.h>
 /*
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 831547d79683..a4274203f252 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -142,6 +142,7 @@ extern IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_fusionhdtv_mce[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_pinnacle_pctv_hd[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE];
 #endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 475d0d8275e0..316a58453134 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -61,8 +61,6 @@
                        v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
        } while (0)
-/* Prints the ioctl in a human-readable format */
-extern void v4l_printk_ioctl(unsigned int cmd);
 /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
 #define v4l_print_ioctl(name, cmd)               \
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index c544c6f90893..f2114459995d 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -44,6 +44,8 @@ extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
 extern char *v4l2_norm_to_name(v4l2_std_id id);
 extern int v4l2_video_std_construct(struct v4l2_standard *vs,
                                    int id, char *name);
+/* Prints the ioctl in a human-readable format */
+extern void v4l_printk_ioctl(unsigned int cmd);
 /* prority handling */
 struct v4l2_prio_state {
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 97f14d469595..99033945cdee 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -149,7 +149,7 @@ struct videobuf_qtype_ops {
 };
 struct videobuf_queue {
-        struct mutex               lock;
+        struct mutex               vb_lock;
        spinlock_t                 *irqlock;
        void                       *dev; /* on pci, points to struct pci_dev */
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index 26a8958d23d1..ec63ab0fab93 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -17,7 +17,7 @@
 /* --------------------------------------------------------------------- */
-struct videbuf_vmalloc_memory
+struct videobuf_vmalloc_memory
 {
        u32                 magic;
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index c17fa1fdc356..6512d85f11b3 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -14,8 +14,6 @@
 /* capable of receiving packets */
 #define IP6_TNL_F_CAP_RCV 0x20000
-#define IP6_TNL_MAX 128
 /* IPv6 tunnel */
 struct ip6_tnl {
diff --git a/include/net/sock.h b/include/net/sock.h
index 8a7889b35810..fd9876087651 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -180,6 +180,7 @@ struct sock_common {
  *     @sk_sndmsg_off: cached offset for sendmsg
  *     @sk_send_head: front of stuff to transmit
  *     @sk_security: used by security modules
+  *     @sk_mark: generic packet mark
  *     @sk_write_pending: a write to stream socket waits to start
  *     @sk_state_change: callback to indicate change in the state of the sock
  *     @sk_data_ready: callback to indicate there is data to be processed
diff --git a/include/sound/opl3.h b/include/sound/opl3.h
index a0c5febdc4ea..6ba670707831 100644
--- a/include/sound/opl3.h
+++ b/include/sound/opl3.h
@@ -370,12 +370,13 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3, int device, int seq_device,
 int snd_opl3_open(struct snd_hwdep * hw, struct file *file);
 int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file,
                   unsigned int cmd, unsigned long arg);
-long snd_opl3_write(struct snd_hwdep *hw, const char __user *buf, long count,
-                    loff_t *offset);
 int snd_opl3_release(struct snd_hwdep * hw, struct file *file);
 void snd_opl3_reset(struct snd_opl3 * opl3);
+#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
+long snd_opl3_write(struct snd_hwdep *hw, const char __user *buf, long count,
+                    loff_t *offset);
 int snd_opl3_load_patch(struct snd_opl3 *opl3,
                        int prog, int bank, int type,
                        const char *name,
@@ -384,5 +385,9 @@ int snd_opl3_load_patch(struct snd_opl3 *opl3,
 struct fm_patch *snd_opl3_find_patch(struct snd_opl3 *opl3, int prog, int bank,
                                     int create_patch);
 void snd_opl3_clear_patches(struct snd_opl3 *opl3);
+#else
+#define snd_opl3_write  NULL
+static inline void snd_opl3_clear_patches(struct snd_opl3 *opl3) {}
+#endif
 #endif /* __SOUND_OPL3_H */