672 files changed, 11165 insertions, 10500 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 26a28419caf..366ec06a518 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -274,6 +274,9 @@ config ARCH_WANT_OLD_COMPAT_IPC
 config GENERIC_KERNEL_THREAD
        bool
+config GENERIC_KERNEL_EXECVE
+        bool
 config HAVE_ARCH_SECCOMP_FILTER
        bool
        help
@@ -319,4 +322,23 @@ config HAVE_IRQ_TIME_ACCOUNTING
 config HAVE_ARCH_TRANSPARENT_HUGEPAGE
        bool
+config HAVE_MOD_ARCH_SPECIFIC
+        bool
+        help
+          The arch uses struct mod_arch_specific to store data.  Many arches
+          just need a simple module loader without arch specific data - those
+          should not enable this.
+config MODULES_USE_ELF_RELA
+        bool
+        help
+          Modules only use ELF RELA relocations.  Modules with ELF REL
+          relocations will give an error.
+config MODULES_USE_ELF_REL
+        bool
+        help
+          Modules only use ELF REL relocations.  Modules with ELF RELA
+          relocations will give an error.
 source "kernel/gcov/Kconfig"
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 7da91246e27..5dd7f5db24d 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -21,6 +21,9 @@ config ALPHA
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select GENERIC_KERNEL_THREAD
+        select GENERIC_KERNEL_EXECVE
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
        help
          The Alpha is a 64-bit general-purpose processor designed and
          marketed by the Digital Equipment Corporation of blessed memory,
diff --git a/arch/alpha/include/asm/module.h b/arch/alpha/include/asm/module.h
index 7b63743c534..9cd13b55155 100644
--- a/arch/alpha/include/asm/module.h
+++ b/arch/alpha/include/asm/module.h
@@ -1,19 +1,13 @@
 #ifndef _ALPHA_MODULE_H
 #define _ALPHA_MODULE_H
+#include <asm-generic/module.h>
 struct mod_arch_specific
 {
        unsigned int gotsecindex;
 };
-#define Elf_Sym Elf64_Sym
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Ehdr Elf64_Ehdr
-#define Elf_Phdr Elf64_Phdr
-#define Elf_Dyn Elf64_Dyn
-#define Elf_Rel Elf64_Rel
-#define Elf_Rela Elf64_Rela
 #define ARCH_SHF_SMALL SHF_ALPHA_GPREL
 #ifdef MODULE
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h
index 28335bd40e4..4554ecbff7c 100644
--- a/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@@ -84,7 +84,6 @@ register struct thread_info *__current_thread_info __asm__("$8");
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 /* Work to do on interrupt/exception return.  */
@@ -117,5 +116,7 @@ register struct thread_info *__current_thread_info __asm__("$8");
                 (int __user *)(value));                                \
        })
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif /* __KERNEL__ */
 #endif /* _ALPHA_THREAD_INFO_H */
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index 3cb6c118898..7826e227e4d 100644
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -482,7 +482,6 @@
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_EXECVE
-#define __ARCH_WANT_KERNEL_EXECVE
 /* "Conditional" syscalls.  What we want is
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index 7e43e1156d1..a7607832dd4 100644
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -311,7 +311,7 @@ entSys:
        .align  4
 ret_from_sys_call:
-        cmovne  $26, 0, $19             /* $19 = 0 => non-restartable */
+        cmovne  $26, 0, $18             /* $18 = 0 => non-restartable */
        ldq     $0, SP_OFF($sp)
        and     $0, 8, $0
        beq     $0, ret_to_kernel
@@ -320,8 +320,8 @@ ret_to_user:
                sampling and the rti.  */
        lda     $16, 7
        call_pal PAL_swpipl
-        ldl     $5, TI_FLAGS($8)
+        ldl     $17, TI_FLAGS($8)
-        and     $5, _TIF_WORK_MASK, $2
+        and     $17, _TIF_WORK_MASK, $2
        bne     $2, work_pending
 restore_all:
        RESTORE_ALL
@@ -341,10 +341,10 @@ $syscall_error:
         * frame to indicate that a negative return value wasn't an
         * error number..
         */
-        ldq     $19, 0($sp)     /* old syscall nr (zero if success) */
+        ldq     $18, 0($sp)     /* old syscall nr (zero if success) */
-        beq     $19, $ret_success
+        beq     $18, $ret_success
-        ldq     $20, 72($sp)    /* .. and this a3 */
+        ldq     $19, 72($sp)    /* .. and this a3 */
        subq    $31, $0, $0     /* with error in v0 */
        addq    $31, 1, $1      /* set a3 for errno return */
        stq     $0, 0($sp)
@@ -362,51 +362,35 @@ $ret_success:
 * Do all cleanup when returning from all interrupts and system calls.
 *
 * Arguments:
- *       $5: TI_FLAGS.
 *       $8: current.
- *      $19: The old syscall number, or zero if this is not a return
+ *      $17: TI_FLAGS.
+ *      $18: The old syscall number, or zero if this is not a return
 *           from a syscall that errored and is possibly restartable.
- *      $20: The old a3 value
+ *      $19: The old a3 value
 */
        .align  4
        .ent    work_pending
 work_pending:
-        and     $5, _TIF_NEED_RESCHED, $2
+        and     $17, _TIF_NOTIFY_RESUME | _TIF_SIGPENDING, $2
-        beq     $2, $work_notifysig
+        bne     $2, $work_notifysig
 $work_resched:
-        subq    $sp, 16, $sp
+        /*
-        stq     $19, 0($sp)              /* save syscall nr */
+         * We can get here only if we returned from syscall without SIGPENDING
-        stq     $20, 8($sp)              /* and error indication (a3) */
+         * or got through work_notifysig already.  Either case means no syscall
+         * restarts for us, so let $18 and $19 burn.
+         */
        jsr     $26, schedule
-        ldq     $19, 0($sp)
+        mov     0, $18
-        ldq     $20, 8($sp)
+        br      ret_to_user
-        addq    $sp, 16, $sp
-        /* Make sure need_resched and sigpending don't change between
-                sampling and the rti.  */
-        lda     $16, 7
-        call_pal PAL_swpipl
-        ldl     $5, TI_FLAGS($8)
-        and     $5, _TIF_WORK_MASK, $2
-        beq     $2, restore_all
-        and     $5, _TIF_NEED_RESCHED, $2
-        bne     $2, $work_resched
 $work_notifysig:
        mov     $sp, $16
        bsr     $1, do_switch_stack
-        mov     $sp, $17
+        jsr     $26, do_work_pending
-        mov     $5, $18
-        mov     $19, $9         /* save old syscall number */
-        mov     $20, $10        /* save old a3 */
-        and     $5, _TIF_SIGPENDING, $2
-        cmovne  $2, 0, $9       /* we don't want double syscall restarts */
-        jsr     $26, do_notify_resume
-        mov     $9, $19
-        mov     $10, $20
        bsr     $1, undo_switch_stack
-        br      ret_to_user
+        br      restore_all
 .end work_pending
 /*
@@ -418,11 +402,10 @@ $work_notifysig:
 strace:
        /* set up signal stack, call syscall_trace */
        bsr     $1, do_switch_stack
-        jsr     $26, syscall_trace
+        jsr     $26, syscall_trace_enter /* returns the syscall number */
        bsr     $1, undo_switch_stack
-        /* get the system call number and the arguments back.. */
+        /* get the arguments back.. */
-        ldq     $0, 0($sp)
        ldq     $16, SP_OFF+24($sp)
        ldq     $17, SP_OFF+32($sp)
        ldq     $18, SP_OFF+40($sp)
@@ -449,15 +432,15 @@ $strace_success:
        stq     $0, 0($sp)              /* save return value */
        bsr     $1, do_switch_stack
-        jsr     $26, syscall_trace
+        jsr     $26, syscall_trace_leave
        bsr     $1, undo_switch_stack
        br      $31, ret_from_sys_call
        .align  3
 $strace_error:
-        ldq     $19, 0($sp)     /* old syscall nr (zero if success) */
+        ldq     $18, 0($sp)     /* old syscall nr (zero if success) */
-        beq     $19, $strace_success
+        beq     $18, $strace_success
-        ldq     $20, 72($sp)    /* .. and this a3 */
+        ldq     $19, 72($sp)    /* .. and this a3 */
        subq    $31, $0, $0     /* with error in v0 */
        addq    $31, 1, $1      /* set a3 for errno return */
@@ -465,11 +448,11 @@ $strace_error:
        stq     $1, 72($sp)     /* a3 for return */
        bsr     $1, do_switch_stack
-        mov     $19, $9         /* save old syscall number */
+        mov     $18, $9         /* save old syscall number */
-        mov     $20, $10        /* save old a3 */
+        mov     $19, $10        /* save old a3 */
-        jsr     $26, syscall_trace
+        jsr     $26, syscall_trace_leave
-        mov     $9, $19
+        mov     $9, $18
-        mov     $10, $20
+        mov     $10, $19
        bsr     $1, undo_switch_stack
        mov     $31, $26        /* tell "ret_from_sys_call" we can restart */
@@ -620,24 +603,9 @@ ret_from_kernel_thread:
        mov     $9, $27
        mov     $10, $16
        jsr     $26, ($9)
-        ldgp    $gp, 0($26)
-        mov     $0, $16
-        mov     $31, $26
-        jmp     $31, sys_exit
-.end ret_from_kernel_thread
-        .globl  ret_from_kernel_execve
-        .align  4
-        .ent    ret_from_kernel_execve
-ret_from_kernel_execve:
-        mov     $16, $sp
-        /* Avoid the HAE being gratuitously wrong, to avoid restoring it.  */
-        ldq     $2, alpha_mv+HAE_CACHE
-        stq     $2, 152($sp)            /* HAE */
        mov     $31, $19                /* to disable syscall restarts */
        br      $31, ret_to_user
+.end ret_from_kernel_thread
-.end    ret_from_kernel_execve
 /*
@@ -698,7 +666,7 @@ sys_sigreturn:
        lda     $sp, -SWITCH_STACK_SIZE($sp)
        jsr     $26, do_sigreturn
        bne     $9, 1f
-        jsr     $26, syscall_trace
+        jsr     $26, syscall_trace_leave
 1:      br      $1, undo_switch_stack
        br      ret_from_sys_call
 .end sys_sigreturn
@@ -715,7 +683,7 @@ sys_rt_sigreturn:
        lda     $sp, -SWITCH_STACK_SIZE($sp)
        jsr     $26, do_rt_sigreturn
        bne     $9, 1f
-        jsr     $26, syscall_trace
+        jsr     $26, syscall_trace_leave
 1:      br      $1, undo_switch_stack
        br      ret_from_sys_call
 .end sys_rt_sigreturn
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 63e77e3944c..9eb090582cf 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -449,7 +449,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)
 {
        int retval;
        struct cdfs_args tmp;
-        char *devname;
+        struct filename *devname;
        retval = -EFAULT;
        if (copy_from_user(&tmp, args, sizeof(tmp)))
@@ -458,7 +458,7 @@ osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags)
        retval = PTR_ERR(devname);
        if (IS_ERR(devname))
                goto out;
-        retval = do_mount(devname, dirname, "ext2", flags, NULL);
+        retval = do_mount(devname->name, dirname, "ext2", flags, NULL);
        putname(devname);
 out:
        return retval;
@@ -469,7 +469,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)
 {
        int retval;
        struct cdfs_args tmp;
-        char *devname;
+        struct filename *devname;
        retval = -EFAULT;
        if (copy_from_user(&tmp, args, sizeof(tmp)))
@@ -478,7 +478,7 @@ osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags)
        retval = PTR_ERR(devname);
        if (IS_ERR(devname))
                goto out;
-        retval = do_mount(devname, dirname, "iso9660", flags, NULL);
+        retval = do_mount(devname->name, dirname, "iso9660", flags, NULL);
        putname(devname);
 out:
        return retval;
@@ -499,7 +499,7 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
                int, flag, void __user *, data)
 {
        int retval;
-        char *name;
+        struct filename *name;
        name = getname(path);
        retval = PTR_ERR(name);
@@ -507,13 +507,13 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path,
                goto out;
        switch (typenr) {
        case 1:
-                retval = osf_ufs_mount(name, data, flag);
+                retval = osf_ufs_mount(name->name, data, flag);
                break;
        case 6:
-                retval = osf_cdfs_mount(name, data, flag);
+                retval = osf_cdfs_mount(name->name, data, flag);
                break;
        case 9:
-                retval = osf_procfs_mount(name, data, flag);
+                retval = osf_procfs_mount(name->name, data, flag);
                break;
        default:
                retval = -EINVAL;
diff --git a/arch/alpha/kernel/ptrace.c b/arch/alpha/kernel/ptrace.c
index 54616f496ae..2a4a80ff4a2 100644
--- a/arch/alpha/kernel/ptrace.c
+++ b/arch/alpha/kernel/ptrace.c
@@ -13,6 +13,7 @@
 #include <linux/user.h>
 #include <linux/security.h>
 #include <linux/signal.h>
+#include <linux/tracehook.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -312,25 +313,18 @@ long arch_ptrace(struct task_struct *child, long request,
        return ret;
 }
+asmlinkage unsigned long syscall_trace_enter(void)
+{
+        unsigned long ret = 0;
+        if (test_thread_flag(TIF_SYSCALL_TRACE) &&
+            tracehook_report_syscall_entry(current_pt_regs()))
+                ret = -1UL;
+        return ret ?: current_pt_regs()->r0;
+}
 asmlinkage void
-syscall_trace(void)
+syscall_trace_leave(void)
 {
-        if (!test_thread_flag(TIF_SYSCALL_TRACE))
+        if (test_thread_flag(TIF_SYSCALL_TRACE))
-                return;
+                tracehook_report_syscall_exit(current_pt_regs(), 0);
-        if (!(current->ptrace & PT_PTRACED))
-                return;
-        /* The 0x80 provides a way for the tracing parent to distinguish
-           between a syscall stop and SIGTRAP delivery */
-        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-                                 ? 0x80 : 0));
-        /*
-         * This isn't the same as continuing with a signal, but it will do
-         * for normal use.  strace only continues with a signal if the
-         * stopping signal is not SIGTRAP.  -brl
-         */
-        if (current->exit_code) {
-                send_sig(current->exit_code, current, 1);
-                current->exit_code = 0;
-        }
 }
diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index a8c97d42ec8..32575f85507 100644
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -298,8 +298,9 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
 static long
 setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, 
-                 struct switch_stack *sw, unsigned long mask, unsigned long sp)
+                 unsigned long mask, unsigned long sp)
 {
+        struct switch_stack *sw = (struct switch_stack *)regs - 1;
        long i, err = 0;
        err |= __put_user(on_sig_stack((unsigned long)sc), &sc->sc_onstack);
@@ -354,7 +355,7 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
 static int
 setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
-            struct pt_regs *regs, struct switch_stack * sw)
+            struct pt_regs *regs)
 {
        unsigned long oldsp, r26, err = 0;
        struct sigframe __user *frame;
@@ -364,7 +365,7 @@ setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;
-        err |= setup_sigcontext(&frame->sc, regs, sw, set->sig[0], oldsp);
+        err |= setup_sigcontext(&frame->sc, regs, set->sig[0], oldsp);
        if (err)
                return -EFAULT;
@@ -401,7 +402,7 @@ setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
 static int
 setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-               sigset_t *set, struct pt_regs *regs, struct switch_stack * sw)
+               sigset_t *set, struct pt_regs *regs)
 {
        unsigned long oldsp, r26, err = 0;
        struct rt_sigframe __user *frame;
@@ -420,7 +421,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
        err |= __put_user(sas_ss_flags(oldsp), &frame->uc.uc_stack.ss_flags);
        err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
-        err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, sw,
+        err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, 
                                set->sig[0], oldsp);
        err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
        if (err)
@@ -464,15 +465,15 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 */
 static inline void
 handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
-              struct pt_regs * regs, struct switch_stack *sw)
+              struct pt_regs * regs)
 {
        sigset_t *oldset = sigmask_to_save();
        int ret;
        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs, sw);
+                ret = setup_rt_frame(sig, ka, info, oldset, regs);
        else
-                ret = setup_frame(sig, ka, oldset, regs, sw);
+                ret = setup_frame(sig, ka, oldset, regs);
        if (ret) {
                force_sigsegv(sig, current);
@@ -519,8 +520,7 @@ syscall_restart(unsigned long r0, unsigned long r19,
 * all (if we get here from anything but a syscall return, it will be 0)
 */
 static void
-do_signal(struct pt_regs * regs, struct switch_stack * sw,
+do_signal(struct pt_regs *regs, unsigned long r0, unsigned long r19)
-          unsigned long r0, unsigned long r19)
 {
        siginfo_t info;
        int signr;
@@ -537,7 +537,7 @@ do_signal(struct pt_regs * regs, struct switch_stack * sw,
                /* Whee!  Actually deliver the signal.  */
                if (r0)
                        syscall_restart(r0, r19, regs, &ka);
-                handle_signal(signr, &ka, &info, regs, sw);
+                handle_signal(signr, &ka, &info, regs);
                if (single_stepping) 
                        ptrace_set_bpt(current); /* re-set bpt */
                return;
@@ -568,15 +568,23 @@ do_signal(struct pt_regs * regs, struct switch_stack * sw,
 }
 void
-do_notify_resume(struct pt_regs *regs, struct switch_stack *sw,
+do_work_pending(struct pt_regs *regs, unsigned long thread_flags,
-                 unsigned long thread_info_flags,
                 unsigned long r0, unsigned long r19)
 {
-        if (thread_info_flags & _TIF_SIGPENDING)
+        do {
-                do_signal(regs, sw, r0, r19);
+                if (thread_flags & _TIF_NEED_RESCHED) {
+                        schedule();
-        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
+                } else {
-                clear_thread_flag(TIF_NOTIFY_RESUME);
+                        local_irq_enable();
-                tracehook_notify_resume(regs);
+                        if (thread_flags & _TIF_SIGPENDING) {
-        }
+                                do_signal(regs, r0, r19);
+                                r0 = 0;
+                        } else {
+                                clear_thread_flag(TIF_NOTIFY_RESUME);
+                                tracehook_notify_resume(regs);
+                        }
+                }
+                local_irq_disable();
+                thread_flags = current_thread_info()->flags;
+        } while (thread_flags & _TIF_WORK_MASK);
 }
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 767aae8277f..73067efd484 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1,58 +1,60 @@
 config ARM
        bool
        default y
+        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select ARCH_HAVE_CUSTOM_GPIO_H
-        select HAVE_AOUT
+        select ARCH_WANT_IPC_PARSE_VERSION
-        select HAVE_DMA_API_DEBUG
+        select CPU_PM if (SUSPEND || CPU_IDLE)
-        select HAVE_IDE if PCI || ISA || PCMCIA
+        select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
-        select HAVE_DMA_ATTRS
-        select HAVE_DMA_CONTIGUOUS if MMU
-        select HAVE_MEMBLOCK
-        select RTC_LIB
-        select SYS_SUPPORTS_APM_EMULATION
        select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
-        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
-        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
+        select GENERIC_IRQ_PROBE
+        select GENERIC_IRQ_SHOW
+        select GENERIC_KERNEL_THREAD
+        select GENERIC_KERNEL_EXECVE
+        select GENERIC_PCI_IOMAP
+        select GENERIC_SMP_IDLE_THREAD
+        select GENERIC_STRNCPY_FROM_USER
+        select GENERIC_STRNLEN_USER
+        select HARDIRQS_SW_RESEND
+        select HAVE_AOUT
        select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
-        select HAVE_SYSCALL_TRACEPOINTS
+        select HAVE_BPF_JIT
-        select HAVE_KPROBES if !XIP_KERNEL
+        select HAVE_C_RECORDMCOUNT
-        select HAVE_KRETPROBES if (HAVE_KPROBES)
+        select HAVE_DEBUG_KMEMLEAK
-        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+        select HAVE_DMA_API_DEBUG
-        select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
+        select HAVE_DMA_ATTRS
+        select HAVE_DMA_CONTIGUOUS if MMU
        select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)
+        select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
        select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
-        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
        select HAVE_GENERIC_DMA_COHERENT
-        select HAVE_DEBUG_KMEMLEAK
+        select HAVE_GENERIC_HARDIRQS
+        select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
+        select HAVE_IDE if PCI || ISA || PCMCIA
+        select HAVE_IRQ_WORK
        select HAVE_KERNEL_GZIP
-        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_LZMA
+        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_XZ
-        select HAVE_IRQ_WORK
+        select HAVE_KPROBES if !XIP_KERNEL
+        select HAVE_KRETPROBES if (HAVE_KPROBES)
+        select HAVE_MEMBLOCK
+        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
        select HAVE_PERF_EVENTS
-        select PERF_USE_VMALLOC
        select HAVE_REGS_AND_STACK_ACCESS_API
-        select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
+        select HAVE_SYSCALL_TRACEPOINTS
-        select HAVE_C_RECORDMCOUNT
-        select HAVE_GENERIC_HARDIRQS
-        select HARDIRQS_SW_RESEND
-        select GENERIC_IRQ_PROBE
-        select GENERIC_IRQ_SHOW
        select HAVE_UID16
-        select ARCH_WANT_IPC_PARSE_VERSION
-        select HARDIRQS_SW_RESEND
-        select CPU_PM if (SUSPEND || CPU_IDLE)
-        select GENERIC_PCI_IOMAP
-        select HAVE_BPF_JIT
-        select GENERIC_SMP_IDLE_THREAD
        select KTIME_SCALAR
-        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+        select PERF_USE_VMALLOC
-        select GENERIC_STRNCPY_FROM_USER
+        select RTC_LIB
-        select GENERIC_STRNLEN_USER
+        select SYS_SUPPORTS_APM_EMULATION
-        select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
+        select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
-        select GENERIC_KERNEL_THREAD
+        select MODULES_USE_ELF_REL
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and
@@ -68,9 +70,9 @@ config NEED_SG_DMA_LENGTH
        bool
 config ARM_DMA_USE_IOMMU
-        select NEED_SG_DMA_LENGTH
-        select ARM_HAS_SG_CHAIN
        bool
+        select ARM_HAS_SG_CHAIN
+        select NEED_SG_DMA_LENGTH
 config HAVE_PWM
        bool
@@ -262,69 +264,69 @@ choice
 config ARCH_MULTIPLATFORM
        bool "Allow multiple platforms to be selected"
+        depends on MMU
        select ARM_PATCH_PHYS_VIRT
        select AUTO_ZRELADDR
        select COMMON_CLK
        select MULTI_IRQ_HANDLER
        select SPARSE_IRQ
        select USE_OF
-        depends on MMU
 config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
-        select ARM_AMBA
        select ARCH_HAS_CPUFREQ
+        select ARM_AMBA
        select COMMON_CLK
        select COMMON_CLK_VERSATILE
+        select GENERIC_CLOCKEVENTS
        select HAVE_TCM
        select ICST
-        select GENERIC_CLOCKEVENTS
+        select MULTI_IRQ_HANDLER
+        select NEED_MACH_MEMORY_H
        select PLAT_VERSATILE
        select PLAT_VERSATILE_FPGA_IRQ
-        select NEED_MACH_MEMORY_H
        select SPARSE_IRQ
-        select MULTI_IRQ_HANDLER
        help
          Support for ARM's Integrator platform.
 config ARCH_REALVIEW
        bool "ARM Ltd. RealView family"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_AMBA
+        select ARM_TIMER_SP804
        select COMMON_CLK
        select COMMON_CLK_VERSATILE
-        select ICST
        select GENERIC_CLOCKEVENTS
-        select ARCH_WANT_OPTIONAL_GPIOLIB
-        select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLCD
-        select ARM_TIMER_SP804
        select GPIO_PL061 if GPIOLIB
+        select ICST
        select NEED_MACH_MEMORY_H
+        select PLAT_VERSATILE
+        select PLAT_VERSATILE_CLCD
        help
          This enables support for ARM Ltd RealView boards.
 config ARCH_VERSATILE
        bool "ARM Ltd. Versatile family"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_AMBA
+        select ARM_TIMER_SP804
        select ARM_VIC
        select CLKDEV_LOOKUP
+        select GENERIC_CLOCKEVENTS
        select HAVE_MACH_CLKDEV
        select ICST
-        select GENERIC_CLOCKEVENTS
-        select ARCH_WANT_OPTIONAL_GPIOLIB
        select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLOCK
        select PLAT_VERSATILE_CLCD
+        select PLAT_VERSATILE_CLOCK
        select PLAT_VERSATILE_FPGA_IRQ
-        select ARM_TIMER_SP804
        help
          This enables support for ARM Ltd Versatile board.
 config ARCH_AT91
        bool "Atmel AT91"
        select ARCH_REQUIRE_GPIOLIB
-        select HAVE_CLK
        select CLKDEV_LOOKUP
+        select HAVE_CLK
        select IRQ_DOMAIN
        select NEED_MACH_GPIO_H
        select NEED_MACH_IO_H if PCCARD
@@ -349,43 +351,43 @@ config ARCH_BCM2835
          This enables support for the Broadcom BCM2835 SoC. This SoC is
          use in the Raspberry Pi, and Roku 2 devices.
-config ARCH_CLPS711X
-        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
-        select CPU_ARM720T
-        select ARCH_USES_GETTIMEOFFSET
-        select COMMON_CLK
-        select CLKDEV_LOOKUP
-        select NEED_MACH_MEMORY_H
-        help
-          Support for Cirrus Logic 711x/721x/731x based boards.
 config ARCH_CNS3XXX
        bool "Cavium Networks CNS3XXX family"
+        select ARM_GIC
        select CPU_V6K
        select GENERIC_CLOCKEVENTS
-        select ARM_GIC
        select MIGHT_HAVE_CACHE_L2X0
        select MIGHT_HAVE_PCI
        select PCI_DOMAINS if PCI
        help
          Support for Cavium Networks CNS3XXX platform.
+config ARCH_CLPS711X
+        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
+        select ARCH_USES_GETTIMEOFFSET
+        select CLKDEV_LOOKUP
+        select COMMON_CLK
+        select CPU_ARM720T
+        select NEED_MACH_MEMORY_H
+        help
+          Support for Cirrus Logic 711x/721x/731x based boards.
 config ARCH_GEMINI
        bool "Cortina Systems Gemini"
-        select CPU_FA526
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_USES_GETTIMEOFFSET
+        select CPU_FA526
        help
          Support for the Cortina Systems Gemini family SoCs
 config ARCH_SIRF
        bool "CSR SiRF"
-        select NO_IOPORT
        select ARCH_REQUIRE_GPIOLIB
-        select GENERIC_CLOCKEVENTS
        select COMMON_CLK
+        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
        select MIGHT_HAVE_CACHE_L2X0
+        select NO_IOPORT
        select PINCTRL
        select PINCTRL_SIRF
        select USE_OF
@@ -394,12 +396,12 @@ config ARCH_SIRF
 config ARCH_EBSA110
        bool "EBSA-110"
+        select ARCH_USES_GETTIMEOFFSET
        select CPU_SA110
        select ISA
-        select NO_IOPORT
-        select ARCH_USES_GETTIMEOFFSET
        select NEED_MACH_IO_H
        select NEED_MACH_MEMORY_H
+        select NO_IOPORT
        help
          This is an evaluation board for the StrongARM processor available
          from Digital. It has limited hardware on-board, including an
@@ -408,13 +410,13 @@ config ARCH_EBSA110
 config ARCH_EP93XX
        bool "EP93xx-based"
-        select CPU_ARM920T
+        select ARCH_HAS_HOLES_MEMORYMODEL
+        select ARCH_REQUIRE_GPIOLIB
+        select ARCH_USES_GETTIMEOFFSET
        select ARM_AMBA
        select ARM_VIC
        select CLKDEV_LOOKUP
-        select ARCH_REQUIRE_GPIOLIB
+        select CPU_ARM920T
-        select ARCH_HAS_HOLES_MEMORYMODEL
-        select ARCH_USES_GETTIMEOFFSET
        select NEED_MACH_MEMORY_H
        help
          This enables support for the Cirrus EP93xx series of CPUs.
@@ -433,10 +435,10 @@ config ARCH_FOOTBRIDGE
 config ARCH_MXC
        bool "Freescale MXC/iMX-based"
-        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
+        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
        select MULTI_IRQ_HANDLER
        select SPARSE_IRQ
@@ -446,11 +448,11 @@ config ARCH_MXC
 config ARCH_MXS
        bool "Freescale MXS-based"
-        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select COMMON_CLK
+        select GENERIC_CLOCKEVENTS
        select HAVE_CLK_PREPARE
        select MULTI_IRQ_HANDLER
        select PINCTRL
@@ -461,43 +463,43 @@ config ARCH_MXS
 config ARCH_NETX
        bool "Hilscher NetX based"
+        select ARM_VIC
        select CLKSRC_MMIO
        select CPU_ARM926T
-        select ARM_VIC
        select GENERIC_CLOCKEVENTS
        help
          This enables support for systems based on the Hilscher NetX Soc
 config ARCH_H720X
        bool "Hynix HMS720x-based"
+        select ARCH_USES_GETTIMEOFFSET
        select CPU_ARM720T
        select ISA_DMA_API
-        select ARCH_USES_GETTIMEOFFSET
        help
          This enables support for systems based on the Hynix HMS720x
 config ARCH_IOP13XX
        bool "IOP13xx-based"
        depends on MMU
-        select CPU_XSC3
-        select PLAT_IOP
-        select PCI
        select ARCH_SUPPORTS_MSI
-        select VMSPLIT_1G
+        select CPU_XSC3
        select NEED_MACH_MEMORY_H
        select NEED_RET_TO_USER
+        select PCI
+        select PLAT_IOP
+        select VMSPLIT_1G
        help
          Support for Intel's IOP13XX (XScale) family of processors.
 config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
+        select ARCH_REQUIRE_GPIOLIB
        select CPU_XSCALE
        select NEED_MACH_GPIO_H
        select NEED_RET_TO_USER
-        select PLAT_IOP
        select PCI
-        select ARCH_REQUIRE_GPIOLIB
+        select PLAT_IOP
        help
          Support for Intel's 80219 and IOP32X (XScale) family of
          processors.
@@ -505,12 +507,12 @@ config ARCH_IOP32X
 config ARCH_IOP33X
        bool "IOP33x-based"
        depends on MMU
+        select ARCH_REQUIRE_GPIOLIB
        select CPU_XSCALE
        select NEED_MACH_GPIO_H
        select NEED_RET_TO_USER
-        select PLAT_IOP
        select PCI
-        select ARCH_REQUIRE_GPIOLIB
+        select PLAT_IOP
        help
          Support for Intel's IOP33X (XScale) family of processors.
@@ -518,20 +520,20 @@ config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
        select ARCH_HAS_DMA_SET_COHERENT_MASK
+        select ARCH_REQUIRE_GPIOLIB
        select CLKSRC_MMIO
        select CPU_XSCALE
-        select ARCH_REQUIRE_GPIOLIB
+        select DMABOUNCE if PCI
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
        select NEED_MACH_IO_H
-        select DMABOUNCE if PCI
        help
          Support for Intel's IXP4XX (XScale) family of processors.
 config ARCH_DOVE
        bool "Marvell Dove"
-        select CPU_V7
        select ARCH_REQUIRE_GPIOLIB
+        select CPU_V7
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
        select PLAT_ORION_LEGACY
@@ -541,36 +543,21 @@ config ARCH_DOVE
 config ARCH_KIRKWOOD
        bool "Marvell Kirkwood"
-        select CPU_FEROCEON
-        select PCI
        select ARCH_REQUIRE_GPIOLIB
+        select CPU_FEROCEON
        select GENERIC_CLOCKEVENTS
+        select PCI
        select PLAT_ORION_LEGACY
        help
          Support for the following Marvell Kirkwood series SoCs:
          88F6180, 88F6192 and 88F6281.
-config ARCH_LPC32XX
-        bool "NXP LPC32XX"
-        select CLKSRC_MMIO
-        select CPU_ARM926T
-        select ARCH_REQUIRE_GPIOLIB
-        select HAVE_IDE
-        select ARM_AMBA
-        select USB_ARCH_HAS_OHCI
-        select CLKDEV_LOOKUP
-        select GENERIC_CLOCKEVENTS
-        select USE_OF
-        select HAVE_PWM
-        help
-          Support for the NXP LPC32XX family of processors
 config ARCH_MV78XX0
        bool "Marvell MV78xx0"
-        select CPU_FEROCEON
-        select PCI
        select ARCH_REQUIRE_GPIOLIB
+        select CPU_FEROCEON
        select GENERIC_CLOCKEVENTS
+        select PCI
        select PLAT_ORION_LEGACY
        help
          Support for the following Marvell MV78xx0 series SoCs:
@@ -579,10 +566,10 @@ config ARCH_MV78XX0
 config ARCH_ORION5X
        bool "Marvell Orion"
        depends on MMU
-        select CPU_FEROCEON
-        select PCI
        select ARCH_REQUIRE_GPIOLIB
+        select CPU_FEROCEON
        select GENERIC_CLOCKEVENTS
+        select PCI
        select PLAT_ORION_LEGACY
        help
          Support for the following Marvell Orion 5x series SoCs:
@@ -594,33 +581,33 @@ config ARCH_MMP
        depends on MMU
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
+        select GENERIC_ALLOCATOR
        select GENERIC_CLOCKEVENTS
        select GPIO_PXA
        select IRQ_DOMAIN
+        select NEED_MACH_GPIO_H
        select PLAT_PXA
        select SPARSE_IRQ
-        select GENERIC_ALLOCATOR
-        select NEED_MACH_GPIO_H
        help
          Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
 config ARCH_KS8695
        bool "Micrel/Kendin KS8695"
-        select CPU_ARM922T
        select ARCH_REQUIRE_GPIOLIB
-        select NEED_MACH_MEMORY_H
        select CLKSRC_MMIO
+        select CPU_ARM922T
        select GENERIC_CLOCKEVENTS
+        select NEED_MACH_MEMORY_H
        help
          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
          System-on-Chip devices.
 config ARCH_W90X900
        bool "Nuvoton W90X900 CPU"
-        select CPU_ARM926T
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
+        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
        help
          Support for Nuvoton (Winbond logic dept.) ARM9 processor,
@@ -631,18 +618,33 @@ config ARCH_W90X900
          <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
                ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
+config ARCH_LPC32XX
+        bool "NXP LPC32XX"
+        select ARCH_REQUIRE_GPIOLIB
+        select ARM_AMBA
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
+        select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
+        select HAVE_IDE
+        select HAVE_PWM
+        select USB_ARCH_HAS_OHCI
+        select USE_OF
+        help
+          Support for the NXP LPC32XX family of processors
 config ARCH_TEGRA
        bool "NVIDIA Tegra"
+        select ARCH_HAS_CPUFREQ
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
+        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select HAVE_CLK
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
-        select ARCH_HAS_CPUFREQ
        select USE_OF
-        select COMMON_CLK
        help
          This enables support for NVIDIA Tegra based systems (Tegra APX,
          Tegra 6xx and Tegra 2 series).
@@ -650,29 +652,29 @@ config ARCH_TEGRA
 config ARCH_PXA
        bool "PXA2xx/PXA3xx-based"
        depends on MMU
-        select ARCH_MTD_XIP
        select ARCH_HAS_CPUFREQ
+        select ARCH_MTD_XIP
+        select ARCH_REQUIRE_GPIOLIB
+        select ARM_CPU_SUSPEND if PM
+        select AUTO_ZRELADDR
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
-        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_CLOCKEVENTS
        select GPIO_PXA
-        select PLAT_PXA
-        select SPARSE_IRQ
-        select AUTO_ZRELADDR
-        select MULTI_IRQ_HANDLER
-        select ARM_CPU_SUSPEND if PM
        select HAVE_IDE
+        select MULTI_IRQ_HANDLER
        select NEED_MACH_GPIO_H
+        select PLAT_PXA
+        select SPARSE_IRQ
        help
          Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 config ARCH_MSM
        bool "Qualcomm MSM"
-        select HAVE_CLK
-        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
        help
          Support for Qualcomm MSM/QSD based systems.  This runs on the
          apps processor of the MSM/QSD and depends on a shared memory
@@ -682,50 +684,50 @@ config ARCH_MSM
 config ARCH_SHMOBILE
        bool "Renesas SH-Mobile / R-Mobile"
-        select HAVE_CLK
        select CLKDEV_LOOKUP
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
        select HAVE_MACH_CLKDEV
        select HAVE_SMP
-        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_CACHE_L2X0
-        select NO_IOPORT
-        select SPARSE_IRQ
        select MULTI_IRQ_HANDLER
-        select PM_GENERIC_DOMAINS if PM
        select NEED_MACH_MEMORY_H
+        select NO_IOPORT
+        select PM_GENERIC_DOMAINS if PM
+        select SPARSE_IRQ
        help
          Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
 config ARCH_RPC
        bool "RiscPC"
        select ARCH_ACORN
-        select FIQ
        select ARCH_MAY_HAVE_PC_FDC
-        select HAVE_PATA_PLATFORM
-        select ISA_DMA_API
-        select NO_IOPORT
        select ARCH_SPARSEMEM_ENABLE
        select ARCH_USES_GETTIMEOFFSET
+        select FIQ
        select HAVE_IDE
+        select HAVE_PATA_PLATFORM
+        select ISA_DMA_API
        select NEED_MACH_IO_H
        select NEED_MACH_MEMORY_H
+        select NO_IOPORT
        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.
 config ARCH_SA1100
        bool "SA1100-based"
-        select CLKSRC_MMIO
-        select CPU_SA1100
-        select ISA
-        select ARCH_SPARSEMEM_ENABLE
-        select ARCH_MTD_XIP
        select ARCH_HAS_CPUFREQ
+        select ARCH_MTD_XIP
+        select ARCH_REQUIRE_GPIOLIB
+        select ARCH_SPARSEMEM_ENABLE
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
        select CPU_FREQ
+        select CPU_SA1100
        select GENERIC_CLOCKEVENTS
-        select CLKDEV_LOOKUP
-        select ARCH_REQUIRE_GPIOLIB
        select HAVE_IDE
+        select ISA
        select NEED_MACH_GPIO_H
        select NEED_MACH_MEMORY_H
        select SPARSE_IRQ
@@ -734,14 +736,14 @@ config ARCH_SA1100
 config ARCH_S3C24XX
        bool "Samsung S3C24XX SoCs"
-        select GENERIC_GPIO
        select ARCH_HAS_CPUFREQ
-        select HAVE_CLK
-        select CLKDEV_LOOKUP
        select ARCH_USES_GETTIMEOFFSET
+        select CLKDEV_LOOKUP
+        select GENERIC_GPIO
+        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC if RTC_CLASS
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_GPIO_H
        select NEED_MACH_IO_H
        help
@@ -752,38 +754,38 @@ config ARCH_S3C24XX
 config ARCH_S3C64XX
        bool "Samsung S3C64XX"
-        select PLAT_SAMSUNG
+        select ARCH_HAS_CPUFREQ
-        select CPU_V6
+        select ARCH_REQUIRE_GPIOLIB
+        select ARCH_USES_GETTIMEOFFSET
        select ARM_VIC
+        select CLKDEV_LOOKUP
+        select CPU_V6
        select HAVE_CLK
+        select HAVE_S3C2410_I2C if I2C
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_TCM
-        select CLKDEV_LOOKUP
+        select NEED_MACH_GPIO_H
        select NO_IOPORT
-        select ARCH_USES_GETTIMEOFFSET
+        select PLAT_SAMSUNG
-        select ARCH_HAS_CPUFREQ
+        select S3C_DEV_NAND
-        select ARCH_REQUIRE_GPIOLIB
+        select S3C_GPIO_TRACK
        select SAMSUNG_CLKSRC
+        select SAMSUNG_GPIOLIB_4BIT
        select SAMSUNG_IRQ_VIC_TIMER
-        select S3C_GPIO_TRACK
-        select S3C_DEV_NAND
        select USB_ARCH_HAS_OHCI
-        select SAMSUNG_GPIOLIB_4BIT
-        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
-        select NEED_MACH_GPIO_H
        help
          Samsung S3C64XX series based systems
 config ARCH_S5P64X0
        bool "Samsung S5P6440 S5P6450"
-        select CPU_V6
-        select GENERIC_GPIO
-        select HAVE_CLK
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select CPU_V6
        select GENERIC_CLOCKEVENTS
+        select GENERIC_GPIO
+        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_GPIO_H
        help
@@ -792,50 +794,50 @@ config ARCH_S5P64X0
 config ARCH_S5PC100
        bool "Samsung S5PC100"
-        select GENERIC_GPIO
+        select ARCH_USES_GETTIMEOFFSET
-        select HAVE_CLK
        select CLKDEV_LOOKUP
        select CPU_V7
-        select ARCH_USES_GETTIMEOFFSET
+        select GENERIC_GPIO
+        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC if RTC_CLASS
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_GPIO_H
        help
          Samsung S5PC100 series based systems
 config ARCH_S5PV210
        bool "Samsung S5PV210/S5PC110"
-        select CPU_V7
+        select ARCH_HAS_CPUFREQ
-        select ARCH_SPARSEMEM_ENABLE
        select ARCH_HAS_HOLES_MEMORYMODEL
-        select GENERIC_GPIO
+        select ARCH_SPARSEMEM_ENABLE
-        select HAVE_CLK
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
-        select ARCH_HAS_CPUFREQ
+        select CPU_V7
        select GENERIC_CLOCKEVENTS
+        select GENERIC_GPIO
+        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C_RTC if RTC_CLASS
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_GPIO_H
        select NEED_MACH_MEMORY_H
        help
          Samsung S5PV210/S5PC110 series based systems
 config ARCH_EXYNOS
-        bool "SAMSUNG EXYNOS"
+        bool "Samsung EXYNOS"
-        select CPU_V7
+        select ARCH_HAS_CPUFREQ
-        select ARCH_SPARSEMEM_ENABLE
        select ARCH_HAS_HOLES_MEMORYMODEL
-        select GENERIC_GPIO
+        select ARCH_SPARSEMEM_ENABLE
-        select HAVE_CLK
        select CLKDEV_LOOKUP
-        select ARCH_HAS_CPUFREQ
+        select CPU_V7
        select GENERIC_CLOCKEVENTS
-        select HAVE_S3C_RTC if RTC_CLASS
+        select GENERIC_GPIO
+        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_GPIO_H
        select NEED_MACH_MEMORY_H
        help
@@ -843,13 +845,13 @@ config ARCH_EXYNOS
 config ARCH_SHARK
        bool "Shark"
+        select ARCH_USES_GETTIMEOFFSET
        select CPU_SA110
        select ISA
        select ISA_DMA
-        select ZONE_DMA
-        select PCI
-        select ARCH_USES_GETTIMEOFFSET
        select NEED_MACH_MEMORY_H
+        select PCI
+        select ZONE_DMA
        help
          Support for the StrongARM based Digital DNARD machine, also known
          as "Shark" (<http://www.shark-linux.de/shark.html>).
@@ -857,17 +859,17 @@ config ARCH_SHARK
 config ARCH_U300
        bool "ST-Ericsson U300 Series"
        depends on MMU
-        select CLKSRC_MMIO
+        select ARCH_REQUIRE_GPIOLIB
-        select CPU_ARM926T
-        select HAVE_TCM
        select ARM_AMBA
        select ARM_PATCH_PHYS_VIRT
        select ARM_VIC
-        select GENERIC_CLOCKEVENTS
        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
        select COMMON_CLK
+        select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
+        select HAVE_TCM
        select SPARSE_IRQ
        help
          Support for ST-Ericsson U300 series mobile platforms.
@@ -875,12 +877,12 @@ config ARCH_U300
 config ARCH_U8500
        bool "ST-Ericsson U8500 Series"
        depends on MMU
-        select CPU_V7
+        select ARCH_HAS_CPUFREQ
+        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
-        select GENERIC_CLOCKEVENTS
        select CLKDEV_LOOKUP
-        select ARCH_REQUIRE_GPIOLIB
+        select CPU_V7
-        select ARCH_HAS_CPUFREQ
+        select GENERIC_CLOCKEVENTS
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
        help
@@ -888,78 +890,78 @@ config ARCH_U8500
 config ARCH_NOMADIK
        bool "STMicroelectronics Nomadik"
+        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select ARM_VIC
-        select CPU_ARM926T
        select COMMON_CLK
+        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
+        select MIGHT_HAVE_CACHE_L2X0
        select PINCTRL
        select PINCTRL_STN8815
-        select MIGHT_HAVE_CACHE_L2X0
-        select ARCH_REQUIRE_GPIOLIB
        help
          Support for the Nomadik platform by ST-Ericsson
+config PLAT_SPEAR
+        bool "ST SPEAr"
+        select ARCH_REQUIRE_GPIOLIB
+        select ARM_AMBA
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
+        select COMMON_CLK
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
+        help
+          Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
 config ARCH_DAVINCI
        bool "TI DaVinci"
-        select GENERIC_CLOCKEVENTS
+        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_REQUIRE_GPIOLIB
-        select ZONE_DMA
-        select HAVE_IDE
        select CLKDEV_LOOKUP
        select GENERIC_ALLOCATOR
+        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
-        select ARCH_HAS_HOLES_MEMORYMODEL
+        select HAVE_IDE
        select NEED_MACH_GPIO_H
+        select ZONE_DMA
        help
          Support for TI's DaVinci platform.
 config ARCH_OMAP
        bool "TI OMAP"
        depends on MMU
-        select HAVE_CLK
-        select ARCH_REQUIRE_GPIOLIB
        select ARCH_HAS_CPUFREQ
-        select CLKSRC_MMIO
-        select GENERIC_CLOCKEVENTS
        select ARCH_HAS_HOLES_MEMORYMODEL
-        select NEED_MACH_GPIO_H
-        help
-          Support for TI's OMAP platform (OMAP1/2/3/4).
-config PLAT_SPEAR
-        bool "ST SPEAr"
-        select ARM_AMBA
        select ARCH_REQUIRE_GPIOLIB
-        select CLKDEV_LOOKUP
-        select COMMON_CLK
        select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
+        select NEED_MACH_GPIO_H
        help
-          Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
+          Support for TI's OMAP platform (OMAP1/2/3/4).
 config ARCH_VT8500
        bool "VIA/WonderMedia 85xx"
-        select CPU_ARM926T
-        select GENERIC_GPIO
        select ARCH_HAS_CPUFREQ
-        select GENERIC_CLOCKEVENTS
        select ARCH_REQUIRE_GPIOLIB
-        select USE_OF
+        select CLKDEV_LOOKUP
        select COMMON_CLK
+        select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
+        select GENERIC_GPIO
        select HAVE_CLK
-        select CLKDEV_LOOKUP
+        select USE_OF
        help
          Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
 config ARCH_ZYNQ
        bool "Xilinx Zynq ARM Cortex A9 Platform"
+        select ARM_AMBA
+        select ARM_GIC
+        select CLKDEV_LOOKUP
        select CPU_V7
        select GENERIC_CLOCKEVENTS
-        select CLKDEV_LOOKUP
-        select ARM_GIC
-        select ARM_AMBA
        select ICST
        select MIGHT_HAVE_CACHE_L2X0
        select USE_OF
@@ -974,33 +976,33 @@ comment "CPU Core family selection"
 config ARCH_MULTI_V4
        bool "ARMv4 based platforms (FA526, StrongARM)"
-        select ARCH_MULTI_V4_V5
        depends on !ARCH_MULTI_V6_V7
+        select ARCH_MULTI_V4_V5
 config ARCH_MULTI_V4T
        bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
-        select ARCH_MULTI_V4_V5
        depends on !ARCH_MULTI_V6_V7
+        select ARCH_MULTI_V4_V5
 config ARCH_MULTI_V5
        bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)"
-        select ARCH_MULTI_V4_V5
        depends on !ARCH_MULTI_V6_V7
+        select ARCH_MULTI_V4_V5
 config ARCH_MULTI_V4_V5
        bool
 config ARCH_MULTI_V6
        bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
-        select CPU_V6
        select ARCH_MULTI_V6_V7
+        select CPU_V6
 config ARCH_MULTI_V7
        bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
-        select CPU_V7
-        select ARCH_VEXPRESS
        default y
        select ARCH_MULTI_V6_V7
+        select ARCH_VEXPRESS
+        select CPU_V7
 config ARCH_MULTI_V6_V7
        bool
@@ -1137,9 +1139,9 @@ config PLAT_IOP
 config PLAT_ORION
        bool
        select CLKSRC_MMIO
+        select COMMON_CLK
        select GENERIC_IRQ_CHIP
        select IRQ_DOMAIN
-        select COMMON_CLK
 config PLAT_ORION_LEGACY
        bool
@@ -1497,8 +1499,8 @@ config SMP
        depends on GENERIC_CLOCKEVENTS
        depends on HAVE_SMP
        depends on MMU
-        select USE_GENERIC_SMP_HELPERS
        select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
+        select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
@@ -1857,9 +1859,9 @@ menu "Boot options"
 config USE_OF
        bool "Flattened Device Tree support"
+        select IRQ_DOMAIN
        select OF
        select OF_EARLY_FLATTREE
-        select IRQ_DOMAIN
        help
          Include support for flattened device tree machine descriptions.
@@ -2141,8 +2143,8 @@ config CPU_FREQ_PXA
        bool
        depends on CPU_FREQ && ARCH_PXA && PXA25x
        default y
-        select CPU_FREQ_TABLE
        select CPU_FREQ_DEFAULT_GOV_USERSPACE
+        select CPU_FREQ_TABLE
 config CPU_FREQ_S3C
        bool
diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
index d0d441c429a..f79a08efe00 100644
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
@@ -1,6 +1,7 @@
 ashldi3.S
 font.c
 lib1funcs.S
+hyp-stub.S
 piggy.gzip
 piggy.lzo
 piggy.lzma
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index bb267562e7e..a517153a13e 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -30,6 +30,10 @@ FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c
 OBJS            += string.o
 CFLAGS_string.o := -Os
+ifeq ($(CONFIG_ARM_VIRT_EXT),y)
+OBJS            += hyp-stub.o
+endif
 #
 # Architecture dependencies
 #
@@ -126,7 +130,7 @@ KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
 endif
 ccflags-y := -fpic -fno-builtin -I$(obj)
-asflags-y := -Wa,-march=all
+asflags-y := -Wa,-march=all -DZIMAGE
 # Supply kernel BSS size to the decompressor via a linker symbol.
 KBSS_SZ = $(shell $(CROSS_COMPILE)size $(obj)/../../../../vmlinux | \
@@ -198,3 +202,6 @@ $(obj)/font.c: $(FONTC)
 $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KCONFIG_CONFIG)
        @sed "$(SEDFLAGS)" < $< > $@
+$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S
+        $(call cmd,shipped)
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index bc67cbff394..90275f036cd 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -9,6 +9,7 @@
 * published by the Free Software Foundation.
 */
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 /*
 * Debugging stuff
@@ -132,7 +133,12 @@ start:
                .word   start                   @ absolute load/run zImage address
                .word   _edata                  @ zImage end address
 THUMB(         .thumb                  )
-1:              mov     r7, r1                  @ save architecture ID
+1:
+                mrs     r9, cpsr
+#ifdef CONFIG_ARM_VIRT_EXT
+                bl      __hyp_stub_install      @ get into SVC mode, reversibly
+#endif
+                mov     r7, r1                  @ save architecture ID
                mov     r8, r2                  @ save atags pointer
 #ifndef __ARM_ARCH_2__
@@ -148,9 +154,9 @@ start:
 ARM(           swi     0x123456        )       @ angel_SWI_ARM
 THUMB(         svc     0xab            )       @ angel_SWI_THUMB
 not_angel:
-                mrs     r2, cpsr                @ turn off interrupts to
+                safe_svcmode_maskall r0
-                orr     r2, r2, #0xc0           @ prevent angel from running
+                msr     spsr_cxsf, r9           @ Save the CPU boot mode in
-                msr     cpsr_c, r2
+                                                @ SPSR
 #else
                teqp    pc, #0x0c000003         @ turn off interrupts
 #endif
@@ -350,6 +356,20 @@ dtb_check_done:
                adr     r5, restart
                bic     r5, r5, #31
+/* Relocate the hyp vector base if necessary */
+#ifdef CONFIG_ARM_VIRT_EXT
+                mrs     r0, spsr
+                and     r0, r0, #MODE_MASK
+                cmp     r0, #HYP_MODE
+                bne     1f
+                bl      __hyp_get_vectors
+                sub     r0, r0, r5
+                add     r0, r0, r10
+                bl      __hyp_set_vectors
+1:
+#endif
                sub     r9, r6, r5              @ size to copy
                add     r9, r9, #31             @ rounded up to a multiple
                bic     r9, r9, #31             @ ... of 32 bytes
@@ -458,11 +478,29 @@ not_relocated:	mov	r0, #0
                bl      decompress_kernel
                bl      cache_clean_flush
                bl      cache_off
-                mov     r0, #0                  @ must be zero
                mov     r1, r7                  @ restore architecture number
                mov     r2, r8                  @ restore atags pointer
- ARM(           mov     pc, r4  )               @ call kernel
- THUMB(         bx      r4      )               @ entry point is always ARM
+#ifdef CONFIG_ARM_VIRT_EXT
+                mrs     r0, spsr                @ Get saved CPU boot mode
+                and     r0, r0, #MODE_MASK
+                cmp     r0, #HYP_MODE           @ if not booted in HYP mode...
+                bne     __enter_kernel          @ boot kernel directly
+                adr     r12, .L__hyp_reentry_vectors_offset
+                ldr     r0, [r12]
+                add     r0, r0, r12
+                bl      __hyp_set_vectors
+                __HVC(0)                        @ otherwise bounce to hyp mode
+                b       .                       @ should never be reached
+                .align  2
+.L__hyp_reentry_vectors_offset: .long   __hyp_reentry_vectors - .
+#else
+                b       __enter_kernel
+#endif
                .align  2
                .type   LC0, #object
@@ -1196,6 +1234,25 @@ memdump:	mov	r12, r0
 #endif
                .ltorg
+#ifdef CONFIG_ARM_VIRT_EXT
+.align 5
+__hyp_reentry_vectors:
+                W(b)    .                       @ reset
+                W(b)    .                       @ undef
+                W(b)    .                       @ svc
+                W(b)    .                       @ pabort
+                W(b)    .                       @ dabort
+                W(b)    __enter_kernel          @ hyp
+                W(b)    .                       @ irq
+                W(b)    .                       @ fiq
+#endif /* CONFIG_ARM_VIRT_EXT */
+__enter_kernel:
+                mov     r0, #0                  @ must be 0
+ ARM(           mov     pc, r4  )               @ call kernel
+ THUMB(         bx      r4      )               @ entry point is always ARM
 reloc_code_end:
                .align
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 283fa1d804f..45ceeb0e93e 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -1,15 +1,15 @@
 config ARM_GIC
+        bool
        select IRQ_DOMAIN
        select MULTI_IRQ_HANDLER
-        bool
 config GIC_NON_BANKED
        bool
 config ARM_VIC
+        bool
        select IRQ_DOMAIN
        select MULTI_IRQ_HANDLER
-        bool
 config ARM_VIC_NR
        int
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index 8a7196ca510..f70ae175a3d 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -1,6 +1,4 @@
-include include/asm-generic/Kbuild.asm
-header-y += hwcap.h
 generic-y += auxvec.h
 generic-y += bitsperlong.h
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 5c8b3bf4d82..2ef95813fce 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -22,6 +22,7 @@
 #include <asm/ptrace.h>
 #include <asm/domain.h>
+#include <asm/opcodes-virt.h>
 #define IOMEM(x)        (x)
@@ -240,6 +241,34 @@
 #endif
 /*
+ * Helper macro to enter SVC mode cleanly and mask interrupts. reg is
+ * a scratch register for the macro to overwrite.
+ *
+ * This macro is intended for forcing the CPU into SVC mode at boot time.
+ * you cannot return to the original mode.
+ *
+ * Beware, it also clobers LR.
+ */
+.macro safe_svcmode_maskall reg:req
+        mrs     \reg , cpsr
+        mov     lr , \reg
+        and     lr , lr , #MODE_MASK
+        cmp     lr , #HYP_MODE
+        orr     \reg , \reg , #PSR_I_BIT | PSR_F_BIT
+        bic     \reg , \reg , #MODE_MASK
+        orr     \reg , \reg , #SVC_MODE
+THUMB(  orr     \reg , \reg , #PSR_T_BIT        )
+        bne     1f
+        orr     \reg, \reg, #PSR_A_BIT
+        adr     lr, BSYM(2f)
+        msr     spsr_cxsf, \reg
+        __MSR_ELR_HYP(14)
+        __ERET
+1:      msr     cpsr_c, \reg
+2:
+.endm
+/*
 * STRT/LDRT access macros with ARM and Thumb-2 variants
 */
 #ifdef CONFIG_THUMB2_KERNEL
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index e4448e16046..e1489c54cd1 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -49,6 +49,13 @@
 *
 *              Unconditionally clean and invalidate the entire cache.
 *
+ *     flush_kern_louis()
+ *
+ *             Flush data cache levels up to the level of unification
+ *             inner shareable and invalidate the I-cache.
+ *             Only needed from v7 onwards, falls back to flush_cache_all()
+ *             for all other processor versions.
+ *
 *      flush_user_all()
 *
 *              Clean and invalidate all user space cache entries
@@ -97,6 +104,7 @@
 struct cpu_cache_fns {
        void (*flush_icache_all)(void);
        void (*flush_kern_all)(void);
+        void (*flush_kern_louis)(void);
        void (*flush_user_all)(void);
        void (*flush_user_range)(unsigned long, unsigned long, unsigned int);
@@ -119,6 +127,7 @@ extern struct cpu_cache_fns cpu_cache;
 #define __cpuc_flush_icache_all         cpu_cache.flush_icache_all
 #define __cpuc_flush_kern_all           cpu_cache.flush_kern_all
+#define __cpuc_flush_kern_louis         cpu_cache.flush_kern_louis
 #define __cpuc_flush_user_all           cpu_cache.flush_user_all
 #define __cpuc_flush_user_range         cpu_cache.flush_user_range
 #define __cpuc_coherent_kern_range      cpu_cache.coherent_kern_range
@@ -139,6 +148,7 @@ extern struct cpu_cache_fns cpu_cache;
 extern void __cpuc_flush_icache_all(void);
 extern void __cpuc_flush_kern_all(void);
+extern void __cpuc_flush_kern_louis(void);
 extern void __cpuc_flush_user_all(void);
 extern void __cpuc_flush_user_range(unsigned long, unsigned long, unsigned int);
 extern void __cpuc_coherent_kern_range(unsigned long, unsigned long);
@@ -204,6 +214,11 @@ static inline void __flush_icache_all(void)
        __flush_icache_preferred();
 }
+/*
+ * Flush caches up to Level of Unification Inner Shareable
+ */
+#define flush_cache_louis()             __cpuc_flush_kern_louis()
 #define flush_cache_all()               __cpuc_flush_kern_all()
 static inline void vivt_flush_cache_mm(struct mm_struct *mm)
diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
index 4f8d2c0dc44..cca9f15704e 100644
--- a/arch/arm/include/asm/glue-cache.h
+++ b/arch/arm/include/asm/glue-cache.h
@@ -132,6 +132,7 @@
 #ifndef MULTI_CACHE
 #define __cpuc_flush_icache_all         __glue(_CACHE,_flush_icache_all)
 #define __cpuc_flush_kern_all           __glue(_CACHE,_flush_kern_cache_all)
+#define __cpuc_flush_kern_louis         __glue(_CACHE,_flush_kern_cache_louis)
 #define __cpuc_flush_user_all           __glue(_CACHE,_flush_user_cache_all)
 #define __cpuc_flush_user_range         __glue(_CACHE,_flush_user_cache_range)
 #define __cpuc_coherent_kern_range      __glue(_CACHE,_coherent_kern_range)
diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h
index 917626128a1..6ff56eca3f1 100644
--- a/arch/arm/include/asm/hwcap.h
+++ b/arch/arm/include/asm/hwcap.h
@@ -1,31 +1,8 @@
 #ifndef __ASMARM_HWCAP_H
 #define __ASMARM_HWCAP_H
-/*
+#include <uapi/asm/hwcap.h>
- * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
- */
-#define HWCAP_SWP       (1 << 0)
-#define HWCAP_HALF      (1 << 1)
-#define HWCAP_THUMB     (1 << 2)
-#define HWCAP_26BIT     (1 << 3)        /* Play it safe */
-#define HWCAP_FAST_MULT (1 << 4)
-#define HWCAP_FPA       (1 << 5)
-#define HWCAP_VFP       (1 << 6)
-#define HWCAP_EDSP      (1 << 7)
-#define HWCAP_JAVA      (1 << 8)
-#define HWCAP_IWMMXT    (1 << 9)
-#define HWCAP_CRUNCH    (1 << 10)
-#define HWCAP_THUMBEE   (1 << 11)
-#define HWCAP_NEON      (1 << 12)
-#define HWCAP_VFPv3     (1 << 13)
-#define HWCAP_VFPv3D16  (1 << 14)
-#define HWCAP_TLS       (1 << 15)
-#define HWCAP_VFPv4     (1 << 16)
-#define HWCAP_IDIVA     (1 << 17)
-#define HWCAP_IDIVT     (1 << 18)
-#define HWCAP_IDIV      (HWCAP_IDIVA | HWCAP_IDIVT)
-#if defined(__KERNEL__)
 #if !defined(__ASSEMBLY__)
 /*
 * This yields a mask that user programs can use to figure out what
@@ -35,5 +12,3 @@
 extern unsigned int elf_hwcap;
 #endif
 #endif
-#endif
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
index 6c6809f982f..0d3a28dbc8e 100644
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -1,9 +1,7 @@
 #ifndef _ASM_ARM_MODULE_H
 #define _ASM_ARM_MODULE_H
-#define Elf_Shdr        Elf32_Shdr
+#include <asm-generic/module.h>
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
 struct unwind_table;
@@ -16,13 +14,11 @@ enum {
        ARM_SEC_DEVEXIT,
        ARM_SEC_MAX,
 };
-#endif
 struct mod_arch_specific {
-#ifdef CONFIG_ARM_UNWIND
        struct unwind_table *unwind[ARM_SEC_MAX];
-#endif
 };
+#endif
 /*
 * Add the ARM architecture version to the version magic string
diff --git a/arch/arm/include/asm/opcodes-virt.h b/arch/arm/include/asm/opcodes-virt.h
index b85665a96f8..efcfdf92d9d 100644
--- a/arch/arm/include/asm/opcodes-virt.h
+++ b/arch/arm/include/asm/opcodes-virt.h
@@ -26,4 +26,14 @@
        0xF7E08000 | (((imm16) & 0xF000) << 4) | ((imm16) & 0x0FFF)     \
 )
+#define __ERET  __inst_arm_thumb32(                                     \
+        0xE160006E,                                                     \
+        0xF3DE8F00                                                      \
+)
+#define __MSR_ELR_HYP(regnum)   __inst_arm_thumb32(                     \
+        0xE12EF300 | regnum,                                            \
+        0xF3808E30 | (regnum << 16)                                     \
+)
 #endif /* ! __ASM_ARM_OPCODES_VIRT_H */
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index 44fe998269d..3d52ee1bfb3 100644
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -10,132 +10,12 @@
 #ifndef __ASM_ARM_PTRACE_H
 #define __ASM_ARM_PTRACE_H
-#include <asm/hwcap.h>
+#include <uapi/asm/ptrace.h>
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS        14
-#define PTRACE_SETFPREGS        15
-/* PTRACE_ATTACH is 16 */
-/* PTRACE_DETACH is 17 */
-#define PTRACE_GETWMMXREGS      18
-#define PTRACE_SETWMMXREGS      19
-/* 20 is unused */
-#define PTRACE_OLDSETOPTIONS    21
-#define PTRACE_GET_THREAD_AREA  22
-#define PTRACE_SET_SYSCALL      23
-/* PTRACE_SYSCALL is 24 */
-#define PTRACE_GETCRUNCHREGS    25
-#define PTRACE_SETCRUNCHREGS    26
-#define PTRACE_GETVFPREGS       27
-#define PTRACE_SETVFPREGS       28
-#define PTRACE_GETHBPREGS       29
-#define PTRACE_SETHBPREGS       30
-/*
- * PSR bits
- */
-#define USR26_MODE      0x00000000
-#define FIQ26_MODE      0x00000001
-#define IRQ26_MODE      0x00000002
-#define SVC26_MODE      0x00000003
-#define USR_MODE        0x00000010
-#define FIQ_MODE        0x00000011
-#define IRQ_MODE        0x00000012
-#define SVC_MODE        0x00000013
-#define ABT_MODE        0x00000017
-#define UND_MODE        0x0000001b
-#define SYSTEM_MODE     0x0000001f
-#define MODE32_BIT      0x00000010
-#define MODE_MASK       0x0000001f
-#define PSR_T_BIT       0x00000020
-#define PSR_F_BIT       0x00000040
-#define PSR_I_BIT       0x00000080
-#define PSR_A_BIT       0x00000100
-#define PSR_E_BIT       0x00000200
-#define PSR_J_BIT       0x01000000
-#define PSR_Q_BIT       0x08000000
-#define PSR_V_BIT       0x10000000
-#define PSR_C_BIT       0x20000000
-#define PSR_Z_BIT       0x40000000
-#define PSR_N_BIT       0x80000000
-/*
- * Groups of PSR bits
- */
-#define PSR_f           0xff000000      /* Flags                */
-#define PSR_s           0x00ff0000      /* Status               */
-#define PSR_x           0x0000ff00      /* Extension            */
-#define PSR_c           0x000000ff      /* Control              */
-/*
- * ARMv7 groups of PSR bits
- */
-#define APSR_MASK       0xf80f0000      /* N, Z, C, V, Q and GE flags */
-#define PSR_ISET_MASK   0x01000010      /* ISA state (J, T) mask */
-#define PSR_IT_MASK     0x0600fc00      /* If-Then execution state mask */
-#define PSR_ENDIAN_MASK 0x00000200      /* Endianness state mask */
-/*
- * Default endianness state
- */
-#ifdef CONFIG_CPU_ENDIAN_BE8
-#define PSR_ENDSTATE    PSR_E_BIT
-#else
-#define PSR_ENDSTATE    0
-#endif
-/* 
- * These are 'magic' values for PTRACE_PEEKUSR that return info about where a
- * process is located in memory.
- */
-#define PT_TEXT_ADDR            0x10000
-#define PT_DATA_ADDR            0x10004
-#define PT_TEXT_END_ADDR        0x10008
 #ifndef __ASSEMBLY__
-/*
- * This struct defines the way the registers are stored on the
- * stack during a system call.  Note that sizeof(struct pt_regs)
- * has to be a multiple of 8.
- */
-#ifndef __KERNEL__
-struct pt_regs {
-        long uregs[18];
-};
-#else /* __KERNEL__ */
 struct pt_regs {
        unsigned long uregs[18];
 };
-#endif /* __KERNEL__ */
-#define ARM_cpsr        uregs[16]
-#define ARM_pc          uregs[15]
-#define ARM_lr          uregs[14]
-#define ARM_sp          uregs[13]
-#define ARM_ip          uregs[12]
-#define ARM_fp          uregs[11]
-#define ARM_r10         uregs[10]
-#define ARM_r9          uregs[9]
-#define ARM_r8          uregs[8]
-#define ARM_r7          uregs[7]
-#define ARM_r6          uregs[6]
-#define ARM_r5          uregs[5]
-#define ARM_r4          uregs[4]
-#define ARM_r3          uregs[3]
-#define ARM_r2          uregs[2]
-#define ARM_r1          uregs[1]
-#define ARM_r0          uregs[0]
-#define ARM_ORIG_r0     uregs[17]
-/*
- * The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
- * and core dumps.
- */
-#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
-#ifdef __KERNEL__
 #define user_mode(regs) \
        (((regs)->ARM_cpsr & 0xf) == 0)
@@ -259,9 +139,5 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
        (struct pt_regs *)((sp | (THREAD_SIZE - 1)) - 7) - 1;   \
 })
-#endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 #endif
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 24d284a1bfc..c50f0560950 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -14,176 +14,8 @@
 #ifndef __ASMARM_SETUP_H
 #define __ASMARM_SETUP_H
-#include <linux/types.h>
+#include <uapi/asm/setup.h>
-#define COMMAND_LINE_SIZE 1024
-/* The list ends with an ATAG_NONE node. */
-#define ATAG_NONE       0x00000000
-struct tag_header {
-        __u32 size;
-        __u32 tag;
-};
-/* The list must start with an ATAG_CORE node */
-#define ATAG_CORE       0x54410001
-struct tag_core {
-        __u32 flags;            /* bit 0 = read-only */
-        __u32 pagesize;
-        __u32 rootdev;
-};
-/* it is allowed to have multiple ATAG_MEM nodes */
-#define ATAG_MEM        0x54410002
-struct tag_mem32 {
-        __u32   size;
-        __u32   start;  /* physical start address */
-};
-/* VGA text type displays */
-#define ATAG_VIDEOTEXT  0x54410003
-struct tag_videotext {
-        __u8            x;
-        __u8            y;
-        __u16           video_page;
-        __u8            video_mode;
-        __u8            video_cols;
-        __u16           video_ega_bx;
-        __u8            video_lines;
-        __u8            video_isvga;
-        __u16           video_points;
-};
-/* describes how the ramdisk will be used in kernel */
-#define ATAG_RAMDISK    0x54410004
-struct tag_ramdisk {
-        __u32 flags;    /* bit 0 = load, bit 1 = prompt */
-        __u32 size;     /* decompressed ramdisk size in _kilo_ bytes */
-        __u32 start;    /* starting block of floppy-based RAM disk image */
-};
-/* describes where the compressed ramdisk image lives (virtual address) */
-/*
- * this one accidentally used virtual addresses - as such,
- * it's deprecated.
- */
-#define ATAG_INITRD     0x54410005
-/* describes where the compressed ramdisk image lives (physical address) */
-#define ATAG_INITRD2    0x54420005
-struct tag_initrd {
-        __u32 start;    /* physical start address */
-        __u32 size;     /* size of compressed ramdisk image in bytes */
-};
-/* board serial number. "64 bits should be enough for everybody" */
-#define ATAG_SERIAL     0x54410006
-struct tag_serialnr {
-        __u32 low;
-        __u32 high;
-};
-/* board revision */
-#define ATAG_REVISION   0x54410007
-struct tag_revision {
-        __u32 rev;
-};
-/* initial values for vesafb-type framebuffers. see struct screen_info
- * in include/linux/tty.h
- */
-#define ATAG_VIDEOLFB   0x54410008
-struct tag_videolfb {
-        __u16           lfb_width;
-        __u16           lfb_height;
-        __u16           lfb_depth;
-        __u16           lfb_linelength;
-        __u32           lfb_base;
-        __u32           lfb_size;
-        __u8            red_size;
-        __u8            red_pos;
-        __u8            green_size;
-        __u8            green_pos;
-        __u8            blue_size;
-        __u8            blue_pos;
-        __u8            rsvd_size;
-        __u8            rsvd_pos;
-};
-/* command line: \0 terminated string */
-#define ATAG_CMDLINE    0x54410009
-struct tag_cmdline {
-        char    cmdline[1];     /* this is the minimum size */
-};
-/* acorn RiscPC specific information */
-#define ATAG_ACORN      0x41000101
-struct tag_acorn {
-        __u32 memc_control_reg;
-        __u32 vram_pages;
-        __u8 sounddefault;
-        __u8 adfsdrives;
-};
-/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
-#define ATAG_MEMCLK     0x41000402
-struct tag_memclk {
-        __u32 fmemclk;
-};
-struct tag {
-        struct tag_header hdr;
-        union {
-                struct tag_core         core;
-                struct tag_mem32        mem;
-                struct tag_videotext    videotext;
-                struct tag_ramdisk      ramdisk;
-                struct tag_initrd       initrd;
-                struct tag_serialnr     serialnr;
-                struct tag_revision     revision;
-                struct tag_videolfb     videolfb;
-                struct tag_cmdline      cmdline;
-                /*
-                 * Acorn specific
-                 */
-                struct tag_acorn        acorn;
-                /*
-                 * DC21285 specific
-                 */
-                struct tag_memclk       memclk;
-        } u;
-};
-struct tagtable {
-        __u32 tag;
-        int (*parse)(const struct tag *);
-};
-#define tag_member_present(tag,member)                          \
-        ((unsigned long)(&((struct tag *)0L)->member + 1)       \
-                <= (tag)->hdr.size * 4)
-#define tag_next(t)     ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
-#define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
-#define for_each_tag(t,base)            \
-        for (t = base; t->hdr.size; t = tag_next(t))
-#ifdef __KERNEL__
 #define __tag __used __attribute__((__section__(".taglist.init")))
 #define __tagtable(tag, fn) \
@@ -221,6 +53,4 @@ extern int arm_add_memory(phys_addr_t start, phys_addr_t size);
 extern void early_print(const char *str, ...);
 extern void dump_machine_table(void);
-#endif  /*  __KERNEL__  */
 #endif
diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h
index 43ba0fb1c8a..5a7963dbd3f 100644
--- a/arch/arm/include/asm/signal.h
+++ b/arch/arm/include/asm/signal.h
@@ -1,12 +1,8 @@
 #ifndef _ASMARM_SIGNAL_H
 #define _ASMARM_SIGNAL_H
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-#ifdef __KERNEL__
 /* Most things should be clean enough to redefine this at will, if care
   is taken to make libc match.  */
@@ -20,100 +16,6 @@ typedef struct {
        unsigned long sig[_NSIG_WORDS];
 } sigset_t;
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-#define NSIG            32
-typedef unsigned long sigset_t;
-#endif /* __KERNEL__ */
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-#define SIGSWI          32
-/*
- * SA_FLAGS values:
- *
- * SA_NOCLDSTOP         flag to turn off SIGCHLD when children stop.
- * SA_NOCLDWAIT         flag on SIGCHLD to inhibit zombies.
- * SA_SIGINFO           deliver the signal with SIGINFO structs
- * SA_THIRTYTWO         delivers the signal in 32-bit mode, even if the task 
- *                      is running in 26-bit.
- * SA_ONSTACK           allows alternate signal stacks (see sigaltstack(2)).
- * SA_RESTART           flag to get restarting signals (which were the default long ago)
- * SA_NODEFER           prevents the current signal from being masked in the handler.
- * SA_RESETHAND         clears the handler when the signal is delivered.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOCLDWAIT    0x00000002
-#define SA_SIGINFO      0x00000004
-#define SA_THIRTYTWO    0x02000000
-#define SA_RESTORER     0x04000000
-#define SA_ONSTACK      0x08000000
-#define SA_RESTART      0x10000000
-#define SA_NODEFER      0x40000000
-#define SA_RESETHAND    0x80000000
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-/* 
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-#include <asm-generic/signal-defs.h>
-#ifdef __KERNEL__
 struct old_sigaction {
        __sighandler_t sa_handler;
        old_sigset_t sa_mask;
@@ -132,33 +34,6 @@ struct k_sigaction {
        struct sigaction sa;
 };
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-#endif /* __KERNEL__ */
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-#ifdef __KERNEL__
 #include <asm/sigcontext.h>
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif
-#endif
diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h
index b859d82e30c..537fc9b9188 100644
--- a/arch/arm/include/asm/swab.h
+++ b/arch/arm/include/asm/swab.h
@@ -15,14 +15,8 @@
 #ifndef __ASM_ARM_SWAB_H
 #define __ASM_ARM_SWAB_H
-#include <linux/compiler.h>
+#include <uapi/asm/swab.h>
-#include <linux/types.h>
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __SWAB_64_THRU_32__
-#endif
-#if defined(__KERNEL__)
 #if __LINUX_ARM_ARCH__ >= 6
 static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)
@@ -42,32 +36,3 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
 #endif
 #endif
-#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6
-static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
-{
-        __u32 t;
-#ifndef __thumb__
-        if (!__builtin_constant_p(x)) {
-                /*
-                 * The compiler needs a bit of a hint here to always do the
-                 * right thing and not screw it up to different degrees
-                 * depending on the gcc version.
-                 */
-                asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
-        } else
-#endif
-                t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */
-        x = (x << 24) | (x >> 8);               /* mov r0,r0,ror #8      */
-        t &= ~0x00FF0000;                       /* bic r1,r1,#0x00FF0000 */
-        x ^= (t >> 8);                          /* eor r0,r0,r1,lsr #8   */
-        return x;
-}
-#define __arch_swab32 __arch_swab32
-#endif
-#endif
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index f71cdab18b8..8477b4c1d39 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -151,7 +151,6 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
 #define TIF_SYSCALL_TRACE       8
 #define TIF_SYSCALL_AUDIT       9
 #define TIF_SYSCALL_TRACEPOINT  10
-#define TIF_POLLING_NRFLAG      16
 #define TIF_USING_IWMMXT        17
 #define TIF_MEMDIE              18      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     20
@@ -164,7 +163,6 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
 #define _TIF_SYSCALL_AUDIT      (1 << TIF_SYSCALL_AUDIT)
 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_USING_IWMMXT       (1 << TIF_USING_IWMMXT)
 #define _TIF_SECCOMP            (1 << TIF_SECCOMP)
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index f259921edfe..8f60b6e6bd4 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -13,447 +13,10 @@
 #ifndef __ASM_ARM_UNISTD_H
 #define __ASM_ARM_UNISTD_H
-#define __NR_OABI_SYSCALL_BASE  0x900000
+#include <uapi/asm/unistd.h>
-#if defined(__thumb__) || defined(__ARM_EABI__)
-#define __NR_SYSCALL_BASE       0
-#else
-#define __NR_SYSCALL_BASE       __NR_OABI_SYSCALL_BASE
-#endif
-/*
- * This file contains the system call numbers.
- */
-#define __NR_restart_syscall            (__NR_SYSCALL_BASE+  0)
-#define __NR_exit                       (__NR_SYSCALL_BASE+  1)
-#define __NR_fork                       (__NR_SYSCALL_BASE+  2)
-#define __NR_read                       (__NR_SYSCALL_BASE+  3)
-#define __NR_write                      (__NR_SYSCALL_BASE+  4)
-#define __NR_open                       (__NR_SYSCALL_BASE+  5)
-#define __NR_close                      (__NR_SYSCALL_BASE+  6)
-                                        /* 7 was sys_waitpid */
-#define __NR_creat                      (__NR_SYSCALL_BASE+  8)
-#define __NR_link                       (__NR_SYSCALL_BASE+  9)
-#define __NR_unlink                     (__NR_SYSCALL_BASE+ 10)
-#define __NR_execve                     (__NR_SYSCALL_BASE+ 11)
-#define __NR_chdir                      (__NR_SYSCALL_BASE+ 12)
-#define __NR_time                       (__NR_SYSCALL_BASE+ 13)
-#define __NR_mknod                      (__NR_SYSCALL_BASE+ 14)
-#define __NR_chmod                      (__NR_SYSCALL_BASE+ 15)
-#define __NR_lchown                     (__NR_SYSCALL_BASE+ 16)
-                                        /* 17 was sys_break */
-                                        /* 18 was sys_stat */
-#define __NR_lseek                      (__NR_SYSCALL_BASE+ 19)
-#define __NR_getpid                     (__NR_SYSCALL_BASE+ 20)
-#define __NR_mount                      (__NR_SYSCALL_BASE+ 21)
-#define __NR_umount                     (__NR_SYSCALL_BASE+ 22)
-#define __NR_setuid                     (__NR_SYSCALL_BASE+ 23)
-#define __NR_getuid                     (__NR_SYSCALL_BASE+ 24)
-#define __NR_stime                      (__NR_SYSCALL_BASE+ 25)
-#define __NR_ptrace                     (__NR_SYSCALL_BASE+ 26)
-#define __NR_alarm                      (__NR_SYSCALL_BASE+ 27)
-                                        /* 28 was sys_fstat */
-#define __NR_pause                      (__NR_SYSCALL_BASE+ 29)
-#define __NR_utime                      (__NR_SYSCALL_BASE+ 30)
-                                        /* 31 was sys_stty */
-                                        /* 32 was sys_gtty */
-#define __NR_access                     (__NR_SYSCALL_BASE+ 33)
-#define __NR_nice                       (__NR_SYSCALL_BASE+ 34)
-                                        /* 35 was sys_ftime */
-#define __NR_sync                       (__NR_SYSCALL_BASE+ 36)
-#define __NR_kill                       (__NR_SYSCALL_BASE+ 37)
-#define __NR_rename                     (__NR_SYSCALL_BASE+ 38)
-#define __NR_mkdir                      (__NR_SYSCALL_BASE+ 39)
-#define __NR_rmdir                      (__NR_SYSCALL_BASE+ 40)
-#define __NR_dup                        (__NR_SYSCALL_BASE+ 41)
-#define __NR_pipe                       (__NR_SYSCALL_BASE+ 42)
-#define __NR_times                      (__NR_SYSCALL_BASE+ 43)
-                                        /* 44 was sys_prof */
-#define __NR_brk                        (__NR_SYSCALL_BASE+ 45)
-#define __NR_setgid                     (__NR_SYSCALL_BASE+ 46)
-#define __NR_getgid                     (__NR_SYSCALL_BASE+ 47)
-                                        /* 48 was sys_signal */
-#define __NR_geteuid                    (__NR_SYSCALL_BASE+ 49)
-#define __NR_getegid                    (__NR_SYSCALL_BASE+ 50)
-#define __NR_acct                       (__NR_SYSCALL_BASE+ 51)
-#define __NR_umount2                    (__NR_SYSCALL_BASE+ 52)
-                                        /* 53 was sys_lock */
-#define __NR_ioctl                      (__NR_SYSCALL_BASE+ 54)
-#define __NR_fcntl                      (__NR_SYSCALL_BASE+ 55)
-                                        /* 56 was sys_mpx */
-#define __NR_setpgid                    (__NR_SYSCALL_BASE+ 57)
-                                        /* 58 was sys_ulimit */
-                                        /* 59 was sys_olduname */
-#define __NR_umask                      (__NR_SYSCALL_BASE+ 60)
-#define __NR_chroot                     (__NR_SYSCALL_BASE+ 61)
-#define __NR_ustat                      (__NR_SYSCALL_BASE+ 62)
-#define __NR_dup2                       (__NR_SYSCALL_BASE+ 63)
-#define __NR_getppid                    (__NR_SYSCALL_BASE+ 64)
-#define __NR_getpgrp                    (__NR_SYSCALL_BASE+ 65)
-#define __NR_setsid                     (__NR_SYSCALL_BASE+ 66)
-#define __NR_sigaction                  (__NR_SYSCALL_BASE+ 67)
-                                        /* 68 was sys_sgetmask */
-                                        /* 69 was sys_ssetmask */
-#define __NR_setreuid                   (__NR_SYSCALL_BASE+ 70)
-#define __NR_setregid                   (__NR_SYSCALL_BASE+ 71)
-#define __NR_sigsuspend                 (__NR_SYSCALL_BASE+ 72)
-#define __NR_sigpending                 (__NR_SYSCALL_BASE+ 73)
-#define __NR_sethostname                (__NR_SYSCALL_BASE+ 74)
-#define __NR_setrlimit                  (__NR_SYSCALL_BASE+ 75)
-#define __NR_getrlimit                  (__NR_SYSCALL_BASE+ 76) /* Back compat 2GB limited rlimit */
-#define __NR_getrusage                  (__NR_SYSCALL_BASE+ 77)
-#define __NR_gettimeofday               (__NR_SYSCALL_BASE+ 78)
-#define __NR_settimeofday               (__NR_SYSCALL_BASE+ 79)
-#define __NR_getgroups                  (__NR_SYSCALL_BASE+ 80)
-#define __NR_setgroups                  (__NR_SYSCALL_BASE+ 81)
-#define __NR_select                     (__NR_SYSCALL_BASE+ 82)
-#define __NR_symlink                    (__NR_SYSCALL_BASE+ 83)
-                                        /* 84 was sys_lstat */
-#define __NR_readlink                   (__NR_SYSCALL_BASE+ 85)
-#define __NR_uselib                     (__NR_SYSCALL_BASE+ 86)
-#define __NR_swapon                     (__NR_SYSCALL_BASE+ 87)
-#define __NR_reboot                     (__NR_SYSCALL_BASE+ 88)
-#define __NR_readdir                    (__NR_SYSCALL_BASE+ 89)
-#define __NR_mmap                       (__NR_SYSCALL_BASE+ 90)
-#define __NR_munmap                     (__NR_SYSCALL_BASE+ 91)
-#define __NR_truncate                   (__NR_SYSCALL_BASE+ 92)
-#define __NR_ftruncate                  (__NR_SYSCALL_BASE+ 93)
-#define __NR_fchmod                     (__NR_SYSCALL_BASE+ 94)
-#define __NR_fchown                     (__NR_SYSCALL_BASE+ 95)
-#define __NR_getpriority                (__NR_SYSCALL_BASE+ 96)
-#define __NR_setpriority                (__NR_SYSCALL_BASE+ 97)
-                                        /* 98 was sys_profil */
-#define __NR_statfs                     (__NR_SYSCALL_BASE+ 99)
-#define __NR_fstatfs                    (__NR_SYSCALL_BASE+100)
-                                        /* 101 was sys_ioperm */
-#define __NR_socketcall                 (__NR_SYSCALL_BASE+102)
-#define __NR_syslog                     (__NR_SYSCALL_BASE+103)
-#define __NR_setitimer                  (__NR_SYSCALL_BASE+104)
-#define __NR_getitimer                  (__NR_SYSCALL_BASE+105)
-#define __NR_stat                       (__NR_SYSCALL_BASE+106)
-#define __NR_lstat                      (__NR_SYSCALL_BASE+107)
-#define __NR_fstat                      (__NR_SYSCALL_BASE+108)
-                                        /* 109 was sys_uname */
-                                        /* 110 was sys_iopl */
-#define __NR_vhangup                    (__NR_SYSCALL_BASE+111)
-                                        /* 112 was sys_idle */
-#define __NR_syscall                    (__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */
-#define __NR_wait4                      (__NR_SYSCALL_BASE+114)
-#define __NR_swapoff                    (__NR_SYSCALL_BASE+115)
-#define __NR_sysinfo                    (__NR_SYSCALL_BASE+116)
-#define __NR_ipc                        (__NR_SYSCALL_BASE+117)
-#define __NR_fsync                      (__NR_SYSCALL_BASE+118)
-#define __NR_sigreturn                  (__NR_SYSCALL_BASE+119)
-#define __NR_clone                      (__NR_SYSCALL_BASE+120)
-#define __NR_setdomainname              (__NR_SYSCALL_BASE+121)
-#define __NR_uname                      (__NR_SYSCALL_BASE+122)
-                                        /* 123 was sys_modify_ldt */
-#define __NR_adjtimex                   (__NR_SYSCALL_BASE+124)
-#define __NR_mprotect                   (__NR_SYSCALL_BASE+125)
-#define __NR_sigprocmask                (__NR_SYSCALL_BASE+126)
-                                        /* 127 was sys_create_module */
-#define __NR_init_module                (__NR_SYSCALL_BASE+128)
-#define __NR_delete_module              (__NR_SYSCALL_BASE+129)
-                                        /* 130 was sys_get_kernel_syms */
-#define __NR_quotactl                   (__NR_SYSCALL_BASE+131)
-#define __NR_getpgid                    (__NR_SYSCALL_BASE+132)
-#define __NR_fchdir                     (__NR_SYSCALL_BASE+133)
-#define __NR_bdflush                    (__NR_SYSCALL_BASE+134)
-#define __NR_sysfs                      (__NR_SYSCALL_BASE+135)
-#define __NR_personality                (__NR_SYSCALL_BASE+136)
-                                        /* 137 was sys_afs_syscall */
-#define __NR_setfsuid                   (__NR_SYSCALL_BASE+138)
-#define __NR_setfsgid                   (__NR_SYSCALL_BASE+139)
-#define __NR__llseek                    (__NR_SYSCALL_BASE+140)
-#define __NR_getdents                   (__NR_SYSCALL_BASE+141)
-#define __NR__newselect                 (__NR_SYSCALL_BASE+142)
-#define __NR_flock                      (__NR_SYSCALL_BASE+143)
-#define __NR_msync                      (__NR_SYSCALL_BASE+144)
-#define __NR_readv                      (__NR_SYSCALL_BASE+145)
-#define __NR_writev                     (__NR_SYSCALL_BASE+146)
-#define __NR_getsid                     (__NR_SYSCALL_BASE+147)
-#define __NR_fdatasync                  (__NR_SYSCALL_BASE+148)
-#define __NR__sysctl                    (__NR_SYSCALL_BASE+149)
-#define __NR_mlock                      (__NR_SYSCALL_BASE+150)
-#define __NR_munlock                    (__NR_SYSCALL_BASE+151)
-#define __NR_mlockall                   (__NR_SYSCALL_BASE+152)
-#define __NR_munlockall                 (__NR_SYSCALL_BASE+153)
-#define __NR_sched_setparam             (__NR_SYSCALL_BASE+154)
-#define __NR_sched_getparam             (__NR_SYSCALL_BASE+155)
-#define __NR_sched_setscheduler         (__NR_SYSCALL_BASE+156)
-#define __NR_sched_getscheduler         (__NR_SYSCALL_BASE+157)
-#define __NR_sched_yield                (__NR_SYSCALL_BASE+158)
-#define __NR_sched_get_priority_max     (__NR_SYSCALL_BASE+159)
-#define __NR_sched_get_priority_min     (__NR_SYSCALL_BASE+160)
-#define __NR_sched_rr_get_interval      (__NR_SYSCALL_BASE+161)
-#define __NR_nanosleep                  (__NR_SYSCALL_BASE+162)
-#define __NR_mremap                     (__NR_SYSCALL_BASE+163)
-#define __NR_setresuid                  (__NR_SYSCALL_BASE+164)
-#define __NR_getresuid                  (__NR_SYSCALL_BASE+165)
-                                        /* 166 was sys_vm86 */
-                                        /* 167 was sys_query_module */
-#define __NR_poll                       (__NR_SYSCALL_BASE+168)
-#define __NR_nfsservctl                 (__NR_SYSCALL_BASE+169)
-#define __NR_setresgid                  (__NR_SYSCALL_BASE+170)
-#define __NR_getresgid                  (__NR_SYSCALL_BASE+171)
-#define __NR_prctl                      (__NR_SYSCALL_BASE+172)
-#define __NR_rt_sigreturn               (__NR_SYSCALL_BASE+173)
-#define __NR_rt_sigaction               (__NR_SYSCALL_BASE+174)
-#define __NR_rt_sigprocmask             (__NR_SYSCALL_BASE+175)
-#define __NR_rt_sigpending              (__NR_SYSCALL_BASE+176)
-#define __NR_rt_sigtimedwait            (__NR_SYSCALL_BASE+177)
-#define __NR_rt_sigqueueinfo            (__NR_SYSCALL_BASE+178)
-#define __NR_rt_sigsuspend              (__NR_SYSCALL_BASE+179)
-#define __NR_pread64                    (__NR_SYSCALL_BASE+180)
-#define __NR_pwrite64                   (__NR_SYSCALL_BASE+181)
-#define __NR_chown                      (__NR_SYSCALL_BASE+182)
-#define __NR_getcwd                     (__NR_SYSCALL_BASE+183)
-#define __NR_capget                     (__NR_SYSCALL_BASE+184)
-#define __NR_capset                     (__NR_SYSCALL_BASE+185)
-#define __NR_sigaltstack                (__NR_SYSCALL_BASE+186)
-#define __NR_sendfile                   (__NR_SYSCALL_BASE+187)
-                                        /* 188 reserved */
-                                        /* 189 reserved */
-#define __NR_vfork                      (__NR_SYSCALL_BASE+190)
-#define __NR_ugetrlimit                 (__NR_SYSCALL_BASE+191) /* SuS compliant getrlimit */
-#define __NR_mmap2                      (__NR_SYSCALL_BASE+192)
-#define __NR_truncate64                 (__NR_SYSCALL_BASE+193)
-#define __NR_ftruncate64                (__NR_SYSCALL_BASE+194)
-#define __NR_stat64                     (__NR_SYSCALL_BASE+195)
-#define __NR_lstat64                    (__NR_SYSCALL_BASE+196)
-#define __NR_fstat64                    (__NR_SYSCALL_BASE+197)
-#define __NR_lchown32                   (__NR_SYSCALL_BASE+198)
-#define __NR_getuid32                   (__NR_SYSCALL_BASE+199)
-#define __NR_getgid32                   (__NR_SYSCALL_BASE+200)
-#define __NR_geteuid32                  (__NR_SYSCALL_BASE+201)
-#define __NR_getegid32                  (__NR_SYSCALL_BASE+202)
-#define __NR_setreuid32                 (__NR_SYSCALL_BASE+203)
-#define __NR_setregid32                 (__NR_SYSCALL_BASE+204)
-#define __NR_getgroups32                (__NR_SYSCALL_BASE+205)
-#define __NR_setgroups32                (__NR_SYSCALL_BASE+206)
-#define __NR_fchown32                   (__NR_SYSCALL_BASE+207)
-#define __NR_setresuid32                (__NR_SYSCALL_BASE+208)
-#define __NR_getresuid32                (__NR_SYSCALL_BASE+209)
-#define __NR_setresgid32                (__NR_SYSCALL_BASE+210)
-#define __NR_getresgid32                (__NR_SYSCALL_BASE+211)
-#define __NR_chown32                    (__NR_SYSCALL_BASE+212)
-#define __NR_setuid32                   (__NR_SYSCALL_BASE+213)
-#define __NR_setgid32                   (__NR_SYSCALL_BASE+214)
-#define __NR_setfsuid32                 (__NR_SYSCALL_BASE+215)
-#define __NR_setfsgid32                 (__NR_SYSCALL_BASE+216)
-#define __NR_getdents64                 (__NR_SYSCALL_BASE+217)
-#define __NR_pivot_root                 (__NR_SYSCALL_BASE+218)
-#define __NR_mincore                    (__NR_SYSCALL_BASE+219)
-#define __NR_madvise                    (__NR_SYSCALL_BASE+220)
-#define __NR_fcntl64                    (__NR_SYSCALL_BASE+221)
-                                        /* 222 for tux */
-                                        /* 223 is unused */
-#define __NR_gettid                     (__NR_SYSCALL_BASE+224)
-#define __NR_readahead                  (__NR_SYSCALL_BASE+225)
-#define __NR_setxattr                   (__NR_SYSCALL_BASE+226)
-#define __NR_lsetxattr                  (__NR_SYSCALL_BASE+227)
-#define __NR_fsetxattr                  (__NR_SYSCALL_BASE+228)
-#define __NR_getxattr                   (__NR_SYSCALL_BASE+229)
-#define __NR_lgetxattr                  (__NR_SYSCALL_BASE+230)
-#define __NR_fgetxattr                  (__NR_SYSCALL_BASE+231)
-#define __NR_listxattr                  (__NR_SYSCALL_BASE+232)
-#define __NR_llistxattr                 (__NR_SYSCALL_BASE+233)
-#define __NR_flistxattr                 (__NR_SYSCALL_BASE+234)
-#define __NR_removexattr                (__NR_SYSCALL_BASE+235)
-#define __NR_lremovexattr               (__NR_SYSCALL_BASE+236)
-#define __NR_fremovexattr               (__NR_SYSCALL_BASE+237)
-#define __NR_tkill                      (__NR_SYSCALL_BASE+238)
-#define __NR_sendfile64                 (__NR_SYSCALL_BASE+239)
-#define __NR_futex                      (__NR_SYSCALL_BASE+240)
-#define __NR_sched_setaffinity          (__NR_SYSCALL_BASE+241)
-#define __NR_sched_getaffinity          (__NR_SYSCALL_BASE+242)
-#define __NR_io_setup                   (__NR_SYSCALL_BASE+243)
-#define __NR_io_destroy                 (__NR_SYSCALL_BASE+244)
-#define __NR_io_getevents               (__NR_SYSCALL_BASE+245)
-#define __NR_io_submit                  (__NR_SYSCALL_BASE+246)
-#define __NR_io_cancel                  (__NR_SYSCALL_BASE+247)
-#define __NR_exit_group                 (__NR_SYSCALL_BASE+248)
-#define __NR_lookup_dcookie             (__NR_SYSCALL_BASE+249)
-#define __NR_epoll_create               (__NR_SYSCALL_BASE+250)
-#define __NR_epoll_ctl                  (__NR_SYSCALL_BASE+251)
-#define __NR_epoll_wait                 (__NR_SYSCALL_BASE+252)
-#define __NR_remap_file_pages           (__NR_SYSCALL_BASE+253)
-                                        /* 254 for set_thread_area */
-                                        /* 255 for get_thread_area */
-#define __NR_set_tid_address            (__NR_SYSCALL_BASE+256)
-#define __NR_timer_create               (__NR_SYSCALL_BASE+257)
-#define __NR_timer_settime              (__NR_SYSCALL_BASE+258)
-#define __NR_timer_gettime              (__NR_SYSCALL_BASE+259)
-#define __NR_timer_getoverrun           (__NR_SYSCALL_BASE+260)
-#define __NR_timer_delete               (__NR_SYSCALL_BASE+261)
-#define __NR_clock_settime              (__NR_SYSCALL_BASE+262)
-#define __NR_clock_gettime              (__NR_SYSCALL_BASE+263)
-#define __NR_clock_getres               (__NR_SYSCALL_BASE+264)
-#define __NR_clock_nanosleep            (__NR_SYSCALL_BASE+265)
-#define __NR_statfs64                   (__NR_SYSCALL_BASE+266)
-#define __NR_fstatfs64                  (__NR_SYSCALL_BASE+267)
-#define __NR_tgkill                     (__NR_SYSCALL_BASE+268)
-#define __NR_utimes                     (__NR_SYSCALL_BASE+269)
-#define __NR_arm_fadvise64_64           (__NR_SYSCALL_BASE+270)
-#define __NR_pciconfig_iobase           (__NR_SYSCALL_BASE+271)
-#define __NR_pciconfig_read             (__NR_SYSCALL_BASE+272)
-#define __NR_pciconfig_write            (__NR_SYSCALL_BASE+273)
-#define __NR_mq_open                    (__NR_SYSCALL_BASE+274)
-#define __NR_mq_unlink                  (__NR_SYSCALL_BASE+275)
-#define __NR_mq_timedsend               (__NR_SYSCALL_BASE+276)
-#define __NR_mq_timedreceive            (__NR_SYSCALL_BASE+277)
-#define __NR_mq_notify                  (__NR_SYSCALL_BASE+278)
-#define __NR_mq_getsetattr              (__NR_SYSCALL_BASE+279)
-#define __NR_waitid                     (__NR_SYSCALL_BASE+280)
-#define __NR_socket                     (__NR_SYSCALL_BASE+281)
-#define __NR_bind                       (__NR_SYSCALL_BASE+282)
-#define __NR_connect                    (__NR_SYSCALL_BASE+283)
-#define __NR_listen                     (__NR_SYSCALL_BASE+284)
-#define __NR_accept                     (__NR_SYSCALL_BASE+285)
-#define __NR_getsockname                (__NR_SYSCALL_BASE+286)
-#define __NR_getpeername                (__NR_SYSCALL_BASE+287)
-#define __NR_socketpair                 (__NR_SYSCALL_BASE+288)
-#define __NR_send                       (__NR_SYSCALL_BASE+289)
-#define __NR_sendto                     (__NR_SYSCALL_BASE+290)
-#define __NR_recv                       (__NR_SYSCALL_BASE+291)
-#define __NR_recvfrom                   (__NR_SYSCALL_BASE+292)
-#define __NR_shutdown                   (__NR_SYSCALL_BASE+293)
-#define __NR_setsockopt                 (__NR_SYSCALL_BASE+294)
-#define __NR_getsockopt                 (__NR_SYSCALL_BASE+295)
-#define __NR_sendmsg                    (__NR_SYSCALL_BASE+296)
-#define __NR_recvmsg                    (__NR_SYSCALL_BASE+297)
-#define __NR_semop                      (__NR_SYSCALL_BASE+298)
-#define __NR_semget                     (__NR_SYSCALL_BASE+299)
-#define __NR_semctl                     (__NR_SYSCALL_BASE+300)
-#define __NR_msgsnd                     (__NR_SYSCALL_BASE+301)
-#define __NR_msgrcv                     (__NR_SYSCALL_BASE+302)
-#define __NR_msgget                     (__NR_SYSCALL_BASE+303)
-#define __NR_msgctl                     (__NR_SYSCALL_BASE+304)
-#define __NR_shmat                      (__NR_SYSCALL_BASE+305)
-#define __NR_shmdt                      (__NR_SYSCALL_BASE+306)
-#define __NR_shmget                     (__NR_SYSCALL_BASE+307)
-#define __NR_shmctl                     (__NR_SYSCALL_BASE+308)
-#define __NR_add_key                    (__NR_SYSCALL_BASE+309)
-#define __NR_request_key                (__NR_SYSCALL_BASE+310)
-#define __NR_keyctl                     (__NR_SYSCALL_BASE+311)
-#define __NR_semtimedop                 (__NR_SYSCALL_BASE+312)
-#define __NR_vserver                    (__NR_SYSCALL_BASE+313)
-#define __NR_ioprio_set                 (__NR_SYSCALL_BASE+314)
-#define __NR_ioprio_get                 (__NR_SYSCALL_BASE+315)
-#define __NR_inotify_init               (__NR_SYSCALL_BASE+316)
-#define __NR_inotify_add_watch          (__NR_SYSCALL_BASE+317)
-#define __NR_inotify_rm_watch           (__NR_SYSCALL_BASE+318)
-#define __NR_mbind                      (__NR_SYSCALL_BASE+319)
-#define __NR_get_mempolicy              (__NR_SYSCALL_BASE+320)
-#define __NR_set_mempolicy              (__NR_SYSCALL_BASE+321)
-#define __NR_openat                     (__NR_SYSCALL_BASE+322)
-#define __NR_mkdirat                    (__NR_SYSCALL_BASE+323)
-#define __NR_mknodat                    (__NR_SYSCALL_BASE+324)
-#define __NR_fchownat                   (__NR_SYSCALL_BASE+325)
-#define __NR_futimesat                  (__NR_SYSCALL_BASE+326)
-#define __NR_fstatat64                  (__NR_SYSCALL_BASE+327)
-#define __NR_unlinkat                   (__NR_SYSCALL_BASE+328)
-#define __NR_renameat                   (__NR_SYSCALL_BASE+329)
-#define __NR_linkat                     (__NR_SYSCALL_BASE+330)
-#define __NR_symlinkat                  (__NR_SYSCALL_BASE+331)
-#define __NR_readlinkat                 (__NR_SYSCALL_BASE+332)
-#define __NR_fchmodat                   (__NR_SYSCALL_BASE+333)
-#define __NR_faccessat                  (__NR_SYSCALL_BASE+334)
-#define __NR_pselect6                   (__NR_SYSCALL_BASE+335)
-#define __NR_ppoll                      (__NR_SYSCALL_BASE+336)
-#define __NR_unshare                    (__NR_SYSCALL_BASE+337)
-#define __NR_set_robust_list            (__NR_SYSCALL_BASE+338)
-#define __NR_get_robust_list            (__NR_SYSCALL_BASE+339)
-#define __NR_splice                     (__NR_SYSCALL_BASE+340)
-#define __NR_arm_sync_file_range        (__NR_SYSCALL_BASE+341)
-#define __NR_sync_file_range2           __NR_arm_sync_file_range
-#define __NR_tee                        (__NR_SYSCALL_BASE+342)
-#define __NR_vmsplice                   (__NR_SYSCALL_BASE+343)
-#define __NR_move_pages                 (__NR_SYSCALL_BASE+344)
-#define __NR_getcpu                     (__NR_SYSCALL_BASE+345)
-#define __NR_epoll_pwait                (__NR_SYSCALL_BASE+346)
-#define __NR_kexec_load                 (__NR_SYSCALL_BASE+347)
-#define __NR_utimensat                  (__NR_SYSCALL_BASE+348)
-#define __NR_signalfd                   (__NR_SYSCALL_BASE+349)
-#define __NR_timerfd_create             (__NR_SYSCALL_BASE+350)
-#define __NR_eventfd                    (__NR_SYSCALL_BASE+351)
-#define __NR_fallocate                  (__NR_SYSCALL_BASE+352)
-#define __NR_timerfd_settime            (__NR_SYSCALL_BASE+353)
-#define __NR_timerfd_gettime            (__NR_SYSCALL_BASE+354)
-#define __NR_signalfd4                  (__NR_SYSCALL_BASE+355)
-#define __NR_eventfd2                   (__NR_SYSCALL_BASE+356)
-#define __NR_epoll_create1              (__NR_SYSCALL_BASE+357)
-#define __NR_dup3                       (__NR_SYSCALL_BASE+358)
-#define __NR_pipe2                      (__NR_SYSCALL_BASE+359)
-#define __NR_inotify_init1              (__NR_SYSCALL_BASE+360)
-#define __NR_preadv                     (__NR_SYSCALL_BASE+361)
-#define __NR_pwritev                    (__NR_SYSCALL_BASE+362)
-#define __NR_rt_tgsigqueueinfo          (__NR_SYSCALL_BASE+363)
-#define __NR_perf_event_open            (__NR_SYSCALL_BASE+364)
-#define __NR_recvmmsg                   (__NR_SYSCALL_BASE+365)
-#define __NR_accept4                    (__NR_SYSCALL_BASE+366)
-#define __NR_fanotify_init              (__NR_SYSCALL_BASE+367)
-#define __NR_fanotify_mark              (__NR_SYSCALL_BASE+368)
-#define __NR_prlimit64                  (__NR_SYSCALL_BASE+369)
-#define __NR_name_to_handle_at          (__NR_SYSCALL_BASE+370)
-#define __NR_open_by_handle_at          (__NR_SYSCALL_BASE+371)
-#define __NR_clock_adjtime              (__NR_SYSCALL_BASE+372)
-#define __NR_syncfs                     (__NR_SYSCALL_BASE+373)
-#define __NR_sendmmsg                   (__NR_SYSCALL_BASE+374)
-#define __NR_setns                      (__NR_SYSCALL_BASE+375)
-#define __NR_process_vm_readv           (__NR_SYSCALL_BASE+376)
-#define __NR_process_vm_writev          (__NR_SYSCALL_BASE+377)
-                                        /* 378 for kcmp */
-/*
- * This may need to be greater than __NR_last_syscall+1 in order to
- * account for the padding in the syscall table
- */
-#ifdef __KERNEL__
 #define __NR_syscalls  (380)
-#endif /* __KERNEL__ */
-/*
- * The following SWIs are ARM private.
- */
-#define __ARM_NR_BASE                   (__NR_SYSCALL_BASE+0x0f0000)
-#define __ARM_NR_breakpoint             (__ARM_NR_BASE+1)
-#define __ARM_NR_cacheflush             (__ARM_NR_BASE+2)
-#define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
-#define __ARM_NR_usr32                  (__ARM_NR_BASE+4)
-#define __ARM_NR_set_tls                (__ARM_NR_BASE+5)
-/*
- * *NOTE*: This is a ghost syscall private to the kernel.  Only the
- * __kuser_cmpxchg code in entry-armv.S should be aware of its
- * existence.  Don't ever use this from user code.
- */
-#ifdef __KERNEL__
 #define __ARM_NR_cmpxchg                (__ARM_NR_BASE+0x00fff0)
-#endif
-/*
- * The following syscalls are obsolete and no longer available for EABI.
- */
-#if !defined(__KERNEL__)
-#if defined(__ARM_EABI__)
-#undef __NR_time
-#undef __NR_umount
-#undef __NR_stime
-#undef __NR_alarm
-#undef __NR_utime
-#undef __NR_getrlimit
-#undef __NR_select
-#undef __NR_readdir
-#undef __NR_mmap
-#undef __NR_socketcall
-#undef __NR_syscall
-#undef __NR_ipc
-#endif
-#endif
-#ifdef __KERNEL__
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_GETHOSTNAME
@@ -479,7 +42,6 @@
 #define __ARCH_WANT_SYS_SOCKETCALL
 #endif
 #define __ARCH_WANT_SYS_EXECVE
-#define __ARCH_WANT_KERNEL_EXECVE
 /*
 * "Conditional" syscalls
@@ -496,5 +58,4 @@
 #define __IGNORE_migrate_pages
 #define __IGNORE_kcmp
-#endif /* __KERNEL__ */
 #endif /* __ASM_ARM_UNISTD_H */
diff --git a/arch/arm/include/asm/vfpmacros.h b/arch/arm/include/asm/vfpmacros.h
index a7aadbd9a6d..6a6f1e485f4 100644
--- a/arch/arm/include/asm/vfpmacros.h
+++ b/arch/arm/include/asm/vfpmacros.h
@@ -28,7 +28,7 @@
        ldr     \tmp, =elf_hwcap                    @ may not have MVFR regs
        ldr     \tmp, [\tmp, #0]
        tst     \tmp, #HWCAP_VFPv3D16
-        ldceq   p11, cr0, [\base],#32*4             @ FLDMIAD \base!, {d16-d31}
+        ldceql  p11, cr0, [\base],#32*4             @ FLDMIAD \base!, {d16-d31}
        addne   \base, \base, #32*4                 @ step over unused register space
 #else
        VFPFMRX \tmp, MVFR0                         @ Media and VFP Feature Register 0
@@ -52,7 +52,7 @@
        ldr     \tmp, =elf_hwcap                    @ may not have MVFR regs
        ldr     \tmp, [\tmp, #0]
        tst     \tmp, #HWCAP_VFPv3D16
-        stceq   p11, cr0, [\base],#32*4             @ FSTMIAD \base!, {d16-d31}
+        stceql  p11, cr0, [\base],#32*4             @ FSTMIAD \base!, {d16-d31}
        addne   \base, \base, #32*4                 @ step over unused register space
 #else
        VFPFMRX \tmp, MVFR0                         @ Media and VFP Feature Register 0
diff --git a/arch/arm/include/asm/virt.h b/arch/arm/include/asm/virt.h
new file mode 100644
index 00000000000..86164df86cb
--- /dev/null
+++ b/arch/arm/include/asm/virt.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2012 Linaro Limited.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef VIRT_H
+#define VIRT_H
+#include <asm/ptrace.h>
+/*
+ * Flag indicating that the kernel was not entered in the same mode on every
+ * CPU.  The zImage loader stashes this value in an SPSR, so we need an
+ * architecturally defined flag bit here (the N flag, as it happens)
+ */
+#define BOOT_CPU_MODE_MISMATCH (1<<31)
+#ifndef __ASSEMBLY__
+#ifdef CONFIG_ARM_VIRT_EXT
+/*
+ * __boot_cpu_mode records what mode the primary CPU was booted in.
+ * A correctly-implemented bootloader must start all CPUs in the same mode:
+ * if it fails to do this, the flag BOOT_CPU_MODE_MISMATCH is set to indicate
+ * that some CPU(s) were booted in a different mode.
+ *
+ * This allows the kernel to flag an error when the secondaries have come up.
+ */
+extern int __boot_cpu_mode;
+void __hyp_set_vectors(unsigned long phys_vector_base);
+unsigned long __hyp_get_vectors(void);
+#else
+#define __boot_cpu_mode (SVC_MODE)
+#endif
+#ifndef ZIMAGE
+void hyp_mode_check(void);
+/* Reports the availability of HYP mode */
+static inline bool is_hyp_mode_available(void)
+{
+        return ((__boot_cpu_mode & MODE_MASK) == HYP_MODE &&
+                !(__boot_cpu_mode & BOOT_CPU_MODE_MISMATCH));
+}
+/* Check if the bootloader has booted CPUs in different modes */
+static inline bool is_hyp_mode_mismatched(void)
+{
+        return !!(__boot_cpu_mode & BOOT_CPU_MODE_MISMATCH);
+}
+#endif
+#endif /* __ASSEMBLY__ */
+#endif /* ! VIRT_H */
diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild
index baebb3da1d4..47bcb2d254a 100644
--- a/arch/arm/include/uapi/asm/Kbuild
+++ b/arch/arm/include/uapi/asm/Kbuild
@@ -1,3 +1,19 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += a.out.h
+header-y += byteorder.h
+header-y += fcntl.h
+header-y += hwcap.h
+header-y += ioctls.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += posix_types.h
+header-y += ptrace.h
+header-y += setup.h
+header-y += sigcontext.h
+header-y += signal.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += unistd.h
diff --git a/arch/arm/include/asm/a.out.h b/arch/arm/include/uapi/asm/a.out.h
index 083894b2e3b..083894b2e3b 100644
--- a/arch/arm/include/asm/a.out.h
+++ b/arch/arm/include/uapi/asm/a.out.h
diff --git a/arch/arm/include/asm/byteorder.h b/arch/arm/include/uapi/asm/byteorder.h
index 77379748b17..77379748b17 100644
--- a/arch/arm/include/asm/byteorder.h
+++ b/arch/arm/include/uapi/asm/byteorder.h
diff --git a/arch/arm/include/asm/fcntl.h b/arch/arm/include/uapi/asm/fcntl.h
index a80b6607b2e..a80b6607b2e 100644
--- a/arch/arm/include/asm/fcntl.h
+++ b/arch/arm/include/uapi/asm/fcntl.h
diff --git a/arch/arm/include/uapi/asm/hwcap.h b/arch/arm/include/uapi/asm/hwcap.h
new file mode 100644
index 00000000000..f254f6503cc
--- /dev/null
+++ b/arch/arm/include/uapi/asm/hwcap.h
@@ -0,0 +1,29 @@
+#ifndef _UAPI__ASMARM_HWCAP_H
+#define _UAPI__ASMARM_HWCAP_H
+/*
+ * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
+ */
+#define HWCAP_SWP       (1 << 0)
+#define HWCAP_HALF      (1 << 1)
+#define HWCAP_THUMB     (1 << 2)
+#define HWCAP_26BIT     (1 << 3)        /* Play it safe */
+#define HWCAP_FAST_MULT (1 << 4)
+#define HWCAP_FPA       (1 << 5)
+#define HWCAP_VFP       (1 << 6)
+#define HWCAP_EDSP      (1 << 7)
+#define HWCAP_JAVA      (1 << 8)
+#define HWCAP_IWMMXT    (1 << 9)
+#define HWCAP_CRUNCH    (1 << 10)
+#define HWCAP_THUMBEE   (1 << 11)
+#define HWCAP_NEON      (1 << 12)
+#define HWCAP_VFPv3     (1 << 13)
+#define HWCAP_VFPv3D16  (1 << 14)
+#define HWCAP_TLS       (1 << 15)
+#define HWCAP_VFPv4     (1 << 16)
+#define HWCAP_IDIVA     (1 << 17)
+#define HWCAP_IDIVT     (1 << 18)
+#define HWCAP_IDIV      (HWCAP_IDIVA | HWCAP_IDIVT)
+#endif /* _UAPI__ASMARM_HWCAP_H */
diff --git a/arch/arm/include/asm/ioctls.h b/arch/arm/include/uapi/asm/ioctls.h
index 9c962981612..9c962981612 100644
--- a/arch/arm/include/asm/ioctls.h
+++ b/arch/arm/include/uapi/asm/ioctls.h
diff --git a/arch/arm/include/asm/kvm_para.h b/arch/arm/include/uapi/asm/kvm_para.h
index 14fab8f0b95..14fab8f0b95 100644
--- a/arch/arm/include/asm/kvm_para.h
+++ b/arch/arm/include/uapi/asm/kvm_para.h
diff --git a/arch/arm/include/asm/mman.h b/arch/arm/include/uapi/asm/mman.h
index 41f99c573b9..41f99c573b9 100644
--- a/arch/arm/include/asm/mman.h
+++ b/arch/arm/include/uapi/asm/mman.h
diff --git a/arch/arm/include/asm/posix_types.h b/arch/arm/include/uapi/asm/posix_types.h
index d2de9cbbcd9..d2de9cbbcd9 100644
--- a/arch/arm/include/asm/posix_types.h
+++ b/arch/arm/include/uapi/asm/posix_types.h
diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..96ee0929790
--- /dev/null
+++ b/arch/arm/include/uapi/asm/ptrace.h
@@ -0,0 +1,138 @@
+/*
+ *  arch/arm/include/asm/ptrace.h
+ *
+ *  Copyright (C) 1996-2003 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPI__ASM_ARM_PTRACE_H
+#define _UAPI__ASM_ARM_PTRACE_H
+#include <asm/hwcap.h>
+#define PTRACE_GETREGS          12
+#define PTRACE_SETREGS          13
+#define PTRACE_GETFPREGS        14
+#define PTRACE_SETFPREGS        15
+/* PTRACE_ATTACH is 16 */
+/* PTRACE_DETACH is 17 */
+#define PTRACE_GETWMMXREGS      18
+#define PTRACE_SETWMMXREGS      19
+/* 20 is unused */
+#define PTRACE_OLDSETOPTIONS    21
+#define PTRACE_GET_THREAD_AREA  22
+#define PTRACE_SET_SYSCALL      23
+/* PTRACE_SYSCALL is 24 */
+#define PTRACE_GETCRUNCHREGS    25
+#define PTRACE_SETCRUNCHREGS    26
+#define PTRACE_GETVFPREGS       27
+#define PTRACE_SETVFPREGS       28
+#define PTRACE_GETHBPREGS       29
+#define PTRACE_SETHBPREGS       30
+/*
+ * PSR bits
+ */
+#define USR26_MODE      0x00000000
+#define FIQ26_MODE      0x00000001
+#define IRQ26_MODE      0x00000002
+#define SVC26_MODE      0x00000003
+#define USR_MODE        0x00000010
+#define FIQ_MODE        0x00000011
+#define IRQ_MODE        0x00000012
+#define SVC_MODE        0x00000013
+#define ABT_MODE        0x00000017
+#define HYP_MODE        0x0000001a
+#define UND_MODE        0x0000001b
+#define SYSTEM_MODE     0x0000001f
+#define MODE32_BIT      0x00000010
+#define MODE_MASK       0x0000001f
+#define PSR_T_BIT       0x00000020
+#define PSR_F_BIT       0x00000040
+#define PSR_I_BIT       0x00000080
+#define PSR_A_BIT       0x00000100
+#define PSR_E_BIT       0x00000200
+#define PSR_J_BIT       0x01000000
+#define PSR_Q_BIT       0x08000000
+#define PSR_V_BIT       0x10000000
+#define PSR_C_BIT       0x20000000
+#define PSR_Z_BIT       0x40000000
+#define PSR_N_BIT       0x80000000
+/*
+ * Groups of PSR bits
+ */
+#define PSR_f           0xff000000      /* Flags                */
+#define PSR_s           0x00ff0000      /* Status               */
+#define PSR_x           0x0000ff00      /* Extension            */
+#define PSR_c           0x000000ff      /* Control              */
+/*
+ * ARMv7 groups of PSR bits
+ */
+#define APSR_MASK       0xf80f0000      /* N, Z, C, V, Q and GE flags */
+#define PSR_ISET_MASK   0x01000010      /* ISA state (J, T) mask */
+#define PSR_IT_MASK     0x0600fc00      /* If-Then execution state mask */
+#define PSR_ENDIAN_MASK 0x00000200      /* Endianness state mask */
+/*
+ * Default endianness state
+ */
+#ifdef CONFIG_CPU_ENDIAN_BE8
+#define PSR_ENDSTATE    PSR_E_BIT
+#else
+#define PSR_ENDSTATE    0
+#endif
+/* 
+ * These are 'magic' values for PTRACE_PEEKUSR that return info about where a
+ * process is located in memory.
+ */
+#define PT_TEXT_ADDR            0x10000
+#define PT_DATA_ADDR            0x10004
+#define PT_TEXT_END_ADDR        0x10008
+#ifndef __ASSEMBLY__
+/*
+ * This struct defines the way the registers are stored on the
+ * stack during a system call.  Note that sizeof(struct pt_regs)
+ * has to be a multiple of 8.
+ */
+#ifndef __KERNEL__
+struct pt_regs {
+        long uregs[18];
+};
+#endif /* __KERNEL__ */
+#define ARM_cpsr        uregs[16]
+#define ARM_pc          uregs[15]
+#define ARM_lr          uregs[14]
+#define ARM_sp          uregs[13]
+#define ARM_ip          uregs[12]
+#define ARM_fp          uregs[11]
+#define ARM_r10         uregs[10]
+#define ARM_r9          uregs[9]
+#define ARM_r8          uregs[8]
+#define ARM_r7          uregs[7]
+#define ARM_r6          uregs[6]
+#define ARM_r5          uregs[5]
+#define ARM_r4          uregs[4]
+#define ARM_r3          uregs[3]
+#define ARM_r2          uregs[2]
+#define ARM_r1          uregs[1]
+#define ARM_r0          uregs[0]
+#define ARM_ORIG_r0     uregs[17]
+/*
+ * The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
+ * and core dumps.
+ */
+#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
+#endif /* __ASSEMBLY__ */
+#endif /* _UAPI__ASM_ARM_PTRACE_H */
diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
new file mode 100644
index 00000000000..979ff401640
--- /dev/null
+++ b/arch/arm/include/uapi/asm/setup.h
@@ -0,0 +1,187 @@
+/*
+ *  linux/include/asm/setup.h
+ *
+ *  Copyright (C) 1997-1999 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *  Structure passed to kernel to tell it about the
+ *  hardware it's running on.  See Documentation/arm/Setup
+ *  for more info.
+ */
+#ifndef _UAPI__ASMARM_SETUP_H
+#define _UAPI__ASMARM_SETUP_H
+#include <linux/types.h>
+#define COMMAND_LINE_SIZE 1024
+/* The list ends with an ATAG_NONE node. */
+#define ATAG_NONE       0x00000000
+struct tag_header {
+        __u32 size;
+        __u32 tag;
+};
+/* The list must start with an ATAG_CORE node */
+#define ATAG_CORE       0x54410001
+struct tag_core {
+        __u32 flags;            /* bit 0 = read-only */
+        __u32 pagesize;
+        __u32 rootdev;
+};
+/* it is allowed to have multiple ATAG_MEM nodes */
+#define ATAG_MEM        0x54410002
+struct tag_mem32 {
+        __u32   size;
+        __u32   start;  /* physical start address */
+};
+/* VGA text type displays */
+#define ATAG_VIDEOTEXT  0x54410003
+struct tag_videotext {
+        __u8            x;
+        __u8            y;
+        __u16           video_page;
+        __u8            video_mode;
+        __u8            video_cols;
+        __u16           video_ega_bx;
+        __u8            video_lines;
+        __u8            video_isvga;
+        __u16           video_points;
+};
+/* describes how the ramdisk will be used in kernel */
+#define ATAG_RAMDISK    0x54410004
+struct tag_ramdisk {
+        __u32 flags;    /* bit 0 = load, bit 1 = prompt */
+        __u32 size;     /* decompressed ramdisk size in _kilo_ bytes */
+        __u32 start;    /* starting block of floppy-based RAM disk image */
+};
+/* describes where the compressed ramdisk image lives (virtual address) */
+/*
+ * this one accidentally used virtual addresses - as such,
+ * it's deprecated.
+ */
+#define ATAG_INITRD     0x54410005
+/* describes where the compressed ramdisk image lives (physical address) */
+#define ATAG_INITRD2    0x54420005
+struct tag_initrd {
+        __u32 start;    /* physical start address */
+        __u32 size;     /* size of compressed ramdisk image in bytes */
+};
+/* board serial number. "64 bits should be enough for everybody" */
+#define ATAG_SERIAL     0x54410006
+struct tag_serialnr {
+        __u32 low;
+        __u32 high;
+};
+/* board revision */
+#define ATAG_REVISION   0x54410007
+struct tag_revision {
+        __u32 rev;
+};
+/* initial values for vesafb-type framebuffers. see struct screen_info
+ * in include/linux/tty.h
+ */
+#define ATAG_VIDEOLFB   0x54410008
+struct tag_videolfb {
+        __u16           lfb_width;
+        __u16           lfb_height;
+        __u16           lfb_depth;
+        __u16           lfb_linelength;
+        __u32           lfb_base;
+        __u32           lfb_size;
+        __u8            red_size;
+        __u8            red_pos;
+        __u8            green_size;
+        __u8            green_pos;
+        __u8            blue_size;
+        __u8            blue_pos;
+        __u8            rsvd_size;
+        __u8            rsvd_pos;
+};
+/* command line: \0 terminated string */
+#define ATAG_CMDLINE    0x54410009
+struct tag_cmdline {
+        char    cmdline[1];     /* this is the minimum size */
+};
+/* acorn RiscPC specific information */
+#define ATAG_ACORN      0x41000101
+struct tag_acorn {
+        __u32 memc_control_reg;
+        __u32 vram_pages;
+        __u8 sounddefault;
+        __u8 adfsdrives;
+};
+/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
+#define ATAG_MEMCLK     0x41000402
+struct tag_memclk {
+        __u32 fmemclk;
+};
+struct tag {
+        struct tag_header hdr;
+        union {
+                struct tag_core         core;
+                struct tag_mem32        mem;
+                struct tag_videotext    videotext;
+                struct tag_ramdisk      ramdisk;
+                struct tag_initrd       initrd;
+                struct tag_serialnr     serialnr;
+                struct tag_revision     revision;
+                struct tag_videolfb     videolfb;
+                struct tag_cmdline      cmdline;
+                /*
+                 * Acorn specific
+                 */
+                struct tag_acorn        acorn;
+                /*
+                 * DC21285 specific
+                 */
+                struct tag_memclk       memclk;
+        } u;
+};
+struct tagtable {
+        __u32 tag;
+        int (*parse)(const struct tag *);
+};
+#define tag_member_present(tag,member)                          \
+        ((unsigned long)(&((struct tag *)0L)->member + 1)       \
+                <= (tag)->hdr.size * 4)
+#define tag_next(t)     ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
+#define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
+#define for_each_tag(t,base)            \
+        for (t = base; t->hdr.size; t = tag_next(t))
+#endif /* _UAPI__ASMARM_SETUP_H */
diff --git a/arch/arm/include/asm/sigcontext.h b/arch/arm/include/uapi/asm/sigcontext.h
index fc0b80b6a6f..fc0b80b6a6f 100644
--- a/arch/arm/include/asm/sigcontext.h
+++ b/arch/arm/include/uapi/asm/sigcontext.h
diff --git a/arch/arm/include/uapi/asm/signal.h b/arch/arm/include/uapi/asm/signal.h
new file mode 100644
index 00000000000..921c57fdc52
--- /dev/null
+++ b/arch/arm/include/uapi/asm/signal.h
@@ -0,0 +1,127 @@
+#ifndef _UAPI_ASMARM_SIGNAL_H
+#define _UAPI_ASMARM_SIGNAL_H
+#include <linux/types.h>
+/* Avoid too many header ordering problems.  */
+struct siginfo;
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+#define NSIG            32
+typedef unsigned long sigset_t;
+#endif /* __KERNEL__ */
+#define SIGHUP           1
+#define SIGINT           2
+#define SIGQUIT          3
+#define SIGILL           4
+#define SIGTRAP          5
+#define SIGABRT          6
+#define SIGIOT           6
+#define SIGBUS           7
+#define SIGFPE           8
+#define SIGKILL          9
+#define SIGUSR1         10
+#define SIGSEGV         11
+#define SIGUSR2         12
+#define SIGPIPE         13
+#define SIGALRM         14
+#define SIGTERM         15
+#define SIGSTKFLT       16
+#define SIGCHLD         17
+#define SIGCONT         18
+#define SIGSTOP         19
+#define SIGTSTP         20
+#define SIGTTIN         21
+#define SIGTTOU         22
+#define SIGURG          23
+#define SIGXCPU         24
+#define SIGXFSZ         25
+#define SIGVTALRM       26
+#define SIGPROF         27
+#define SIGWINCH        28
+#define SIGIO           29
+#define SIGPOLL         SIGIO
+/*
+#define SIGLOST         29
+*/
+#define SIGPWR          30
+#define SIGSYS          31
+#define SIGUNUSED       31
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        _NSIG
+#define SIGSWI          32
+/*
+ * SA_FLAGS values:
+ *
+ * SA_NOCLDSTOP         flag to turn off SIGCHLD when children stop.
+ * SA_NOCLDWAIT         flag on SIGCHLD to inhibit zombies.
+ * SA_SIGINFO           deliver the signal with SIGINFO structs
+ * SA_THIRTYTWO         delivers the signal in 32-bit mode, even if the task 
+ *                      is running in 26-bit.
+ * SA_ONSTACK           allows alternate signal stacks (see sigaltstack(2)).
+ * SA_RESTART           flag to get restarting signals (which were the default long ago)
+ * SA_NODEFER           prevents the current signal from being masked in the handler.
+ * SA_RESETHAND         clears the handler when the signal is delivered.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_NOCLDSTOP    0x00000001
+#define SA_NOCLDWAIT    0x00000002
+#define SA_SIGINFO      0x00000004
+#define SA_THIRTYTWO    0x02000000
+#define SA_RESTORER     0x04000000
+#define SA_ONSTACK      0x08000000
+#define SA_RESTART      0x10000000
+#define SA_NODEFER      0x40000000
+#define SA_RESETHAND    0x80000000
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+/* 
+ * sigaltstack controls
+ */
+#define SS_ONSTACK      1
+#define SS_DISABLE      2
+#define MINSIGSTKSZ     2048
+#define SIGSTKSZ        8192
+#include <asm-generic/signal-defs.h>
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+struct sigaction {
+        union {
+          __sighandler_t _sa_handler;
+          void (*_sa_sigaction)(int, struct siginfo *, void *);
+        } _u;
+        sigset_t sa_mask;
+        unsigned long sa_flags;
+        void (*sa_restorer)(void);
+};
+#define sa_handler      _u._sa_handler
+#define sa_sigaction    _u._sa_sigaction
+#endif /* __KERNEL__ */
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        int ss_flags;
+        size_t ss_size;
+} stack_t;
+#endif /* _UAPI_ASMARM_SIGNAL_H */
diff --git a/arch/arm/include/asm/stat.h b/arch/arm/include/uapi/asm/stat.h
index 42c0c13999d..42c0c13999d 100644
--- a/arch/arm/include/asm/stat.h
+++ b/arch/arm/include/uapi/asm/stat.h
diff --git a/arch/arm/include/asm/statfs.h b/arch/arm/include/uapi/asm/statfs.h
index 079447c05ba..079447c05ba 100644
--- a/arch/arm/include/asm/statfs.h
+++ b/arch/arm/include/uapi/asm/statfs.h
diff --git a/arch/arm/include/uapi/asm/swab.h b/arch/arm/include/uapi/asm/swab.h
new file mode 100644
index 00000000000..6fcb32a5c45
--- /dev/null
+++ b/arch/arm/include/uapi/asm/swab.h
@@ -0,0 +1,53 @@
+/*
+ *  arch/arm/include/asm/byteorder.h
+ *
+ * ARM Endian-ness.  In little endian mode, the data bus is connected such
+ * that byte accesses appear as:
+ *  0 = d0...d7, 1 = d8...d15, 2 = d16...d23, 3 = d24...d31
+ * and word accesses (data or instruction) appear as:
+ *  d0...d31
+ *
+ * When in big endian mode, byte accesses appear as:
+ *  0 = d24...d31, 1 = d16...d23, 2 = d8...d15, 3 = d0...d7
+ * and word accesses (data or instruction) appear as:
+ *  d0...d31
+ */
+#ifndef _UAPI__ASM_ARM_SWAB_H
+#define _UAPI__ASM_ARM_SWAB_H
+#include <linux/compiler.h>
+#include <linux/types.h>
+#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
+#  define __SWAB_64_THRU_32__
+#endif
+#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6
+static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
+{
+        __u32 t;
+#ifndef __thumb__
+        if (!__builtin_constant_p(x)) {
+                /*
+                 * The compiler needs a bit of a hint here to always do the
+                 * right thing and not screw it up to different degrees
+                 * depending on the gcc version.
+                 */
+                asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
+        } else
+#endif
+                t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */
+        x = (x << 24) | (x >> 8);               /* mov r0,r0,ror #8      */
+        t &= ~0x00FF0000;                       /* bic r1,r1,#0x00FF0000 */
+        x ^= (t >> 8);                          /* eor r0,r0,r1,lsr #8   */
+        return x;
+}
+#define __arch_swab32 __arch_swab32
+#endif
+#endif /* _UAPI__ASM_ARM_SWAB_H */
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..ac03bdb4ae4
--- /dev/null
+++ b/arch/arm/include/uapi/asm/unistd.h
@@ -0,0 +1,450 @@
+/*
+ *  arch/arm/include/asm/unistd.h
+ *
+ *  Copyright (C) 2001-2005 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Please forward _all_ changes to this file to rmk@arm.linux.org.uk,
+ * no matter what the change is.  Thanks!
+ */
+#ifndef _UAPI__ASM_ARM_UNISTD_H
+#define _UAPI__ASM_ARM_UNISTD_H
+#define __NR_OABI_SYSCALL_BASE  0x900000
+#if defined(__thumb__) || defined(__ARM_EABI__)
+#define __NR_SYSCALL_BASE       0
+#else
+#define __NR_SYSCALL_BASE       __NR_OABI_SYSCALL_BASE
+#endif
+/*
+ * This file contains the system call numbers.
+ */
+#define __NR_restart_syscall            (__NR_SYSCALL_BASE+  0)
+#define __NR_exit                       (__NR_SYSCALL_BASE+  1)
+#define __NR_fork                       (__NR_SYSCALL_BASE+  2)
+#define __NR_read                       (__NR_SYSCALL_BASE+  3)
+#define __NR_write                      (__NR_SYSCALL_BASE+  4)
+#define __NR_open                       (__NR_SYSCALL_BASE+  5)
+#define __NR_close                      (__NR_SYSCALL_BASE+  6)
+                                        /* 7 was sys_waitpid */
+#define __NR_creat                      (__NR_SYSCALL_BASE+  8)
+#define __NR_link                       (__NR_SYSCALL_BASE+  9)
+#define __NR_unlink                     (__NR_SYSCALL_BASE+ 10)
+#define __NR_execve                     (__NR_SYSCALL_BASE+ 11)
+#define __NR_chdir                      (__NR_SYSCALL_BASE+ 12)
+#define __NR_time                       (__NR_SYSCALL_BASE+ 13)
+#define __NR_mknod                      (__NR_SYSCALL_BASE+ 14)
+#define __NR_chmod                      (__NR_SYSCALL_BASE+ 15)
+#define __NR_lchown                     (__NR_SYSCALL_BASE+ 16)
+                                        /* 17 was sys_break */
+                                        /* 18 was sys_stat */
+#define __NR_lseek                      (__NR_SYSCALL_BASE+ 19)
+#define __NR_getpid                     (__NR_SYSCALL_BASE+ 20)
+#define __NR_mount                      (__NR_SYSCALL_BASE+ 21)
+#define __NR_umount                     (__NR_SYSCALL_BASE+ 22)
+#define __NR_setuid                     (__NR_SYSCALL_BASE+ 23)
+#define __NR_getuid                     (__NR_SYSCALL_BASE+ 24)
+#define __NR_stime                      (__NR_SYSCALL_BASE+ 25)
+#define __NR_ptrace                     (__NR_SYSCALL_BASE+ 26)
+#define __NR_alarm                      (__NR_SYSCALL_BASE+ 27)
+                                        /* 28 was sys_fstat */
+#define __NR_pause                      (__NR_SYSCALL_BASE+ 29)
+#define __NR_utime                      (__NR_SYSCALL_BASE+ 30)
+                                        /* 31 was sys_stty */
+                                        /* 32 was sys_gtty */
+#define __NR_access                     (__NR_SYSCALL_BASE+ 33)
+#define __NR_nice                       (__NR_SYSCALL_BASE+ 34)
+                                        /* 35 was sys_ftime */
+#define __NR_sync                       (__NR_SYSCALL_BASE+ 36)
+#define __NR_kill                       (__NR_SYSCALL_BASE+ 37)
+#define __NR_rename                     (__NR_SYSCALL_BASE+ 38)
+#define __NR_mkdir                      (__NR_SYSCALL_BASE+ 39)
+#define __NR_rmdir                      (__NR_SYSCALL_BASE+ 40)
+#define __NR_dup                        (__NR_SYSCALL_BASE+ 41)
+#define __NR_pipe                       (__NR_SYSCALL_BASE+ 42)
+#define __NR_times                      (__NR_SYSCALL_BASE+ 43)
+                                        /* 44 was sys_prof */
+#define __NR_brk                        (__NR_SYSCALL_BASE+ 45)
+#define __NR_setgid                     (__NR_SYSCALL_BASE+ 46)
+#define __NR_getgid                     (__NR_SYSCALL_BASE+ 47)
+                                        /* 48 was sys_signal */
+#define __NR_geteuid                    (__NR_SYSCALL_BASE+ 49)
+#define __NR_getegid                    (__NR_SYSCALL_BASE+ 50)
+#define __NR_acct                       (__NR_SYSCALL_BASE+ 51)
+#define __NR_umount2                    (__NR_SYSCALL_BASE+ 52)
+                                        /* 53 was sys_lock */
+#define __NR_ioctl                      (__NR_SYSCALL_BASE+ 54)
+#define __NR_fcntl                      (__NR_SYSCALL_BASE+ 55)
+                                        /* 56 was sys_mpx */
+#define __NR_setpgid                    (__NR_SYSCALL_BASE+ 57)
+                                        /* 58 was sys_ulimit */
+                                        /* 59 was sys_olduname */
+#define __NR_umask                      (__NR_SYSCALL_BASE+ 60)
+#define __NR_chroot                     (__NR_SYSCALL_BASE+ 61)
+#define __NR_ustat                      (__NR_SYSCALL_BASE+ 62)
+#define __NR_dup2                       (__NR_SYSCALL_BASE+ 63)
+#define __NR_getppid                    (__NR_SYSCALL_BASE+ 64)
+#define __NR_getpgrp                    (__NR_SYSCALL_BASE+ 65)
+#define __NR_setsid                     (__NR_SYSCALL_BASE+ 66)
+#define __NR_sigaction                  (__NR_SYSCALL_BASE+ 67)
+                                        /* 68 was sys_sgetmask */
+                                        /* 69 was sys_ssetmask */
+#define __NR_setreuid                   (__NR_SYSCALL_BASE+ 70)
+#define __NR_setregid                   (__NR_SYSCALL_BASE+ 71)
+#define __NR_sigsuspend                 (__NR_SYSCALL_BASE+ 72)
+#define __NR_sigpending                 (__NR_SYSCALL_BASE+ 73)
+#define __NR_sethostname                (__NR_SYSCALL_BASE+ 74)
+#define __NR_setrlimit                  (__NR_SYSCALL_BASE+ 75)
+#define __NR_getrlimit                  (__NR_SYSCALL_BASE+ 76) /* Back compat 2GB limited rlimit */
+#define __NR_getrusage                  (__NR_SYSCALL_BASE+ 77)
+#define __NR_gettimeofday               (__NR_SYSCALL_BASE+ 78)
+#define __NR_settimeofday               (__NR_SYSCALL_BASE+ 79)
+#define __NR_getgroups                  (__NR_SYSCALL_BASE+ 80)
+#define __NR_setgroups                  (__NR_SYSCALL_BASE+ 81)
+#define __NR_select                     (__NR_SYSCALL_BASE+ 82)
+#define __NR_symlink                    (__NR_SYSCALL_BASE+ 83)
+                                        /* 84 was sys_lstat */
+#define __NR_readlink                   (__NR_SYSCALL_BASE+ 85)
+#define __NR_uselib                     (__NR_SYSCALL_BASE+ 86)
+#define __NR_swapon                     (__NR_SYSCALL_BASE+ 87)
+#define __NR_reboot                     (__NR_SYSCALL_BASE+ 88)
+#define __NR_readdir                    (__NR_SYSCALL_BASE+ 89)
+#define __NR_mmap                       (__NR_SYSCALL_BASE+ 90)
+#define __NR_munmap                     (__NR_SYSCALL_BASE+ 91)
+#define __NR_truncate                   (__NR_SYSCALL_BASE+ 92)
+#define __NR_ftruncate                  (__NR_SYSCALL_BASE+ 93)
+#define __NR_fchmod                     (__NR_SYSCALL_BASE+ 94)
+#define __NR_fchown                     (__NR_SYSCALL_BASE+ 95)
+#define __NR_getpriority                (__NR_SYSCALL_BASE+ 96)
+#define __NR_setpriority                (__NR_SYSCALL_BASE+ 97)
+                                        /* 98 was sys_profil */
+#define __NR_statfs                     (__NR_SYSCALL_BASE+ 99)
+#define __NR_fstatfs                    (__NR_SYSCALL_BASE+100)
+                                        /* 101 was sys_ioperm */
+#define __NR_socketcall                 (__NR_SYSCALL_BASE+102)
+#define __NR_syslog                     (__NR_SYSCALL_BASE+103)
+#define __NR_setitimer                  (__NR_SYSCALL_BASE+104)
+#define __NR_getitimer                  (__NR_SYSCALL_BASE+105)
+#define __NR_stat                       (__NR_SYSCALL_BASE+106)
+#define __NR_lstat                      (__NR_SYSCALL_BASE+107)
+#define __NR_fstat                      (__NR_SYSCALL_BASE+108)
+                                        /* 109 was sys_uname */
+                                        /* 110 was sys_iopl */
+#define __NR_vhangup                    (__NR_SYSCALL_BASE+111)
+                                        /* 112 was sys_idle */
+#define __NR_syscall                    (__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */
+#define __NR_wait4                      (__NR_SYSCALL_BASE+114)
+#define __NR_swapoff                    (__NR_SYSCALL_BASE+115)
+#define __NR_sysinfo                    (__NR_SYSCALL_BASE+116)
+#define __NR_ipc                        (__NR_SYSCALL_BASE+117)
+#define __NR_fsync                      (__NR_SYSCALL_BASE+118)
+#define __NR_sigreturn                  (__NR_SYSCALL_BASE+119)
+#define __NR_clone                      (__NR_SYSCALL_BASE+120)
+#define __NR_setdomainname              (__NR_SYSCALL_BASE+121)
+#define __NR_uname                      (__NR_SYSCALL_BASE+122)
+                                        /* 123 was sys_modify_ldt */
+#define __NR_adjtimex                   (__NR_SYSCALL_BASE+124)
+#define __NR_mprotect                   (__NR_SYSCALL_BASE+125)
+#define __NR_sigprocmask                (__NR_SYSCALL_BASE+126)
+                                        /* 127 was sys_create_module */
+#define __NR_init_module                (__NR_SYSCALL_BASE+128)
+#define __NR_delete_module              (__NR_SYSCALL_BASE+129)
+                                        /* 130 was sys_get_kernel_syms */
+#define __NR_quotactl                   (__NR_SYSCALL_BASE+131)
+#define __NR_getpgid                    (__NR_SYSCALL_BASE+132)
+#define __NR_fchdir                     (__NR_SYSCALL_BASE+133)
+#define __NR_bdflush                    (__NR_SYSCALL_BASE+134)
+#define __NR_sysfs                      (__NR_SYSCALL_BASE+135)
+#define __NR_personality                (__NR_SYSCALL_BASE+136)
+                                        /* 137 was sys_afs_syscall */
+#define __NR_setfsuid                   (__NR_SYSCALL_BASE+138)
+#define __NR_setfsgid                   (__NR_SYSCALL_BASE+139)
+#define __NR__llseek                    (__NR_SYSCALL_BASE+140)
+#define __NR_getdents                   (__NR_SYSCALL_BASE+141)
+#define __NR__newselect                 (__NR_SYSCALL_BASE+142)
+#define __NR_flock                      (__NR_SYSCALL_BASE+143)
+#define __NR_msync                      (__NR_SYSCALL_BASE+144)
+#define __NR_readv                      (__NR_SYSCALL_BASE+145)
+#define __NR_writev                     (__NR_SYSCALL_BASE+146)
+#define __NR_getsid                     (__NR_SYSCALL_BASE+147)
+#define __NR_fdatasync                  (__NR_SYSCALL_BASE+148)
+#define __NR__sysctl                    (__NR_SYSCALL_BASE+149)
+#define __NR_mlock                      (__NR_SYSCALL_BASE+150)
+#define __NR_munlock                    (__NR_SYSCALL_BASE+151)
+#define __NR_mlockall                   (__NR_SYSCALL_BASE+152)
+#define __NR_munlockall                 (__NR_SYSCALL_BASE+153)
+#define __NR_sched_setparam             (__NR_SYSCALL_BASE+154)
+#define __NR_sched_getparam             (__NR_SYSCALL_BASE+155)
+#define __NR_sched_setscheduler         (__NR_SYSCALL_BASE+156)
+#define __NR_sched_getscheduler         (__NR_SYSCALL_BASE+157)
+#define __NR_sched_yield                (__NR_SYSCALL_BASE+158)
+#define __NR_sched_get_priority_max     (__NR_SYSCALL_BASE+159)
+#define __NR_sched_get_priority_min     (__NR_SYSCALL_BASE+160)
+#define __NR_sched_rr_get_interval      (__NR_SYSCALL_BASE+161)
+#define __NR_nanosleep                  (__NR_SYSCALL_BASE+162)
+#define __NR_mremap                     (__NR_SYSCALL_BASE+163)
+#define __NR_setresuid                  (__NR_SYSCALL_BASE+164)
+#define __NR_getresuid                  (__NR_SYSCALL_BASE+165)
+                                        /* 166 was sys_vm86 */
+                                        /* 167 was sys_query_module */
+#define __NR_poll                       (__NR_SYSCALL_BASE+168)
+#define __NR_nfsservctl                 (__NR_SYSCALL_BASE+169)
+#define __NR_setresgid                  (__NR_SYSCALL_BASE+170)
+#define __NR_getresgid                  (__NR_SYSCALL_BASE+171)
+#define __NR_prctl                      (__NR_SYSCALL_BASE+172)
+#define __NR_rt_sigreturn               (__NR_SYSCALL_BASE+173)
+#define __NR_rt_sigaction               (__NR_SYSCALL_BASE+174)
+#define __NR_rt_sigprocmask             (__NR_SYSCALL_BASE+175)
+#define __NR_rt_sigpending              (__NR_SYSCALL_BASE+176)
+#define __NR_rt_sigtimedwait            (__NR_SYSCALL_BASE+177)
+#define __NR_rt_sigqueueinfo            (__NR_SYSCALL_BASE+178)
+#define __NR_rt_sigsuspend              (__NR_SYSCALL_BASE+179)
+#define __NR_pread64                    (__NR_SYSCALL_BASE+180)
+#define __NR_pwrite64                   (__NR_SYSCALL_BASE+181)
+#define __NR_chown                      (__NR_SYSCALL_BASE+182)
+#define __NR_getcwd                     (__NR_SYSCALL_BASE+183)
+#define __NR_capget                     (__NR_SYSCALL_BASE+184)
+#define __NR_capset                     (__NR_SYSCALL_BASE+185)
+#define __NR_sigaltstack                (__NR_SYSCALL_BASE+186)
+#define __NR_sendfile                   (__NR_SYSCALL_BASE+187)
+                                        /* 188 reserved */
+                                        /* 189 reserved */
+#define __NR_vfork                      (__NR_SYSCALL_BASE+190)
+#define __NR_ugetrlimit                 (__NR_SYSCALL_BASE+191) /* SuS compliant getrlimit */
+#define __NR_mmap2                      (__NR_SYSCALL_BASE+192)
+#define __NR_truncate64                 (__NR_SYSCALL_BASE+193)
+#define __NR_ftruncate64                (__NR_SYSCALL_BASE+194)
+#define __NR_stat64                     (__NR_SYSCALL_BASE+195)
+#define __NR_lstat64                    (__NR_SYSCALL_BASE+196)
+#define __NR_fstat64                    (__NR_SYSCALL_BASE+197)
+#define __NR_lchown32                   (__NR_SYSCALL_BASE+198)
+#define __NR_getuid32                   (__NR_SYSCALL_BASE+199)
+#define __NR_getgid32                   (__NR_SYSCALL_BASE+200)
+#define __NR_geteuid32                  (__NR_SYSCALL_BASE+201)
+#define __NR_getegid32                  (__NR_SYSCALL_BASE+202)
+#define __NR_setreuid32                 (__NR_SYSCALL_BASE+203)
+#define __NR_setregid32                 (__NR_SYSCALL_BASE+204)
+#define __NR_getgroups32                (__NR_SYSCALL_BASE+205)
+#define __NR_setgroups32                (__NR_SYSCALL_BASE+206)
+#define __NR_fchown32                   (__NR_SYSCALL_BASE+207)
+#define __NR_setresuid32                (__NR_SYSCALL_BASE+208)
+#define __NR_getresuid32                (__NR_SYSCALL_BASE+209)
+#define __NR_setresgid32                (__NR_SYSCALL_BASE+210)
+#define __NR_getresgid32                (__NR_SYSCALL_BASE+211)
+#define __NR_chown32                    (__NR_SYSCALL_BASE+212)
+#define __NR_setuid32                   (__NR_SYSCALL_BASE+213)
+#define __NR_setgid32                   (__NR_SYSCALL_BASE+214)
+#define __NR_setfsuid32                 (__NR_SYSCALL_BASE+215)
+#define __NR_setfsgid32                 (__NR_SYSCALL_BASE+216)
+#define __NR_getdents64                 (__NR_SYSCALL_BASE+217)
+#define __NR_pivot_root                 (__NR_SYSCALL_BASE+218)
+#define __NR_mincore                    (__NR_SYSCALL_BASE+219)
+#define __NR_madvise                    (__NR_SYSCALL_BASE+220)
+#define __NR_fcntl64                    (__NR_SYSCALL_BASE+221)
+                                        /* 222 for tux */
+                                        /* 223 is unused */
+#define __NR_gettid                     (__NR_SYSCALL_BASE+224)
+#define __NR_readahead                  (__NR_SYSCALL_BASE+225)
+#define __NR_setxattr                   (__NR_SYSCALL_BASE+226)
+#define __NR_lsetxattr                  (__NR_SYSCALL_BASE+227)
+#define __NR_fsetxattr                  (__NR_SYSCALL_BASE+228)
+#define __NR_getxattr                   (__NR_SYSCALL_BASE+229)
+#define __NR_lgetxattr                  (__NR_SYSCALL_BASE+230)
+#define __NR_fgetxattr                  (__NR_SYSCALL_BASE+231)
+#define __NR_listxattr                  (__NR_SYSCALL_BASE+232)
+#define __NR_llistxattr                 (__NR_SYSCALL_BASE+233)
+#define __NR_flistxattr                 (__NR_SYSCALL_BASE+234)
+#define __NR_removexattr                (__NR_SYSCALL_BASE+235)
+#define __NR_lremovexattr               (__NR_SYSCALL_BASE+236)
+#define __NR_fremovexattr               (__NR_SYSCALL_BASE+237)
+#define __NR_tkill                      (__NR_SYSCALL_BASE+238)
+#define __NR_sendfile64                 (__NR_SYSCALL_BASE+239)
+#define __NR_futex                      (__NR_SYSCALL_BASE+240)
+#define __NR_sched_setaffinity          (__NR_SYSCALL_BASE+241)
+#define __NR_sched_getaffinity          (__NR_SYSCALL_BASE+242)
+#define __NR_io_setup                   (__NR_SYSCALL_BASE+243)
+#define __NR_io_destroy                 (__NR_SYSCALL_BASE+244)
+#define __NR_io_getevents               (__NR_SYSCALL_BASE+245)
+#define __NR_io_submit                  (__NR_SYSCALL_BASE+246)
+#define __NR_io_cancel                  (__NR_SYSCALL_BASE+247)
+#define __NR_exit_group                 (__NR_SYSCALL_BASE+248)
+#define __NR_lookup_dcookie             (__NR_SYSCALL_BASE+249)
+#define __NR_epoll_create               (__NR_SYSCALL_BASE+250)
+#define __NR_epoll_ctl                  (__NR_SYSCALL_BASE+251)
+#define __NR_epoll_wait                 (__NR_SYSCALL_BASE+252)
+#define __NR_remap_file_pages           (__NR_SYSCALL_BASE+253)
+                                        /* 254 for set_thread_area */
+                                        /* 255 for get_thread_area */
+#define __NR_set_tid_address            (__NR_SYSCALL_BASE+256)
+#define __NR_timer_create               (__NR_SYSCALL_BASE+257)
+#define __NR_timer_settime              (__NR_SYSCALL_BASE+258)
+#define __NR_timer_gettime              (__NR_SYSCALL_BASE+259)
+#define __NR_timer_getoverrun           (__NR_SYSCALL_BASE+260)
+#define __NR_timer_delete               (__NR_SYSCALL_BASE+261)
+#define __NR_clock_settime              (__NR_SYSCALL_BASE+262)
+#define __NR_clock_gettime              (__NR_SYSCALL_BASE+263)
+#define __NR_clock_getres               (__NR_SYSCALL_BASE+264)
+#define __NR_clock_nanosleep            (__NR_SYSCALL_BASE+265)
+#define __NR_statfs64                   (__NR_SYSCALL_BASE+266)
+#define __NR_fstatfs64                  (__NR_SYSCALL_BASE+267)
+#define __NR_tgkill                     (__NR_SYSCALL_BASE+268)
+#define __NR_utimes                     (__NR_SYSCALL_BASE+269)
+#define __NR_arm_fadvise64_64           (__NR_SYSCALL_BASE+270)
+#define __NR_pciconfig_iobase           (__NR_SYSCALL_BASE+271)
+#define __NR_pciconfig_read             (__NR_SYSCALL_BASE+272)
+#define __NR_pciconfig_write            (__NR_SYSCALL_BASE+273)
+#define __NR_mq_open                    (__NR_SYSCALL_BASE+274)
+#define __NR_mq_unlink                  (__NR_SYSCALL_BASE+275)
+#define __NR_mq_timedsend               (__NR_SYSCALL_BASE+276)
+#define __NR_mq_timedreceive            (__NR_SYSCALL_BASE+277)
+#define __NR_mq_notify                  (__NR_SYSCALL_BASE+278)
+#define __NR_mq_getsetattr              (__NR_SYSCALL_BASE+279)
+#define __NR_waitid                     (__NR_SYSCALL_BASE+280)
+#define __NR_socket                     (__NR_SYSCALL_BASE+281)
+#define __NR_bind                       (__NR_SYSCALL_BASE+282)
+#define __NR_connect                    (__NR_SYSCALL_BASE+283)
+#define __NR_listen                     (__NR_SYSCALL_BASE+284)
+#define __NR_accept                     (__NR_SYSCALL_BASE+285)
+#define __NR_getsockname                (__NR_SYSCALL_BASE+286)
+#define __NR_getpeername                (__NR_SYSCALL_BASE+287)
+#define __NR_socketpair                 (__NR_SYSCALL_BASE+288)
+#define __NR_send                       (__NR_SYSCALL_BASE+289)
+#define __NR_sendto                     (__NR_SYSCALL_BASE+290)
+#define __NR_recv                       (__NR_SYSCALL_BASE+291)
+#define __NR_recvfrom                   (__NR_SYSCALL_BASE+292)
+#define __NR_shutdown                   (__NR_SYSCALL_BASE+293)
+#define __NR_setsockopt                 (__NR_SYSCALL_BASE+294)
+#define __NR_getsockopt                 (__NR_SYSCALL_BASE+295)
+#define __NR_sendmsg                    (__NR_SYSCALL_BASE+296)
+#define __NR_recvmsg                    (__NR_SYSCALL_BASE+297)
+#define __NR_semop                      (__NR_SYSCALL_BASE+298)
+#define __NR_semget                     (__NR_SYSCALL_BASE+299)
+#define __NR_semctl                     (__NR_SYSCALL_BASE+300)
+#define __NR_msgsnd                     (__NR_SYSCALL_BASE+301)
+#define __NR_msgrcv                     (__NR_SYSCALL_BASE+302)
+#define __NR_msgget                     (__NR_SYSCALL_BASE+303)
+#define __NR_msgctl                     (__NR_SYSCALL_BASE+304)
+#define __NR_shmat                      (__NR_SYSCALL_BASE+305)
+#define __NR_shmdt                      (__NR_SYSCALL_BASE+306)
+#define __NR_shmget                     (__NR_SYSCALL_BASE+307)
+#define __NR_shmctl                     (__NR_SYSCALL_BASE+308)
+#define __NR_add_key                    (__NR_SYSCALL_BASE+309)
+#define __NR_request_key                (__NR_SYSCALL_BASE+310)
+#define __NR_keyctl                     (__NR_SYSCALL_BASE+311)
+#define __NR_semtimedop                 (__NR_SYSCALL_BASE+312)
+#define __NR_vserver                    (__NR_SYSCALL_BASE+313)
+#define __NR_ioprio_set                 (__NR_SYSCALL_BASE+314)
+#define __NR_ioprio_get                 (__NR_SYSCALL_BASE+315)
+#define __NR_inotify_init               (__NR_SYSCALL_BASE+316)
+#define __NR_inotify_add_watch          (__NR_SYSCALL_BASE+317)
+#define __NR_inotify_rm_watch           (__NR_SYSCALL_BASE+318)
+#define __NR_mbind                      (__NR_SYSCALL_BASE+319)
+#define __NR_get_mempolicy              (__NR_SYSCALL_BASE+320)
+#define __NR_set_mempolicy              (__NR_SYSCALL_BASE+321)
+#define __NR_openat                     (__NR_SYSCALL_BASE+322)
+#define __NR_mkdirat                    (__NR_SYSCALL_BASE+323)
+#define __NR_mknodat                    (__NR_SYSCALL_BASE+324)
+#define __NR_fchownat                   (__NR_SYSCALL_BASE+325)
+#define __NR_futimesat                  (__NR_SYSCALL_BASE+326)
+#define __NR_fstatat64                  (__NR_SYSCALL_BASE+327)
+#define __NR_unlinkat                   (__NR_SYSCALL_BASE+328)
+#define __NR_renameat                   (__NR_SYSCALL_BASE+329)
+#define __NR_linkat                     (__NR_SYSCALL_BASE+330)
+#define __NR_symlinkat                  (__NR_SYSCALL_BASE+331)
+#define __NR_readlinkat                 (__NR_SYSCALL_BASE+332)
+#define __NR_fchmodat                   (__NR_SYSCALL_BASE+333)
+#define __NR_faccessat                  (__NR_SYSCALL_BASE+334)
+#define __NR_pselect6                   (__NR_SYSCALL_BASE+335)
+#define __NR_ppoll                      (__NR_SYSCALL_BASE+336)
+#define __NR_unshare                    (__NR_SYSCALL_BASE+337)
+#define __NR_set_robust_list            (__NR_SYSCALL_BASE+338)
+#define __NR_get_robust_list            (__NR_SYSCALL_BASE+339)
+#define __NR_splice                     (__NR_SYSCALL_BASE+340)
+#define __NR_arm_sync_file_range        (__NR_SYSCALL_BASE+341)
+#define __NR_sync_file_range2           __NR_arm_sync_file_range
+#define __NR_tee                        (__NR_SYSCALL_BASE+342)
+#define __NR_vmsplice                   (__NR_SYSCALL_BASE+343)
+#define __NR_move_pages                 (__NR_SYSCALL_BASE+344)
+#define __NR_getcpu                     (__NR_SYSCALL_BASE+345)
+#define __NR_epoll_pwait                (__NR_SYSCALL_BASE+346)
+#define __NR_kexec_load                 (__NR_SYSCALL_BASE+347)
+#define __NR_utimensat                  (__NR_SYSCALL_BASE+348)
+#define __NR_signalfd                   (__NR_SYSCALL_BASE+349)
+#define __NR_timerfd_create             (__NR_SYSCALL_BASE+350)
+#define __NR_eventfd                    (__NR_SYSCALL_BASE+351)
+#define __NR_fallocate                  (__NR_SYSCALL_BASE+352)
+#define __NR_timerfd_settime            (__NR_SYSCALL_BASE+353)
+#define __NR_timerfd_gettime            (__NR_SYSCALL_BASE+354)
+#define __NR_signalfd4                  (__NR_SYSCALL_BASE+355)
+#define __NR_eventfd2                   (__NR_SYSCALL_BASE+356)
+#define __NR_epoll_create1              (__NR_SYSCALL_BASE+357)
+#define __NR_dup3                       (__NR_SYSCALL_BASE+358)
+#define __NR_pipe2                      (__NR_SYSCALL_BASE+359)
+#define __NR_inotify_init1              (__NR_SYSCALL_BASE+360)
+#define __NR_preadv                     (__NR_SYSCALL_BASE+361)
+#define __NR_pwritev                    (__NR_SYSCALL_BASE+362)
+#define __NR_rt_tgsigqueueinfo          (__NR_SYSCALL_BASE+363)
+#define __NR_perf_event_open            (__NR_SYSCALL_BASE+364)
+#define __NR_recvmmsg                   (__NR_SYSCALL_BASE+365)
+#define __NR_accept4                    (__NR_SYSCALL_BASE+366)
+#define __NR_fanotify_init              (__NR_SYSCALL_BASE+367)
+#define __NR_fanotify_mark              (__NR_SYSCALL_BASE+368)
+#define __NR_prlimit64                  (__NR_SYSCALL_BASE+369)
+#define __NR_name_to_handle_at          (__NR_SYSCALL_BASE+370)
+#define __NR_open_by_handle_at          (__NR_SYSCALL_BASE+371)
+#define __NR_clock_adjtime              (__NR_SYSCALL_BASE+372)
+#define __NR_syncfs                     (__NR_SYSCALL_BASE+373)
+#define __NR_sendmmsg                   (__NR_SYSCALL_BASE+374)
+#define __NR_setns                      (__NR_SYSCALL_BASE+375)
+#define __NR_process_vm_readv           (__NR_SYSCALL_BASE+376)
+#define __NR_process_vm_writev          (__NR_SYSCALL_BASE+377)
+                                        /* 378 for kcmp */
+/*
+ * This may need to be greater than __NR_last_syscall+1 in order to
+ * account for the padding in the syscall table
+ */
+/*
+ * The following SWIs are ARM private.
+ */
+#define __ARM_NR_BASE                   (__NR_SYSCALL_BASE+0x0f0000)
+#define __ARM_NR_breakpoint             (__ARM_NR_BASE+1)
+#define __ARM_NR_cacheflush             (__ARM_NR_BASE+2)
+#define __ARM_NR_usr26                  (__ARM_NR_BASE+3)
+#define __ARM_NR_usr32                  (__ARM_NR_BASE+4)
+#define __ARM_NR_set_tls                (__ARM_NR_BASE+5)
+/*
+ * *NOTE*: This is a ghost syscall private to the kernel.  Only the
+ * __kuser_cmpxchg code in entry-armv.S should be aware of its
+ * existence.  Don't ever use this from user code.
+ */
+/*
+ * The following syscalls are obsolete and no longer available for EABI.
+ */
+#if !defined(__KERNEL__)
+#if defined(__ARM_EABI__)
+#undef __NR_time
+#undef __NR_umount
+#undef __NR_stime
+#undef __NR_alarm
+#undef __NR_utime
+#undef __NR_getrlimit
+#undef __NR_select
+#undef __NR_readdir
+#undef __NR_mmap
+#undef __NR_socketcall
+#undef __NR_syscall
+#undef __NR_ipc
+#endif
+#endif
+#endif /* _UAPI__ASM_ARM_UNISTD_H */
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 5dfef9d97ed..5bbec7b8183 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -81,4 +81,6 @@ head-y			:= head$(MMUEXT).o
 obj-$(CONFIG_DEBUG_LL)  += debug.o
 obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
+obj-$(CONFIG_ARM_VIRT_EXT)      += hyp-stub.o
 extra-y := $(head-y) vmlinux.lds
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index e340fa1db20..417bac1846b 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -86,35 +86,14 @@ ENDPROC(ret_to_user)
 */
 ENTRY(ret_from_fork)
        bl      schedule_tail
+        cmp     r5, #0
+        movne   r0, r4
+        movne   lr, pc
+        movne   pc, r5
        get_thread_info tsk
-        mov     why, #1
        b       ret_slow_syscall
 ENDPROC(ret_from_fork)
-ENTRY(ret_from_kernel_thread)
- UNWIND(.fnstart)
- UNWIND(.cantunwind)
-        bl      schedule_tail
-        mov     r0, r4
-        adr     lr, BSYM(1f)    @ kernel threads should not exit
-        mov     pc, r5
-1:      bl      do_exit
-        nop
- UNWIND(.fnend)
-ENDPROC(ret_from_kernel_thread)
-/*
- * turn a kernel thread into userland process
- * use: ret_from_kernel_execve(struct pt_regs *normal)
- */
-ENTRY(ret_from_kernel_execve)
-        mov     why, #0                 @ not a syscall
-        str     why, [r0, #S_R0]        @ ... and we want 0 in ->ARM_r0 as well
-        get_thread_info tsk             @ thread structure
-        mov     sp, r0                  @ stack pointer just under pt_regs
-        b       ret_slow_syscall
-ENDPROC(ret_from_kernel_execve)
        .equ NR_syscalls,0
 #define CALL(x) .equ NR_syscalls,NR_syscalls+1
 #include "calls.S"
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 9874d074119..4eee351f466 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -83,8 +83,12 @@ ENTRY(stext)
 THUMB( .thumb                  )       @ switch to Thumb now.
 THUMB(1:                       )
-        setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode
+#ifdef CONFIG_ARM_VIRT_EXT
-                                                @ and irqs disabled
+        bl      __hyp_stub_install
+#endif
+        @ ensure svc mode and all interrupts masked
+        safe_svcmode_maskall r9
        mrc     p15, 0, r9, c0, c0              @ get processor id
        bl      __lookup_processor_type         @ r5=procinfo r9=cpuid
        movs    r10, r5                         @ invalid processor (r5=0)?
@@ -326,7 +330,11 @@ ENTRY(secondary_startup)
         * the processor type - there is no need to check the machine type
         * as it has already been validated by the primary processor.
         */
-        setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9
+#ifdef CONFIG_ARM_VIRT_EXT
+        bl      __hyp_stub_install
+#endif
+        safe_svcmode_maskall r9
        mrc     p15, 0, r9, c0, c0              @ get processor id
        bl      __lookup_processor_type
        movs    r10, r5                         @ invalid processor?
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
new file mode 100644
index 00000000000..65b2417aebc
--- /dev/null
+++ b/arch/arm/kernel/hyp-stub.S
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2012 Linaro Limited.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include <linux/init.h>
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/virt.h>
+#ifndef ZIMAGE
+/*
+ * For the kernel proper, we need to find out the CPU boot mode long after
+ * boot, so we need to store it in a writable variable.
+ *
+ * This is not in .bss, because we set it sufficiently early that the boot-time
+ * zeroing of .bss would clobber it.
+ */
+.data
+ENTRY(__boot_cpu_mode)
+        .long   0
+.text
+        /*
+         * Save the primary CPU boot mode. Requires 3 scratch registers.
+         */
+        .macro  store_primary_cpu_mode  reg1, reg2, reg3
+        mrs     \reg1, cpsr
+        and     \reg1, \reg1, #MODE_MASK
+        adr     \reg2, .L__boot_cpu_mode_offset
+        ldr     \reg3, [\reg2]
+        str     \reg1, [\reg2, \reg3]
+        .endm
+        /*
+         * Compare the current mode with the one saved on the primary CPU.
+         * If they don't match, record that fact. The Z bit indicates
+         * if there's a match or not.
+         * Requires 3 additionnal scratch registers.
+         */
+        .macro  compare_cpu_mode_with_primary mode, reg1, reg2, reg3
+        adr     \reg2, .L__boot_cpu_mode_offset
+        ldr     \reg3, [\reg2]
+        ldr     \reg1, [\reg2, \reg3]
+        cmp     \mode, \reg1            @ matches primary CPU boot mode?
+        orrne   r7, r7, #BOOT_CPU_MODE_MISMATCH
+        strne   r7, [r5, r6]            @ record what happened and give up
+        .endm
+#else   /* ZIMAGE */
+        .macro  store_primary_cpu_mode  reg1:req, reg2:req, reg3:req
+        .endm
+/*
+ * The zImage loader only runs on one CPU, so we don't bother with mult-CPU
+ * consistency checking:
+ */
+        .macro  compare_cpu_mode_with_primary mode, reg1, reg2, reg3
+        cmp     \mode, \mode
+        .endm
+#endif /* ZIMAGE */
+/*
+ * Hypervisor stub installation functions.
+ *
+ * These must be called with the MMU and D-cache off.
+ * They are not ABI compliant and are only intended to be called from the kernel
+ * entry points in head.S.
+ */
+@ Call this from the primary CPU
+ENTRY(__hyp_stub_install)
+        store_primary_cpu_mode  r4, r5, r6
+ENDPROC(__hyp_stub_install)
+        @ fall through...
+@ Secondary CPUs should call here
+ENTRY(__hyp_stub_install_secondary)
+        mrs     r4, cpsr
+        and     r4, r4, #MODE_MASK
+        /*
+         * If the secondary has booted with a different mode, give up
+         * immediately.
+         */
+        compare_cpu_mode_with_primary   r4, r5, r6, r7
+        bxne    lr
+        /*
+         * Once we have given up on one CPU, we do not try to install the
+         * stub hypervisor on the remaining ones: because the saved boot mode
+         * is modified, it can't compare equal to the CPSR mode field any
+         * more.
+         *
+         * Otherwise...
+         */
+        cmp     r4, #HYP_MODE
+        bxne    lr                      @ give up if the CPU is not in HYP mode
+/*
+ * Configure HSCTLR to set correct exception endianness/instruction set
+ * state etc.
+ * Turn off all traps
+ * Eventually, CPU-specific code might be needed -- assume not for now
+ *
+ * This code relies on the "eret" instruction to synchronize the
+ * various coprocessor accesses.
+ */
+        @ Now install the hypervisor stub:
+        adr     r7, __hyp_stub_vectors
+        mcr     p15, 4, r7, c12, c0, 0  @ set hypervisor vector base (HVBAR)
+        @ Disable all traps, so we don't get any nasty surprise
+        mov     r7, #0
+        mcr     p15, 4, r7, c1, c1, 0   @ HCR
+        mcr     p15, 4, r7, c1, c1, 2   @ HCPTR
+        mcr     p15, 4, r7, c1, c1, 3   @ HSTR
+THUMB(  orr     r7, #(1 << 30)  )       @ HSCTLR.TE
+#ifdef CONFIG_CPU_BIG_ENDIAN
+        orr     r7, #(1 << 9)           @ HSCTLR.EE
+#endif
+        mcr     p15, 4, r7, c1, c0, 0   @ HSCTLR
+        mrc     p15, 4, r7, c1, c1, 1   @ HDCR
+        and     r7, #0x1f               @ Preserve HPMN
+        mcr     p15, 4, r7, c1, c1, 1   @ HDCR
+#if !defined(ZIMAGE) && defined(CONFIG_ARM_ARCH_TIMER)
+        @ make CNTP_* and CNTPCT accessible from PL1
+        mrc     p15, 0, r7, c0, c1, 1   @ ID_PFR1
+        lsr     r7, #16
+        and     r7, #0xf
+        cmp     r7, #1
+        bne     1f
+        mrc     p15, 4, r7, c14, c1, 0  @ CNTHCTL
+        orr     r7, r7, #3              @ PL1PCEN | PL1PCTEN
+        mcr     p15, 4, r7, c14, c1, 0  @ CNTHCTL
+1:
+#endif
+        bic     r7, r4, #MODE_MASK
+        orr     r7, r7, #SVC_MODE
+THUMB(  orr     r7, r7, #PSR_T_BIT      )
+        msr     spsr_cxsf, r7           @ This is SPSR_hyp.
+        __MSR_ELR_HYP(14)               @ msr elr_hyp, lr
+        __ERET                          @ return, switching to SVC mode
+                                        @ The boot CPU mode is left in r4.
+ENDPROC(__hyp_stub_install_secondary)
+__hyp_stub_do_trap:
+        cmp     r0, #-1
+        mrceq   p15, 4, r0, c12, c0, 0  @ get HVBAR
+        mcrne   p15, 4, r0, c12, c0, 0  @ set HVBAR
+        __ERET
+ENDPROC(__hyp_stub_do_trap)
+/*
+ * __hyp_set_vectors: Call this after boot to set the initial hypervisor
+ * vectors as part of hypervisor installation.  On an SMP system, this should
+ * be called on each CPU.
+ *
+ * r0 must be the physical address of the new vector table (which must lie in
+ * the bottom 4GB of physical address space.
+ *
+ * r0 must be 32-byte aligned.
+ *
+ * Before calling this, you must check that the stub hypervisor is installed
+ * everywhere, by waiting for any secondary CPUs to be brought up and then
+ * checking that BOOT_CPU_MODE_HAVE_HYP(__boot_cpu_mode) is true.
+ *
+ * If not, there is a pre-existing hypervisor, some CPUs failed to boot, or
+ * something else went wrong... in such cases, trying to install a new
+ * hypervisor is unlikely to work as desired.
+ *
+ * When you call into your shiny new hypervisor, sp_hyp will contain junk,
+ * so you will need to set that to something sensible at the new hypervisor's
+ * initialisation entry point.
+ */
+ENTRY(__hyp_get_vectors)
+        mov     r0, #-1
+ENDPROC(__hyp_get_vectors)
+        @ fall through
+ENTRY(__hyp_set_vectors)
+        __HVC(0)
+        bx      lr
+ENDPROC(__hyp_set_vectors)
+#ifndef ZIMAGE
+.align 2
+.L__boot_cpu_mode_offset:
+        .long   __boot_cpu_mode - .
+#endif
+.align 5
+__hyp_stub_vectors:
+__hyp_stub_reset:       W(b)    .
+__hyp_stub_und:         W(b)    .
+__hyp_stub_svc:         W(b)    .
+__hyp_stub_pabort:      W(b)    .
+__hyp_stub_dabort:      W(b)    .
+__hyp_stub_trap:        W(b)    __hyp_stub_do_trap
+__hyp_stub_irq:         W(b)    .
+__hyp_stub_fiq:         W(b)    .
+ENDPROC(__hyp_stub_vectors)
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index f98c17ff195..90084a6de35 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -373,7 +373,6 @@ void release_thread(struct task_struct *dead_task)
 }
 asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
-asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
 int
 copy_thread(unsigned long clone_flags, unsigned long stack_start,
@@ -388,13 +387,13 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start,
                *childregs = *regs;
                childregs->ARM_r0 = 0;
                childregs->ARM_sp = stack_start;
-                thread->cpu_context.pc = (unsigned long)ret_from_fork;
        } else {
+                memset(childregs, 0, sizeof(struct pt_regs));
                thread->cpu_context.r4 = stk_sz;
                thread->cpu_context.r5 = stack_start;
-                thread->cpu_context.pc = (unsigned long)ret_from_kernel_thread;
                childregs->ARM_cpsr = SVC_MODE;
        }
+        thread->cpu_context.pc = (unsigned long)ret_from_fork;
        thread->cpu_context.sp = (unsigned long)childregs;
        clear_ptrace_hw_breakpoint(p);
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index febafa0f552..da1d1aa20ad 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -53,6 +53,7 @@
 #include <asm/traps.h>
 #include <asm/unwind.h>
 #include <asm/memblock.h>
+#include <asm/virt.h>
 #include "atags.h"
 #include "tcm.h"
@@ -703,6 +704,21 @@ static int __init meminfo_cmp(const void *_a, const void *_b)
        return cmp < 0 ? -1 : cmp > 0 ? 1 : 0;
 }
+void __init hyp_mode_check(void)
+{
+#ifdef CONFIG_ARM_VIRT_EXT
+        if (is_hyp_mode_available()) {
+                pr_info("CPU: All CPU(s) started in HYP mode.\n");
+                pr_info("CPU: Virtualization extensions available.\n");
+        } else if (is_hyp_mode_mismatched()) {
+                pr_warn("CPU: WARNING: CPU(s) started in wrong/inconsistent modes (primary CPU mode 0x%x)\n",
+                        __boot_cpu_mode & MODE_MASK);
+                pr_warn("CPU: This may indicate a broken bootloader or firmware.\n");
+        } else
+                pr_info("CPU: All CPU(s) started in SVC mode.\n");
+#endif
+}
 void __init setup_arch(char **cmdline_p)
 {
        struct machine_desc *mdesc;
@@ -748,6 +764,10 @@ void __init setup_arch(char **cmdline_p)
                smp_init_cpus();
        }
 #endif
+        if (!is_smp())
+                hyp_mode_check();
        reserve_crashkernel();
        tcm_init();
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index f27789e4e38..56f72d257eb 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/personality.h>
-#include <linux/freezer.h>
 #include <linux/uaccess.h>
 #include <linux/tracehook.h>
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index d100eacdb79..8e20754dd31 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -43,6 +43,7 @@
 #include <asm/ptrace.h>
 #include <asm/localtimer.h>
 #include <asm/smp_plat.h>
+#include <asm/virt.h>
 #include <asm/mach/arch.h>
 /*
@@ -202,8 +203,11 @@ int __cpuinit __cpu_disable(void)
        /*
         * Flush user cache and TLB mappings, and then remove this CPU
         * from the vm mask set of all processes.
+         *
+         * Caches are flushed to the Level of Unification Inner Shareable
+         * to write-back dirty lines to unified caches shared by all CPUs.
         */
-        flush_cache_all();
+        flush_cache_louis();
        local_flush_tlb_all();
        clear_tasks_mm_cpumask(cpu);
@@ -355,6 +359,8 @@ void __init smp_cpus_done(unsigned int max_cpus)
               num_online_cpus(),
               bogosum / (500000/HZ),
               (bogosum / (5000/HZ)) % 100);
+        hyp_mode_check();
 }
 void __init smp_prepare_boot_cpu(void)
diff --git a/arch/arm/kernel/suspend.c b/arch/arm/kernel/suspend.c
index 1794cc3b0f1..358bca3a995 100644
--- a/arch/arm/kernel/suspend.c
+++ b/arch/arm/kernel/suspend.c
@@ -17,6 +17,8 @@ extern void cpu_resume_mmu(void);
 */
 void __cpu_suspend_save(u32 *ptr, u32 ptrsz, u32 sp, u32 *save_ptr)
 {
+        u32 *ctx = ptr;
        *save_ptr = virt_to_phys(ptr);
        /* This must correspond to the LDM in cpu_resume() assembly */
@@ -26,7 +28,20 @@ void __cpu_suspend_save(u32 *ptr, u32 ptrsz, u32 sp, u32 *save_ptr)
        cpu_do_suspend(ptr);
-        flush_cache_all();
+        flush_cache_louis();
+        /*
+         * flush_cache_louis does not guarantee that
+         * save_ptr and ptr are cleaned to main memory,
+         * just up to the Level of Unification Inner Shareable.
+         * Since the context pointer and context itself
+         * are to be retrieved with the MMU off that
+         * data must be cleaned from all cache levels
+         * to main memory using "area" cache primitives.
+        */
+        __cpuc_flush_dcache_area(ctx, ptrsz);
+        __cpuc_flush_dcache_area(save_ptr, sizeof(*save_ptr));
        outer_clean_range(*save_ptr, *save_ptr + ptrsz);
        outer_clean_range(virt_to_phys(save_ptr),
                          virt_to_phys(save_ptr) + sizeof(*save_ptr));
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index c8050b14e61..b1420710193 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -19,8 +19,8 @@ config AT91_SAM9G45_RESET
 config SOC_AT91SAM9
        bool
-        select GENERIC_CLOCKEVENTS
        select CPU_ARM926T
+        select GENERIC_CLOCKEVENTS
 menu "Atmel AT91 System-on-Chip"
@@ -28,66 +28,66 @@ comment "Atmel AT91 Processor"
 config SOC_AT91SAM9
        bool
+        select AT91_SAM9_SMC
+        select AT91_SAM9_TIME
        select CPU_ARM926T
        select MULTI_IRQ_HANDLER
        select SPARSE_IRQ
-        select AT91_SAM9_TIME
-        select AT91_SAM9_SMC
 config SOC_AT91RM9200
        bool "AT91RM9200"
        select CPU_ARM920T
-        select MULTI_IRQ_HANDLER
-        select SPARSE_IRQ
        select GENERIC_CLOCKEVENTS
        select HAVE_AT91_DBGU0
+        select MULTI_IRQ_HANDLER
+        select SPARSE_IRQ
 config SOC_AT91SAM9260
        bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
-        select SOC_AT91SAM9
        select HAVE_AT91_DBGU0
        select HAVE_NET_MACB
+        select SOC_AT91SAM9
        help
          Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
          or AT91SAM9G20 SoC.
 config SOC_AT91SAM9261
        bool "AT91SAM9261 or AT91SAM9G10"
-        select SOC_AT91SAM9
        select HAVE_AT91_DBGU0
        select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
        help
          Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
 config SOC_AT91SAM9263
        bool "AT91SAM9263"
-        select SOC_AT91SAM9
        select HAVE_AT91_DBGU1
        select HAVE_FB_ATMEL
        select HAVE_NET_MACB
+        select SOC_AT91SAM9
 config SOC_AT91SAM9RL
        bool "AT91SAM9RL"
-        select SOC_AT91SAM9
        select HAVE_AT91_DBGU0
        select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
 config SOC_AT91SAM9G45
        bool "AT91SAM9G45 or AT91SAM9M10 families"
-        select SOC_AT91SAM9
        select HAVE_AT91_DBGU1
        select HAVE_FB_ATMEL
        select HAVE_NET_MACB
+        select SOC_AT91SAM9
        help
          Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
          This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
 config SOC_AT91SAM9X5
        bool "AT91SAM9x5 family"
-        select SOC_AT91SAM9
        select HAVE_AT91_DBGU0
        select HAVE_FB_ATMEL
        select HAVE_NET_MACB
+        select SOC_AT91SAM9
        help
          Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
          This means that your SAM9 name finishes with a '5' (except if it is
@@ -97,9 +97,9 @@ config SOC_AT91SAM9X5
 config SOC_AT91SAM9N12
        bool "AT91SAM9N12 family"
-        select SOC_AT91SAM9
        select HAVE_AT91_DBGU0
        select HAVE_FB_ATMEL
+        select SOC_AT91SAM9
        help
          Select this if you are using Atmel's AT91SAM9N12 SoC.
@@ -144,9 +144,9 @@ config ARCH_AT91SAM9G45
 config ARCH_AT91X40
        bool "AT91x40"
        depends on !MMU
+        select ARCH_USES_GETTIMEOFFSET
        select MULTI_IRQ_HANDLER
        select SPARSE_IRQ
-        select ARCH_USES_GETTIMEOFFSET
 endchoice
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index e6135363765..263242da2cb 100644
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -23,9 +23,9 @@ config ARCH_CLEP7312
 config ARCH_EDB7211
        bool "EDB7211"
-        select ISA
-        select ARCH_SPARSEMEM_ENABLE
        select ARCH_SELECT_MEMORY_MODEL
+        select ARCH_SPARSEMEM_ENABLE
+        select ISA
        help
          Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211
          evaluation board.
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index ab99c3c3b75..f8eecb95941 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -4,12 +4,12 @@ config AINTC
        bool
 config CP_INTC
-        select IRQ_DOMAIN
        bool
+        select IRQ_DOMAIN
 config ARCH_DAVINCI_DMx
-        select CPU_ARM926T
        bool
+        select CPU_ARM926T
 menu "TI DaVinci Implementations"
@@ -32,19 +32,19 @@ config ARCH_DAVINCI_DM646x
 config ARCH_DAVINCI_DA830
        bool "DA830/OMAP-L137/AM17x based system"
-        select CP_INTC
        select ARCH_DAVINCI_DA8XX
        select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1
+        select CP_INTC
 config ARCH_DAVINCI_DA850
        bool "DA850/OMAP-L138/AM18x based system"
-        select CP_INTC
        select ARCH_DAVINCI_DA8XX
        select ARCH_HAS_CPUFREQ
+        select CP_INTC
 config ARCH_DAVINCI_DA8XX
-        select CPU_ARM926T
        bool
+        select CPU_ARM926T
 config ARCH_DAVINCI_DM365
        bool "DaVinci 365 based system"
@@ -52,9 +52,9 @@ config ARCH_DAVINCI_DM365
        select ARCH_DAVINCI_DMx
 config ARCH_DAVINCI_TNETV107X
+        bool "TNETV107X based system"
        select CPU_V6
        select CP_INTC
-        bool "TNETV107X based system"
 comment "DaVinci Board Type"
@@ -103,9 +103,9 @@ config MACH_DAVINCI_DM6467_EVM
        bool "TI DM6467 EVM"
        default ARCH_DAVINCI_DM646x
        depends on ARCH_DAVINCI_DM646x
-        select MACH_DAVINCI_DM6467TEVM
        select EEPROM_AT24
        select I2C
+        select MACH_DAVINCI_DM6467TEVM
        help
          Configure this option to specify the whether the board used
          for development is a DM6467 EVM
@@ -127,8 +127,8 @@ config MACH_DAVINCI_DA830_EVM
        bool "TI DA830/OMAP-L137/AM17x Reference Platform"
        default ARCH_DAVINCI_DA830
        depends on ARCH_DAVINCI_DA830
-        select GPIO_PCF857X
        select EEPROM_AT24
+        select GPIO_PCF857X
        select I2C
        help
          Say Y here to select the TI DA830/OMAP-L137/AM17x Evaluation Module.
@@ -186,6 +186,13 @@ config DA850_UI_RMII
          NOTE: Please take care while choosing this option, MII PHY will
          not be functional if RMII mode is selected.
+config DA850_UI_SD_VIDEO_PORT
+        bool "Video Port Interface"
+        help
+          Say Y if you want to use Video Port Interface (VPIF) on the
+          DA850/OMAP-L138 EVM. The Video decoders/encoders are found on the
+          UI daughter card that is supplied with the EVM.
 endchoice
 config DA850_WL12XX
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 1295e616cee..32ee3f89596 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -45,6 +45,9 @@
 #include <linux/platform_data/mtd-davinci-aemif.h>
 #include <linux/platform_data/spi-davinci.h>
+#include <media/tvp514x.h>
+#include <media/adv7343.h>
 #define DA850_EVM_PHY_ID                "davinci_mdio-0:00"
 #define DA850_LCD_PWR_PIN               GPIO_TO_PIN(2, 8)
 #define DA850_LCD_BL_PIN                GPIO_TO_PIN(2, 15)
@@ -452,6 +455,15 @@ static void da850_evm_ui_keys_init(unsigned gpio)
        }
 }
+#ifdef CONFIG_DA850_UI_SD_VIDEO_PORT
+static inline void da850_evm_setup_video_port(int video_sel)
+{
+        gpio_set_value_cansleep(video_sel, 0);
+}
+#else
+static inline void da850_evm_setup_video_port(int video_sel) { }
+#endif
 static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
                                                unsigned ngpio, void *c)
 {
@@ -497,6 +509,8 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
        da850_evm_setup_emac_rmii(sel_a);
+        da850_evm_setup_video_port(sel_c);
        return 0;
 exp_setup_keys_fail:
@@ -1149,6 +1163,169 @@ static __init int da850_evm_init_cpufreq(void)
 static __init int da850_evm_init_cpufreq(void) { return 0; }
 #endif
+#if defined(CONFIG_DA850_UI_SD_VIDEO_PORT)
+#define TVP5147_CH0             "tvp514x-0"
+#define TVP5147_CH1             "tvp514x-1"
+/* VPIF capture configuration */
+static struct tvp514x_platform_data tvp5146_pdata = {
+                .clk_polarity = 0,
+                .hs_polarity  = 1,
+                .vs_polarity  = 1,
+};
+#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL)
+static const struct vpif_input da850_ch0_inputs[] = {
+        {
+                .input = {
+                        .index = 0,
+                        .name  = "Composite",
+                        .type  = V4L2_INPUT_TYPE_CAMERA,
+                        .capabilities = V4L2_IN_CAP_STD,
+                        .std   = TVP514X_STD_ALL,
+                },
+                .input_route = INPUT_CVBS_VI2B,
+                .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,
+                .subdev_name = TVP5147_CH0,
+        },
+};
+static const struct vpif_input da850_ch1_inputs[] = {
+        {
+                .input = {
+                        .index = 0,
+                        .name  = "S-Video",
+                        .type  = V4L2_INPUT_TYPE_CAMERA,
+                        .capabilities = V4L2_IN_CAP_STD,
+                        .std   = TVP514X_STD_ALL,
+                },
+                .input_route = INPUT_SVIDEO_VI2C_VI1C,
+                .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,
+                .subdev_name = TVP5147_CH1,
+        },
+};
+static struct vpif_subdev_info da850_vpif_capture_sdev_info[] = {
+        {
+                .name = TVP5147_CH0,
+                .board_info = {
+                        I2C_BOARD_INFO("tvp5146", 0x5d),
+                        .platform_data = &tvp5146_pdata,
+                },
+        },
+        {
+                .name = TVP5147_CH1,
+                .board_info = {
+                        I2C_BOARD_INFO("tvp5146", 0x5c),
+                        .platform_data = &tvp5146_pdata,
+                },
+        },
+};
+static struct vpif_capture_config da850_vpif_capture_config = {
+        .subdev_info = da850_vpif_capture_sdev_info,
+        .subdev_count = ARRAY_SIZE(da850_vpif_capture_sdev_info),
+        .chan_config[0] = {
+                .inputs = da850_ch0_inputs,
+                .input_count = ARRAY_SIZE(da850_ch0_inputs),
+                .vpif_if = {
+                        .if_type = VPIF_IF_BT656,
+                        .hd_pol  = 1,
+                        .vd_pol  = 1,
+                        .fid_pol = 0,
+                },
+        },
+        .chan_config[1] = {
+                .inputs = da850_ch1_inputs,
+                .input_count = ARRAY_SIZE(da850_ch1_inputs),
+                .vpif_if = {
+                        .if_type = VPIF_IF_BT656,
+                        .hd_pol  = 1,
+                        .vd_pol  = 1,
+                        .fid_pol = 0,
+                },
+        },
+        .card_name = "DA850/OMAP-L138 Video Capture",
+};
+/* VPIF display configuration */
+static struct vpif_subdev_info da850_vpif_subdev[] = {
+        {
+                .name = "adv7343",
+                .board_info = {
+                        I2C_BOARD_INFO("adv7343", 0x2a),
+                },
+        },
+};
+static const struct vpif_output da850_ch0_outputs[] = {
+        {
+                .output = {
+                        .index = 0,
+                        .name = "Composite",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_STD,
+                        .std = V4L2_STD_ALL,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_COMPOSITE_ID,
+        },
+        {
+                .output = {
+                        .index = 1,
+                        .name = "S-Video",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_STD,
+                        .std = V4L2_STD_ALL,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_SVIDEO_ID,
+        },
+};
+static struct vpif_display_config da850_vpif_display_config = {
+        .subdevinfo   = da850_vpif_subdev,
+        .subdev_count = ARRAY_SIZE(da850_vpif_subdev),
+        .chan_config[0] = {
+                .outputs = da850_ch0_outputs,
+                .output_count = ARRAY_SIZE(da850_ch0_outputs),
+        },
+        .card_name    = "DA850/OMAP-L138 Video Display",
+};
+static __init void da850_vpif_init(void)
+{
+        int ret;
+        ret = da850_register_vpif();
+        if (ret)
+                pr_warn("da850_evm_init: VPIF setup failed: %d\n", ret);
+        ret = davinci_cfg_reg_list(da850_vpif_capture_pins);
+        if (ret)
+                pr_warn("da850_evm_init: VPIF capture mux setup failed: %d\n",
+                        ret);
+        ret = da850_register_vpif_capture(&da850_vpif_capture_config);
+        if (ret)
+                pr_warn("da850_evm_init: VPIF capture setup failed: %d\n", ret);
+        ret = davinci_cfg_reg_list(da850_vpif_display_pins);
+        if (ret)
+                pr_warn("da850_evm_init: VPIF display mux setup failed: %d\n",
+                        ret);
+        ret = da850_register_vpif_display(&da850_vpif_display_config);
+        if (ret)
+                pr_warn("da850_evm_init: VPIF display setup failed: %d\n", ret);
+}
+#else
+static __init void da850_vpif_init(void) {}
+#endif
 #ifdef CONFIG_DA850_WL12XX
 static void wl12xx_set_power(int index, bool power_on)
@@ -1375,6 +1552,8 @@ static __init void da850_evm_init(void)
                pr_warning("da850_evm_init: suspend registration failed: %d\n",
                                ret);
+        da850_vpif_init();
        ret = da8xx_register_spi(1, da850evm_spi_info,
                                 ARRAY_SIZE(da850evm_spi_info));
        if (ret)
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index ca72fc4b8cc..f22572cee49 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -23,6 +23,7 @@
 #include <linux/phy.h>
 #include <linux/clk.h>
 #include <linux/videodev2.h>
+#include <linux/v4l2-dv-timings.h>
 #include <linux/export.h>
 #include <media/tvp514x.h>
@@ -620,7 +621,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
        {
                .name           = "ntsc",
                .timings_type   = VPBE_ENC_STD,
-                .timings        = {V4L2_STD_525_60},
+                .std_id         = V4L2_STD_525_60,
                .interlaced     = 1,
                .xres           = 720,
                .yres           = 480,
@@ -632,7 +633,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
        {
                .name           = "pal",
                .timings_type   = VPBE_ENC_STD,
-                .timings        = {V4L2_STD_625_50},
+                .std_id         = V4L2_STD_625_50,
                .interlaced     = 1,
                .xres           = 720,
                .yres           = 576,
@@ -647,8 +648,8 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
 static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {
        {
                .name           = "480p59_94",
-                .timings_type   = VPBE_ENC_DV_PRESET,
+                .timings_type   = VPBE_ENC_CUSTOM_TIMINGS,
-                .timings        = {V4L2_DV_480P59_94},
+                .dv_timings     = V4L2_DV_BT_CEA_720X480P59_94,
                .interlaced     = 0,
                .xres           = 720,
                .yres           = 480,
@@ -659,8 +660,8 @@ static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {
        },
        {
                .name           = "576p50",
-                .timings_type   = VPBE_ENC_DV_PRESET,
+                .timings_type   = VPBE_ENC_CUSTOM_TIMINGS,
-                .timings        = {V4L2_DV_576P50},
+                .dv_timings     = V4L2_DV_BT_CEA_720X576P50,
                .interlaced     = 0,
                .xres           = 720,
                .yres           = 576,
@@ -698,7 +699,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = {
                        .index          = 1,
                        .name           = "Component",
                        .type           = V4L2_OUTPUT_TYPE_ANALOG,
-                        .capabilities   = V4L2_OUT_CAP_PRESETS,
+                        .capabilities   = V4L2_OUT_CAP_DV_TIMINGS,
                },
                .subdev_name    = VPBE_VENC_SUBDEV_NAME,
                .default_mode   = "480p59_94",
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 9944367b493..1dbf85beed1 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -26,6 +26,7 @@
 #include <linux/i2c/pcf857x.h>
 #include <media/tvp514x.h>
+#include <media/adv7343.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
@@ -496,18 +497,49 @@ static struct vpif_subdev_info dm646x_vpif_subdev[] = {
        },
 };
-static const char *output[] = {
+static const struct vpif_output dm6467_ch0_outputs[] = {
-        "Composite",
+        {
-        "Component",
+                .output = {
-        "S-Video",
+                        .index = 0,
+                        .name = "Composite",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_STD,
+                        .std = V4L2_STD_ALL,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_COMPOSITE_ID,
+        },
+        {
+                .output = {
+                        .index = 1,
+                        .name = "Component",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_COMPONENT_ID,
+        },
+        {
+                .output = {
+                        .index = 2,
+                        .name = "S-Video",
+                        .type = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities = V4L2_OUT_CAP_STD,
+                        .std = V4L2_STD_ALL,
+                },
+                .subdev_name = "adv7343",
+                .output_route = ADV7343_SVIDEO_ID,
+        },
 };
 static struct vpif_display_config dm646x_vpif_display_config = {
        .set_clock      = set_vpif_clock,
        .subdevinfo     = dm646x_vpif_subdev,
        .subdev_count   = ARRAY_SIZE(dm646x_vpif_subdev),
-        .output         = output,
+        .chan_config[0] = {
-        .output_count   = ARRAY_SIZE(output),
+                .outputs = dm6467_ch0_outputs,
+                .output_count = ARRAY_SIZE(dm6467_ch0_outputs),
+        },
        .card_name      = "DM646x EVM",
 };
@@ -601,15 +633,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = {
                        I2C_BOARD_INFO("tvp5146", 0x5d),
                        .platform_data = &tvp5146_pdata,
                },
-                .input = INPUT_CVBS_VI2B,
-                .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
-                .can_route = 1,
-                .vpif_if = {
-                        .if_type = VPIF_IF_BT656,
-                        .hd_pol = 1,
-                        .vd_pol = 1,
-                        .fid_pol = 0,
-                },
        },
        {
                .name   = TVP5147_CH1,
@@ -617,15 +640,6 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = {
                        I2C_BOARD_INFO("tvp5146", 0x5c),
                        .platform_data = &tvp5146_pdata,
                },
-                .input = INPUT_SVIDEO_VI2C_VI1C,
-                .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
-                .can_route = 1,
-                .vpif_if = {
-                        .if_type = VPIF_IF_BT656,
-                        .hd_pol = 1,
-                        .vd_pol = 1,
-                        .fid_pol = 0,
-                },
        },
 };
@@ -635,9 +649,12 @@ static const struct vpif_input dm6467_ch0_inputs[] = {
                        .index = 0,
                        .name = "Composite",
                        .type = V4L2_INPUT_TYPE_CAMERA,
+                        .capabilities = V4L2_IN_CAP_STD,
                        .std = TVP514X_STD_ALL,
                },
                .subdev_name = TVP5147_CH0,
+                .input_route = INPUT_CVBS_VI2B,
+                .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,
        },
 };
@@ -647,9 +664,12 @@ static const struct vpif_input dm6467_ch1_inputs[] = {
                        .index = 0,
                        .name = "S-Video",
                        .type = V4L2_INPUT_TYPE_CAMERA,
+                        .capabilities = V4L2_IN_CAP_STD,
                        .std = TVP514X_STD_ALL,
                },
                .subdev_name = TVP5147_CH1,
+                .input_route = INPUT_SVIDEO_VI2C_VI1C,
+                .output_route = OUTPUT_10BIT_422_EMBEDDED_SYNC,
        },
 };
@@ -661,10 +681,22 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = {
        .chan_config[0] = {
                .inputs = dm6467_ch0_inputs,
                .input_count = ARRAY_SIZE(dm6467_ch0_inputs),
+                .vpif_if = {
+                        .if_type = VPIF_IF_BT656,
+                        .hd_pol = 1,
+                        .vd_pol = 1,
+                        .fid_pol = 0,
+                },
        },
        .chan_config[1] = {
                .inputs = dm6467_ch1_inputs,
                .input_count = ARRAY_SIZE(dm6467_ch1_inputs),
+                .vpif_if = {
+                        .if_type = VPIF_IF_BT656,
+                        .hd_pol = 1,
+                        .vd_pol = 1,
+                        .fid_pol = 0,
+                },
        },
 };
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index e517e1036b0..b90c172d554 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -347,6 +347,13 @@ static struct clk spi1_clk = {
        .flags          = DA850_CLK_ASYNC3,
 };
+static struct clk vpif_clk = {
+        .name           = "vpif",
+        .parent         = &pll0_sysclk2,
+        .lpsc           = DA850_LPSC1_VPIF,
+        .gpsc           = 1,
+};
 static struct clk sata_clk = {
        .name           = "sata",
        .parent         = &pll0_sysclk2,
@@ -397,6 +404,7 @@ static struct clk_lookup da850_clks[] = {
        CLK(NULL,               "usb20",        &usb20_clk),
        CLK("spi_davinci.0",    NULL,           &spi0_clk),
        CLK("spi_davinci.1",    NULL,           &spi1_clk),
+        CLK("vpif",             NULL,           &vpif_clk),
        CLK("ahci",             NULL,           &sata_clk),
        CLK(NULL,               NULL,           NULL),
 };
@@ -573,6 +581,46 @@ static const struct mux_config da850_pins[] = {
        MUX_CFG(DA850, GPIO6_10,        13,     20,     15,     8,      false)
        MUX_CFG(DA850, GPIO6_13,        13,     8,      15,     8,      false)
        MUX_CFG(DA850, RTC_ALARM,       0,      28,     15,     2,      false)
+        /* VPIF Capture */
+        MUX_CFG(DA850, VPIF_DIN0,       15,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN1,       15,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN2,       14,     28,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN3,       14,     24,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN4,       14,     20,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN5,       14,     16,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN6,       14,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN7,       14,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN8,       16,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN9,       16,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN10,      15,     28,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN11,      15,     24,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN12,      15,     20,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN13,      15,     16,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN14,      15,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DIN15,      15,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKIN0,     14,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKIN1,     14,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKIN2,     19,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKIN3,     19,     16,     15,     1,      false)
+        /* VPIF Display */
+        MUX_CFG(DA850, VPIF_DOUT0,      17,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT1,      17,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT2,      16,     28,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT3,      16,     24,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT4,      16,     20,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT5,      16,     16,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT6,      16,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT7,      16,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT8,      18,     4,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT9,      18,     0,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT10,     17,     28,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT11,     17,     24,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT12,     17,     20,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT13,     17,     16,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT14,     17,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_DOUT15,     17,     8,      15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKO2,      19,     12,     15,     1,      false)
+        MUX_CFG(DA850, VPIF_CLKO3,      19,     20,     15,     1,      false)
 #endif
 };
@@ -595,6 +643,26 @@ const short da850_lcdcntl_pins[] __initconst = {
        -1
 };
+const short da850_vpif_capture_pins[] __initdata = {
+        DA850_VPIF_DIN0, DA850_VPIF_DIN1, DA850_VPIF_DIN2, DA850_VPIF_DIN3,
+        DA850_VPIF_DIN4, DA850_VPIF_DIN5, DA850_VPIF_DIN6, DA850_VPIF_DIN7,
+        DA850_VPIF_DIN8, DA850_VPIF_DIN9, DA850_VPIF_DIN10, DA850_VPIF_DIN11,
+        DA850_VPIF_DIN12, DA850_VPIF_DIN13, DA850_VPIF_DIN14, DA850_VPIF_DIN15,
+        DA850_VPIF_CLKIN0, DA850_VPIF_CLKIN1, DA850_VPIF_CLKIN2,
+        DA850_VPIF_CLKIN3,
+        -1
+};
+const short da850_vpif_display_pins[] __initdata = {
+        DA850_VPIF_DOUT0, DA850_VPIF_DOUT1, DA850_VPIF_DOUT2, DA850_VPIF_DOUT3,
+        DA850_VPIF_DOUT4, DA850_VPIF_DOUT5, DA850_VPIF_DOUT6, DA850_VPIF_DOUT7,
+        DA850_VPIF_DOUT8, DA850_VPIF_DOUT9, DA850_VPIF_DOUT10,
+        DA850_VPIF_DOUT11, DA850_VPIF_DOUT12, DA850_VPIF_DOUT13,
+        DA850_VPIF_DOUT14, DA850_VPIF_DOUT15, DA850_VPIF_CLKO2,
+        DA850_VPIF_CLKO3,
+        -1
+};
 /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
 static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
        [IRQ_DA8XX_COMMTX]              = 7,
@@ -1064,6 +1132,90 @@ no_ddrpll_mem:
        return ret;
 }
+/* VPIF resource, platform data */
+static u64 da850_vpif_dma_mask = DMA_BIT_MASK(32);
+static struct resource da850_vpif_resource[] = {
+        {
+                .start = DA8XX_VPIF_BASE,
+                .end   = DA8XX_VPIF_BASE + 0xfff,
+                .flags = IORESOURCE_MEM,
+        }
+};
+static struct platform_device da850_vpif_dev = {
+        .name           = "vpif",
+        .id             = -1,
+        .dev            = {
+                .dma_mask               = &da850_vpif_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = da850_vpif_resource,
+        .num_resources  = ARRAY_SIZE(da850_vpif_resource),
+};
+static struct resource da850_vpif_display_resource[] = {
+        {
+                .start = IRQ_DA850_VPIFINT,
+                .end   = IRQ_DA850_VPIFINT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+static struct platform_device da850_vpif_display_dev = {
+        .name           = "vpif_display",
+        .id             = -1,
+        .dev            = {
+                .dma_mask               = &da850_vpif_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = da850_vpif_display_resource,
+        .num_resources  = ARRAY_SIZE(da850_vpif_display_resource),
+};
+static struct resource da850_vpif_capture_resource[] = {
+        {
+                .start = IRQ_DA850_VPIFINT,
+                .end   = IRQ_DA850_VPIFINT,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .start = IRQ_DA850_VPIFINT,
+                .end   = IRQ_DA850_VPIFINT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+static struct platform_device da850_vpif_capture_dev = {
+        .name           = "vpif_capture",
+        .id             = -1,
+        .dev            = {
+                .dma_mask               = &da850_vpif_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+        .resource       = da850_vpif_capture_resource,
+        .num_resources  = ARRAY_SIZE(da850_vpif_capture_resource),
+};
+int __init da850_register_vpif(void)
+{
+        return platform_device_register(&da850_vpif_dev);
+}
+int __init da850_register_vpif_display(struct vpif_display_config
+                                                *display_config)
+{
+        da850_vpif_display_dev.dev.platform_data = display_config;
+        return platform_device_register(&da850_vpif_display_dev);
+}
+int __init da850_register_vpif_capture(struct vpif_capture_config
+                                                        *capture_config)
+{
+        da850_vpif_capture_dev.dev.platform_data = capture_config;
+        return platform_device_register(&da850_vpif_capture_dev);
+}
 static struct davinci_soc_info davinci_soc_info_da850 = {
        .io_desc                = da850_io_desc,
        .io_desc_num            = ARRAY_SIZE(da850_io_desc),
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 0755d466221..cd0c8b1e1ec 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -701,7 +701,7 @@ static struct resource dm644x_venc_resources[] = {
 #define DM644X_VPSS_DACCLKEN                  BIT(4)
 static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type,
-                                   unsigned int mode)
+                                   unsigned int pclock)
 {
        int ret = 0;
        u32 v = DM644X_VPSS_VENCLKEN;
@@ -711,27 +711,18 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type,
                v |= DM644X_VPSS_DACCLKEN;
                writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
                break;
-        case VPBE_ENC_DV_PRESET:
+        case VPBE_ENC_CUSTOM_TIMINGS:
-                switch (mode) {
+                if (pclock <= 27000000) {
-                case V4L2_DV_480P59_94:
-                case V4L2_DV_576P50:
                        v |= DM644X_VPSS_MUXSEL_PLL2_MODE |
                             DM644X_VPSS_DACCLKEN;
                        writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
-                        break;
+                } else {
-                case V4L2_DV_720P60:
-                case V4L2_DV_1080I60:
-                case V4L2_DV_1080P30:
                        /*
                         * For HD, use external clock source since
                         * HD requires higher clock rate
                         */
                        v |= DM644X_VPSS_MUXSEL_VPBECLK_MODE;
                        writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
-                        break;
-                default:
-                        ret = -EINVAL;
-                        break;
                }
                break;
        default:
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index c9ee723c56f..aaccdc4528f 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -17,6 +17,7 @@
 #include <linux/davinci_emac.h>
 #include <linux/spi/spi.h>
 #include <linux/platform_data/davinci_asp.h>
+#include <linux/videodev2.h>
 #include <mach/serial.h>
 #include <mach/edma.h>
@@ -26,6 +27,8 @@
 #include <linux/platform_data/usb-davinci.h>
 #include <linux/platform_data/spi-davinci.h>
+#include <media/davinci/vpif_types.h>
 extern void __iomem *da8xx_syscfg0_base;
 extern void __iomem *da8xx_syscfg1_base;
@@ -63,6 +66,7 @@ extern unsigned int da850_max_speed;
 #define DA8XX_PLL0_BASE         0x01c11000
 #define DA8XX_TIMER64P0_BASE    0x01c20000
 #define DA8XX_TIMER64P1_BASE    0x01c21000
+#define DA8XX_VPIF_BASE         0x01e17000
 #define DA8XX_GPIO_BASE         0x01e26000
 #define DA8XX_PSC1_BASE         0x01e27000
 #define DA8XX_AEMIF_CS2_BASE    0x60000000
@@ -92,6 +96,11 @@ int da8xx_register_cpuidle(void);
 void __iomem * __init da8xx_get_mem_ctlr(void);
 int da850_register_pm(struct platform_device *pdev);
 int __init da850_register_sata(unsigned long refclkpn);
+int __init da850_register_vpif(void);
+int __init da850_register_vpif_display
+                        (struct vpif_display_config *display_config);
+int __init da850_register_vpif_capture
+                        (struct vpif_capture_config *capture_config);
 void da8xx_restart(char mode, const char *cmd);
 extern struct platform_device da8xx_serial_device;
@@ -126,6 +135,8 @@ extern const short da830_ecap1_pins[];
 extern const short da830_ecap2_pins[];
 extern const short da830_eqep0_pins[];
 extern const short da830_eqep1_pins[];
+extern const short da850_vpif_capture_pins[];
+extern const short da850_vpif_display_pins[];
 extern const short da850_i2c0_pins[];
 extern const short da850_i2c1_pins[];
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index a7e92fca32e..9e95b8a1edb 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -928,6 +928,48 @@ enum davinci_da850_index {
        DA850_GPIO6_10,
        DA850_GPIO6_13,
        DA850_RTC_ALARM,
+        /* VPIF Capture */
+        DA850_VPIF_DIN0,
+        DA850_VPIF_DIN1,
+        DA850_VPIF_DIN2,
+        DA850_VPIF_DIN3,
+        DA850_VPIF_DIN4,
+        DA850_VPIF_DIN5,
+        DA850_VPIF_DIN6,
+        DA850_VPIF_DIN7,
+        DA850_VPIF_DIN8,
+        DA850_VPIF_DIN9,
+        DA850_VPIF_DIN10,
+        DA850_VPIF_DIN11,
+        DA850_VPIF_DIN12,
+        DA850_VPIF_DIN13,
+        DA850_VPIF_DIN14,
+        DA850_VPIF_DIN15,
+        DA850_VPIF_CLKIN0,
+        DA850_VPIF_CLKIN1,
+        DA850_VPIF_CLKIN2,
+        DA850_VPIF_CLKIN3,
+        /* VPIF Display */
+        DA850_VPIF_DOUT0,
+        DA850_VPIF_DOUT1,
+        DA850_VPIF_DOUT2,
+        DA850_VPIF_DOUT3,
+        DA850_VPIF_DOUT4,
+        DA850_VPIF_DOUT5,
+        DA850_VPIF_DOUT6,
+        DA850_VPIF_DOUT7,
+        DA850_VPIF_DOUT8,
+        DA850_VPIF_DOUT9,
+        DA850_VPIF_DOUT10,
+        DA850_VPIF_DOUT11,
+        DA850_VPIF_DOUT12,
+        DA850_VPIF_DOUT13,
+        DA850_VPIF_DOUT14,
+        DA850_VPIF_DOUT15,
+        DA850_VPIF_CLKO2,
+        DA850_VPIF_CLKO3,
 };
 enum davinci_tnetv107x_index {
diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/include/mach/psc.h
index 405318e35bf..40a0027838e 100644
--- a/arch/arm/mach-davinci/include/mach/psc.h
+++ b/arch/arm/mach-davinci/include/mach/psc.h
@@ -166,6 +166,7 @@
 #define DA830_LPSC1_McASP1              8
 #define DA850_LPSC1_SATA                8
 #define DA830_LPSC1_McASP2              9
+#define DA850_LPSC1_VPIF                9
 #define DA8XX_LPSC1_SPI1                10
 #define DA8XX_LPSC1_I2C                 11
 #define DA8XX_LPSC1_UART1               12
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 4372075c551..da55107033d 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -31,11 +31,11 @@ config CPU_EXYNOS4210
        bool "SAMSUNG EXYNOS4210"
        default y
        depends on ARCH_EXYNOS4
-        select SAMSUNG_DMADEV
        select ARM_CPU_SUSPEND if PM
+        select PM_GENERIC_DOMAINS
        select S5P_PM if PM
        select S5P_SLEEP if PM
-        select PM_GENERIC_DOMAINS
+        select SAMSUNG_DMADEV
        help
          Enable EXYNOS4210 CPU support
@@ -43,9 +43,9 @@ config SOC_EXYNOS4212
        bool "SAMSUNG EXYNOS4212"
        default y
        depends on ARCH_EXYNOS4
-        select SAMSUNG_DMADEV
        select S5P_PM if PM
        select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
        help
          Enable EXYNOS4212 SoC support
@@ -61,9 +61,9 @@ config SOC_EXYNOS5250
        bool "SAMSUNG EXYNOS5250"
        default y
        depends on ARCH_EXYNOS5
-        select SAMSUNG_DMADEV
        select S5P_PM if PM
        select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
        help
          Enable EXYNOS5250 SoC support
@@ -189,71 +189,71 @@ config MACH_SMDKC210
 config MACH_SMDKV310
        bool "SMDKV310"
        select CPU_EXYNOS4210
-        select S5P_DEV_FIMD0
+        select EXYNOS4_DEV_AHCI
+        select EXYNOS4_DEV_USB_OHCI
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_I2C1
+        select EXYNOS4_SETUP_KEYPAD
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
+        select EXYNOS_DEV_SYSMMU
+        select S3C24XX_PWM
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_HSMMC2
+        select S3C_DEV_HSMMC3
+        select S3C_DEV_I2C1
        select S3C_DEV_RTC
+        select S3C_DEV_USB_HSOTG
        select S3C_DEV_WDT
-        select S3C_DEV_I2C1
        select S5P_DEV_FIMC0
        select S5P_DEV_FIMC1
        select S5P_DEV_FIMC2
        select S5P_DEV_FIMC3
+        select S5P_DEV_FIMD0
        select S5P_DEV_G2D
        select S5P_DEV_I2C_HDMIPHY
        select S5P_DEV_JPEG
        select S5P_DEV_MFC
        select S5P_DEV_TV
        select S5P_DEV_USB_EHCI
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S3C_DEV_HSMMC3
-        select S3C_DEV_USB_HSOTG
        select SAMSUNG_DEV_BACKLIGHT
-        select EXYNOS_DEV_DRM
-        select EXYNOS_DEV_SYSMMU
-        select EXYNOS4_DEV_AHCI
        select SAMSUNG_DEV_KEYPAD
-        select EXYNOS_DEV_DMA
        select SAMSUNG_DEV_PWM
-        select EXYNOS4_DEV_USB_OHCI
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_I2C1
-        select EXYNOS4_SETUP_KEYPAD
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_USB_PHY
-        select S3C24XX_PWM
        help
          Machine support for Samsung SMDKV310
 config MACH_ARMLEX4210
        bool "ARMLEX4210"
        select CPU_EXYNOS4210
-        select S3C_DEV_RTC
+        select EXYNOS4_DEV_AHCI
-        select S3C_DEV_WDT
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS_DEV_DMA
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
-        select EXYNOS4_DEV_AHCI
+        select S3C_DEV_RTC
-        select EXYNOS_DEV_DMA
+        select S3C_DEV_WDT
-        select EXYNOS4_SETUP_SDHCI
        help
          Machine support for Samsung ARMLEX4210 based on EXYNOS4210
 config MACH_UNIVERSAL_C210
        bool "Mobile UNIVERSAL_C210 Board"
-        select CPU_EXYNOS4210
-        select S5P_HRT
        select CLKSRC_MMIO
+        select CPU_EXYNOS4210
+        select EXYNOS4_SETUP_FIMC
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_I2C1
+        select EXYNOS4_SETUP_I2C3
+        select EXYNOS4_SETUP_I2C5
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
+        select EXYNOS_DEV_SYSMMU
        select HAVE_SCHED_CLOCK
-        select S5P_GPIO_INT
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
-        select S5P_DEV_FIMC3
-        select S5P_DEV_G2D
-        select S5P_DEV_CSIS0
-        select S5P_DEV_JPEG
-        select S5P_DEV_FIMD0
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
@@ -261,21 +261,21 @@ config MACH_UNIVERSAL_C210
        select S3C_DEV_I2C3
        select S3C_DEV_I2C5
        select S3C_DEV_USB_HSOTG
+        select S5P_DEV_CSIS0
+        select S5P_DEV_FIMC0
+        select S5P_DEV_FIMC1
+        select S5P_DEV_FIMC2
+        select S5P_DEV_FIMC3
+        select S5P_DEV_FIMD0
+        select S5P_DEV_G2D
        select S5P_DEV_I2C_HDMIPHY
+        select S5P_DEV_JPEG
        select S5P_DEV_MFC
        select S5P_DEV_ONENAND
        select S5P_DEV_TV
-        select EXYNOS_DEV_SYSMMU
+        select S5P_GPIO_INT
-        select EXYNOS_DEV_DMA
+        select S5P_HRT
-        select EXYNOS_DEV_DRM
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_I2C1
-        select EXYNOS4_SETUP_I2C3
-        select EXYNOS4_SETUP_I2C5
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_FIMC
        select S5P_SETUP_MIPIPHY
-        select EXYNOS4_SETUP_USB_PHY
        help
          Machine support for Samsung Mobile Universal S5PC210 Reference
          Board.
@@ -283,10 +283,16 @@ config MACH_UNIVERSAL_C210
 config MACH_NURI
        bool "Mobile NURI Board"
        select CPU_EXYNOS4210
-        select S5P_GPIO_INT
+        select EXYNOS4_SETUP_FIMC
-        select S3C_DEV_WDT
+        select EXYNOS4_SETUP_FIMD0
-        select S3C_DEV_RTC
+        select EXYNOS4_SETUP_I2C1
-        select S5P_DEV_FIMD0
+        select EXYNOS4_SETUP_I2C3
+        select EXYNOS4_SETUP_I2C5
+        select EXYNOS4_SETUP_I2C6
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
@@ -294,41 +300,42 @@ config MACH_NURI
        select S3C_DEV_I2C3
        select S3C_DEV_I2C5
        select S3C_DEV_I2C6
+        select S3C_DEV_RTC
        select S3C_DEV_USB_HSOTG
+        select S3C_DEV_WDT
        select S5P_DEV_CSIS0
-        select S5P_DEV_JPEG
        select S5P_DEV_FIMC0
        select S5P_DEV_FIMC1
        select S5P_DEV_FIMC2
        select S5P_DEV_FIMC3
+        select S5P_DEV_FIMD0
        select S5P_DEV_G2D
+        select S5P_DEV_JPEG
        select S5P_DEV_MFC
        select S5P_DEV_USB_EHCI
+        select S5P_GPIO_INT
        select S5P_SETUP_MIPIPHY
-        select EXYNOS_DEV_DMA
-        select EXYNOS_DEV_DRM
-        select EXYNOS4_SETUP_FIMC
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_I2C1
-        select EXYNOS4_SETUP_I2C3
-        select EXYNOS4_SETUP_I2C5
-        select EXYNOS4_SETUP_I2C6
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_USB_PHY
-        select S5P_SETUP_MIPIPHY
-        select SAMSUNG_DEV_PWM
        select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_PWM
        help
          Machine support for Samsung Mobile NURI Board.
 config MACH_ORIGEN
        bool "ORIGEN"
        select CPU_EXYNOS4210
-        select S3C_DEV_RTC
+        select EXYNOS4_DEV_USB_OHCI
-        select S3C_DEV_WDT
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
+        select EXYNOS_DEV_SYSMMU
+        select S3C24XX_PWM
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC2
+        select S3C_DEV_RTC
        select S3C_DEV_USB_HSOTG
+        select S3C_DEV_WDT
        select S5P_DEV_FIMC0
        select S5P_DEV_FIMC1
        select S5P_DEV_FIMC2
@@ -342,14 +349,6 @@ config MACH_ORIGEN
        select S5P_DEV_USB_EHCI
        select SAMSUNG_DEV_BACKLIGHT
        select SAMSUNG_DEV_PWM
-        select EXYNOS_DEV_DRM
-        select EXYNOS_DEV_SYSMMU
-        select EXYNOS_DEV_DMA
-        select EXYNOS4_DEV_USB_OHCI
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_USB_PHY
-        select S3C24XX_PWM
        help
          Machine support for ORIGEN based on Samsung EXYNOS4210
@@ -357,7 +356,17 @@ comment "EXYNOS4212 Boards"
 config MACH_SMDK4212
        bool "SMDK4212"
-        select SOC_EXYNOS4212
+        select EXYNOS4_SETUP_FIMD0
+        select EXYNOS4_SETUP_I2C1
+        select EXYNOS4_SETUP_I2C3
+        select EXYNOS4_SETUP_I2C7
+        select EXYNOS4_SETUP_KEYPAD
+        select EXYNOS4_SETUP_SDHCI
+        select EXYNOS4_SETUP_USB_PHY
+        select EXYNOS_DEV_DMA
+        select EXYNOS_DEV_DRM
+        select EXYNOS_DEV_SYSMMU
+        select S3C24XX_PWM
        select S3C_DEV_HSMMC2
        select S3C_DEV_HSMMC3
        select S3C_DEV_I2C1
@@ -375,17 +384,7 @@ config MACH_SMDK4212
        select SAMSUNG_DEV_BACKLIGHT
        select SAMSUNG_DEV_KEYPAD
        select SAMSUNG_DEV_PWM
-        select EXYNOS_DEV_SYSMMU
+        select SOC_EXYNOS4212
-        select EXYNOS_DEV_DMA
-        select EXYNOS_DEV_DRM
-        select EXYNOS4_SETUP_FIMD0
-        select EXYNOS4_SETUP_I2C1
-        select EXYNOS4_SETUP_I2C3
-        select EXYNOS4_SETUP_I2C7
-        select EXYNOS4_SETUP_KEYPAD
-        select EXYNOS4_SETUP_SDHCI
-        select EXYNOS4_SETUP_USB_PHY
-        select S3C24XX_PWM
        help
          Machine support for Samsung SMDK4212
@@ -393,8 +392,8 @@ comment "EXYNOS4412 Boards"
 config MACH_SMDK4412
        bool "SMDK4412"
-        select SOC_EXYNOS4412
        select MACH_SMDK4212
+        select SOC_EXYNOS4412
        help
          Machine support for Samsung SMDK4412
 endif
@@ -404,12 +403,12 @@ comment "Flattened Device Tree based board for EXYNOS SoCs"
 config MACH_EXYNOS4_DT
        bool "Samsung Exynos4 Machine using device tree"
        depends on ARCH_EXYNOS4
-        select CPU_EXYNOS4210
-        select USE_OF
        select ARM_AMBA
+        select CPU_EXYNOS4210
        select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
        select PINCTRL
        select PINCTRL_EXYNOS4
+        select USE_OF
        help
          Machine support for Samsung Exynos4 machine with device tree enabled.
          Select this if a fdt blob is available for the Exynos4 SoC based board.
@@ -419,9 +418,9 @@ config MACH_EXYNOS4_DT
 config MACH_EXYNOS5_DT
        bool "SAMSUNG EXYNOS5 Machine using device tree"
        depends on ARCH_EXYNOS5
+        select ARM_AMBA
        select SOC_EXYNOS5250
        select USE_OF
-        select ARM_AMBA
        help
          Machine support for Samsung EXYNOS5 machine with device tree enabled.
          Select this if a fdt blob is available for the EXYNOS5 SoC based board.
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 480cd78f192..c05d7aa8403 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -29,6 +29,7 @@
 #include <drm/exynos_drm.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <media/m5mols.h>
 #include <media/s5k6aa.h>
 #include <media/s5p_fimc.h>
@@ -39,7 +40,6 @@
 #include <asm/mach-types.h>
 #include <plat/adc.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/regs-serial.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
@@ -378,10 +378,10 @@ static struct regulator_consumer_supply __initdata max8997_ldo1_[] = {
 };
 static struct regulator_consumer_supply __initdata max8997_ldo3_[] = {
        REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */
-        REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */
 };
 static struct regulator_consumer_supply __initdata max8997_ldo4_[] = {
-        REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */
 };
 static struct regulator_consumer_supply __initdata max8997_ldo5_[] = {
        REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */
@@ -1180,9 +1180,7 @@ static struct platform_device cam_8m_12v_fixed_rdev = {
 static struct s5p_platform_mipi_csis mipi_csis_platdata = {
        .clk_rate       = 166000000UL,
        .lanes          = 2,
-        .alignment      = 32,
        .hs_settle      = 12,
-        .phy_enable     = s5p_csis_phy_enable,
 };
 #define GPIO_CAM_MEGA_RST       EXYNOS4_GPY3(7) /* ISP_RESET */
@@ -1226,7 +1224,6 @@ static struct s5p_fimc_isp_info nuri_camera_sensors[] = {
                .bus_type       = FIMC_MIPI_CSI2,
                .board_info     = &m5mols_board_info,
                .clk_frequency  = 24000000UL,
-                .csi_data_align = 32,
        },
 };
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index 67b50bb89c0..9adf491674e 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -30,9 +30,9 @@
 #include <asm/mach-types.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <plat/regs-serial.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/sdhci.h>
@@ -97,12 +97,12 @@ static struct s3c2410_uartcfg origen_uartcfgs[] __initdata = {
 };
 static struct regulator_consumer_supply __initdata ldo3_consumer[] = {
-        REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */
        REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */
        REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */
 };
 static struct regulator_consumer_supply __initdata ldo6_consumer[] = {
-        REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
+        REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */
 };
 static struct regulator_consumer_supply __initdata ldo7_consumer[] = {
        REGULATOR_SUPPLY("avdd", "alc5625"), /* Realtek ALC5625 */
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c
index 7a265d1a82d..730f1ac6592 100644
--- a/arch/arm/mach-exynos/mach-smdk4x12.c
+++ b/arch/arm/mach-exynos/mach-smdk4x12.c
@@ -27,6 +27,7 @@
 #include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
+#include <video/samsung_fimd.h>
 #include <plat/backlight.h>
 #include <plat/clock.h>
 #include <plat/cpu.h>
@@ -36,7 +37,6 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/mfc.h>
-#include <plat/regs-fb.h>
 #include <plat/regs-serial.h>
 #include <plat/sdhci.h>
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index c15d2238ceb..ee4fb1a9cb7 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -27,9 +27,9 @@
 #include <asm/mach-types.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-srom.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/fb.h>
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 98d3aced228..ebc9dd339a3 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -30,6 +30,7 @@
 #include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
+#include <video/samsung_fimd.h>
 #include <plat/regs-serial.h>
 #include <plat/clock.h>
 #include <plat/cpu.h>
@@ -39,7 +40,6 @@
 #include <plat/fb.h>
 #include <plat/mfc.h>
 #include <plat/sdhci.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/fimc-core.h>
 #include <plat/s5p-time.h>
 #include <plat/camport.h>
@@ -209,7 +209,7 @@ static struct regulator_consumer_supply lp3974_ldo3_consumer[] = {
        REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
        REGULATOR_SUPPLY("vdd", "exynos4-hdmi"),
        REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"),
-        REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"),
+        REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"),
 };
 static struct regulator_init_data lp3974_ldo3_data = {
@@ -273,7 +273,7 @@ static struct regulator_init_data lp3974_ldo6_data = {
 };
 static struct regulator_consumer_supply lp3974_ldo7_consumer[] = {
-        REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"),
+        REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"),
 };
 static struct regulator_init_data lp3974_ldo7_data = {
@@ -942,9 +942,7 @@ static struct platform_device cam_s_if_fixed_reg_dev = {
 static struct s5p_platform_mipi_csis mipi_csis_platdata = {
        .clk_rate       = 166000000UL,
        .lanes          = 2,
-        .alignment      = 32,
        .hs_settle      = 12,
-        .phy_enable     = s5p_csis_phy_enable,
 };
 #define GPIO_CAM_LEVEL_EN(n)    EXYNOS4_GPE4(n + 3)
@@ -1008,7 +1006,6 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = {
                .board_info     = &m5mols_board_info,
                .i2c_bus_num    = 0,
                .clk_frequency  = 24000000UL,
-                .csi_data_align = 32,
        },
 };
diff --git a/arch/arm/mach-exynos/setup-fimd0.c b/arch/arm/mach-exynos/setup-fimd0.c
index 07a6dbeecdd..5665bb4e980 100644
--- a/arch/arm/mach-exynos/setup-fimd0.c
+++ b/arch/arm/mach-exynos/setup-fimd0.c
@@ -13,8 +13,8 @@
 #include <linux/fb.h>
 #include <linux/gpio.h>
+#include <video/samsung_fimd.h>
 #include <plat/gpio-cfg.h>
-#include <plat/regs-fb-v4.h>
 #include <mach/map.h>
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index f643ef819da..abda5a18a66 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -91,7 +91,7 @@ config FOOTBRIDGE_ADDIN
 # EBSA285 board in either host or addin mode
 config ARCH_EBSA285
-        select ARCH_MAY_HAVE_PC_FDC
        bool
+        select ARCH_MAY_HAVE_PC_FDC
 endif
diff --git a/arch/arm/mach-h720x/Kconfig b/arch/arm/mach-h720x/Kconfig
index abf356c0234..6bb755bcb6f 100644
--- a/arch/arm/mach-h720x/Kconfig
+++ b/arch/arm/mach-h720x/Kconfig
@@ -12,9 +12,9 @@ config ARCH_H7201
 config ARCH_H7202
        bool "hms30c7202"
+        depends on ARCH_H720X
        select CPU_H7202
        select ZONE_DMA
-        depends on ARCH_H720X
        help
          Say Y here if you are using the Hynix HMS30C7202 Reference Board
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 32197c117af..8d276584650 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -41,68 +41,68 @@ config SOC_IMX1
 config SOC_IMX21
        bool
-        select MACH_MX21
-        select CPU_ARM926T
        select COMMON_CLK
+        select CPU_ARM926T
        select IMX_HAVE_IOMUX_V1
+        select MACH_MX21
        select MXC_AVIC
 config SOC_IMX25
        bool
        select ARCH_MX25
+        select ARCH_MXC_IOMUX_V3
        select COMMON_CLK
        select CPU_ARM926T
        select HAVE_CAN_FLEXCAN if CAN
-        select ARCH_MXC_IOMUX_V3
        select MXC_AVIC
 config SOC_IMX27
        bool
-        select MACH_MX27
-        select CPU_ARM926T
        select COMMON_CLK
+        select CPU_ARM926T
        select IMX_HAVE_IOMUX_V1
+        select MACH_MX27
        select MXC_AVIC
 config SOC_IMX31
        bool
+        select COMMON_CLK
        select CPU_V6
        select IMX_HAVE_PLATFORM_MXC_RNGA
        select MXC_AVIC
-        select COMMON_CLK
        select SMP_ON_UP if SMP
 config SOC_IMX35
        bool
-        select CPU_V6K
        select ARCH_MXC_IOMUX_V3
        select COMMON_CLK
+        select CPU_V6K
+        select HAVE_CAN_FLEXCAN if CAN
        select HAVE_EPIT
        select MXC_AVIC
        select SMP_ON_UP if SMP
-        select HAVE_CAN_FLEXCAN if CAN
 config SOC_IMX5
-        select CPU_V7
+        bool
-        select MXC_TZIC
-        select COMMON_CLK
-        select ARCH_MXC_IOMUX_V3
        select ARCH_HAS_CPUFREQ
        select ARCH_MX5
-        bool
+        select ARCH_MXC_IOMUX_V3
+        select COMMON_CLK
+        select CPU_V7
+        select MXC_TZIC
 config SOC_IMX50
        bool
-        select SOC_IMX5
        select ARCH_MX50
+        select SOC_IMX5
 config  SOC_IMX51
        bool
-        select SOC_IMX5
        select ARCH_MX5
        select ARCH_MX51
        select PINCTRL
        select PINCTRL_IMX51
+        select SOC_IMX5
 if ARCH_IMX_V4_V5
@@ -112,10 +112,10 @@ config MACH_MXLADS
 config ARCH_MX1ADS
        bool "MX1ADS platform"
-        select MACH_MXLADS
-        select SOC_IMX1
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_UART
+        select MACH_MXLADS
+        select SOC_IMX1
        help
          Say Y here if you are using Motorola MX1ADS/MXLADS boards
@@ -127,9 +127,9 @@ config MACH_SCB9328
 config MACH_APF9328
        bool "APF9328"
-        select SOC_IMX1
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX1
        help
          Say Yes here if you are using the Armadeus APF9328 development board
@@ -137,11 +137,11 @@ comment "MX21 platforms:"
 config MACH_MX21ADS
        bool "MX21ADS platform"
-        select SOC_IMX21
        select IMX_HAVE_PLATFORM_IMX_FB
        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_MXC_MMC
        select IMX_HAVE_PLATFORM_MXC_NAND
+        select SOC_IMX21
        help
          Include support for MX21ADS platform. This includes specific
          configurations for the board and its peripherals.
@@ -150,22 +150,21 @@ comment "MX25 platforms:"
 config MACH_MX25_3DS
        bool "Support MX25PDK (3DS) Platform"
-        select SOC_IMX25
        select IMX_HAVE_PLATFORM_FLEXCAN
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMXDI_RTC
-        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_FB
+        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_KEYPAD
        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_MXC_EHCI
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select SOC_IMX25
 config MACH_EUKREA_CPUIMX25SD
        bool "Support Eukrea CPUIMX25 Platform"
-        select SOC_IMX25
        select IMX_HAVE_PLATFORM_FLEXCAN
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
@@ -177,6 +176,7 @@ config MACH_EUKREA_CPUIMX25SD
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX25
 choice
        prompt "Baseboard"
@@ -199,20 +199,19 @@ comment "MX27 platforms:"
 config MACH_MX27ADS
        bool "MX27ADS platform"
-        select SOC_IMX27
        select IMX_HAVE_PLATFORM_IMX_FB
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_MXC_MMC
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_MXC_W1
+        select SOC_IMX27
        help
          Include support for MX27ADS platform. This includes specific
          configurations for the board and its peripherals.
 config MACH_PCM038
        bool "Phytec phyCORE-i.MX27 CPU module (pcm038)"
-        select SOC_IMX27
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_UART
@@ -221,6 +220,7 @@ config MACH_PCM038
        select IMX_HAVE_PLATFORM_MXC_W1
        select IMX_HAVE_PLATFORM_SPI_IMX
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX27
        help
          Include support for phyCORE-i.MX27 (aka pcm038) platform. This
          includes specific configurations for the module and its peripherals.
@@ -242,7 +242,6 @@ endchoice
 config MACH_CPUIMX27
        bool "Eukrea CPUIMX27 module"
-        select SOC_IMX27
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_I2C
@@ -251,6 +250,7 @@ config MACH_CPUIMX27
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_MXC_W1
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX27
        help
          Include support for Eukrea CPUIMX27 platform. This includes
          specific configurations for the module and its peripherals.
@@ -292,7 +292,6 @@ endchoice
 config MACH_MX27_3DS
        bool "MX27PDK platform"
-        select SOC_IMX27
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_FB
@@ -306,13 +305,13 @@ config MACH_MX27_3DS
        select IMX_HAVE_PLATFORM_SPI_IMX
        select MXC_DEBUG_BOARD
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX27
        help
          Include support for MX27PDK platform. This includes specific
          configurations for the board and its peripherals.
 config MACH_IMX27_VISSTRIM_M10
        bool "Vista Silicon i.MX27 Visstrim_m10"
-        select SOC_IMX27
        select IMX_HAVE_PLATFORM_GPIO_KEYS
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_SSI
@@ -321,6 +320,7 @@ config MACH_IMX27_VISSTRIM_M10
        select IMX_HAVE_PLATFORM_MXC_EHCI
        select IMX_HAVE_PLATFORM_MXC_MMC
        select LEDS_GPIO_REGISTER
+        select SOC_IMX27
        help
          Include support for Visstrim_m10 platform and its different variants.
          This includes specific configurations for the board and its
@@ -328,16 +328,15 @@ config MACH_IMX27_VISSTRIM_M10
 config MACH_IMX27LITE
        bool "LogicPD MX27 LITEKIT platform"
-        select SOC_IMX27
-        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_IMX_SSI
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX27
        help
          Include support for MX27 LITEKIT platform. This includes specific
          configurations for the board and its peripherals.
 config MACH_PCA100
        bool "Phytec phyCARD-s (pca100)"
-        select SOC_IMX27
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_FB
@@ -350,27 +349,28 @@ config MACH_PCA100
        select IMX_HAVE_PLATFORM_MXC_W1
        select IMX_HAVE_PLATFORM_SPI_IMX
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX27
        help
          Include support for phyCARD-s (aka pca100) platform. This
          includes specific configurations for the module and its peripherals.
 config MACH_MXT_TD60
        bool "Maxtrack i-MXT TD60"
-        select SOC_IMX27
        select IMX_HAVE_PLATFORM_IMX_FB
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_MXC_MMC
        select IMX_HAVE_PLATFORM_MXC_NAND
+        select SOC_IMX27
        help
          Include support for i-MXT (aka td60) platform. This
          includes specific configurations for the module and its peripherals.
 config MACH_IMX27IPCAM
        bool "IMX27 IPCAM platform"
-        select SOC_IMX27
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX27
        help
          Include support for IMX27 IPCAM platform. This includes specific
          configurations for the board and its peripherals.
@@ -390,11 +390,11 @@ comment "MX31 platforms:"
 config MACH_MX31ADS
        bool "Support MX31ADS platforms"
-        select SOC_IMX31
+        default y
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_SSI
        select IMX_HAVE_PLATFORM_IMX_UART
-        default y
+        select SOC_IMX31
        help
          Include support for MX31ADS platform. This includes specific
          configurations for the board and its peripherals.
@@ -412,21 +412,19 @@ config MACH_MX31ADS_WM1133_EV1
 config MACH_MX31LILLY
        bool "Support MX31 LILLY-1131 platforms (INCO startec)"
-        select SOC_IMX31
        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_IPU_CORE
        select IMX_HAVE_PLATFORM_MXC_EHCI
        select IMX_HAVE_PLATFORM_MXC_MMC
        select IMX_HAVE_PLATFORM_SPI_IMX
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
        help
          Include support for mx31 based LILLY1131 modules. This includes
          specific configurations for the board and its peripherals.
 config MACH_MX31LITE
        bool "Support MX31 LITEKIT (LogicPD)"
-        select SOC_IMX31
-        select MXC_ULPI if USB_ULPI
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_MXC_EHCI
@@ -435,13 +433,14 @@ config MACH_MX31LITE
        select IMX_HAVE_PLATFORM_MXC_RTC
        select IMX_HAVE_PLATFORM_SPI_IMX
        select LEDS_GPIO_REGISTER
+        select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
        help
          Include support for MX31 LITEKIT platform. This includes specific
          configurations for the board and its peripherals.
 config MACH_PCM037
        bool "Support Phytec pcm037 (i.MX31) platforms"
-        select SOC_IMX31
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_I2C
@@ -452,6 +451,7 @@ config MACH_PCM037
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_MXC_W1
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
        help
          Include support for Phytec pcm037 platform. This includes
          specific configurations for the board and its peripherals.
@@ -468,8 +468,6 @@ config MACH_PCM037_EET
 config MACH_MX31_3DS
        bool "Support MX31PDK (3DS)"
-        select SOC_IMX31
-        select MXC_DEBUG_BOARD
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_I2C
@@ -481,7 +479,9 @@ config MACH_MX31_3DS
        select IMX_HAVE_PLATFORM_MXC_MMC
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_SPI_IMX
+        select MXC_DEBUG_BOARD
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
        help
          Include support for MX31PDK (3DS) platform. This includes specific
          configurations for the board and its peripherals.
@@ -497,7 +497,6 @@ config MACH_MX31_3DS_MXC_NAND_USE_BBT
 config MACH_MX31MOBOARD
        bool "Support mx31moboard platforms (EPFL Mobots group)"
-        select SOC_IMX31
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_I2C
@@ -509,22 +508,22 @@ config MACH_MX31MOBOARD
        select IMX_HAVE_PLATFORM_SPI_IMX
        select LEDS_GPIO_REGISTER
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
        help
          Include support for mx31moboard platform. This includes specific
          configurations for the board and its peripherals.
 config MACH_QONG
        bool "Support Dave/DENX QongEVB-LITE platform"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX31
        help
          Include support for Dave/DENX QongEVB-LITE platform. This includes
          specific configurations for the board and its peripherals.
 config MACH_ARMADILLO5X0
        bool "Support Atmark Armadillo-500 Development Base Board"
-        select SOC_IMX31
        select IMX_HAVE_PLATFORM_GPIO_KEYS
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_UART
@@ -533,23 +532,24 @@ config MACH_ARMADILLO5X0
        select IMX_HAVE_PLATFORM_MXC_MMC
        select IMX_HAVE_PLATFORM_MXC_NAND
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX31
        help
          Include support for Atmark Armadillo-500 platform. This includes
          specific configurations for the board and its peripherals.
 config MACH_KZM_ARM11_01
        bool "Support KZM-ARM11-01(Kyoto Microcomputer)"
-        select SOC_IMX31
        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX31
        help
          Include support for KZM-ARM11-01. This includes specific
          configurations for the board and its peripherals.
 config MACH_BUG
        bool "Support Buglabs BUGBase platform"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_UART
        default y
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select SOC_IMX31
        help
          Include support for BUGBase 1.3 platform. This includes specific
          configurations for the board and its peripherals.
@@ -565,7 +565,6 @@ comment "MX35 platforms:"
 config MACH_PCM043
        bool "Support Phytec pcm043 (i.MX35) platforms"
-        select SOC_IMX35
        select IMX_HAVE_PLATFORM_FLEXCAN
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
@@ -577,14 +576,13 @@ config MACH_PCM043
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX35
        help
          Include support for Phytec pcm043 platform. This includes
          specific configurations for the board and its peripherals.
 config MACH_MX35_3DS
        bool "Support MX35PDK platform"
-        select SOC_IMX35
-        select MXC_DEBUG_BOARD
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_FB
@@ -595,13 +593,14 @@ config MACH_MX35_3DS
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_MXC_RTC
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select MXC_DEBUG_BOARD
+        select SOC_IMX35
        help
          Include support for MX35PDK platform. This includes specific
          configurations for the board and its peripherals.
 config MACH_EUKREA_CPUIMX35SD
        bool "Support Eukrea CPUIMX35 Platform"
-        select SOC_IMX35
        select IMX_HAVE_PLATFORM_FLEXCAN
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
@@ -611,6 +610,7 @@ config MACH_EUKREA_CPUIMX35SD
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
        select MXC_ULPI if USB_ULPI
+        select SOC_IMX35
        help
          Include support for Eukrea CPUIMX35 platform. This includes
          specific configurations for the board and its peripherals.
@@ -635,16 +635,16 @@ endchoice
 config MACH_VPR200
        bool "Support VPR200 platform"
-        select SOC_IMX35
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_GPIO_KEYS
        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_IPU_CORE
        select IMX_HAVE_PLATFORM_MXC_EHCI
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select SOC_IMX35
        help
          Include support for VPR200 platform. This includes specific
          configurations for the board and its peripherals.
@@ -654,11 +654,11 @@ comment "i.MX5 platforms:"
 config MACH_MX50_RDP
        bool "Support MX50 reference design platform"
        depends on BROKEN
-        select SOC_IMX50
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
        select IMX_HAVE_PLATFORM_SPI_IMX
+        select SOC_IMX50
        help
          Include support for MX50 reference design platform (RDP) board. This
          includes specific configurations for the board and its peripherals.
@@ -667,15 +667,14 @@ comment "i.MX51 machines:"
 config MACH_IMX51_DT
        bool "Support i.MX51 platforms from device tree"
-        select SOC_IMX51
        select MACH_MX51_BABBAGE
+        select SOC_IMX51
        help
          Include support for Freescale i.MX51 based platforms
          using the device tree for discovery
 config MACH_MX51_BABBAGE
        bool "Support MX51 BABBAGE platforms"
-        select SOC_IMX51
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_I2C
@@ -683,6 +682,7 @@ config MACH_MX51_BABBAGE
        select IMX_HAVE_PLATFORM_MXC_EHCI
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
        select IMX_HAVE_PLATFORM_SPI_IMX
+        select SOC_IMX51
        help
          Include support for MX51 Babbage platform, also known as MX51EVK in
          u-boot. This includes specific configurations for the board and its
@@ -690,27 +690,27 @@ config MACH_MX51_BABBAGE
 config MACH_MX51_3DS
        bool "Support MX51PDK (3DS)"
-        select SOC_IMX51
        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_KEYPAD
        select IMX_HAVE_PLATFORM_IMX_UART
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
        select IMX_HAVE_PLATFORM_SPI_IMX
        select MXC_DEBUG_BOARD
+        select SOC_IMX51
        help
          Include support for MX51PDK (3DS) platform. This includes specific
          configurations for the board and its peripherals.
 config MACH_EUKREA_CPUIMX51SD
        bool "Support Eukrea CPUIMX51SD module"
-        select SOC_IMX51
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_IMX_I2C
        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_IMX2_WDT
        select IMX_HAVE_PLATFORM_MXC_EHCI
        select IMX_HAVE_PLATFORM_MXC_NAND
        select IMX_HAVE_PLATFORM_SPI_IMX
+        select SOC_IMX51
        help
          Include support for Eukrea CPUIMX51SD platform. This includes
          specific configurations for the module and its peripherals.
@@ -736,12 +736,12 @@ comment "Device tree only"
 config  SOC_IMX53
        bool "i.MX53 support"
-        select SOC_IMX5
        select ARCH_MX5
        select ARCH_MX53
        select HAVE_CAN_FLEXCAN if CAN
        select PINCTRL
        select PINCTRL_IMX53
+        select SOC_IMX5
        help
          This enables support for Freescale i.MX53 processor.
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index fd5e7b6881b..73a2d905af8 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -234,8 +234,8 @@ config IXP4XX_QMGR
 config IXP4XX_NPE
        tristate "IXP4xx Network Processor Engine support"
-        select HOTPLUG
        select FW_LOADER
+        select HOTPLUG
        help
          This driver supports IXP4xx built-in network coprocessors
          and is automatically selected by Ethernet and HSS drivers.
diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
index d697d07a1bf..178d4daa5e1 100644
--- a/arch/arm/mach-mmp/Kconfig
+++ b/arch/arm/mach-mmp/Kconfig
@@ -107,22 +107,22 @@ endmenu
 config CPU_PXA168
        bool
-        select CPU_MOHAWK
        select COMMON_CLK
+        select CPU_MOHAWK
        help
          Select code specific to PXA168
 config CPU_PXA910
        bool
-        select CPU_MOHAWK
        select COMMON_CLK
+        select CPU_MOHAWK
        help
          Select code specific to PXA910
 config CPU_MMP2
        bool
-        select CPU_PJ4
        select COMMON_CLK
+        select CPU_PJ4
        help
          Select code specific to MMP2. MMP2 is ARMv7 compatible.
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 7902de151cc..b61908594b4 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -10,35 +10,35 @@ choice
 config ARCH_MSM7X00A
        bool "MSM7x00A / MSM7x01A"
-        select MACH_TROUT if !MACH_HALIBUT
        select ARCH_MSM_ARM11
-        select MSM_SMD
-        select MSM_SMD_PKG3
        select CPU_V6
        select GPIO_MSM_V1
+        select MACH_TROUT if !MACH_HALIBUT
        select MSM_PROC_COMM
+        select MSM_SMD
+        select MSM_SMD_PKG3
 config ARCH_MSM7X30
        bool "MSM7x30"
-        select MACH_MSM7X30_SURF # if !
        select ARCH_MSM_SCORPION
-        select MSM_SMD
-        select MSM_VIC
        select CPU_V7
-        select MSM_GPIOMUX
        select GPIO_MSM_V1
+        select MACH_MSM7X30_SURF # if !
+        select MSM_GPIOMUX
        select MSM_PROC_COMM
+        select MSM_SMD
+        select MSM_VIC
 config ARCH_QSD8X50
        bool "QSD8X50"
-        select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
        select ARCH_MSM_SCORPION
-        select MSM_SMD
-        select MSM_VIC
        select CPU_V7
-        select MSM_GPIOMUX
        select GPIO_MSM_V1
+        select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
+        select MSM_GPIOMUX
        select MSM_PROC_COMM
+        select MSM_SMD
+        select MSM_VIC
 endchoice
@@ -47,10 +47,10 @@ config ARCH_MSM8X60
        select ARCH_MSM_SCORPIONMP
        select ARM_GIC
        select CPU_V7
-        select MSM_V2_TLMM
        select GPIO_MSM_V2
        select MSM_GPIOMUX
        select MSM_SCM if SMP
+        select MSM_V2_TLMM
        select USE_OF
 config ARCH_MSM8960
@@ -58,9 +58,9 @@ config ARCH_MSM8960
        select ARCH_MSM_SCORPIONMP
        select ARM_GIC
        select CPU_V7
-        select MSM_V2_TLMM
        select MSM_GPIOMUX
        select MSM_SCM if SMP
+        select MSM_V2_TLMM
        select USE_OF
 config MSM_HAS_DEBUG_UART_HS
@@ -110,8 +110,8 @@ config MACH_QSD8X50_SURF
 config MACH_QSD8X50A_ST1_5
        depends on ARCH_QSD8X50
-        select MSM_SOC_REV_A
        bool "QSD8x50A ST1.5"
+        select MSM_SOC_REV_A
        help
          Support for the Qualcomm ST1.5.
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
index 365879b47c0..c744946ef02 100644
--- a/arch/arm/mach-nomadik/Kconfig
+++ b/arch/arm/mach-nomadik/Kconfig
@@ -4,8 +4,8 @@ menu "Nomadik boards"
 config MACH_NOMADIK_8815NHK
        bool "ST 8815 Nomadik Hardware Kit (evaluation board)"
-        select NOMADIK_8815
        select HAS_MTU
+        select NOMADIK_8815
 endmenu
@@ -16,7 +16,7 @@ config I2C_BITBANG_8815NHK
        tristate "Driver for bit-bang busses found on the 8815 NHK"
        depends on I2C && MACH_NOMADIK_8815NHK
        depends on PINCTRL_NOMADIK
-        select I2C_ALGOBIT
        default y
+        select I2C_ALGOBIT
 endif
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index cba3f7191cf..903da8eb886 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -8,15 +8,15 @@ comment "OMAP Core Type"
 config ARCH_OMAP730
        depends on ARCH_OMAP1
        bool "OMAP730 Based System"
+        select ARCH_OMAP_OTG
        select CPU_ARM926T
        select OMAP_MPU_TIMER
-        select ARCH_OMAP_OTG
 config ARCH_OMAP850
        depends on ARCH_OMAP1
        bool "OMAP850 Based System"
-        select CPU_ARM926T
        select ARCH_OMAP_OTG
+        select CPU_ARM926T
 config ARCH_OMAP15XX
        depends on ARCH_OMAP1
@@ -28,8 +28,8 @@ config ARCH_OMAP15XX
 config ARCH_OMAP16XX
        depends on ARCH_OMAP1
        bool "OMAP16xx Based System"
-        select CPU_ARM926T
        select ARCH_OMAP_OTG
+        select CPU_ARM926T
 comment "OMAP Board Type"
        depends on ARCH_OMAP1
@@ -132,8 +132,8 @@ config MACH_OMAP_PALMTT
 config MACH_SX1
        bool "Siemens SX1"
-        select I2C
        depends on ARCH_OMAP1 && ARCH_OMAP15XX
+        select I2C
        help
          Support for the Siemens SX1 phone. To boot the kernel,
          you'll need a SX1 compatible bootloader; check out
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index a6219eaf1f6..2a1a898c7f9 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -6,19 +6,19 @@ config ARCH_OMAP2PLUS_TYPICAL
        bool "Typical OMAP configuration"
        default y
        select AEABI
-        select REGULATOR
+        select HIGHMEM
-        select PM_RUNTIME
-        select VFP
-        select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
-        select SERIAL_OMAP
-        select SERIAL_OMAP_CONSOLE
        select I2C
        select I2C_OMAP
        select MENELAUS if ARCH_OMAP2
+        select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
+        select PINCTRL
+        select PM_RUNTIME
+        select REGULATOR
+        select SERIAL_OMAP
+        select SERIAL_OMAP_CONSOLE
        select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
        select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
-        select HIGHMEM
+        select VFP
-        select PINCTRL
        help
          Compile a kernel suitable for booting most boards
@@ -40,44 +40,44 @@ config ARCH_OMAP3
        bool "TI OMAP3"
        depends on ARCH_OMAP2PLUS
        default y
-        select CPU_V7
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
        select ARCH_HAS_OPP
-        select PM_RUNTIME if CPU_IDLE
-        select PM_OPP if PM
        select ARM_CPU_SUSPEND if PM
+        select CPU_V7
        select MULTI_IRQ_HANDLER
-        select SOC_HAS_OMAP2_SDRC
        select OMAP_INTERCONNECT
+        select PM_OPP if PM
+        select PM_RUNTIME if CPU_IDLE
+        select SOC_HAS_OMAP2_SDRC
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
 config ARCH_OMAP4
        bool "TI OMAP4"
        default y
        depends on ARCH_OMAP2PLUS
+        select ARCH_HAS_OPP
+        select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
+        select ARM_CPU_SUSPEND if PM
+        select ARM_ERRATA_720789
+        select ARM_GIC
        select CACHE_L2X0
        select CPU_V7
-        select ARM_GIC
        select HAVE_SMP
        select LOCAL_TIMERS if SMP
+        select OMAP_INTERCONNECT
        select PL310_ERRATA_588369
        select PL310_ERRATA_727915
-        select ARM_ERRATA_720789
-        select ARCH_HAS_OPP
-        select PM_RUNTIME if CPU_IDLE
        select PM_OPP if PM
+        select PM_RUNTIME if CPU_IDLE
        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select ARM_CPU_SUSPEND if PM
-        select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
-        select OMAP_INTERCONNECT
 config SOC_OMAP5
        bool "TI OMAP5"
-        select CPU_V7
+        select ARM_ARCH_TIMER
+        select ARM_CPU_SUSPEND if PM
        select ARM_GIC
+        select CPU_V7
        select HAVE_SMP
-        select ARM_CPU_SUSPEND if PM
        select SOC_HAS_REALTIME_COUNTER
-        select ARM_ARCH_TIMER
 comment "OMAP Core Type"
        depends on ARCH_OMAP2
@@ -109,8 +109,8 @@ config SOC_TI81XX
 config SOC_AM33XX
        bool "AM33XX support"
        default y
-        select CPU_V7
        select ARM_CPU_SUSPEND if PM
+        select CPU_V7
        select MULTI_IRQ_HANDLER
 config OMAP_PACKAGE_ZAF
@@ -157,8 +157,8 @@ config MACH_OMAP_H4
        bool "OMAP 2420 H4 board"
        depends on SOC_OMAP2420
        default y
-        select OMAP_PACKAGE_ZAF
        select OMAP_DEBUG_DEVICES
+        select OMAP_PACKAGE_ZAF
 config MACH_OMAP_APOLLON
        bool "OMAP 2420 Apollon board"
@@ -193,8 +193,8 @@ config MACH_OMAP_LDP
 config MACH_OMAP3530_LV_SOM
        bool "OMAP3 Logic 3530 LV SOM board"
        depends on ARCH_OMAP3
-        select OMAP_PACKAGE_CBB
        default y
+        select OMAP_PACKAGE_CBB
        help
         Support for the LogicPD OMAP3530 SOM Development kit
         for full description please see the products webpage at
@@ -203,8 +203,8 @@ config MACH_OMAP3530_LV_SOM
 config MACH_OMAP3_TORPEDO
        bool "OMAP3 Logic 35x Torpedo board"
        depends on ARCH_OMAP3
-        select OMAP_PACKAGE_CBB
        default y
+        select OMAP_PACKAGE_CBB
        help
         Support for the LogicPD OMAP35x Torpedo Development kit
         for full description please see the products webpage at
@@ -265,17 +265,17 @@ config MACH_NOKIA_N8X0
        bool "Nokia N800/N810"
        depends on SOC_OMAP2420
        default y
-        select OMAP_PACKAGE_ZAC
        select MACH_NOKIA_N800
        select MACH_NOKIA_N810
        select MACH_NOKIA_N810_WIMAX
+        select OMAP_PACKAGE_ZAC
 config MACH_NOKIA_RM680
        bool "Nokia RM-680/696 board"
        depends on ARCH_OMAP3
        default y
-        select OMAP_PACKAGE_CBB
        select MACH_NOKIA_RM696
+        select OMAP_PACKAGE_CBB
 config MACH_NOKIA_RX51
        bool "Nokia RX-51 board"
@@ -288,20 +288,20 @@ config MACH_OMAP_ZOOM2
        depends on ARCH_OMAP3
        default y
        select OMAP_PACKAGE_CBB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        select SERIAL_8250
-        select SERIAL_CORE_CONSOLE
        select SERIAL_8250_CONSOLE
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SERIAL_CORE_CONSOLE
 config MACH_OMAP_ZOOM3
        bool "OMAP3630 Zoom3 board"
        depends on ARCH_OMAP3
        default y
        select OMAP_PACKAGE_CBP
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        select SERIAL_8250
-        select SERIAL_CORE_CONSOLE
        select SERIAL_8250_CONSOLE
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SERIAL_CORE_CONSOLE
 config MACH_CM_T35
        bool "CompuLab CM-T35/CM-T3730 modules"
@@ -329,8 +329,8 @@ config MACH_IGEP0030
        bool "IGEP OMAP3 module"
        depends on ARCH_OMAP3
        default y
-        select OMAP_PACKAGE_CBB
        select MACH_IGEP0020
+        select OMAP_PACKAGE_CBB
 config MACH_SBC3530
        bool "OMAP3 SBC STALKER board"
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 5ff28afbefe..3669c120c7e 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -607,29 +607,6 @@ static void __init omap_sfh7741prox_init(void)
                        __func__, OMAP4_SFH7741_ENABLE_GPIO, error);
 }
-static struct gpio sdp4430_hdmi_gpios[] = {
-        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
-        { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_ls_oe" },
-        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
-};
-static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
-{
-        int status;
-        status = gpio_request_array(sdp4430_hdmi_gpios,
-                                    ARRAY_SIZE(sdp4430_hdmi_gpios));
-        if (status)
-                pr_err("%s: Cannot request HDMI GPIOs\n", __func__);
-        return status;
-}
-static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
-{
-        gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));
-}
 static struct nokia_dsi_panel_data dsi1_panel = {
                .name           = "taal",
                .reset_gpio     = 102,
@@ -650,29 +627,6 @@ static struct omap_dss_device sdp4430_lcd_device = {
        .phy.dsi                = {
                .module         = 0,
        },
-        .clocks = {
-                .dispc = {
-                        .channel = {
-                                /* Logic Clock = 172.8 MHz */
-                                .lck_div        = 1,
-                                /* Pixel Clock = 34.56 MHz */
-                                .pck_div        = 5,
-                                .lcd_clk_src    = OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC,
-                        },
-                        .dispc_fclk_src = OMAP_DSS_CLK_SRC_FCK,
-                },
-                .dsi = {
-                        .regn           = 16,   /* Fint = 2.4 MHz */
-                        .regm           = 180,  /* DDR Clock = 216 MHz */
-                        .regm_dispc     = 5,    /* PLL1_CLK1 = 172.8 MHz */
-                        .regm_dsi       = 5,    /* PLL1_CLK2 = 172.8 MHz */
-                        .lp_clk_div     = 10,   /* LP Clock = 8.64 MHz */
-                        .dsi_fclk_src   = OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI,
-                },
-        },
        .channel                = OMAP_DSS_CHANNEL_LCD,
 };
@@ -697,33 +651,12 @@ static struct omap_dss_device sdp4430_lcd2_device = {
                .module         = 1,
        },
-        .clocks = {
-                .dispc = {
-                        .channel = {
-                                /* Logic Clock = 172.8 MHz */
-                                .lck_div        = 1,
-                                /* Pixel Clock = 34.56 MHz */
-                                .pck_div        = 5,
-                                .lcd_clk_src    = OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC,
-                        },
-                        .dispc_fclk_src = OMAP_DSS_CLK_SRC_FCK,
-                },
-                .dsi = {
-                        .regn           = 16,   /* Fint = 2.4 MHz */
-                        .regm           = 180,  /* DDR Clock = 216 MHz */
-                        .regm_dispc     = 5,    /* PLL1_CLK1 = 172.8 MHz */
-                        .regm_dsi       = 5,    /* PLL1_CLK2 = 172.8 MHz */
-                        .lp_clk_div     = 10,   /* LP Clock = 8.64 MHz */
-                        .dsi_fclk_src   = OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI,
-                },
-        },
        .channel                = OMAP_DSS_CHANNEL_LCD2,
 };
 static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
+        .ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
+        .ls_oe_gpio = HDMI_GPIO_LS_OE,
        .hpd_gpio = HDMI_GPIO_HPD,
 };
@@ -731,8 +664,6 @@ static struct omap_dss_device sdp4430_hdmi_device = {
        .name = "hdmi",
        .driver_name = "hdmi_panel",
        .type = OMAP_DISPLAY_TYPE_HDMI,
-        .platform_enable = sdp4430_panel_enable_hdmi,
-        .platform_disable = sdp4430_panel_disable_hdmi,
        .channel = OMAP_DSS_CHANNEL_DIGIT,
        .data = &sdp4430_hdmi_data,
 };
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index f62b903f3ea..bfcd397e233 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -428,30 +428,9 @@ static struct omap_dss_device omap4_panda_dvi_device = {
        .channel                = OMAP_DSS_CHANNEL_LCD2,
 };
-static struct gpio panda_hdmi_gpios[] = {
-        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
-        { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
-        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
-};
-static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
-{
-        int status;
-        status = gpio_request_array(panda_hdmi_gpios,
-                                    ARRAY_SIZE(panda_hdmi_gpios));
-        if (status)
-                pr_err("Cannot request HDMI GPIOs\n");
-        return status;
-}
-static void omap4_panda_panel_disable_hdmi(struct omap_dss_device *dssdev)
-{
-        gpio_free_array(panda_hdmi_gpios, ARRAY_SIZE(panda_hdmi_gpios));
-}
 static struct omap_dss_hdmi_data omap4_panda_hdmi_data = {
+        .ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
+        .ls_oe_gpio = HDMI_GPIO_LS_OE,
        .hpd_gpio = HDMI_GPIO_HPD,
 };
@@ -459,8 +438,6 @@ static struct omap_dss_device  omap4_panda_hdmi_device = {
        .name = "hdmi",
        .driver_name = "hdmi_panel",
        .type = OMAP_DISPLAY_TYPE_HDMI,
-        .platform_enable = omap4_panda_panel_enable_hdmi,
-        .platform_disable = omap4_panda_panel_disable_hdmi,
        .channel = OMAP_DSS_CHANNEL_DIGIT,
        .data = &omap4_panda_hdmi_data,
 };
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index a51ece491b9..1011995f150 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -95,7 +95,6 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = {
        { "dss_core", "omapdss_dss", -1 },
        { "dss_dispc", "omapdss_dispc", -1 },
        { "dss_rfbi", "omapdss_rfbi", -1 },
-        { "dss_venc", "omapdss_venc", -1 },
        { "dss_dsi1", "omapdss_dsi", 0 },
        { "dss_dsi2", "omapdss_dsi", 1 },
        { "dss_hdmi", "omapdss_hdmi", -1 },
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index d83ae4540b9..635e109f5ad 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -239,6 +239,10 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
 static struct twl4030_usb_data omap4_usb_pdata = {
 };
+static struct regulator_consumer_supply omap4_vdda_hdmi_dac_supplies[] = {
+        REGULATOR_SUPPLY("vdda_hdmi_dac", "omapdss_hdmi"),
+};
 static struct regulator_init_data omap4_vdac_idata = {
        .constraints = {
                .min_uV                 = 1800000,
@@ -248,6 +252,8 @@ static struct regulator_init_data omap4_vdac_idata = {
                .valid_ops_mask         = REGULATOR_CHANGE_MODE
                                        | REGULATOR_CHANGE_STATUS,
        },
+        .num_consumer_supplies  = ARRAY_SIZE(omap4_vdda_hdmi_dac_supplies),
+        .consumer_supplies      = omap4_vdda_hdmi_dac_supplies,
        .supply_regulator       = "V2V1",
 };
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 41fc8532767..558ccfb8d45 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -6,8 +6,8 @@ config ARCH_PRIMA2
        bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
        default y
        select CPU_V7
-        select ZONE_DMA
        select SIRF_IRQ
+        select ZONE_DMA
        help
          Support for CSR SiRFSoC ARM Cortex A9 Platform
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 8e6288de69b..11aa7399dc0 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -27,10 +27,10 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
 config MACH_PXA3XX_DT
        bool "Support PXA3xx platforms from device tree"
-        select PXA3xx
        select CPU_PXA300
-        select POWER_SUPPLY
        select HAVE_PWM
+        select POWER_SUPPLY
+        select PXA3xx
        select USE_OF
        help
          Include support for Marvell PXA3xx based platforms using
@@ -44,13 +44,13 @@ config ARCH_LUBBOCK
 config MACH_MAINSTONE
        bool "Intel HCDDBBVA0 Development Platform (aka Mainstone)"
-        select PXA27x
        select HAVE_PWM
+        select PXA27x
 config MACH_ZYLONITE
        bool
-        select PXA3xx
        select HAVE_PWM
+        select PXA3xx
 config MACH_ZYLONITE300
        bool "PXA3xx Development Platform (aka Zylonite) PXA300/310"
@@ -65,19 +65,19 @@ config MACH_ZYLONITE320
 config MACH_LITTLETON
        bool "PXA3xx Form Factor Platform (aka Littleton)"
-        select PXA3xx
        select CPU_PXA300
        select CPU_PXA310
+        select PXA3xx
 config MACH_TAVOREVB
        bool "PXA930 Evaluation Board (aka TavorEVB)"
-        select PXA3xx
        select CPU_PXA930
+        select PXA3xx
 config MACH_SAAR
        bool "PXA930 Handheld Platform (aka SAAR)"
-        select PXA3xx
        select CPU_PXA930
+        select PXA3xx
 comment "Third Party Dev Platforms (sorted by vendor name)"
@@ -87,29 +87,29 @@ config ARCH_PXA_IDP
 config ARCH_VIPER
        bool "Arcom/Eurotech VIPER SBC"
-        select PXA25x
+        select ARCOM_PCMCIA
-        select ISA
-        select I2C_GPIO
        select HAVE_PWM
+        select I2C_GPIO
+        select ISA
+        select PXA25x
        select PXA_HAVE_ISA_IRQS
-        select ARCOM_PCMCIA
 config MACH_ARCOM_ZEUS
        bool "Arcom/Eurotech ZEUS SBC"
-        select PXA27x
+        select ARCOM_PCMCIA
        select ISA
+        select PXA27x
        select PXA_HAVE_ISA_IRQS
-        select ARCOM_PCMCIA
 config MACH_BALLOON3
        bool "Balloon 3 board"
-        select PXA27x
        select IWMMXT
+        select PXA27x
 config MACH_CSB726
        bool "Enable Cogent CSB726 System On a Module"
-        select PXA27x
        select IWMMXT
+        select PXA27x
        help
          Say Y here if you intend to run this kernel on a Cogent
          CSB726 System On Module.
@@ -121,11 +121,11 @@ config CSB726_CSB701
 config MACH_ARMCORE
        bool "CompuLab CM-X255/CM-X270 modules"
        select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI
-        select PXA27x
        select IWMMXT
-        select PXA25x
        select MIGHT_HAVE_PCI
        select NEED_MACH_IO_H if PCI
+        select PXA25x
+        select PXA27x
 config MACH_EM_X270
        bool "CompuLab EM-x270 platform"
@@ -137,10 +137,10 @@ config MACH_EXEDA
 config MACH_CM_X300
        bool "CompuLab CM-X300 modules"
-        select PXA3xx
        select CPU_PXA300
        select CPU_PXA310
        select HAVE_PWM
+        select PXA3xx
 config MACH_CAPC7117
        bool "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM"
@@ -168,22 +168,22 @@ endchoice
 config MACH_INTELMOTE2
        bool "Intel Mote 2 Platform"
-        select PXA27x
        select IWMMXT
+        select PXA27x
 config MACH_STARGATE2
        bool "Intel Stargate 2 Platform"
-        select PXA27x
        select IWMMXT
+        select PXA27x
 config MACH_XCEP
        bool "Iskratel Electronics XCEP"
-        select PXA25x
        select MTD
-        select MTD_PHYSMAP
-        select MTD_CFI_INTELEXT
        select MTD_CFI
+        select MTD_CFI_INTELEXT
        select MTD_CHAR
+        select MTD_PHYSMAP
+        select PXA25x
        select SMC91X
        help
          PXA255 based Single Board Computer with SMC 91C111 ethernet chip and 64 MB of flash.
@@ -195,14 +195,14 @@ config TRIZEPS_PXA
 config MACH_TRIZEPS4
        bool "Keith und Koep Trizeps4 DIMM-Module"
        depends on TRIZEPS_PXA
-        select TRIZEPS_PCMCIA
        select PXA27x
+        select TRIZEPS_PCMCIA
 config MACH_TRIZEPS4WL
        bool "Keith und Koep Trizeps4-WL DIMM-Module"
        depends on TRIZEPS_PXA
-        select TRIZEPS_PCMCIA
        select PXA27x
+        select TRIZEPS_PCMCIA
 choice
        prompt "Select base board for Trizeps module"
@@ -231,18 +231,18 @@ config TRIZEPS_PCMCIA
 config MACH_LOGICPD_PXA270
        bool "LogicPD PXA270 Card Engine Development Platform"
-        select PXA27x
        select HAVE_PWM
+        select PXA27x
 config MACH_PCM027
        bool "Phytec phyCORE-PXA270 CPU module (PCM-027)"
-        select PXA27x
        select IWMMXT
+        select PXA27x
 config MACH_PCM990_BASEBOARD
        bool "PHYTEC PCM-990 development board"
-        select HAVE_PWM
        depends on MACH_PCM027
+        select HAVE_PWM
 choice
        prompt "display on pcm990"
@@ -266,19 +266,19 @@ config MACH_COLIBRI
 config MACH_COLIBRI_PXA270_INCOME
        bool "Income s.r.o. PXA270 SBC"
        depends on MACH_COLIBRI
-        select PXA27x
        select HAVE_PWM
+        select PXA27x
 config MACH_COLIBRI300
        bool "Toradex Colibri PXA300/310"
-        select PXA3xx
        select CPU_PXA300
        select CPU_PXA310
+        select PXA3xx
 config MACH_COLIBRI320
        bool "Toradex Colibri PXA320"
-        select PXA3xx
        select CPU_PXA320
+        select PXA3xx
 config MACH_COLIBRI_EVALBOARD
        bool "Toradex Colibri Evaluation Carrier Board support"
@@ -286,8 +286,8 @@ config MACH_COLIBRI_EVALBOARD
 config MACH_VPAC270
        bool "Voipac PXA270"
-        select PXA27x
        select HAVE_PATA_PLATFORM
+        select PXA27x
        help
          PXA270 based Single Board Computer.
@@ -295,9 +295,9 @@ comment "End-user Products (sorted by vendor name)"
 config MACH_H4700
        bool "HP iPAQ hx4700"
-        select PXA27x
-        select IWMMXT
        select HAVE_PWM
+        select IWMMXT
+        select PXA27x
 config MACH_H5000
        bool "HP iPAQ h5000"
@@ -309,16 +309,16 @@ config MACH_HIMALAYA
 config MACH_MAGICIAN
        bool "Enable HTC Magician Support"
-        select PXA27x
-        select IWMMXT
        select HAVE_PWM
+        select IWMMXT
+        select PXA27x
 config MACH_MIOA701
        bool "Mitac Mio A701 Support"
-        select PXA27x
-        select IWMMXT
-        select HAVE_PWM
        select GPIO_SYSFS
+        select HAVE_PWM
+        select IWMMXT
+        select PXA27x
        help
          Say Y here if you intend to run this kernel on a
          MIO A701. Currently there is only basic support
@@ -326,9 +326,9 @@ config MACH_MIOA701
 config PXA_EZX
        bool "Motorola EZX Platform"
-        select PXA27x
-        select IWMMXT
        select HAVE_PWM
+        select IWMMXT
+        select PXA27x
 config MACH_EZX_A780
        bool "Motorola EZX A780"
@@ -393,9 +393,9 @@ config MACH_PALMT5
        bool "Palm Tungsten|T5"
        default y
        depends on ARCH_PXA_PALM
-        select PXA27x
        select IWMMXT
        select MACH_PALM27X
+        select PXA27x
        help
          Say Y here if you intend to run this kernel on a Palm Tungsten|T5
          handheld computer.
@@ -404,9 +404,9 @@ config MACH_PALMTX
        bool "Palm T|X"
        default y
        depends on ARCH_PXA_PALM
-        select PXA27x
        select IWMMXT
        select MACH_PALM27X
+        select PXA27x
        help
          Say Y here if you intend to run this kernel on a Palm T|X
          handheld computer.
@@ -415,9 +415,9 @@ config MACH_PALMZ72
        bool "Palm Zire 72"
        default y
        depends on ARCH_PXA_PALM
-        select PXA27x
        select IWMMXT
        select MACH_PALM27X
+        select PXA27x
        help
          Say Y here if you intend to run this kernel on Palm Zire 72
          handheld computer.
@@ -426,9 +426,9 @@ config MACH_PALMLD
        bool "Palm LifeDrive"
        default y
        depends on ARCH_PXA_PALM
-        select PXA27x
        select IWMMXT
        select MACH_PALM27X
+        select PXA27x
        help
          Say Y here if you intend to run this kernel on a Palm LifeDrive
          handheld computer.
@@ -441,10 +441,10 @@ config MACH_CENTRO
        bool "Palm Centro 685 (GSM)"
        default y
        depends on ARCH_PXA_PALM
-        select MACH_PALM27X
-        select PXA27x
        select IWMMXT
+        select MACH_PALM27X
        select PALM_TREO
+        select PXA27x
        help
          Say Y here if you intend to run this kernel on Palm Centro 685 (GSM)
          smartphone.
@@ -453,37 +453,37 @@ config MACH_TREO680
        bool "Palm Treo 680"
        default y
        depends on ARCH_PXA_PALM
-        select MACH_PALM27X
-        select PXA27x
        select IWMMXT
+        select MACH_PALM27X
        select PALM_TREO
+        select PXA27x
        help
          Say Y here if you intend to run this kernel on Palm Treo 680
          smartphone.
 config MACH_RAUMFELD_RC
        bool "Raumfeld Controller"
-        select PXA3xx
        select CPU_PXA300
-        select POWER_SUPPLY
        select HAVE_PWM
+        select POWER_SUPPLY
+        select PXA3xx
 config MACH_RAUMFELD_CONNECTOR
        bool "Raumfeld Connector"
+        select CPU_PXA300
        select POWER_SUPPLY
        select PXA3xx
-        select CPU_PXA300
 config MACH_RAUMFELD_SPEAKER
        bool "Raumfeld Speaker"
+        select CPU_PXA300
        select POWER_SUPPLY
        select PXA3xx
-        select CPU_PXA300
 config PXA_SHARPSL
        bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
-        select SHARP_SCOOP
        select SHARP_PARAM
+        select SHARP_SCOOP
        help
          Say Y here if you intend to run this kernel on a
          Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi),
@@ -526,11 +526,11 @@ config MACH_HUSKY
 config MACH_AKITA
        bool "Enable Sharp SL-1000 (Akita) Support"
        depends on PXA_SHARPSL
-        select PXA27x
-        select PXA_SHARP_Cxx00
-        select MACH_SPITZ
        select I2C
        select I2C_PXA
+        select MACH_SPITZ
+        select PXA27x
+        select PXA_SHARP_Cxx00
 config MACH_SPITZ
        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
@@ -575,8 +575,8 @@ config MACH_ICONTROL
 config ARCH_PXA_ESERIES
        bool "PXA based Toshiba e-series PDAs"
-        select PXA25x
        select FB_W100
+        select PXA25x
 config MACH_E330
        bool "Toshiba e330"
@@ -628,8 +628,8 @@ config MACH_E800
 config MACH_ZIPIT2
        bool "Zipit Z2 Handheld"
-        select PXA27x
        select HAVE_PWM
+        select PXA27x
 endif
 endmenu
@@ -720,9 +720,9 @@ config SHARPSL_PM
 config SHARPSL_PM_MAX1111
        bool
        select HWMON
+        select SENSORS_MAX1111
        select SPI
        select SPI_MASTER
-        select SENSORS_MAX1111
 config PXA_HAVE_ISA_IRQS
        bool
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index c593be428b8..14c1d47e1ab 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -21,8 +21,8 @@ config REALVIEW_EB_A9MP
 config REALVIEW_EB_ARM11MP
        bool "Support ARM11MPCore Tile"
        depends on MACH_REALVIEW_EB
-        select CPU_V6K
        select ARCH_HAS_BARRIERS if SMP
+        select CPU_V6K
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
        help
@@ -40,12 +40,12 @@ config REALVIEW_EB_ARM11MP_REVB
 config MACH_REALVIEW_PB11MP
        bool "Support RealView(R) Platform Baseboard for ARM11MPCore"
-        select CPU_V6K
+        select ARCH_HAS_BARRIERS if SMP
        select ARM_GIC
+        select CPU_V6K
        select HAVE_PATA_PLATFORM
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
-        select ARCH_HAS_BARRIERS if SMP
        help
          Include support for the ARM(R) RealView(R) Platform Baseboard for
          the ARM11MPCore.  This platform has an on-board ARM11MPCore and has
@@ -54,8 +54,8 @@ config MACH_REALVIEW_PB11MP
 # ARMv6 CPU without K extensions, but does have the new exclusive ops
 config MACH_REALVIEW_PB1176
        bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S"
-        select CPU_V6
        select ARM_GIC
+        select CPU_V6
        select HAVE_TCM
        select MIGHT_HAVE_CACHE_L2X0
        help
@@ -73,8 +73,8 @@ config REALVIEW_PB1176_SECURE_FLASH
 config MACH_REALVIEW_PBA8
        bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform"
-        select CPU_V7
        select ARM_GIC
+        select CPU_V7
        select HAVE_PATA_PLATFORM
        help
          Include support for the ARM(R) RealView Platform Baseboard for
@@ -83,11 +83,11 @@ config MACH_REALVIEW_PBA8
 config MACH_REALVIEW_PBX
        bool "Support RealView(R) Platform Baseboard Explore"
+        select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
        select ARM_GIC
        select HAVE_PATA_PLATFORM
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
-        select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
        select ZONE_DMA if SPARSEMEM
        help
          Include support for the ARM(R) RealView(R) Platform Baseboard
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig
index c5256f4e90b..495f6928cba 100644
--- a/arch/arm/mach-s3c2412/Kconfig
+++ b/arch/arm/mach-s3c2412/Kconfig
@@ -7,7 +7,7 @@
 config S3C2412_CPUFREQ
        bool
        depends on CPU_FREQ_S3C24XX && CPU_S3C2412
-        select S3C2412_IOTIMING
        default y
+        select S3C2412_IOTIMING
        help
          CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index ece7a10fe3c..a4d7fd27bec 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -5,8 +5,8 @@
 config S3C2440_CPUFREQ
        bool "S3C2440/S3C2442 CPU Frequency scaling support"
        depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442)
-        select S3C2410_CPUFREQ_UTILS
        default y
+        select S3C2410_CPUFREQ_UTILS
        help
          CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index d56b0f7f2b2..2b6cb5f29c2 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -17,10 +17,10 @@ config CPU_S3C2410
        bool "SAMSUNG S3C2410"
        default y
        select CPU_ARM920T
-        select S3C2410_CLOCK
        select CPU_LLSERIAL_S3C2410
-        select S3C2410_PM if PM
+        select S3C2410_CLOCK
        select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX
+        select S3C2410_PM if PM
        help
          Support for S3C2410 and S3C2410A family from the S3C24XX line
          of Samsung Mobile CPUs.
@@ -30,8 +30,8 @@ config CPU_S3C2412
        depends on ARCH_S3C24XX
        select CPU_ARM926T
        select CPU_LLSERIAL_S3C2440
-        select S3C2412_PM if PM
        select S3C2412_DMA if S3C24XX_DMA
+        select S3C2412_PM if PM
        help
          Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
@@ -40,10 +40,10 @@ config CPU_S3C2416
        depends on ARCH_S3C24XX
        select CPU_ARM926T
        select CPU_LLSERIAL_S3C2440
-        select SAMSUNG_CLKSRC
+        select S3C2416_PM if PM
        select S3C2443_COMMON
        select S3C2443_DMA if S3C24XX_DMA
-        select S3C2416_PM if PM
+        select SAMSUNG_CLKSRC
        help
          Support for the S3C2416 SoC from the S3C24XX line
@@ -75,9 +75,9 @@ config CPU_S3C2443
        depends on ARCH_S3C24XX
        select CPU_ARM920T
        select CPU_LLSERIAL_S3C2440
-        select SAMSUNG_CLKSRC
        select S3C2443_COMMON
        select S3C2443_DMA if S3C24XX_DMA
+        select SAMSUNG_CLKSRC
        help
          Support for the S3C2443 SoC from the S3C24XX line
@@ -156,16 +156,16 @@ config MACH_AML_M5900
 config ARCH_BAST
        bool "Simtec Electronics BAST (EB2410ITX)"
+        select ISA
+        select MACH_BAST_IDE
        select S3C2410_IOTIMING if S3C2410_CPUFREQ
-        select S3C24XX_SIMTEC_PM if PM
+        select S3C24XX_DCLK
        select S3C24XX_SIMTEC_NOR
+        select S3C24XX_SIMTEC_PM if PM
        select S3C24XX_SIMTEC_USB
-        select MACH_BAST_IDE
-        select S3C24XX_DCLK
-        select ISA
        select S3C_DEV_HWMON
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Simtec Electronics EB2410ITX
          development board (also known as BAST)
@@ -181,9 +181,9 @@ config BAST_PC104_IRQ
 config ARCH_H1940
        bool "IPAQ H1940"
        select PM_H1940 if PM
-        select S3C_DEV_USB_HOST
-        select S3C_DEV_NAND
        select S3C24XX_SETUP_TS
+        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the HP IPAQ H1940
@@ -203,23 +203,23 @@ config PM_H1940
 config MACH_N30
        bool "Acer N30 family"
        select MACH_N35
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you want suppt for the Acer N30, Acer N35,
          Navman PiN570, Yakumo AlphaX or Airis NC05 PDAs.
 config MACH_OTOM
        bool "NexVision OTOM Board"
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Nex Vision OTOM board
 config MACH_QT2410
        bool "QT2410"
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Armzone QT2410
@@ -239,12 +239,12 @@ config MACH_TCT_HAMMER
 config MACH_VR1000
        bool "Thorcom VR1000"
-        select S3C24XX_SIMTEC_PM if PM
+        select MACH_BAST_IDE
        select S3C24XX_DCLK
        select S3C24XX_SIMTEC_NOR
-        select MACH_BAST_IDE
+        select S3C24XX_SIMTEC_PM if PM
-        select S3C_DEV_USB_HOST
        select S3C24XX_SIMTEC_USB
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Thorcom VR1000 board.
@@ -285,8 +285,8 @@ comment "S3C2412 Boards"
 config MACH_JIVE
        bool "Logitech Jive"
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Logitech Jive.
@@ -314,15 +314,15 @@ config MACH_SMDK2413
        bool "SMDK2413"
        select MACH_S3C2413
        select S3C24XX_SMDK
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using an SMDK2413
 config MACH_VSTMS
        bool "VMSTMS"
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using an VSTMS board
@@ -351,13 +351,13 @@ comment "S3C2416 Boards"
 config MACH_SMDK2416
        bool "SMDK2416"
+        select S3C2416_SETUP_SDHCI
        select S3C24XX_SMDK
        select S3C_DEV_FB
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_NAND
        select S3C_DEV_USB_HOST
-        select S3C2416_SETUP_SDHCI
        help
          Say Y here if you are using an SMDK2416
@@ -379,11 +379,11 @@ comment "S3C2440 Boards"
 config MACH_ANUBIS
        bool "Simtec Electronics ANUBIS"
-        select S3C24XX_DCLK
-        select S3C24XX_SIMTEC_PM if PM
        select HAVE_PATA_PLATFORM
-        select S3C24XX_GPIO_EXTRA64
        select S3C2440_XTAL_12000000
+        select S3C24XX_DCLK
+        select S3C24XX_GPIO_EXTRA64
+        select S3C24XX_SIMTEC_PM if PM
        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Simtec Electronics ANUBIS
@@ -391,18 +391,18 @@ config MACH_ANUBIS
 config MACH_AT2440EVB
        bool "Avantech AT2440EVB development board"
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the AT2440EVB development board
 config MACH_MINI2440
        bool "MINI2440 development board"
        select EEPROM_AT24
-        select NEW_LEDS
        select LEDS_CLASS
        select LEDS_TRIGGER
        select LEDS_TRIGGER_BACKLIGHT
+        select NEW_LEDS
        select S3C_DEV_NAND
        select S3C_DEV_USB_HOST
        help
@@ -412,20 +412,20 @@ config MACH_MINI2440
 config MACH_NEXCODER_2440
        bool "NexVision NEXCODER 2440 Light Board"
        select S3C2440_XTAL_12000000
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Nex Vision NEXCODER 2440 Light Board
 config MACH_OSIRIS
        bool "Simtec IM2440D20 (OSIRIS) module"
+        select S3C2410_IOTIMING if S3C2440_CPUFREQ
+        select S3C2440_XTAL_12000000
        select S3C24XX_DCLK
-        select S3C24XX_SIMTEC_PM if PM
        select S3C24XX_GPIO_EXTRA128
-        select S3C2440_XTAL_12000000
+        select S3C24XX_SIMTEC_PM if PM
-        select S3C2410_IOTIMING if S3C2440_CPUFREQ
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the Simtec IM2440D20 module, also
          known as the Osiris.
@@ -445,8 +445,8 @@ config MACH_OSIRIS_DVS
 config MACH_RX3715
        bool "HP iPAQ rx3715"
-        select S3C2440_XTAL_16934400
        select PM_H1940 if PM
+        select S3C2440_XTAL_16934400
        select S3C_DEV_NAND
        help
          Say Y here if you are using the HP iPAQ rx3715.
@@ -455,8 +455,8 @@ config ARCH_S3C2440
        bool "SMDK2440"
        select S3C2440_XTAL_16934400
        select S3C24XX_SMDK
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        help
          Say Y here if you are using the SMDK2440.
@@ -478,11 +478,11 @@ comment "S3C2442 Boards"
 config MACH_NEO1973_GTA02
        bool "Openmoko GTA02 / Freerunner phone"
+        select I2C
+        select MACH_NEO1973
        select MFD_PCF50633
        select PCF50633_GPIO
-        select I2C
        select POWER_SUPPLY
-        select MACH_NEO1973
        select S3C24XX_PWM
        select S3C_DEV_USB_HOST
        help
@@ -490,13 +490,13 @@ config MACH_NEO1973_GTA02
 config MACH_RX1950
        bool "HP iPAQ rx1950"
-        select S3C24XX_DCLK
-        select PM_H1940 if PM
        select I2C
-        select S3C24XX_PWM
+        select PM_H1940 if PM
-        select S3C_DEV_NAND
        select S3C2410_IOTIMING if S3C2440_CPUFREQ
        select S3C2440_XTAL_16934400
+        select S3C24XX_DCLK
+        select S3C24XX_PWM
+        select S3C_DEV_NAND
        help
           Say Y here if you're using HP iPAQ rx1950
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2416.c b/arch/arm/mach-s3c24xx/mach-smdk2416.c
index db2787aa1e5..f30d7fccbfe 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2416.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c
@@ -29,6 +29,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
+#include <video/samsung_fimd.h>
 #include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
@@ -52,7 +53,6 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/s3c-hsudc.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/fb.h>
 #include <plat/common-smdk.h>
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 06ca1cd4cae..63e7ae3ee9e 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -7,9 +7,9 @@
 config PLAT_S3C64XX
        bool
        depends on ARCH_S3C64XX
-        select SAMSUNG_WAKEMASK
-        select PM_GENERIC_DOMAINS
        default y
+        select PM_GENERIC_DOMAINS
+        select SAMSUNG_WAKEMASK
        help
          Base platform code for any Samsung S3C64XX device
@@ -31,8 +31,8 @@ config S3C64XX_DMA
        select S3C_DMA
 config S3C64XX_SETUP_SDHCI
-        select S3C64XX_SETUP_SDHCI_GPIO
        bool
+        select S3C64XX_SETUP_SDHCI_GPIO
        help
          Internal configuration for default SDHCI setup for S3C6400 and
          S3C6410 SoCs.
@@ -93,9 +93,9 @@ config S3C64XX_SETUP_USB_PHY
 config MACH_SMDK6400
       bool "SMDK6400"
        select CPU_S3C6400
+        select S3C64XX_SETUP_SDHCI
        select S3C_DEV_HSMMC
        select S3C_DEV_NAND
-        select S3C64XX_SETUP_SDHCI
        help
          Machine support for the Samsung SMDK6400
@@ -104,21 +104,21 @@ config MACH_SMDK6400
 config MACH_ANW6410
        bool "A&W6410"
        select CPU_S3C6410
-        select S3C_DEV_FB
        select S3C64XX_SETUP_FB_24BPP
+        select S3C_DEV_FB
        help
          Machine support for the A&W6410
 config MACH_MINI6410
        bool "MINI6410"
        select CPU_S3C6410
+        select S3C64XX_SETUP_FB_24BPP
+        select S3C64XX_SETUP_SDHCI
+        select S3C_DEV_FB
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
-        select S3C64XX_SETUP_SDHCI
-        select S3C_DEV_USB_HOST
        select S3C_DEV_NAND
-        select S3C_DEV_FB
+        select S3C_DEV_USB_HOST
-        select S3C64XX_SETUP_FB_24BPP
        select SAMSUNG_DEV_ADC
        select SAMSUNG_DEV_TS
        help
@@ -127,42 +127,42 @@ config MACH_MINI6410
 config MACH_REAL6410
        bool "REAL6410"
        select CPU_S3C6410
-        select S3C_DEV_HSMMC
+        select S3C64XX_SETUP_FB_24BPP
-        select S3C_DEV_HSMMC1
        select S3C64XX_SETUP_SDHCI
        select S3C_DEV_FB
-        select S3C64XX_SETUP_FB_24BPP
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
        select S3C_DEV_NAND
+        select S3C_DEV_USB_HOST
        select SAMSUNG_DEV_ADC
        select SAMSUNG_DEV_TS
-        select S3C_DEV_USB_HOST
        help
          Machine support for the CoreWind REAL6410
 config MACH_SMDK6410
        bool "SMDK6410"
        select CPU_S3C6410
-        select SAMSUNG_DEV_ADC
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select S3C64XX_SETUP_FB_24BPP
+        select S3C64XX_SETUP_I2C1
+        select S3C64XX_SETUP_IDE
+        select S3C64XX_SETUP_KEYPAD
+        select S3C64XX_SETUP_SDHCI
+        select S3C64XX_SETUP_USB_PHY
+        select S3C_DEV_FB
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_I2C1
-        select SAMSUNG_DEV_IDE
-        select S3C_DEV_FB
        select S3C_DEV_RTC
-        select SAMSUNG_DEV_TS
        select S3C_DEV_USB_HOST
        select S3C_DEV_USB_HSOTG
        select S3C_DEV_WDT
+        select SAMSUNG_DEV_ADC
        select SAMSUNG_DEV_BACKLIGHT
+        select SAMSUNG_DEV_IDE
        select SAMSUNG_DEV_KEYPAD
        select SAMSUNG_DEV_PWM
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select SAMSUNG_DEV_TS
-        select S3C64XX_SETUP_SDHCI
-        select S3C64XX_SETUP_I2C1
-        select S3C64XX_SETUP_IDE
-        select S3C64XX_SETUP_FB_24BPP
-        select S3C64XX_SETUP_KEYPAD
-        select S3C64XX_SETUP_USB_PHY
        help
          Machine support for the Samsung SMDK6410
@@ -198,13 +198,13 @@ endchoice
 config SMDK6410_WM1190_EV1
        bool "Support Wolfson Microelectronics 1190-EV1 PMIC card"
        depends on MACH_SMDK6410
-        select REGULATOR
-        select REGULATOR_WM8350
-        select SAMSUNG_GPIO_EXTRA64
-        select MFD_WM8350_I2C
        select MFD_WM8350_CONFIG_MODE_0
        select MFD_WM8350_CONFIG_MODE_3
+        select MFD_WM8350_I2C
        select MFD_WM8352_CONFIG_MODE_0
+        select REGULATOR
+        select REGULATOR_WM8350
+        select SAMSUNG_GPIO_EXTRA64
        help
          The Wolfson Microelectronics 1190-EV1 is a WM835x based PMIC
          and audio daughtercard for the Samsung SMDK6410 reference
@@ -216,11 +216,11 @@ config SMDK6410_WM1190_EV1
 config SMDK6410_WM1192_EV1
        bool "Support Wolfson Microelectronics 1192-EV1 PMIC card"
        depends on MACH_SMDK6410
+        select MFD_WM831X
+        select MFD_WM831X_I2C
        select REGULATOR
        select REGULATOR_WM831X
        select SAMSUNG_GPIO_EXTRA64
-        select MFD_WM831X
-        select MFD_WM831X_I2C
        help
          The Wolfson Microelectronics 1192-EV1 is a WM831x based PMIC
          daughtercard for the Samsung SMDK6410 reference platform.
@@ -232,19 +232,19 @@ config SMDK6410_WM1192_EV1
 config MACH_NCP
        bool "NCP"
        select CPU_S3C6410
-        select S3C_DEV_I2C1
-        select S3C_DEV_HSMMC1
        select S3C64XX_SETUP_I2C1
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_I2C1
        help
          Machine support for the Samsung NCP
 config MACH_HMT
        bool "Airgoo HMT"
        select CPU_S3C6410
+        select S3C64XX_SETUP_FB_24BPP
        select S3C_DEV_FB
        select S3C_DEV_NAND
        select S3C_DEV_USB_HOST
-        select S3C64XX_SETUP_FB_24BPP
        select SAMSUNG_DEV_PWM
        help
          Machine support for the Airgoo HMT
@@ -252,17 +252,17 @@ config MACH_HMT
 config MACH_SMARTQ
        bool
        select CPU_S3C6410
+        select S3C64XX_SETUP_FB_24BPP
+        select S3C64XX_SETUP_SDHCI
+        select S3C64XX_SETUP_USB_PHY
+        select S3C_DEV_FB
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
-        select S3C_DEV_FB
        select S3C_DEV_HWMON
        select S3C_DEV_RTC
-        select S3C_DEV_USB_HSOTG
        select S3C_DEV_USB_HOST
-        select S3C64XX_SETUP_SDHCI
+        select S3C_DEV_USB_HSOTG
-        select S3C64XX_SETUP_FB_24BPP
-        select S3C64XX_SETUP_USB_PHY
        select SAMSUNG_DEV_ADC
        select SAMSUNG_DEV_PWM
        select SAMSUNG_DEV_TS
@@ -284,26 +284,26 @@ config MACH_SMARTQ7
 config MACH_WLF_CRAGG_6410
        bool "Wolfson Cragganmore 6410"
        select CPU_S3C6410
-        select S3C64XX_SETUP_SDHCI
+        select I2C
+        select LEDS_GPIO_REGISTER
+        select S3C64XX_DEV_SPI0
+        select S3C64XX_SETUP_FB_24BPP
        select S3C64XX_SETUP_I2C1
        select S3C64XX_SETUP_IDE
-        select S3C64XX_SETUP_FB_24BPP
        select S3C64XX_SETUP_KEYPAD
+        select S3C64XX_SETUP_SDHCI
        select S3C64XX_SETUP_SPI
        select S3C64XX_SETUP_USB_PHY
-        select SAMSUNG_DEV_ADC
-        select SAMSUNG_DEV_KEYPAD
-        select S3C_DEV_USB_HOST
-        select S3C_DEV_USB_HSOTG
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
        select S3C_DEV_I2C1
-        select S3C_DEV_WDT
        select S3C_DEV_RTC
-        select S3C64XX_DEV_SPI0
+        select S3C_DEV_USB_HOST
+        select S3C_DEV_USB_HSOTG
+        select S3C_DEV_WDT
+        select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_KEYPAD
        select SAMSUNG_GPIO_EXTRA128
-        select I2C
-        select LEDS_GPIO_REGISTER
        help
          Machine support for the Wolfson Cragganmore S3C6410 variant.
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index 15c58dfc458..99e82ac81b6 100644
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -29,6 +29,7 @@
 #include <linux/dm9000.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
@@ -44,7 +45,6 @@
 #include <plat/regs-serial.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 8b4d4670664..13b7eaa45fd 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -46,6 +46,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
+#include <video/samsung_fimd.h>
 #include <mach/hardware.h>
 #include <mach/map.h>
@@ -57,7 +58,6 @@
 #include <mach/regs-gpio-memport.h>
 #include <plat/regs-serial.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/fb.h>
 #include <plat/sdhci.h>
 #include <plat/gpio-cfg.h>
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 02222b32b7d..2b144893ddc 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -26,6 +26,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
+#include <video/samsung_fimd.h>
 #include <mach/hardware.h>
 #include <mach/map.h>
@@ -41,7 +42,6 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/regs-fb-v4.h>
 #include "common.h"
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 09311cc4011..07c349cca33 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -41,9 +41,9 @@
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
-#include <plat/regs-fb-v4.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include "common.h"
diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c
index 46ee88d1681..e5f9a79b535 100644
--- a/arch/arm/mach-s3c64xx/mach-ncp.c
+++ b/arch/arm/mach-s3c64xx/mach-ncp.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
@@ -43,7 +44,6 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
-#include <plat/regs-fb-v4.h>
 #include "common.h"
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index 6daca203e72..7476f7c722a 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -42,9 +42,9 @@
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 #include <plat/regs-serial.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
-#include <plat/regs-fb-v4.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include "common.h"
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
index d6266d8b43c..96d6da2b6b5 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -21,6 +21,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <video/samsung_fimd.h>
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
@@ -28,7 +29,6 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
-#include <plat/regs-fb-v4.h>
 #include "common.h"
 #include "mach-smartq.h"
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c
index 0957d2a980e..7d1167bdc92 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -21,6 +21,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <video/samsung_fimd.h>
 #include <mach/map.h>
 #include <mach/regs-gpio.h>
@@ -28,7 +29,6 @@
 #include <plat/devs.h>
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
-#include <plat/regs-fb-v4.h>
 #include "common.h"
 #include "mach-smartq.h"
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 2547a884647..da1a771a29e 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -43,6 +43,7 @@
 #endif
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
@@ -72,7 +73,6 @@
 #include <linux/platform_data/touchscreen-s3c2410.h>
 #include <plat/keypad.h>
 #include <plat/backlight.h>
-#include <plat/regs-fb-v4.h>
 #include "common.h"
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index c87f6108eeb..e8742cb7ddd 100644
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -9,18 +9,18 @@ if ARCH_S5P64X0
 config CPU_S5P6440
        bool
-        select SAMSUNG_DMADEV
        select S5P_HRT
        select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
        select SAMSUNG_WAKEMASK if PM
        help
          Enable S5P6440 CPU support
 config CPU_S5P6450
        bool
-        select SAMSUNG_DMADEV
        select S5P_HRT
        select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
        select SAMSUNG_WAKEMASK if PM
        help
          Enable S5P6450 CPU support
@@ -52,19 +52,19 @@ config MACH_SMDK6440
        bool "SMDK6440"
        select CPU_S5P6440
        select S3C_DEV_FB
-        select S3C_DEV_I2C1
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
+        select S3C_DEV_I2C1
+        select S3C_DEV_RTC
+        select S3C_DEV_WDT
+        select S5P64X0_SETUP_FB_24BPP
+        select S5P64X0_SETUP_I2C1
+        select S5P64X0_SETUP_SDHCI_GPIO
        select SAMSUNG_DEV_ADC
        select SAMSUNG_DEV_BACKLIGHT
        select SAMSUNG_DEV_PWM
        select SAMSUNG_DEV_TS
-        select S5P64X0_SETUP_FB_24BPP
-        select S5P64X0_SETUP_I2C1
-        select S5P64X0_SETUP_SDHCI_GPIO
        help
          Machine support for the Samsung SMDK6440
@@ -72,19 +72,19 @@ config MACH_SMDK6450
        bool "SMDK6450"
        select CPU_S5P6450
        select S3C_DEV_FB
-        select S3C_DEV_I2C1
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
+        select S3C_DEV_I2C1
+        select S3C_DEV_RTC
+        select S3C_DEV_WDT
+        select S5P64X0_SETUP_FB_24BPP
+        select S5P64X0_SETUP_I2C1
+        select S5P64X0_SETUP_SDHCI_GPIO
        select SAMSUNG_DEV_ADC
        select SAMSUNG_DEV_BACKLIGHT
        select SAMSUNG_DEV_PWM
        select SAMSUNG_DEV_TS
-        select S5P64X0_SETUP_FB_24BPP
-        select S5P64X0_SETUP_I2C1
-        select S5P64X0_SETUP_SDHCI_GPIO
        help
          Machine support for the Samsung SMDK6450
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index dea78a84824..96ea1fe0ec9 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -27,6 +27,7 @@
 #include <linux/mmc/host.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
@@ -52,7 +53,6 @@
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
-#include <plat/regs-fb.h>
 #include <plat/sdhci.h>
 #include "common.h"
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 6f14fc729b8..12748b6eaa7 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -27,6 +27,7 @@
 #include <linux/mmc/host.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
@@ -52,7 +53,6 @@
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
 #include <plat/fb.h>
-#include <plat/regs-fb.h>
 #include <plat/sdhci.h>
 #include "common.h"
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index 75a26eaf263..15170be97a7 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -60,12 +60,6 @@ config MACH_SMDKC100
        select S3C_DEV_I2C1
        select S3C_DEV_RTC
        select S3C_DEV_WDT
-        select SAMSUNG_DEV_ADC
-        select SAMSUNG_DEV_BACKLIGHT
-        select SAMSUNG_DEV_IDE
-        select SAMSUNG_DEV_KEYPAD
-        select SAMSUNG_DEV_PWM
-        select SAMSUNG_DEV_TS
        select S5PC100_SETUP_FB_24BPP
        select S5PC100_SETUP_I2C1
        select S5PC100_SETUP_IDE
@@ -74,6 +68,12 @@ config MACH_SMDKC100
        select S5P_DEV_FIMC0
        select S5P_DEV_FIMC1
        select S5P_DEV_FIMC2
+        select SAMSUNG_DEV_ADC
+        select SAMSUNG_DEV_BACKLIGHT
+        select SAMSUNG_DEV_IDE
+        select SAMSUNG_DEV_KEYPAD
+        select SAMSUNG_DEV_PWM
+        select SAMSUNG_DEV_TS
        help
          Machine support for the Samsung SMDKC100
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index 5d2c0934928..dba7384a87b 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -33,6 +33,7 @@
 #include <mach/regs-gpio.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
@@ -51,7 +52,6 @@
 #include <linux/platform_data/touchscreen-s3c2410.h>
 #include <linux/platform_data/asoc-s3c.h>
 #include <plat/backlight.h>
-#include <plat/regs-fb-v4.h>
 #include "common.h"
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 77185c38188..92ad72f0ef9 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -11,11 +11,11 @@ if ARCH_S5PV210
 config CPU_S5PV210
        bool
-        select SAMSUNG_DMADEV
        select S5P_EXT_INT
        select S5P_HRT
        select S5P_PM if PM
        select S5P_SLEEP if PM
+        select SAMSUNG_DMADEV
        help
          Enable S5PV210 CPU support
@@ -76,44 +76,44 @@ config MACH_AQUILA
        bool "Aquila"
        select CPU_S5PV210
        select S3C_DEV_FB
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
-        select S5P_DEV_ONENAND
        select S5PV210_SETUP_FB_24BPP
        select S5PV210_SETUP_SDHCI
        select S5PV210_SETUP_USB_PHY
+        select S5P_DEV_FIMC0
+        select S5P_DEV_FIMC1
+        select S5P_DEV_FIMC2
+        select S5P_DEV_ONENAND
        help
          Machine support for the Samsung Aquila target based on S5PC110 SoC
 config MACH_GONI
        bool "GONI"
        select CPU_S5PV210
-        select S5P_GPIO_INT
        select S3C_DEV_FB
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
        select S3C_DEV_I2C1
        select S3C_DEV_I2C2
-        select S5P_DEV_MFC
        select S3C_DEV_USB_HSOTG
-        select S5P_DEV_ONENAND
-        select SAMSUNG_DEV_KEYPAD
-        select S5P_DEV_TV
        select S5PV210_SETUP_FB_24BPP
+        select S5PV210_SETUP_FIMC
        select S5PV210_SETUP_I2C1
        select S5PV210_SETUP_I2C2
        select S5PV210_SETUP_KEYPAD
        select S5PV210_SETUP_SDHCI
-        select S5PV210_SETUP_FIMC
        select S5PV210_SETUP_USB_PHY
+        select S5P_DEV_FIMC0
+        select S5P_DEV_FIMC1
+        select S5P_DEV_FIMC2
+        select S5P_DEV_MFC
+        select S5P_DEV_ONENAND
+        select S5P_DEV_TV
+        select S5P_GPIO_INT
+        select SAMSUNG_DEV_KEYPAD
        help
          Machine support for Samsung GONI board
          S5PC110(MCP) is one of package option of S5PV210
@@ -125,14 +125,14 @@ config MACH_SMDKC110
        select S3C_DEV_I2C2
        select S3C_DEV_RTC
        select S3C_DEV_WDT
+        select S5PV210_SETUP_I2C1
+        select S5PV210_SETUP_I2C2
+        select S5PV210_SETUP_IDE
        select S5P_DEV_FIMC0
        select S5P_DEV_FIMC1
        select S5P_DEV_FIMC2
        select S5P_DEV_MFC
        select SAMSUNG_DEV_IDE
-        select S5PV210_SETUP_I2C1
-        select S5PV210_SETUP_I2C2
-        select S5PV210_SETUP_IDE
        help
          Machine support for Samsung SMDKC110
          S5PC110(MCP) is one of package option of S5PV210
@@ -154,6 +154,13 @@ config MACH_SMDKV210
        select S3C_DEV_RTC
        select S3C_DEV_USB_HSOTG
        select S3C_DEV_WDT
+        select S5PV210_SETUP_FB_24BPP
+        select S5PV210_SETUP_I2C1
+        select S5PV210_SETUP_I2C2
+        select S5PV210_SETUP_IDE
+        select S5PV210_SETUP_KEYPAD
+        select S5PV210_SETUP_SDHCI
+        select S5PV210_SETUP_USB_PHY
        select S5P_DEV_FIMC0
        select S5P_DEV_FIMC1
        select S5P_DEV_FIMC2
@@ -165,20 +172,13 @@ config MACH_SMDKV210
        select SAMSUNG_DEV_KEYPAD
        select SAMSUNG_DEV_PWM
        select SAMSUNG_DEV_TS
-        select S5PV210_SETUP_FB_24BPP
-        select S5PV210_SETUP_I2C1
-        select S5PV210_SETUP_I2C2
-        select S5PV210_SETUP_IDE
-        select S5PV210_SETUP_KEYPAD
-        select S5PV210_SETUP_SDHCI
-        select S5PV210_SETUP_USB_PHY
        help
          Machine support for Samsung SMDKV210
 config MACH_TORBRECK
        bool "Torbreck"
-        select CPU_S5PV210
        select ARCH_SPARSEMEM_ENABLE
+        select CPU_S5PV210
        select S3C_DEV_HSMMC
        select S3C_DEV_HSMMC1
        select S3C_DEV_HSMMC2
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 78028df86c5..ee9fa5c2ef2 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -28,6 +28,7 @@
 #include <asm/setup.h>
 #include <asm/mach-types.h>
+#include <video/samsung_fimd.h>
 #include <mach/map.h>
 #include <mach/regs-clock.h>
@@ -39,7 +40,6 @@
 #include <plat/fimc-core.h>
 #include <plat/sdhci.h>
 #include <plat/s5p-time.h>
-#include <plat/regs-fb-v4.h>
 #include "common.h"
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 00f1e47d490..55e1dba4ffd 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -35,6 +35,7 @@
 #include <asm/setup.h>
 #include <asm/mach-types.h>
+#include <video/samsung_fimd.h>
 #include <mach/map.h>
 #include <mach/regs-clock.h>
@@ -49,7 +50,6 @@
 #include <plat/clock.h>
 #include <plat/s5p-time.h>
 #include <plat/mfc.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/camport.h>
 #include <media/v4l2-mediabus.h>
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 7d6fab42050..4cdb5bb7bbc 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -28,6 +28,7 @@
 #include <asm/mach-types.h>
 #include <video/platform_lcd.h>
+#include <video/samsung_fimd.h>
 #include <mach/map.h>
 #include <mach/regs-clock.h>
@@ -46,7 +47,6 @@
 #include <plat/fb.h>
 #include <plat/s5p-time.h>
 #include <plat/backlight.h>
-#include <plat/regs-fb-v4.h>
 #include <plat/mfc.h>
 #include <plat/clock.h>
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index 42625e4d949..ca14dbdcfb2 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -49,15 +49,15 @@ config SA1100_COLLIE
        bool "Sharp Zaurus SL5500"
        # FIXME: select CPU_FREQ_SA11x0
        select SHARP_LOCOMO
-        select SHARP_SCOOP
        select SHARP_PARAM
+        select SHARP_SCOOP
        help
          Say Y here to support the Sharp Zaurus SL5500 PDAs.
 config SA1100_H3100
        bool "Compaq iPAQ H3100"
-        select HTC_EGPIO
        select CPU_FREQ_SA1110
+        select HTC_EGPIO
        help
          Say Y here if you intend to run this kernel on the Compaq iPAQ
          H3100 handheld computer.  Information about this machine and the
@@ -67,8 +67,8 @@ config SA1100_H3100
 config SA1100_H3600
        bool "Compaq iPAQ H3600/H3700"
-        select HTC_EGPIO
        select CPU_FREQ_SA1110
+        select HTC_EGPIO
        help
          Say Y here if you intend to run this kernel on the Compaq iPAQ
          H3600 handheld computer.  Information about this machine and the
@@ -78,16 +78,16 @@ config SA1100_H3600
 config SA1100_BADGE4
        bool "HP Labs BadgePAD 4"
-        select SA1111
        select CPU_FREQ_SA1100
+        select SA1111
        help
          Say Y here if you want to build a kernel for the HP Laboratories
          BadgePAD 4.
 config SA1100_JORNADA720
        bool "HP Jornada 720"
-        select SA1111
        # FIXME: select CPU_FREQ_SA11x0
+        select SA1111
        help
          Say Y here if you want to build a kernel for the HP Jornada 720
          handheld computer.  See 
@@ -95,8 +95,8 @@ config SA1100_JORNADA720
 config SA1100_JORNADA720_SSP
        bool "HP Jornada 720 Extended SSP driver"
-        select SA1100_SSP
        depends on SA1100_JORNADA720
+        select SA1100_SSP
        help
          Say Y here if you have a HP Jornada 7xx handheld computer and you
          want to access devices connected to the MCU. Those include the
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 4cacc2d22fb..8ae100cc655 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -4,49 +4,49 @@ comment "SH-Mobile System Type"
 config ARCH_SH7367
        bool "SH-Mobile G3 (SH7367)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
        select CPU_V6
        select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 config ARCH_SH7377
        bool "SH-Mobile G4 (SH7377)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
        select CPU_V7
        select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 config ARCH_SH7372
        bool "SH-Mobile AP4 (SH7372)"
-        select CPU_V7
-        select SH_CLK_CPG
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_CPU_SUSPEND if PM || CPU_IDLE
+        select CPU_V7
+        select SH_CLK_CPG
 config ARCH_SH73A0
        bool "SH-Mobile AG5 (R8A73A00)"
-        select CPU_V7
-        select SH_CLK_CPG
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
+        select CPU_V7
        select I2C
+        select SH_CLK_CPG
 config ARCH_R8A7740
        bool "R-Mobile A1 (R8A77400)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
        select CPU_V7
        select SH_CLK_CPG
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 config ARCH_R8A7779
        bool "R-Car H1 (R8A77790)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_GIC
        select CPU_V7
        select SH_CLK_CPG
-        select ARM_GIC
-        select ARCH_WANT_OPTIONAL_GPIOLIB
 config ARCH_EMEV2
        bool "Emma Mobile EV2"
-        select CPU_V7
-        select ARM_GIC
        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARM_GIC
+        select CPU_V7
 comment "SH-Mobile Board Type"
@@ -65,9 +65,9 @@ config MACH_AP4EVB
        bool "AP4EVB board"
        depends on ARCH_SH7372
        select ARCH_REQUIRE_GPIOLIB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        select SH_LCD_MIPI_DSI
        select SND_SOC_AK4642 if SND_SIMPLE_CARD
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 choice
        prompt "AP4EVB LCD panel selection"
@@ -84,37 +84,37 @@ endchoice
 config MACH_AG5EVM
        bool "AG5EVM board"
+        depends on ARCH_SH73A0
        select ARCH_REQUIRE_GPIOLIB
-        select SH_LCD_MIPI_DSI
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_SH73A0
+        select SH_LCD_MIPI_DSI
 config MACH_MACKEREL
        bool "mackerel board"
        depends on ARCH_SH7372
        select ARCH_REQUIRE_GPIOLIB
-        select SND_SOC_AK4642 if SND_SIMPLE_CARD
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SND_SOC_AK4642 if SND_SIMPLE_CARD
 config MACH_KOTA2
        bool "KOTA2 board"
+        depends on ARCH_SH73A0
        select ARCH_REQUIRE_GPIOLIB
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_SH73A0
 config MACH_BONITO
        bool "bonito board"
+        depends on ARCH_R8A7740
        select ARCH_REQUIRE_GPIOLIB
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        depends on ARCH_R8A7740
 config MACH_ARMADILLO800EVA
        bool "Armadillo-800 EVA board"
        depends on ARCH_R8A7740
        select ARCH_REQUIRE_GPIOLIB
-        select USE_OF
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        select SND_SOC_WM8978 if SND_SIMPLE_CARD
+        select USE_OF
 config MACH_MARZEN
        bool "MARZEN board"
@@ -125,16 +125,16 @@ config MACH_MARZEN
 config MACH_KZM9D
        bool "KZM9D board"
        depends on ARCH_EMEV2
-        select USE_OF
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select USE_OF
 config MACH_KZM9G
        bool "KZM-A9-GT board"
        depends on ARCH_SH73A0
        select ARCH_REQUIRE_GPIOLIB
-        select USE_OF
-        select SND_SOC_AK4642 if SND_SIMPLE_CARD
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SND_SOC_AK4642 if SND_SIMPLE_CARD
+        select USE_OF
 comment "SH-Mobile System Configuration"
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 11680c532b3..9ff6f6ea361 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -4,42 +4,42 @@ comment "NVIDIA Tegra options"
 config ARCH_TEGRA_2x_SOC
        bool "Enable support for Tegra20 family"
-        select CPU_V7
-        select ARM_GIC
        select ARCH_REQUIRE_GPIOLIB
-        select PINCTRL
-        select PINCTRL_TEGRA20
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select USB_ULPI if USB
-        select USB_ULPI_VIEWPORT if USB_SUPPORT
        select ARM_ERRATA_720789
        select ARM_ERRATA_742230
        select ARM_ERRATA_751472
        select ARM_ERRATA_754327
        select ARM_ERRATA_764369 if SMP
+        select ARM_GIC
+        select CPU_FREQ_TABLE if CPU_FREQ
+        select CPU_V7
+        select PINCTRL
+        select PINCTRL_TEGRA20
        select PL310_ERRATA_727915 if CACHE_L2X0
        select PL310_ERRATA_769419 if CACHE_L2X0
-        select CPU_FREQ_TABLE if CPU_FREQ
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
+        select USB_ULPI if USB
+        select USB_ULPI_VIEWPORT if USB_SUPPORT
        help
          Support for NVIDIA Tegra AP20 and T20 processors, based on the
          ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
 config ARCH_TEGRA_3x_SOC
        bool "Enable support for Tegra30 family"
-        select CPU_V7
-        select ARM_GIC
        select ARCH_REQUIRE_GPIOLIB
-        select PINCTRL
-        select PINCTRL_TEGRA30
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select USB_ULPI if USB
-        select USB_ULPI_VIEWPORT if USB_SUPPORT
        select ARM_ERRATA_743622
        select ARM_ERRATA_751472
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP
-        select PL310_ERRATA_769419 if CACHE_L2X0
+        select ARM_GIC
        select CPU_FREQ_TABLE if CPU_FREQ
+        select CPU_V7
+        select PINCTRL
+        select PINCTRL_TEGRA30
+        select PL310_ERRATA_769419 if CACHE_L2X0
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
+        select USB_ULPI if USB
+        select USB_ULPI_VIEWPORT if USB_SUPPORT
        help
          Support for NVIDIA Tegra T30 processor family, based on the
          ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index f7e12ede008..1f597647d43 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -7,8 +7,8 @@ comment "ST-Ericsson Mobile Platform Products"
 config MACH_U300
        bool "U300"
        select PINCTRL
-        select PINCTRL_U300
        select PINCTRL_COH901
+        select PINCTRL_U300
 comment "ST-Ericsson U300/U335 Feature Selections"
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 5848206ee9b..e8c3f0d70ca 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -3,33 +3,33 @@ if ARCH_U8500
 config UX500_SOC_COMMON
        bool
        default y
-        select ARM_GIC
-        select HAS_MTU
-        select PL310_ERRATA_753970 if CACHE_PL310
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP
+        select ARM_GIC
        select CACHE_L2X0
+        select COMMON_CLK
+        select HAS_MTU
        select PINCTRL
        select PINCTRL_NOMADIK
-        select COMMON_CLK
+        select PL310_ERRATA_753970 if CACHE_PL310
 config UX500_SOC_DB8500
        bool
+        select CPU_FREQ_TABLE if CPU_FREQ
        select MFD_DB8500_PRCMU
+        select PINCTRL_DB8500
        select REGULATOR
        select REGULATOR_DB8500_PRCMU
-        select CPU_FREQ_TABLE if CPU_FREQ
-        select PINCTRL_DB8500
 menu "Ux500 target platform (boards)"
 config MACH_MOP500
        bool "U8500 Development platform, MOP500 versions"
-        select UX500_SOC_DB8500
        select I2C
        select I2C_NOMADIK
-        select SOC_BUS
        select REGULATOR_FIXED_VOLTAGE
+        select SOC_BUS
+        select UX500_SOC_DB8500
        help
          Include support for the MOP500 development platform.
diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index c1f38f6625b..63d8e9f81b9 100644
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -3,9 +3,9 @@ menu "Versatile platform type"
 config ARCH_VERSATILE_PB
        bool "Support Versatile Platform Baseboard for ARM926EJ-S"
+        default y
        select CPU_ARM926T
        select MIGHT_HAVE_PCI
-        default y
        help
          Include support for the ARM(R) Versatile Platform Baseboard
          for the ARM926EJ-S.
@@ -19,8 +19,8 @@ config MACH_VERSATILE_AB
 config MACH_VERSATILE_DT
        bool "Support Versatile platform from device tree"
-        select USE_OF
        select CPU_ARM926T
+        select USE_OF
        help
          Include support for the ARM(R) Versatile/PB platform,
          using the device tree for discovery
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 101b9681c08..94186b6c685 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -10,8 +10,8 @@ config CPU_ARM7TDMI
        depends on !MMU
        select CPU_32v4T
        select CPU_ABRT_LV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4
+        select CPU_PABRT_LEGACY
        help
          A 32-bit RISC microprocessor based on the ARM7 processor core
          which has no memory control unit and cache.
@@ -24,11 +24,11 @@ config CPU_ARM720T
        bool "Support ARM720T processor" if ARCH_INTEGRATOR
        select CPU_32v4T
        select CPU_ABRT_LV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WT if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WT if MMU
        help
          A 32-bit RISC processor with 8kByte Cache, Write Buffer and
@@ -43,9 +43,9 @@ config CPU_ARM740T
        depends on !MMU
        select CPU_32v4T
        select CPU_ABRT_LV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V3     # although the core is v4t
        select CPU_CP15_MPU
+        select CPU_PABRT_LEGACY
        help
          A 32-bit RISC processor with 8KB cache or 4KB variants,
          write buffer and MPU(Protection Unit) built around
@@ -60,8 +60,8 @@ config CPU_ARM9TDMI
        depends on !MMU
        select CPU_32v4T
        select CPU_ABRT_NOMMU
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4
+        select CPU_PABRT_LEGACY
        help
          A 32-bit RISC microprocessor based on the ARM9 processor core
          which has no memory control unit and cache.
@@ -74,11 +74,11 @@ config CPU_ARM920T
        bool "Support ARM920T processor" if ARCH_INTEGRATOR
        select CPU_32v4T
        select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4WT
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
        help
          The ARM920T is licensed to be produced by numerous vendors,
@@ -92,11 +92,11 @@ config CPU_ARM922T
        bool "Support ARM922T processor" if ARCH_INTEGRATOR
        select CPU_32v4T
        select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4WT
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
        help
          The ARM922T is a version of the ARM920T, but with smaller
@@ -111,11 +111,11 @@ config CPU_ARM925T
        bool "Support ARM925T processor" if ARCH_OMAP1
        select CPU_32v4T
        select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4WT
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
        help
          The ARM925T is a mix between the ARM920T and ARM926T, but with
@@ -130,10 +130,10 @@ config CPU_ARM926T
        bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
        select CPU_32v5
        select CPU_ABRT_EV5TJ
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
        help
          This is a variant of the ARM920.  It has slightly different
@@ -148,11 +148,11 @@ config CPU_FA526
        bool
        select CPU_32v4
        select CPU_ABRT_EV4
-        select CPU_PABRT_LEGACY
-        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_CACHE_FA
+        select CPU_CACHE_VIVT
        select CPU_COPY_FA if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_FA if MMU
        help
          The FA526 is a version of the ARMv4 compatible processor with
@@ -167,9 +167,9 @@ config CPU_ARM940T
        depends on !MMU
        select CPU_32v4T
        select CPU_ABRT_NOMMU
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
        select CPU_CP15_MPU
+        select CPU_PABRT_LEGACY
        help
          ARM940T is a member of the ARM9TDMI family of general-
          purpose microprocessors with MPU and separate 4KB
@@ -185,9 +185,9 @@ config CPU_ARM946E
        depends on !MMU
        select CPU_32v5
        select CPU_ABRT_NOMMU
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
        select CPU_CP15_MPU
+        select CPU_PABRT_LEGACY
        help
          ARM946E-S is a member of the ARM9E-S family of high-
          performance, 32-bit system-on-chip processor solutions.
@@ -201,11 +201,11 @@ config CPU_ARM1020
        bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR
        select CPU_32v5
        select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4WT
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
        help
          The ARM1020 is the 32K cached version of the ARM10 processor,
@@ -217,25 +217,25 @@ config CPU_ARM1020
 # ARM1020E - needs validating
 config CPU_ARM1020E
        bool "Support ARM1020E processor" if ARCH_INTEGRATOR
+        depends on n
        select CPU_32v5
        select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4WT
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
-        depends on n
 # ARM1022E
 config CPU_ARM1022
        bool "Support ARM1022E processor" if ARCH_INTEGRATOR
        select CPU_32v5
        select CPU_ABRT_EV4T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU # can probably do better
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
        help
          The ARM1022E is an implementation of the ARMv5TE architecture
@@ -250,10 +250,10 @@ config CPU_ARM1026
        bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR
        select CPU_32v5
        select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU # can probably do better
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
        help
          The ARM1026EJ-S is an implementation of the ARMv5TEJ architecture
@@ -268,11 +268,11 @@ config CPU_SA110
        select CPU_32v3 if ARCH_RPC
        select CPU_32v4 if !ARCH_RPC
        select CPU_ABRT_EV4
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4WB
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_V4WB if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WB if MMU
        help
          The Intel StrongARM(R) SA-110 is a 32-bit microprocessor and
@@ -288,10 +288,10 @@ config CPU_SA1100
        bool
        select CPU_32v4
        select CPU_ABRT_EV4
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_V4WB
        select CPU_CACHE_VIVT
        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WB if MMU
 # XScale
@@ -299,9 +299,9 @@ config CPU_XSCALE
        bool
        select CPU_32v5
        select CPU_ABRT_EV5T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
 # XScale Core Version 3
@@ -309,9 +309,9 @@ config CPU_XSC3
        bool
        select CPU_32v5
        select CPU_ABRT_EV5T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
        select IO_36
@@ -320,21 +320,21 @@ config CPU_MOHAWK
        bool
        select CPU_32v5
        select CPU_ABRT_EV5T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
+        select CPU_COPY_V4WB if MMU
        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_V4WBI if MMU
-        select CPU_COPY_V4WB if MMU
 # Feroceon
 config CPU_FEROCEON
        bool
        select CPU_32v5
        select CPU_ABRT_EV5T
-        select CPU_PABRT_LEGACY
        select CPU_CACHE_VIVT
-        select CPU_CP15_MMU
        select CPU_COPY_FEROCEON if MMU
+        select CPU_CP15_MMU
+        select CPU_PABRT_LEGACY
        select CPU_TLB_FEROCEON if MMU
 config CPU_FEROCEON_OLD_ID
@@ -349,20 +349,20 @@ config CPU_FEROCEON_OLD_ID
 # Marvell PJ4
 config CPU_PJ4
        bool
-        select CPU_V7
        select ARM_THUMBEE
+        select CPU_V7
 # ARMv6
 config CPU_V6
        bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
        select CPU_32v6
        select CPU_ABRT_EV6
-        select CPU_PABRT_V6
        select CPU_CACHE_V6
        select CPU_CACHE_VIPT
+        select CPU_COPY_V6 if MMU
        select CPU_CP15_MMU
        select CPU_HAS_ASID if MMU
-        select CPU_COPY_V6 if MMU
+        select CPU_PABRT_V6
        select CPU_TLB_V6 if MMU
 # ARMv6k
@@ -371,12 +371,12 @@ config CPU_V6K
        select CPU_32v6
        select CPU_32v6K
        select CPU_ABRT_EV6
-        select CPU_PABRT_V6
        select CPU_CACHE_V6
        select CPU_CACHE_VIPT
+        select CPU_COPY_V6 if MMU
        select CPU_CP15_MMU
        select CPU_HAS_ASID if MMU
-        select CPU_COPY_V6 if MMU
+        select CPU_PABRT_V6
        select CPU_TLB_V6 if MMU
 # ARMv7
@@ -385,44 +385,44 @@ config CPU_V7
        select CPU_32v6K
        select CPU_32v7
        select CPU_ABRT_EV7
-        select CPU_PABRT_V7
        select CPU_CACHE_V7
        select CPU_CACHE_VIPT
+        select CPU_COPY_V6 if MMU
        select CPU_CP15_MMU
        select CPU_HAS_ASID if MMU
-        select CPU_COPY_V6 if MMU
+        select CPU_PABRT_V7
        select CPU_TLB_V7 if MMU
 # Figure out what processor architecture version we should be using.
 # This defines the compiler instruction set which depends on the machine type.
 config CPU_32v3
        bool
-        select TLS_REG_EMUL if SMP || !MMU
-        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
        select CPU_USE_DOMAINS if MMU
+        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
+        select TLS_REG_EMUL if SMP || !MMU
 config CPU_32v4
        bool
-        select TLS_REG_EMUL if SMP || !MMU
-        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
        select CPU_USE_DOMAINS if MMU
+        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
+        select TLS_REG_EMUL if SMP || !MMU
 config CPU_32v4T
        bool
-        select TLS_REG_EMUL if SMP || !MMU
-        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
        select CPU_USE_DOMAINS if MMU
+        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
+        select TLS_REG_EMUL if SMP || !MMU
 config CPU_32v5
        bool
-        select TLS_REG_EMUL if SMP || !MMU
-        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
        select CPU_USE_DOMAINS if MMU
+        select NEEDS_SYSCALL_FOR_CMPXCHG if SMP
+        select TLS_REG_EMUL if SMP || !MMU
 config CPU_32v6
        bool
-        select TLS_REG_EMUL if !CPU_32v6K && !MMU
        select CPU_USE_DOMAINS if CPU_V6 && MMU
+        select TLS_REG_EMUL if !CPU_32v6K && !MMU
 config CPU_32v6K
        bool
@@ -624,11 +624,28 @@ config ARM_THUMBEE
          Say Y here if you have a CPU with the ThumbEE extension and code to
          make use of it. Say N for code that can run on CPUs without ThumbEE.
+config ARM_VIRT_EXT
+        bool "Native support for the ARM Virtualization Extensions"
+        depends on MMU && CPU_V7
+        help
+          Enable the kernel to make use of the ARM Virtualization
+          Extensions to install hypervisors without run-time firmware
+          assistance.
+          A compliant bootloader is required in order to make maximum
+          use of this feature.  Refer to Documentation/arm/Booting for
+          details.
+          It is safe to enable this option even if the kernel may not be
+          booted in HYP mode, may not have support for the
+          virtualization extensions, or may be booted with a
+          non-compliant bootloader.
 config SWP_EMULATE
        bool "Emulate SWP/SWPB instructions"
        depends on !CPU_USE_DOMAINS && CPU_V7
-        select HAVE_PROC_CPU if PROC_FS
        default y if SMP
+        select HAVE_PROC_CPU if PROC_FS
        help
          ARMv6 architecture deprecates use of the SWP/SWPB instructions.
          ARMv7 multiprocessing extensions introduce the ability to disable
diff --git a/arch/arm/mm/cache-fa.S b/arch/arm/mm/cache-fa.S
index 07201637109..e505befe51b 100644
--- a/arch/arm/mm/cache-fa.S
+++ b/arch/arm/mm/cache-fa.S
@@ -240,6 +240,9 @@ ENTRY(fa_dma_unmap_area)
        mov     pc, lr
 ENDPROC(fa_dma_unmap_area)
+        .globl  fa_flush_kern_cache_louis
+        .equ    fa_flush_kern_cache_louis, fa_flush_kern_cache_all
        __INITDATA
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
diff --git a/arch/arm/mm/cache-v3.S b/arch/arm/mm/cache-v3.S
index 52e35f32eef..8a3fadece8d 100644
--- a/arch/arm/mm/cache-v3.S
+++ b/arch/arm/mm/cache-v3.S
@@ -128,6 +128,9 @@ ENTRY(v3_dma_map_area)
 ENDPROC(v3_dma_unmap_area)
 ENDPROC(v3_dma_map_area)
+        .globl  v3_flush_kern_cache_louis
+        .equ    v3_flush_kern_cache_louis, v3_flush_kern_cache_all
        __INITDATA
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
diff --git a/arch/arm/mm/cache-v4.S b/arch/arm/mm/cache-v4.S
index 022135d2b7e..43e5d77be67 100644
--- a/arch/arm/mm/cache-v4.S
+++ b/arch/arm/mm/cache-v4.S
@@ -140,6 +140,9 @@ ENTRY(v4_dma_map_area)
 ENDPROC(v4_dma_unmap_area)
 ENDPROC(v4_dma_map_area)
+        .globl  v4_flush_kern_cache_louis
+        .equ    v4_flush_kern_cache_louis, v4_flush_kern_cache_all
        __INITDATA
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
diff --git a/arch/arm/mm/cache-v4wb.S b/arch/arm/mm/cache-v4wb.S
index 8f1eeae340c..cd494532140 100644
--- a/arch/arm/mm/cache-v4wb.S
+++ b/arch/arm/mm/cache-v4wb.S
@@ -251,6 +251,9 @@ ENTRY(v4wb_dma_unmap_area)
        mov     pc, lr
 ENDPROC(v4wb_dma_unmap_area)
+        .globl  v4wb_flush_kern_cache_louis
+        .equ    v4wb_flush_kern_cache_louis, v4wb_flush_kern_cache_all
        __INITDATA
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
diff --git a/arch/arm/mm/cache-v4wt.S b/arch/arm/mm/cache-v4wt.S
index b34a5f908a8..11e5e5838bc 100644
--- a/arch/arm/mm/cache-v4wt.S
+++ b/arch/arm/mm/cache-v4wt.S
@@ -196,6 +196,9 @@ ENTRY(v4wt_dma_map_area)
 ENDPROC(v4wt_dma_unmap_area)
 ENDPROC(v4wt_dma_map_area)
+        .globl  v4wt_flush_kern_cache_louis
+        .equ    v4wt_flush_kern_cache_louis, v4wt_flush_kern_cache_all
        __INITDATA
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S
index 4b10760c56d..d8fd4d4bd3d 100644
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
@@ -326,6 +326,9 @@ ENTRY(v6_dma_unmap_area)
        mov     pc, lr
 ENDPROC(v6_dma_unmap_area)
+        .globl  v6_flush_kern_cache_louis
+        .equ    v6_flush_kern_cache_louis, v6_flush_kern_cache_all
        __INITDATA
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index 3b172275262..cd956647c21 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -33,6 +33,24 @@ ENTRY(v7_flush_icache_all)
        mov     pc, lr
 ENDPROC(v7_flush_icache_all)
+ /*
+ *     v7_flush_dcache_louis()
+ *
+ *     Flush the D-cache up to the Level of Unification Inner Shareable
+ *
+ *     Corrupted registers: r0-r7, r9-r11 (r6 only in Thumb mode)
+ */
+ENTRY(v7_flush_dcache_louis)
+        dmb                                     @ ensure ordering with previous memory accesses
+        mrc     p15, 1, r0, c0, c0, 1           @ read clidr, r0 = clidr
+        ands    r3, r0, #0xe00000               @ extract LoUIS from clidr
+        mov     r3, r3, lsr #20                 @ r3 = LoUIS * 2
+        moveq   pc, lr                          @ return if level == 0
+        mov     r10, #0                         @ r10 (starting level) = 0
+        b       flush_levels                    @ start flushing cache levels
+ENDPROC(v7_flush_dcache_louis)
 /*
 *      v7_flush_dcache_all()
 *
@@ -49,7 +67,7 @@ ENTRY(v7_flush_dcache_all)
        mov     r3, r3, lsr #23                 @ left align loc bit field
        beq     finished                        @ if loc is 0, then no need to clean
        mov     r10, #0                         @ start clean at cache level 0
-loop1:
+flush_levels:
        add     r2, r10, r10, lsr #1            @ work out 3x current cache level
        mov     r1, r0, lsr r2                  @ extract cache type bits from clidr
        and     r1, r1, #7                      @ mask of the bits for current cache only
@@ -71,9 +89,9 @@ loop1:
        clz     r5, r4                          @ find bit position of way size increment
        ldr     r7, =0x7fff
        ands    r7, r7, r1, lsr #13             @ extract max number of the index size
-loop2:
+loop1:
        mov     r9, r4                          @ create working copy of max way size
-loop3:
+loop2:
 ARM(   orr     r11, r10, r9, lsl r5    )       @ factor way and cache number into r11
 THUMB( lsl     r6, r9, r5              )
 THUMB( orr     r11, r10, r6            )       @ factor way and cache number into r11
@@ -82,13 +100,13 @@ loop3:
 THUMB( orr     r11, r11, r6            )       @ factor index number into r11
        mcr     p15, 0, r11, c7, c14, 2         @ clean & invalidate by set/way
        subs    r9, r9, #1                      @ decrement the way
-        bge     loop3
-        subs    r7, r7, #1                      @ decrement the index
        bge     loop2
+        subs    r7, r7, #1                      @ decrement the index
+        bge     loop1
 skip:
        add     r10, r10, #2                    @ increment cache number
        cmp     r3, r10
-        bgt     loop1
+        bgt     flush_levels
 finished:
        mov     r10, #0                         @ swith back to cache level 0
        mcr     p15, 2, r10, c0, c0, 0          @ select current cache level in cssr
@@ -120,6 +138,24 @@ ENTRY(v7_flush_kern_cache_all)
        mov     pc, lr
 ENDPROC(v7_flush_kern_cache_all)
+ /*
+ *     v7_flush_kern_cache_louis(void)
+ *
+ *     Flush the data cache up to Level of Unification Inner Shareable.
+ *     Invalidate the I-cache to the point of unification.
+ */
+ENTRY(v7_flush_kern_cache_louis)
+ ARM(   stmfd   sp!, {r4-r5, r7, r9-r11, lr}    )
+ THUMB( stmfd   sp!, {r4-r7, r9-r11, lr}        )
+        bl      v7_flush_dcache_louis
+        mov     r0, #0
+        ALT_SMP(mcr     p15, 0, r0, c7, c1, 0)  @ invalidate I-cache inner shareable
+        ALT_UP(mcr      p15, 0, r0, c7, c5, 0)  @ I+BTB cache invalidate
+ ARM(   ldmfd   sp!, {r4-r5, r7, r9-r11, lr}    )
+ THUMB( ldmfd   sp!, {r4-r7, r9-r11, lr}        )
+        mov     pc, lr
+ENDPROC(v7_flush_kern_cache_louis)
 /*
 *      v7_flush_cache_all()
 *
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 0650bb87c1e..2bb61e703d6 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -368,6 +368,9 @@ ENTRY(arm1020_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm1020_dma_unmap_area)
+        .globl  arm1020_flush_kern_cache_louis
+        .equ    arm1020_flush_kern_cache_louis, arm1020_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm1020
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 4188478325a..8f96aa40f51 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -354,6 +354,9 @@ ENTRY(arm1020e_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm1020e_dma_unmap_area)
+        .globl  arm1020e_flush_kern_cache_louis
+        .equ    arm1020e_flush_kern_cache_louis, arm1020e_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm1020e
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 33c68824bff..8ebe4a469a2 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -343,6 +343,9 @@ ENTRY(arm1022_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm1022_dma_unmap_area)
+        .globl  arm1022_flush_kern_cache_louis
+        .equ    arm1022_flush_kern_cache_louis, arm1022_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm1022
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index fbc1d5fc24d..093fc7e520c 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -337,6 +337,9 @@ ENTRY(arm1026_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm1026_dma_unmap_area)
+        .globl  arm1026_flush_kern_cache_louis
+        .equ    arm1026_flush_kern_cache_louis, arm1026_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm1026
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 1a8c138eb89..2c3b9421ab5 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -319,6 +319,9 @@ ENTRY(arm920_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm920_dma_unmap_area)
+        .globl  arm920_flush_kern_cache_louis
+        .equ    arm920_flush_kern_cache_louis, arm920_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm920
 #endif
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 4c44d7e1c3c..4464c49d744 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -321,6 +321,9 @@ ENTRY(arm922_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm922_dma_unmap_area)
+        .globl  arm922_flush_kern_cache_louis
+        .equ    arm922_flush_kern_cache_louis, arm922_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm922
 #endif
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index ec5b1180994..281eb9b9c1d 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -376,6 +376,9 @@ ENTRY(arm925_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm925_dma_unmap_area)
+        .globl  arm925_flush_kern_cache_louis
+        .equ    arm925_flush_kern_cache_louis, arm925_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm925
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index c31e62c606c..f1803f7e297 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -339,6 +339,9 @@ ENTRY(arm926_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm926_dma_unmap_area)
+        .globl  arm926_flush_kern_cache_louis
+        .equ    arm926_flush_kern_cache_louis, arm926_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm926
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
index a613a7dd714..8da189d4a40 100644
--- a/arch/arm/mm/proc-arm940.S
+++ b/arch/arm/mm/proc-arm940.S
@@ -267,6 +267,9 @@ ENTRY(arm940_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm940_dma_unmap_area)
+        .globl  arm940_flush_kern_cache_louis
+        .equ    arm940_flush_kern_cache_louis, arm940_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm940
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
index 9f4f2999fdd..f666cf34075 100644
--- a/arch/arm/mm/proc-arm946.S
+++ b/arch/arm/mm/proc-arm946.S
@@ -310,6 +310,9 @@ ENTRY(arm946_dma_unmap_area)
        mov     pc, lr
 ENDPROC(arm946_dma_unmap_area)
+        .globl  arm946_flush_kern_cache_louis
+        .equ    arm946_flush_kern_cache_louis, arm946_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions arm946
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index 23a8e4c7f2b..4106b09e0c2 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -415,6 +415,9 @@ ENTRY(feroceon_dma_unmap_area)
        mov     pc, lr
 ENDPROC(feroceon_dma_unmap_area)
+        .globl  feroceon_flush_kern_cache_louis
+        .equ    feroceon_flush_kern_cache_louis, feroceon_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions feroceon
@@ -431,6 +434,7 @@ ENDPROC(feroceon_dma_unmap_area)
        range_alias flush_icache_all
        range_alias flush_user_cache_all
        range_alias flush_kern_cache_all
+        range_alias flush_kern_cache_louis
        range_alias flush_user_cache_range
        range_alias coherent_kern_range
        range_alias coherent_user_range
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 2d8ff3ad86d..b29a2265af0 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -299,6 +299,7 @@ ENTRY(\name\()_processor_functions)
 ENTRY(\name\()_cache_fns)
        .long   \name\()_flush_icache_all
        .long   \name\()_flush_kern_cache_all
+        .long   \name\()_flush_kern_cache_louis
        .long   \name\()_flush_user_cache_all
        .long   \name\()_flush_user_cache_range
        .long   \name\()_coherent_kern_range
diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
index fbb2124a547..82f9cdc751d 100644
--- a/arch/arm/mm/proc-mohawk.S
+++ b/arch/arm/mm/proc-mohawk.S
@@ -303,6 +303,9 @@ ENTRY(mohawk_dma_unmap_area)
        mov     pc, lr
 ENDPROC(mohawk_dma_unmap_area)
+        .globl  mohawk_flush_kern_cache_louis
+        .equ    mohawk_flush_kern_cache_louis, mohawk_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions mohawk
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index c2e2b66f72b..846d279f317 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -172,7 +172,7 @@ __v7_ca15mp_setup:
 __v7_setup:
        adr     r12, __v7_setup_stack           @ the local stack
        stmia   r12, {r0-r5, r7, r9, r11, lr}
-        bl      v7_flush_dcache_all
+        bl      v7_flush_dcache_louis
        ldmia   r12, {r0-r5, r7, r9, r11, lr}
        mrc     p15, 0, r0, c0, c0, 0           @ read main ID register
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index b0d57869da2..eb93d6487f3 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -337,6 +337,9 @@ ENTRY(xsc3_dma_unmap_area)
        mov     pc, lr
 ENDPROC(xsc3_dma_unmap_area)
+        .globl  xsc3_flush_kern_cache_louis
+        .equ    xsc3_flush_kern_cache_louis, xsc3_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions xsc3
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index 4ffebaa595e..25510361aa1 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -410,6 +410,9 @@ ENTRY(xscale_dma_unmap_area)
        mov     pc, lr
 ENDPROC(xscale_dma_unmap_area)
+        .globl  xscale_flush_kern_cache_louis
+        .equ    xscale_flush_kern_cache_louis, xscale_flush_kern_cache_all
        @ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
        define_cache_functions xscale
@@ -439,6 +442,7 @@ ENDPROC(xscale_dma_unmap_area)
        a0_alias flush_icache_all
        a0_alias flush_user_cache_all
        a0_alias flush_kern_cache_all
+        a0_alias flush_kern_cache_louis
        a0_alias flush_user_cache_range
        a0_alias coherent_kern_range
        a0_alias coherent_user_range
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index baf9064c084..88e1e2e7a20 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -10,16 +10,16 @@ choice
 config ARCH_IMX_V4_V5
        bool "i.MX1, i.MX21, i.MX25, i.MX27"
-        select AUTO_ZRELADDR if !ZBOOT_ROM
        select ARM_PATCH_PHYS_VIRT
+        select AUTO_ZRELADDR if !ZBOOT_ROM
        help
          This enables support for systems based on the Freescale i.MX ARMv4
          and ARMv5 SoCs
 config ARCH_IMX_V6_V7
        bool "i.MX3, i.MX5, i.MX6"
-        select AUTO_ZRELADDR if !ZBOOT_ROM
        select ARM_PATCH_PHYS_VIRT
+        select AUTO_ZRELADDR if !ZBOOT_ROM
        select MIGHT_HAVE_CACHE_L2X0
        help
          This enables support for systems based on the Freescale i.MX3, i.MX5
diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig
index 6b46cee2f9c..a35d9841f49 100644
--- a/arch/arm/plat-mxc/devices/Kconfig
+++ b/arch/arm/plat-mxc/devices/Kconfig
@@ -3,8 +3,8 @@ config IMX_HAVE_PLATFORM_FEC
        default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX50 || SOC_IMX51 || SOC_IMX53
 config IMX_HAVE_PLATFORM_FLEXCAN
-        select HAVE_CAN_FLEXCAN if CAN
        bool
+        select HAVE_CAN_FLEXCAN if CAN
 config IMX_HAVE_PLATFORM_FSL_USB2_UDC
        bool
diff --git a/arch/arm/plat-nomadik/Kconfig b/arch/arm/plat-nomadik/Kconfig
index 4c48c8b60b5..19f55cae5d7 100644
--- a/arch/arm/plat-nomadik/Kconfig
+++ b/arch/arm/plat-nomadik/Kconfig
@@ -5,8 +5,8 @@
 config PLAT_NOMADIK
        bool
        depends on ARCH_NOMADIK || ARCH_U8500
-        select CLKSRC_MMIO
        default y
+        select CLKSRC_MMIO
        help
          Common platform code for Nomadik and other ST-Ericsson
          platforms.
diff --git a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
index 826de74bfdd..c08a54d9d88 100644
--- a/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+++ b/arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
@@ -45,6 +45,12 @@
 #define NMK_GPIO_ALT_B  2
 #define NMK_GPIO_ALT_C  (NMK_GPIO_ALT_A | NMK_GPIO_ALT_B)
+#define NMK_GPIO_ALT_CX_SHIFT 2
+#define NMK_GPIO_ALT_C1 ((1<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)
+#define NMK_GPIO_ALT_C2 ((2<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)
+#define NMK_GPIO_ALT_C3 ((3<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)
+#define NMK_GPIO_ALT_C4 ((4<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)
 /* Pull up/down values */
 enum nmk_gpio_pull {
        NMK_GPIO_PULL_NONE,
diff --git a/arch/arm/plat-nomadik/include/plat/pincfg.h b/arch/arm/plat-nomadik/include/plat/pincfg.h
index 9c949c7c98a..3b8ec60af35 100644
--- a/arch/arm/plat-nomadik/include/plat/pincfg.h
+++ b/arch/arm/plat-nomadik/include/plat/pincfg.h
@@ -25,6 +25,8 @@
 *      bit 19..20 - SLPM direction
 *      bit 21..22 - SLPM Value (if output)
 *      bit 23..25 - PDIS value (if input)
+ *      bit     26 - Gpio mode
+ *      bit     27 - Sleep mode
 *
 * to facilitate the definition, the following macros are provided
 *
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index c9d1c3603bb..7cd56ed5cd9 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -14,10 +14,10 @@ config ARCH_OMAP1
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
-        select IRQ_DOMAIN
        select HAVE_IDE
-        select NEED_MACH_MEMORY_H
+        select IRQ_DOMAIN
        select NEED_MACH_IO_H if PCCARD
+        select NEED_MACH_MEMORY_H
        help
          "Systems based on omap7xx, omap15xx or omap16xx"
@@ -25,10 +25,10 @@ config ARCH_OMAP2PLUS
        bool "TI OMAP2/3/4"
        select CLKDEV_LOOKUP
        select GENERIC_IRQ_CHIP
-        select SPARSE_IRQ
        select OMAP_DM_TIMER
-        select USE_OF
        select PROC_DEVICETREE if PROC_FS
+        select SPARSE_IRQ
+        select USE_OF
        help
          "Systems based on OMAP2, OMAP3, OMAP4 or OMAP5"
@@ -43,8 +43,8 @@ config OMAP_DEBUG_DEVICES
 config OMAP_DEBUG_LEDS
        def_bool y if NEW_LEDS
-        select LEDS_CLASS
        depends on OMAP_DEBUG_DEVICES
+        select LEDS_CLASS
 config POWER_AVS_OMAP
        bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index 21bf6adb919..eef3b6a2f8a 100644
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -6,8 +6,8 @@ config PLAT_S3C24XX
        bool
        depends on ARCH_S3C24XX
        default y
-        select NO_IOPORT
        select ARCH_REQUIRE_GPIOLIB
+        select NO_IOPORT
        select S3C_DEV_NAND
        help
          Base platform code for any Samsung S3C24XX device
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 9c3b90c3538..59401e1cc53 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -7,9 +7,9 @@
 config PLAT_SAMSUNG
        bool
        depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P
-        select NO_IOPORT
-        select GENERIC_IRQ_CHIP
        default y
+        select GENERIC_IRQ_CHIP
+        select NO_IOPORT
        help
          Base platform code for all Samsung SoC based systems
@@ -17,16 +17,16 @@ config PLAT_S5P
        bool
        depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
        default y
-        select ARM_VIC if !ARCH_EXYNOS
+        select ARCH_REQUIRE_GPIOLIB
        select ARM_GIC if ARCH_EXYNOS
+        select ARM_VIC if !ARCH_EXYNOS
        select GIC_NON_BANKED if ARCH_EXYNOS4
        select NO_IOPORT
-        select ARCH_REQUIRE_GPIOLIB
+        select PLAT_SAMSUNG
        select S3C_GPIO_TRACK
        select S5P_GPIO_DRVSTR
-        select SAMSUNG_GPIOLIB_4BIT
-        select PLAT_SAMSUNG
        select SAMSUNG_CLKSRC
+        select SAMSUNG_GPIOLIB_4BIT
        select SAMSUNG_IRQ_VIC_TIMER
        help
          Base platform code for Samsung's S5P series SoC.
@@ -423,10 +423,10 @@ config S3C_DMA
 config SAMSUNG_DMADEV
        bool
+        select ARM_AMBA
        select DMADEVICES
        select PL330_DMA if (ARCH_EXYNOS5 || ARCH_EXYNOS4 || CPU_S5PV210 || CPU_S5PC100 || \
                                        CPU_S5P6450 || CPU_S5P6440)
-        select ARM_AMBA
        help
          Use DMA device engine for PL330 DMAC.
diff --git a/arch/arm/plat-samsung/include/plat/regs-fb-v4.h b/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
deleted file mode 100644
index 4c3647f8005..00000000000
--- a/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/regs-fb-v4.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C64XX - new-style framebuffer register definitions
- *
- * This is the register set for the new style framebuffer interface
- * found from the S3C2443 onwards and specifically the S3C64XX series
- * S3C6400 and S3C6410.
- *
- * The file contains the cpu specific items which change between whichever
- * architecture is selected. See <plat/regs-fb.h> for the core definitions
- * that are the same.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-/* include the core definitions here, in case we really do need to
- * override them at a later date.
-*/
-#include <plat/regs-fb.h>
-#define S3C_FB_MAX_WIN (5)  /* number of hardware windows available. */
-#define VIDCON1_FSTATUS_EVEN    (1 << 15)
-/* Video timing controls */
-#define VIDTCON0                                (0x10)
-#define VIDTCON1                                (0x14)
-#define VIDTCON2                                (0x18)
-/* Window position controls */
-#define WINCON(_win)                            (0x20 + ((_win) * 4))
-/* OSD1 and OSD4 do not have register D */
-#define VIDOSD_BASE                             (0x40)
-#define VIDINTCON0                              (0x130)
-/* WINCONx */
-#define WINCONx_CSCWIDTH_MASK                   (0x3 << 26)
-#define WINCONx_CSCWIDTH_SHIFT                  (26)
-#define WINCONx_CSCWIDTH_WIDE                   (0x0 << 26)
-#define WINCONx_CSCWIDTH_NARROW                 (0x3 << 26)
-#define WINCONx_ENLOCAL                         (1 << 22)
-#define WINCONx_BUFSTATUS                       (1 << 21)
-#define WINCONx_BUFSEL                          (1 << 20)
-#define WINCONx_BUFAUTOEN                       (1 << 19)
-#define WINCONx_YCbCr                           (1 << 13)
-#define WINCON1_LOCALSEL_CAMIF                  (1 << 23)
-#define WINCON2_LOCALSEL_CAMIF                  (1 << 23)
-#define WINCON2_BLD_PIX                         (1 << 6)
-#define WINCON2_ALPHA_SEL                       (1 << 1)
-#define WINCON2_BPPMODE_MASK                    (0xf << 2)
-#define WINCON2_BPPMODE_SHIFT                   (2)
-#define WINCON2_BPPMODE_1BPP                    (0x0 << 2)
-#define WINCON2_BPPMODE_2BPP                    (0x1 << 2)
-#define WINCON2_BPPMODE_4BPP                    (0x2 << 2)
-#define WINCON2_BPPMODE_8BPP_1232               (0x4 << 2)
-#define WINCON2_BPPMODE_16BPP_565               (0x5 << 2)
-#define WINCON2_BPPMODE_16BPP_A1555             (0x6 << 2)
-#define WINCON2_BPPMODE_16BPP_I1555             (0x7 << 2)
-#define WINCON2_BPPMODE_18BPP_666               (0x8 << 2)
-#define WINCON2_BPPMODE_18BPP_A1665             (0x9 << 2)
-#define WINCON2_BPPMODE_19BPP_A1666             (0xa << 2)
-#define WINCON2_BPPMODE_24BPP_888               (0xb << 2)
-#define WINCON2_BPPMODE_24BPP_A1887             (0xc << 2)
-#define WINCON2_BPPMODE_25BPP_A1888             (0xd << 2)
-#define WINCON2_BPPMODE_28BPP_A4888             (0xd << 2)
-#define WINCON3_BLD_PIX                         (1 << 6)
-#define WINCON3_ALPHA_SEL                       (1 << 1)
-#define WINCON3_BPPMODE_MASK                    (0xf << 2)
-#define WINCON3_BPPMODE_SHIFT                   (2)
-#define WINCON3_BPPMODE_1BPP                    (0x0 << 2)
-#define WINCON3_BPPMODE_2BPP                    (0x1 << 2)
-#define WINCON3_BPPMODE_4BPP                    (0x2 << 2)
-#define WINCON3_BPPMODE_16BPP_565               (0x5 << 2)
-#define WINCON3_BPPMODE_16BPP_A1555             (0x6 << 2)
-#define WINCON3_BPPMODE_16BPP_I1555             (0x7 << 2)
-#define WINCON3_BPPMODE_18BPP_666               (0x8 << 2)
-#define WINCON3_BPPMODE_18BPP_A1665             (0x9 << 2)
-#define WINCON3_BPPMODE_19BPP_A1666             (0xa << 2)
-#define WINCON3_BPPMODE_24BPP_888               (0xb << 2)
-#define WINCON3_BPPMODE_24BPP_A1887             (0xc << 2)
-#define WINCON3_BPPMODE_25BPP_A1888             (0xd << 2)
-#define WINCON3_BPPMODE_28BPP_A4888             (0xd << 2)
-#define VIDINTCON0_FIFIOSEL_WINDOW2             (0x10 << 5)
-#define VIDINTCON0_FIFIOSEL_WINDOW3             (0x20 << 5)
-#define VIDINTCON0_FIFIOSEL_WINDOW4             (0x40 << 5)
-#define DITHMODE                                (0x170)
-#define WINxMAP(_win)                           (0x180 + ((_win) * 4))
-#define DITHMODE_R_POS_MASK                     (0x3 << 5)
-#define DITHMODE_R_POS_SHIFT                    (5)
-#define DITHMODE_R_POS_8BIT                     (0x0 << 5)
-#define DITHMODE_R_POS_6BIT                     (0x1 << 5)
-#define DITHMODE_R_POS_5BIT                     (0x2 << 5)
-#define DITHMODE_G_POS_MASK                     (0x3 << 3)
-#define DITHMODE_G_POS_SHIFT                    (3)
-#define DITHMODE_G_POS_8BIT                     (0x0 << 3)
-#define DITHMODE_G_POS_6BIT                     (0x1 << 3)
-#define DITHMODE_G_POS_5BIT                     (0x2 << 3)
-#define DITHMODE_B_POS_MASK                     (0x3 << 1)
-#define DITHMODE_B_POS_SHIFT                    (1)
-#define DITHMODE_B_POS_8BIT                     (0x0 << 1)
-#define DITHMODE_B_POS_6BIT                     (0x1 << 1)
-#define DITHMODE_B_POS_5BIT                     (0x2 << 1)
-#define DITHMODE_DITH_EN                        (1 << 0)
-#define WPALCON                                 (0x1A0)
-/* Palette control */
-/* Note for S5PC100: you can still use those macros on WPALCON (aka WPALCON_L),
- * but make sure that WPALCON_H W2PAL-W4PAL entries are zeroed out */
-#define WPALCON_W4PAL_16BPP_A555                (1 << 8)
-#define WPALCON_W3PAL_16BPP_A555                (1 << 7)
-#define WPALCON_W2PAL_16BPP_A555                (1 << 6)
-/* Notes on per-window bpp settings
- *
- * Value        Win0     Win1     Win2     Win3     Win 4
- * 0000         1(P)     1(P)     1(P)     1(P)     1(P)
- * 0001         2(P)     2(P)     2(P)     2(P)     2(P)
- * 0010         4(P)     4(P)     4(P)     4(P)     -none-
- * 0011         8(P)     8(P)     -none-   -none-   -none-
- * 0100         -none-   8(A232)  8(A232)  -none-   -none-
- * 0101         16(565)  16(565)  16(565)  16(565)   16(565)
- * 0110         -none-   16(A555) 16(A555) 16(A555)  16(A555)
- * 0111         16(I555) 16(I565) 16(I555) 16(I555)  16(I555)
- * 1000         18(666)  18(666)  18(666)  18(666)   18(666)
- * 1001         -none-   18(A665) 18(A665) 18(A665)  16(A665)
- * 1010         -none-   19(A666) 19(A666) 19(A666)  19(A666)
- * 1011         24(888)  24(888)  24(888)  24(888)   24(888)
- * 1100         -none-   24(A887) 24(A887) 24(A887)  24(A887)
- * 1101         -none-   25(A888) 25(A888) 25(A888)  25(A888)
- * 1110         -none-   -none-   -none-   -none-    -none-
- * 1111         -none-   -none-   -none-   -none-    -none-
-*/
diff --git a/arch/arm/plat-samsung/include/plat/regs-fb.h b/arch/arm/plat-samsung/include/plat/regs-fb.h
deleted file mode 100644
index 9a78012d6f4..00000000000
--- a/arch/arm/plat-samsung/include/plat/regs-fb.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/regs-fb.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C Platform - new-style framebuffer register definitions
- *
- * This is the register set for the new style framebuffer interface
- * found from the S3C2443 onwards into the S3C2416, S3C2450 and the
- * S3C64XX series such as the S3C6400 and S3C6410.
- *
- * The file does not contain the cpu specific items which are based on
- * whichever architecture is selected, it only contains the core of the
- * register set. See <mach/regs-fb.h> to get the specifics.
- *
- * Note, we changed to using regs-fb.h as it avoids any clashes with
- * the original regs-lcd.h so out of the way of regs-lcd.h as well as
- * indicating the newer block is much more than just an LCD interface.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-/* Please do not include this file directly, use <mach/regs-fb.h> to
- * ensure all the localised SoC support is included as necessary.
-*/
-/* VIDCON0 */
-#define VIDCON0                                 (0x00)
-#define VIDCON0_INTERLACE                       (1 << 29)
-#define VIDCON0_VIDOUT_MASK                     (0x3 << 26)
-#define VIDCON0_VIDOUT_SHIFT                    (26)
-#define VIDCON0_VIDOUT_RGB                      (0x0 << 26)
-#define VIDCON0_VIDOUT_TV                       (0x1 << 26)
-#define VIDCON0_VIDOUT_I80_LDI0                 (0x2 << 26)
-#define VIDCON0_VIDOUT_I80_LDI1                 (0x3 << 26)
-#define VIDCON0_L1_DATA_MASK                    (0x7 << 23)
-#define VIDCON0_L1_DATA_SHIFT                   (23)
-#define VIDCON0_L1_DATA_16BPP                   (0x0 << 23)
-#define VIDCON0_L1_DATA_18BPP16                 (0x1 << 23)
-#define VIDCON0_L1_DATA_18BPP9                  (0x2 << 23)
-#define VIDCON0_L1_DATA_24BPP                   (0x3 << 23)
-#define VIDCON0_L1_DATA_18BPP                   (0x4 << 23)
-#define VIDCON0_L1_DATA_16BPP8                  (0x5 << 23)
-#define VIDCON0_L0_DATA_MASK                    (0x7 << 20)
-#define VIDCON0_L0_DATA_SHIFT                   (20)
-#define VIDCON0_L0_DATA_16BPP                   (0x0 << 20)
-#define VIDCON0_L0_DATA_18BPP16                 (0x1 << 20)
-#define VIDCON0_L0_DATA_18BPP9                  (0x2 << 20)
-#define VIDCON0_L0_DATA_24BPP                   (0x3 << 20)
-#define VIDCON0_L0_DATA_18BPP                   (0x4 << 20)
-#define VIDCON0_L0_DATA_16BPP8                  (0x5 << 20)
-#define VIDCON0_PNRMODE_MASK                    (0x3 << 17)
-#define VIDCON0_PNRMODE_SHIFT                   (17)
-#define VIDCON0_PNRMODE_RGB                     (0x0 << 17)
-#define VIDCON0_PNRMODE_BGR                     (0x1 << 17)
-#define VIDCON0_PNRMODE_SERIAL_RGB              (0x2 << 17)
-#define VIDCON0_PNRMODE_SERIAL_BGR              (0x3 << 17)
-#define VIDCON0_CLKVALUP                        (1 << 16)
-#define VIDCON0_CLKVAL_F_MASK                   (0xff << 6)
-#define VIDCON0_CLKVAL_F_SHIFT                  (6)
-#define VIDCON0_CLKVAL_F_LIMIT                  (0xff)
-#define VIDCON0_CLKVAL_F(_x)                    ((_x) << 6)
-#define VIDCON0_VLCKFREE                        (1 << 5)
-#define VIDCON0_CLKDIR                          (1 << 4)
-#define VIDCON0_CLKSEL_MASK                     (0x3 << 2)
-#define VIDCON0_CLKSEL_SHIFT                    (2)
-#define VIDCON0_CLKSEL_HCLK                     (0x0 << 2)
-#define VIDCON0_CLKSEL_LCD                      (0x1 << 2)
-#define VIDCON0_CLKSEL_27M                      (0x3 << 2)
-#define VIDCON0_ENVID                           (1 << 1)
-#define VIDCON0_ENVID_F                         (1 << 0)
-#define VIDCON1                                 (0x04)
-#define VIDCON1_LINECNT_MASK                    (0x7ff << 16)
-#define VIDCON1_LINECNT_SHIFT                   (16)
-#define VIDCON1_LINECNT_GET(_v)                 (((_v) >> 16) & 0x7ff)
-#define VIDCON1_VSTATUS_MASK                    (0x3 << 13)
-#define VIDCON1_VSTATUS_SHIFT                   (13)
-#define VIDCON1_VSTATUS_VSYNC                   (0x0 << 13)
-#define VIDCON1_VSTATUS_BACKPORCH               (0x1 << 13)
-#define VIDCON1_VSTATUS_ACTIVE                  (0x2 << 13)
-#define VIDCON1_VSTATUS_FRONTPORCH              (0x0 << 13)
-#define VIDCON1_VCLK_MASK                       (0x3 << 9)
-#define VIDCON1_VCLK_HOLD                       (0x0 << 9)
-#define VIDCON1_VCLK_RUN                        (0x1 << 9)
-#define VIDCON1_INV_VCLK                        (1 << 7)
-#define VIDCON1_INV_HSYNC                       (1 << 6)
-#define VIDCON1_INV_VSYNC                       (1 << 5)
-#define VIDCON1_INV_VDEN                        (1 << 4)
-/* VIDCON2 */
-#define VIDCON2                                 (0x08)
-#define VIDCON2_EN601                           (1 << 23)
-#define VIDCON2_TVFMTSEL_SW                     (1 << 14)
-#define VIDCON2_TVFMTSEL1_MASK                  (0x3 << 12)
-#define VIDCON2_TVFMTSEL1_SHIFT                 (12)
-#define VIDCON2_TVFMTSEL1_RGB                   (0x0 << 12)
-#define VIDCON2_TVFMTSEL1_YUV422                (0x1 << 12)
-#define VIDCON2_TVFMTSEL1_YUV444                (0x2 << 12)
-#define VIDCON2_ORGYCbCr                        (1 << 8)
-#define VIDCON2_YUVORDCrCb                      (1 << 7)
-/* PRTCON (S3C6410, S5PC100)
- * Might not be present in the S3C6410 documentation,
- * but tests prove it's there almost for sure; shouldn't hurt in any case.
- */
-#define PRTCON                                  (0x0c)
-#define PRTCON_PROTECT                          (1 << 11)
-/* VIDTCON0 */
-#define VIDTCON0_VBPDE_MASK                     (0xff << 24)
-#define VIDTCON0_VBPDE_SHIFT                    (24)
-#define VIDTCON0_VBPDE_LIMIT                    (0xff)
-#define VIDTCON0_VBPDE(_x)                      ((_x) << 24)
-#define VIDTCON0_VBPD_MASK                      (0xff << 16)
-#define VIDTCON0_VBPD_SHIFT                     (16)
-#define VIDTCON0_VBPD_LIMIT                     (0xff)
-#define VIDTCON0_VBPD(_x)                       ((_x) << 16)
-#define VIDTCON0_VFPD_MASK                      (0xff << 8)
-#define VIDTCON0_VFPD_SHIFT                     (8)
-#define VIDTCON0_VFPD_LIMIT                     (0xff)
-#define VIDTCON0_VFPD(_x)                       ((_x) << 8)
-#define VIDTCON0_VSPW_MASK                      (0xff << 0)
-#define VIDTCON0_VSPW_SHIFT                     (0)
-#define VIDTCON0_VSPW_LIMIT                     (0xff)
-#define VIDTCON0_VSPW(_x)                       ((_x) << 0)
-/* VIDTCON1 */
-#define VIDTCON1_VFPDE_MASK                     (0xff << 24)
-#define VIDTCON1_VFPDE_SHIFT                    (24)
-#define VIDTCON1_VFPDE_LIMIT                    (0xff)
-#define VIDTCON1_VFPDE(_x)                      ((_x) << 24)
-#define VIDTCON1_HBPD_MASK                      (0xff << 16)
-#define VIDTCON1_HBPD_SHIFT                     (16)
-#define VIDTCON1_HBPD_LIMIT                     (0xff)
-#define VIDTCON1_HBPD(_x)                       ((_x) << 16)
-#define VIDTCON1_HFPD_MASK                      (0xff << 8)
-#define VIDTCON1_HFPD_SHIFT                     (8)
-#define VIDTCON1_HFPD_LIMIT                     (0xff)
-#define VIDTCON1_HFPD(_x)                       ((_x) << 8)
-#define VIDTCON1_HSPW_MASK                      (0xff << 0)
-#define VIDTCON1_HSPW_SHIFT                     (0)
-#define VIDTCON1_HSPW_LIMIT                     (0xff)
-#define VIDTCON1_HSPW(_x)                       ((_x) << 0)
-#define VIDTCON2                                (0x18)
-#define VIDTCON2_LINEVAL_E(_x)                  ((((_x) & 0x800) >> 11) << 23)
-#define VIDTCON2_LINEVAL_MASK                   (0x7ff << 11)
-#define VIDTCON2_LINEVAL_SHIFT                  (11)
-#define VIDTCON2_LINEVAL_LIMIT                  (0x7ff)
-#define VIDTCON2_LINEVAL(_x)                    (((_x) & 0x7ff) << 11)
-#define VIDTCON2_HOZVAL_E(_x)                   ((((_x) & 0x800) >> 11) << 22)
-#define VIDTCON2_HOZVAL_MASK                    (0x7ff << 0)
-#define VIDTCON2_HOZVAL_SHIFT                   (0)
-#define VIDTCON2_HOZVAL_LIMIT                   (0x7ff)
-#define VIDTCON2_HOZVAL(_x)                     (((_x) & 0x7ff) << 0)
-/* WINCONx */
-#define WINCONx_BITSWP                          (1 << 18)
-#define WINCONx_BYTSWP                          (1 << 17)
-#define WINCONx_HAWSWP                          (1 << 16)
-#define WINCONx_WSWP                            (1 << 15)
-#define WINCONx_BURSTLEN_MASK                   (0x3 << 9)
-#define WINCONx_BURSTLEN_SHIFT                  (9)
-#define WINCONx_BURSTLEN_16WORD                 (0x0 << 9)
-#define WINCONx_BURSTLEN_8WORD                  (0x1 << 9)
-#define WINCONx_BURSTLEN_4WORD                  (0x2 << 9)
-#define WINCONx_ENWIN                           (1 << 0)
-#define WINCON0_BPPMODE_MASK                    (0xf << 2)
-#define WINCON0_BPPMODE_SHIFT                   (2)
-#define WINCON0_BPPMODE_1BPP                    (0x0 << 2)
-#define WINCON0_BPPMODE_2BPP                    (0x1 << 2)
-#define WINCON0_BPPMODE_4BPP                    (0x2 << 2)
-#define WINCON0_BPPMODE_8BPP_PALETTE            (0x3 << 2)
-#define WINCON0_BPPMODE_16BPP_565               (0x5 << 2)
-#define WINCON0_BPPMODE_16BPP_1555              (0x7 << 2)
-#define WINCON0_BPPMODE_18BPP_666               (0x8 << 2)
-#define WINCON0_BPPMODE_24BPP_888               (0xb << 2)
-#define WINCON1_BLD_PIX                         (1 << 6)
-#define WINCON1_ALPHA_SEL                       (1 << 1)
-#define WINCON1_BPPMODE_MASK                    (0xf << 2)
-#define WINCON1_BPPMODE_SHIFT                   (2)
-#define WINCON1_BPPMODE_1BPP                    (0x0 << 2)
-#define WINCON1_BPPMODE_2BPP                    (0x1 << 2)
-#define WINCON1_BPPMODE_4BPP                    (0x2 << 2)
-#define WINCON1_BPPMODE_8BPP_PALETTE            (0x3 << 2)
-#define WINCON1_BPPMODE_8BPP_1232               (0x4 << 2)
-#define WINCON1_BPPMODE_16BPP_565               (0x5 << 2)
-#define WINCON1_BPPMODE_16BPP_A1555             (0x6 << 2)
-#define WINCON1_BPPMODE_16BPP_I1555             (0x7 << 2)
-#define WINCON1_BPPMODE_18BPP_666               (0x8 << 2)
-#define WINCON1_BPPMODE_18BPP_A1665             (0x9 << 2)
-#define WINCON1_BPPMODE_19BPP_A1666             (0xa << 2)
-#define WINCON1_BPPMODE_24BPP_888               (0xb << 2)
-#define WINCON1_BPPMODE_24BPP_A1887             (0xc << 2)
-#define WINCON1_BPPMODE_25BPP_A1888             (0xd << 2)
-#define WINCON1_BPPMODE_28BPP_A4888             (0xd << 2)
-/* S5PV210 */
-#define SHADOWCON                               (0x34)
-#define SHADOWCON_WINx_PROTECT(_win)            (1 << (10 + (_win)))
-/* DMA channels (all windows) */
-#define SHADOWCON_CHx_ENABLE(_win)              (1 << (_win))
-/* Local input channels (windows 0-2) */
-#define SHADOWCON_CHx_LOCAL_ENABLE(_win)        (1 << (5 + (_win)))
-#define VIDOSDxA_TOPLEFT_X_E(_x)                ((((_x) & 0x800) >> 11) << 23)
-#define VIDOSDxA_TOPLEFT_X_MASK                 (0x7ff << 11)
-#define VIDOSDxA_TOPLEFT_X_SHIFT                (11)
-#define VIDOSDxA_TOPLEFT_X_LIMIT                (0x7ff)
-#define VIDOSDxA_TOPLEFT_X(_x)                  (((_x) & 0x7ff) << 11)
-#define VIDOSDxA_TOPLEFT_Y_E(_x)                ((((_x) & 0x800) >> 11) << 22)
-#define VIDOSDxA_TOPLEFT_Y_MASK                 (0x7ff << 0)
-#define VIDOSDxA_TOPLEFT_Y_SHIFT                (0)
-#define VIDOSDxA_TOPLEFT_Y_LIMIT                (0x7ff)
-#define VIDOSDxA_TOPLEFT_Y(_x)                  (((_x) & 0x7ff) << 0)
-#define VIDOSDxB_BOTRIGHT_X_E(_x)               ((((_x) & 0x800) >> 11) << 23)
-#define VIDOSDxB_BOTRIGHT_X_MASK                (0x7ff << 11)
-#define VIDOSDxB_BOTRIGHT_X_SHIFT               (11)
-#define VIDOSDxB_BOTRIGHT_X_LIMIT               (0x7ff)
-#define VIDOSDxB_BOTRIGHT_X(_x)                 (((_x) & 0x7ff) << 11)
-#define VIDOSDxB_BOTRIGHT_Y_E(_x)               ((((_x) & 0x800) >> 11) << 22)
-#define VIDOSDxB_BOTRIGHT_Y_MASK                (0x7ff << 0)
-#define VIDOSDxB_BOTRIGHT_Y_SHIFT               (0)
-#define VIDOSDxB_BOTRIGHT_Y_LIMIT               (0x7ff)
-#define VIDOSDxB_BOTRIGHT_Y(_x)                 (((_x) & 0x7ff) << 0)
-/* For VIDOSD[1..4]C */
-#define VIDISD14C_ALPHA0_R(_x)                  ((_x) << 20)
-#define VIDISD14C_ALPHA0_G_MASK                 (0xf << 16)
-#define VIDISD14C_ALPHA0_G_SHIFT                (16)
-#define VIDISD14C_ALPHA0_G_LIMIT                (0xf)
-#define VIDISD14C_ALPHA0_G(_x)                  ((_x) << 16)
-#define VIDISD14C_ALPHA0_B_MASK                 (0xf << 12)
-#define VIDISD14C_ALPHA0_B_SHIFT                (12)
-#define VIDISD14C_ALPHA0_B_LIMIT                (0xf)
-#define VIDISD14C_ALPHA0_B(_x)                  ((_x) << 12)
-#define VIDISD14C_ALPHA1_R_MASK                 (0xf << 8)
-#define VIDISD14C_ALPHA1_R_SHIFT                (8)
-#define VIDISD14C_ALPHA1_R_LIMIT                (0xf)
-#define VIDISD14C_ALPHA1_R(_x)                  ((_x) << 8)
-#define VIDISD14C_ALPHA1_G_MASK                 (0xf << 4)
-#define VIDISD14C_ALPHA1_G_SHIFT                (4)
-#define VIDISD14C_ALPHA1_G_LIMIT                (0xf)
-#define VIDISD14C_ALPHA1_G(_x)                  ((_x) << 4)
-#define VIDISD14C_ALPHA1_B_MASK                 (0xf << 0)
-#define VIDISD14C_ALPHA1_B_SHIFT                (0)
-#define VIDISD14C_ALPHA1_B_LIMIT                (0xf)
-#define VIDISD14C_ALPHA1_B(_x)                  ((_x) << 0)
-/* Video buffer addresses */
-#define VIDW_BUF_START(_buff)                   (0xA0 + ((_buff) * 8))
-#define VIDW_BUF_START1(_buff)                  (0xA4 + ((_buff) * 8))
-#define VIDW_BUF_END(_buff)                     (0xD0 + ((_buff) * 8))
-#define VIDW_BUF_END1(_buff)                    (0xD4 + ((_buff) * 8))
-#define VIDW_BUF_SIZE(_buff)                    (0x100 + ((_buff) * 4))
-#define VIDW_BUF_SIZE_OFFSET_E(_x)              ((((_x) & 0x2000) >> 13) << 27)
-#define VIDW_BUF_SIZE_OFFSET_MASK               (0x1fff << 13)
-#define VIDW_BUF_SIZE_OFFSET_SHIFT              (13)
-#define VIDW_BUF_SIZE_OFFSET_LIMIT              (0x1fff)
-#define VIDW_BUF_SIZE_OFFSET(_x)                (((_x) & 0x1fff) << 13)
-#define VIDW_BUF_SIZE_PAGEWIDTH_E(_x)           ((((_x) & 0x2000) >> 13) << 26)
-#define VIDW_BUF_SIZE_PAGEWIDTH_MASK            (0x1fff << 0)
-#define VIDW_BUF_SIZE_PAGEWIDTH_SHIFT           (0)
-#define VIDW_BUF_SIZE_PAGEWIDTH_LIMIT           (0x1fff)
-#define VIDW_BUF_SIZE_PAGEWIDTH(_x)             (((_x) & 0x1fff) << 0)
-/* Interrupt controls and status */
-#define VIDINTCON0_FIFOINTERVAL_MASK            (0x3f << 20)
-#define VIDINTCON0_FIFOINTERVAL_SHIFT           (20)
-#define VIDINTCON0_FIFOINTERVAL_LIMIT           (0x3f)
-#define VIDINTCON0_FIFOINTERVAL(_x)             ((_x) << 20)
-#define VIDINTCON0_INT_SYSMAINCON               (1 << 19)
-#define VIDINTCON0_INT_SYSSUBCON                (1 << 18)
-#define VIDINTCON0_INT_I80IFDONE                (1 << 17)
-#define VIDINTCON0_FRAMESEL0_MASK               (0x3 << 15)
-#define VIDINTCON0_FRAMESEL0_SHIFT              (15)
-#define VIDINTCON0_FRAMESEL0_BACKPORCH          (0x0 << 15)
-#define VIDINTCON0_FRAMESEL0_VSYNC              (0x1 << 15)
-#define VIDINTCON0_FRAMESEL0_ACTIVE             (0x2 << 15)
-#define VIDINTCON0_FRAMESEL0_FRONTPORCH         (0x3 << 15)
-#define VIDINTCON0_FRAMESEL1                    (1 << 13)
-#define VIDINTCON0_FRAMESEL1_MASK               (0x3 << 13)
-#define VIDINTCON0_FRAMESEL1_NONE               (0x0 << 13)
-#define VIDINTCON0_FRAMESEL1_BACKPORCH          (0x1 << 13)
-#define VIDINTCON0_FRAMESEL1_VSYNC              (0x2 << 13)
-#define VIDINTCON0_FRAMESEL1_FRONTPORCH         (0x3 << 13)
-#define VIDINTCON0_INT_FRAME                    (1 << 12)
-#define VIDINTCON0_FIFIOSEL_MASK                (0x7f << 5)
-#define VIDINTCON0_FIFIOSEL_SHIFT               (5)
-#define VIDINTCON0_FIFIOSEL_WINDOW0             (0x1 << 5)
-#define VIDINTCON0_FIFIOSEL_WINDOW1             (0x2 << 5)
-#define VIDINTCON0_FIFOLEVEL_MASK               (0x7 << 2)
-#define VIDINTCON0_FIFOLEVEL_SHIFT              (2)
-#define VIDINTCON0_FIFOLEVEL_TO25PC             (0x0 << 2)
-#define VIDINTCON0_FIFOLEVEL_TO50PC             (0x1 << 2)
-#define VIDINTCON0_FIFOLEVEL_TO75PC             (0x2 << 2)
-#define VIDINTCON0_FIFOLEVEL_EMPTY              (0x3 << 2)
-#define VIDINTCON0_FIFOLEVEL_FULL               (0x4 << 2)
-#define VIDINTCON0_INT_FIFO_MASK                (0x3 << 0)
-#define VIDINTCON0_INT_FIFO_SHIFT               (0)
-#define VIDINTCON0_INT_ENABLE                   (1 << 0)
-#define VIDINTCON1                              (0x134)
-#define VIDINTCON1_INT_I180                     (1 << 2)
-#define VIDINTCON1_INT_FRAME                    (1 << 1)
-#define VIDINTCON1_INT_FIFO                     (1 << 0)
-/* Window colour-key control registers */
-#define WKEYCON                                 (0x140) /* 6410,V210 */
-#define WKEYCON0                                (0x00)
-#define WKEYCON1                                (0x04)
-#define WxKEYCON0_KEYBL_EN                      (1 << 26)
-#define WxKEYCON0_KEYEN_F                       (1 << 25)
-#define WxKEYCON0_DIRCON                        (1 << 24)
-#define WxKEYCON0_COMPKEY_MASK                  (0xffffff << 0)
-#define WxKEYCON0_COMPKEY_SHIFT                 (0)
-#define WxKEYCON0_COMPKEY_LIMIT                 (0xffffff)
-#define WxKEYCON0_COMPKEY(_x)                   ((_x) << 0)
-#define WxKEYCON1_COLVAL_MASK                   (0xffffff << 0)
-#define WxKEYCON1_COLVAL_SHIFT                  (0)
-#define WxKEYCON1_COLVAL_LIMIT                  (0xffffff)
-#define WxKEYCON1_COLVAL(_x)                    ((_x) << 0)
-/* Window blanking (MAP) */
-#define WINxMAP_MAP                             (1 << 24)
-#define WINxMAP_MAP_COLOUR_MASK                 (0xffffff << 0)
-#define WINxMAP_MAP_COLOUR_SHIFT                (0)
-#define WINxMAP_MAP_COLOUR_LIMIT                (0xffffff)
-#define WINxMAP_MAP_COLOUR(_x)                  ((_x) << 0)
-#define WPALCON_PAL_UPDATE                      (1 << 9)
-#define WPALCON_W1PAL_MASK                      (0x7 << 3)
-#define WPALCON_W1PAL_SHIFT                     (3)
-#define WPALCON_W1PAL_25BPP_A888                (0x0 << 3)
-#define WPALCON_W1PAL_24BPP                     (0x1 << 3)
-#define WPALCON_W1PAL_19BPP_A666                (0x2 << 3)
-#define WPALCON_W1PAL_18BPP_A665                (0x3 << 3)
-#define WPALCON_W1PAL_18BPP                     (0x4 << 3)
-#define WPALCON_W1PAL_16BPP_A555                (0x5 << 3)
-#define WPALCON_W1PAL_16BPP_565                 (0x6 << 3)
-#define WPALCON_W0PAL_MASK                      (0x7 << 0)
-#define WPALCON_W0PAL_SHIFT                     (0)
-#define WPALCON_W0PAL_25BPP_A888                (0x0 << 0)
-#define WPALCON_W0PAL_24BPP                     (0x1 << 0)
-#define WPALCON_W0PAL_19BPP_A666                (0x2 << 0)
-#define WPALCON_W0PAL_18BPP_A665                (0x3 << 0)
-#define WPALCON_W0PAL_18BPP                     (0x4 << 0)
-#define WPALCON_W0PAL_16BPP_A555                (0x5 << 0)
-#define WPALCON_W0PAL_16BPP_565                 (0x6 << 0)
-/* Blending equation control */
-#define BLENDCON                                (0x260)
-#define BLENDCON_NEW_MASK                       (1 << 0)
-#define BLENDCON_NEW_8BIT_ALPHA_VALUE           (1 << 0)
-#define BLENDCON_NEW_4BIT_ALPHA_VALUE           (0 << 0)
diff --git a/arch/arm/plat-samsung/setup-mipiphy.c b/arch/arm/plat-samsung/setup-mipiphy.c
index 683c466c0e6..14745932760 100644
--- a/arch/arm/plat-samsung/setup-mipiphy.c
+++ b/arch/arm/plat-samsung/setup-mipiphy.c
@@ -14,24 +14,18 @@
 #include <linux/spinlock.h>
 #include <mach/regs-clock.h>
-static int __s5p_mipi_phy_control(struct platform_device *pdev,
+static int __s5p_mipi_phy_control(int id, bool on, u32 reset)
-                                  bool on, u32 reset)
 {
        static DEFINE_SPINLOCK(lock);
        void __iomem *addr;
        unsigned long flags;
-        int pid;
        u32 cfg;
-        if (!pdev)
+        id = max(0, id);
+        if (id > 1)
                return -EINVAL;
-        pid = (pdev->id == -1) ? 0 : pdev->id;
+        addr = S5P_MIPI_DPHY_CONTROL(id);
-        if (pid != 0 && pid != 1)
-                return -EINVAL;
-        addr = S5P_MIPI_DPHY_CONTROL(pid);
        spin_lock_irqsave(&lock, flags);
@@ -52,12 +46,12 @@ static int __s5p_mipi_phy_control(struct platform_device *pdev,
        return 0;
 }
-int s5p_csis_phy_enable(struct platform_device *pdev, bool on)
+int s5p_csis_phy_enable(int id, bool on)
 {
-        return __s5p_mipi_phy_control(pdev, on, S5P_MIPI_DPHY_SRESETN);
+        return __s5p_mipi_phy_control(id, on, S5P_MIPI_DPHY_SRESETN);
 }
 int s5p_dsim_phy_enable(struct platform_device *pdev, bool on)
 {
-        return __s5p_mipi_phy_control(pdev, on, S5P_MIPI_DPHY_MRESETN);
+        return __s5p_mipi_phy_control(pdev->id, on, S5P_MIPI_DPHY_MRESETN);
 }
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig
index 4404f82d597..f8db7b2deb3 100644
--- a/arch/arm/plat-spear/Kconfig
+++ b/arch/arm/plat-spear/Kconfig
@@ -12,10 +12,10 @@ config ARCH_SPEAR13XX
        bool "ST SPEAr13xx with Device Tree"
        select ARM_GIC
        select CPU_V7
-        select USE_OF
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
        select PINCTRL
+        select USE_OF
        help
          Supports for ARM's SPEAR13XX family
@@ -23,8 +23,8 @@ config ARCH_SPEAR3XX
        bool "ST SPEAr3xx with Device Tree"
        select ARM_VIC
        select CPU_ARM926T
-        select USE_OF
        select PINCTRL
+        select USE_OF
        help
          Supports for ARM's SPEAR3XX family
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 35924a542d4..fe77e51a784 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -1,6 +1,4 @@
-include include/asm-generic/Kbuild.asm
-header-y += hwcap.h
 generic-y += bug.h
 generic-y += bugs.h
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index db05f976611..6d4482fa35b 100644
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -16,11 +16,7 @@
 #ifndef __ASM_HWCAP_H
 #define __ASM_HWCAP_H
-/*
+#include <uapi/asm/hwcap.h>
- * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
- */
-#define HWCAP_FP                (1 << 0)
-#define HWCAP_ASIMD             (1 << 1)
 #define COMPAT_HWCAP_HALF       (1 << 1)
 #define COMPAT_HWCAP_THUMB      (1 << 2)
@@ -35,7 +31,6 @@
 #define COMPAT_HWCAP_IDIVT      (1 << 18)
 #define COMPAT_HWCAP_IDIV       (COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT)
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 /*
 * This yields a mask that user programs can use to figure out what
@@ -51,5 +46,3 @@
 extern unsigned int elf_hwcap;
 #endif
 #endif
-#endif
diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
index 0fa5d6c9ef7..b04d3404f0d 100644
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -19,9 +19,7 @@
 #ifndef __ASM_PTRACE_H
 #define __ASM_PTRACE_H
-#include <linux/types.h>
+#include <uapi/asm/ptrace.h>
-#include <asm/hwcap.h>
 /* AArch32-specific ptrace requests */
 #define COMPAT_PTRACE_GETREGS           12
@@ -32,80 +30,18 @@
 #define COMPAT_PTRACE_SETVFPREGS        28
 #define COMPAT_PTRACE_GETHBPREGS        29
 #define COMPAT_PTRACE_SETHBPREGS        30
-/*
- * PSR bits
- */
-#define PSR_MODE_EL0t   0x00000000
-#define PSR_MODE_EL1t   0x00000004
-#define PSR_MODE_EL1h   0x00000005
-#define PSR_MODE_EL2t   0x00000008
-#define PSR_MODE_EL2h   0x00000009
-#define PSR_MODE_EL3t   0x0000000c
-#define PSR_MODE_EL3h   0x0000000d
-#define PSR_MODE_MASK   0x0000000f
-/* AArch32 CPSR bits */
-#define PSR_MODE32_BIT          0x00000010
 #define COMPAT_PSR_MODE_USR     0x00000010
 #define COMPAT_PSR_T_BIT        0x00000020
 #define COMPAT_PSR_IT_MASK      0x0600fc00      /* If-Then execution state mask */
-/* AArch64 SPSR bits */
-#define PSR_F_BIT       0x00000040
-#define PSR_I_BIT       0x00000080
-#define PSR_A_BIT       0x00000100
-#define PSR_D_BIT       0x00000200
-#define PSR_Q_BIT       0x08000000
-#define PSR_V_BIT       0x10000000
-#define PSR_C_BIT       0x20000000
-#define PSR_Z_BIT       0x40000000
-#define PSR_N_BIT       0x80000000
-/*
- * Groups of PSR bits
- */
-#define PSR_f           0xff000000      /* Flags                */
-#define PSR_s           0x00ff0000      /* Status               */
-#define PSR_x           0x0000ff00      /* Extension            */
-#define PSR_c           0x000000ff      /* Control              */
 /*
 * These are 'magic' values for PTRACE_PEEKUSR that return info about where a
 * process is located in memory.
 */
-#define PT_TEXT_ADDR            0x10000
+#define COMPAT_PT_TEXT_ADDR             0x10000
-#define PT_DATA_ADDR            0x10004
+#define COMPAT_PT_DATA_ADDR             0x10004
-#define PT_TEXT_END_ADDR        0x10008
+#define COMPAT_PT_TEXT_END_ADDR         0x10008
 #ifndef __ASSEMBLY__
-/*
- * User structures for general purpose, floating point and debug registers.
- */
-struct user_pt_regs {
-        __u64           regs[31];
-        __u64           sp;
-        __u64           pc;
-        __u64           pstate;
-};
-struct user_fpsimd_state {
-        __uint128_t     vregs[32];
-        __u32           fpsr;
-        __u32           fpcr;
-};
-struct user_hwdebug_state {
-        __u32           dbg_info;
-        struct {
-                __u64   addr;
-                __u32   ctrl;
-        }               dbg_regs[16];
-};
-#ifdef __KERNEL__
 /* sizeof(struct user) for AArch32 */
 #define COMPAT_USER_SZ  296
 /* AArch32 uses x13 as the stack pointer... */
@@ -200,8 +136,5 @@ extern unsigned long profile_pc(struct pt_regs *regs);
 extern int aarch32_break_trap(struct pt_regs *regs);
-#endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 #endif
diff --git a/arch/arm64/include/asm/sigcontext.h b/arch/arm64/include/asm/sigcontext.h
index 573cec77881..dca1094acc7 100644
--- a/arch/arm64/include/asm/sigcontext.h
+++ b/arch/arm64/include/asm/sigcontext.h
@@ -16,45 +16,9 @@
 #ifndef __ASM_SIGCONTEXT_H
 #define __ASM_SIGCONTEXT_H
-#include <linux/types.h>
+#include <uapi/asm/sigcontext.h>
 /*
- * Signal context structure - contains all info to do with the state
- * before the signal handler was invoked.
- */
-struct sigcontext {
-        __u64 fault_address;
-        /* AArch64 registers */
-        __u64 regs[31];
-        __u64 sp;
-        __u64 pc;
-        __u64 pstate;
-        /* 4K reserved for FP/SIMD state and future expansion */
-        __u8 __reserved[4096] __attribute__((__aligned__(16)));
-};
-/*
- * Header to be used at the beginning of structures extending the user
- * context. Such structures must be placed after the rt_sigframe on the stack
- * and be 16-byte aligned. The last structure must be a dummy one with the
- * magic and size set to 0.
- */
-struct _aarch64_ctx {
-        __u32 magic;
-        __u32 size;
-};
-#define FPSIMD_MAGIC    0x46508001
-struct fpsimd_context {
-        struct _aarch64_ctx head;
-        __u32 fpsr;
-        __u32 fpcr;
-        __uint128_t vregs[32];
-};
-#ifdef __KERNEL__
-/*
 * Auxiliary context saved in the sigcontext.__reserved array. Not exported to
 * user space as it will change with the addition of new context. User space
 * should check the magic/size information.
@@ -65,5 +29,3 @@ struct aux_context {
        struct _aarch64_ctx end;
 };
 #endif
-#endif
diff --git a/arch/arm64/include/asm/stat.h b/arch/arm64/include/asm/stat.h
index a9f580c28f7..15e35598ac4 100644
--- a/arch/arm64/include/asm/stat.h
+++ b/arch/arm64/include/asm/stat.h
@@ -16,9 +16,8 @@
 #ifndef __ASM_STAT_H
 #define __ASM_STAT_H
-#include <asm-generic/stat.h>
+#include <uapi/asm/stat.h>
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 #include <asm/compat.h>
@@ -60,5 +59,3 @@ struct stat64 {
 #endif
 #endif
-#endif
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index 8f03dee066e..63f853f8b71 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -13,13 +13,17 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __SYSCALL_COMPAT
-#include <asm-generic/unistd.h>
-#endif
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
-#include <asm/unistd32.h>
+#define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION
-#endif
+#define __ARCH_WANT_COMPAT_STAT64
+#define __ARCH_WANT_SYS_GETHOSTNAME
+#define __ARCH_WANT_SYS_PAUSE
+#define __ARCH_WANT_SYS_GETPGRP
+#define __ARCH_WANT_SYS_LLSEEK
+#define __ARCH_WANT_SYS_NICE
+#define __ARCH_WANT_SYS_SIGPENDING
+#define __ARCH_WANT_SYS_SIGPROCMASK
+#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif
+#include <uapi/asm/unistd.h>
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index ba42d41fc5c..6d909faebf2 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -1,5 +1,5 @@
 /*
- * Based on arch/arm/include/asm/unistd.h
+ * AArch32 (compat) system call definitions.
 *
 * Copyright (C) 2001-2005 Russell King
 * Copyright (C) 2012 ARM Ltd.
@@ -21,715 +21,390 @@
 #define __SYSCALL(x, y)
 #endif
+__SYSCALL(0,   sys_restart_syscall)
+__SYSCALL(1,   sys_exit)
+__SYSCALL(2,   compat_sys_fork_wrapper)
+__SYSCALL(3,   sys_read)
+__SYSCALL(4,   sys_write)
+__SYSCALL(5,   compat_sys_open)
+__SYSCALL(6,   sys_close)
+__SYSCALL(7,   sys_ni_syscall)                  /* 7 was sys_waitpid */
+__SYSCALL(8,   sys_creat)
+__SYSCALL(9,   sys_link)
+__SYSCALL(10,  sys_unlink)
+__SYSCALL(11,  compat_sys_execve_wrapper)
+__SYSCALL(12,  sys_chdir)
+__SYSCALL(13,  sys_ni_syscall)                  /* 13 was sys_time */
+__SYSCALL(14,  sys_mknod)
+__SYSCALL(15,  sys_chmod)
+__SYSCALL(16,  sys_lchown16)
+__SYSCALL(17,  sys_ni_syscall)                  /* 17 was sys_break */
+__SYSCALL(18,  sys_ni_syscall)                  /* 18 was sys_stat */
+__SYSCALL(19,  compat_sys_lseek_wrapper)
+__SYSCALL(20,  sys_getpid)
+__SYSCALL(21,  compat_sys_mount)
+__SYSCALL(22,  sys_ni_syscall)                  /* 22 was sys_umount */
+__SYSCALL(23,  sys_setuid16)
+__SYSCALL(24,  sys_getuid16)
+__SYSCALL(25,  sys_ni_syscall)                  /* 25 was sys_stime */
+__SYSCALL(26,  compat_sys_ptrace)
+__SYSCALL(27,  sys_ni_syscall)                  /* 27 was sys_alarm */
+__SYSCALL(28,  sys_ni_syscall)                  /* 28 was sys_fstat */
+__SYSCALL(29,  sys_pause)
+__SYSCALL(30,  sys_ni_syscall)                  /* 30 was sys_utime */
+__SYSCALL(31,  sys_ni_syscall)                  /* 31 was sys_stty */
+__SYSCALL(32,  sys_ni_syscall)                  /* 32 was sys_gtty */
+__SYSCALL(33,  sys_access)
+__SYSCALL(34,  sys_nice)
+__SYSCALL(35,  sys_ni_syscall)                  /* 35 was sys_ftime */
+__SYSCALL(36,  sys_sync)
+__SYSCALL(37,  sys_kill)
+__SYSCALL(38,  sys_rename)
+__SYSCALL(39,  sys_mkdir)
+__SYSCALL(40,  sys_rmdir)
+__SYSCALL(41,  sys_dup)
+__SYSCALL(42,  sys_pipe)
+__SYSCALL(43,  compat_sys_times)
+__SYSCALL(44,  sys_ni_syscall)                  /* 44 was sys_prof */
+__SYSCALL(45,  sys_brk)
+__SYSCALL(46,  sys_setgid16)
+__SYSCALL(47,  sys_getgid16)
+__SYSCALL(48,  sys_ni_syscall)                  /* 48 was sys_signal */
+__SYSCALL(49,  sys_geteuid16)
+__SYSCALL(50,  sys_getegid16)
+__SYSCALL(51,  sys_acct)
+__SYSCALL(52,  sys_umount)
+__SYSCALL(53,  sys_ni_syscall)                  /* 53 was sys_lock */
+__SYSCALL(54,  compat_sys_ioctl)
+__SYSCALL(55,  compat_sys_fcntl)
+__SYSCALL(56,  sys_ni_syscall)                  /* 56 was sys_mpx */
+__SYSCALL(57,  sys_setpgid)
+__SYSCALL(58,  sys_ni_syscall)                  /* 58 was sys_ulimit */
+__SYSCALL(59,  sys_ni_syscall)                  /* 59 was sys_olduname */
+__SYSCALL(60,  sys_umask)
+__SYSCALL(61,  sys_chroot)
+__SYSCALL(62,  compat_sys_ustat)
+__SYSCALL(63,  sys_dup2)
+__SYSCALL(64,  sys_getppid)
+__SYSCALL(65,  sys_getpgrp)
+__SYSCALL(66,  sys_setsid)
+__SYSCALL(67,  compat_sys_sigaction)
+__SYSCALL(68,  sys_ni_syscall)                  /* 68 was sys_sgetmask */
+__SYSCALL(69,  sys_ni_syscall)                  /* 69 was sys_ssetmask */
+__SYSCALL(70,  sys_setreuid16)
+__SYSCALL(71,  sys_setregid16)
+__SYSCALL(72,  compat_sys_sigsuspend)
+__SYSCALL(73,  compat_sys_sigpending)
+__SYSCALL(74,  sys_sethostname)
+__SYSCALL(75,  compat_sys_setrlimit)
+__SYSCALL(76,  sys_ni_syscall)                  /* 76 was compat_sys_getrlimit */
+__SYSCALL(77,  compat_sys_getrusage)
+__SYSCALL(78,  compat_sys_gettimeofday)
+__SYSCALL(79,  compat_sys_settimeofday)
+__SYSCALL(80,  sys_getgroups16)
+__SYSCALL(81,  sys_setgroups16)
+__SYSCALL(82,  sys_ni_syscall)                  /* 82 was compat_sys_select */
+__SYSCALL(83,  sys_symlink)
+__SYSCALL(84,  sys_ni_syscall)                  /* 84 was sys_lstat */
+__SYSCALL(85,  sys_readlink)
+__SYSCALL(86,  sys_uselib)
+__SYSCALL(87,  sys_swapon)
+__SYSCALL(88,  sys_reboot)
+__SYSCALL(89,  sys_ni_syscall)                  /* 89 was sys_readdir */
+__SYSCALL(90,  sys_ni_syscall)                  /* 90 was sys_mmap */
+__SYSCALL(91,  sys_munmap)
+__SYSCALL(92,  sys_truncate)
+__SYSCALL(93,  sys_ftruncate)
+__SYSCALL(94,  sys_fchmod)
+__SYSCALL(95,  sys_fchown16)
+__SYSCALL(96,  sys_getpriority)
+__SYSCALL(97,  sys_setpriority)
+__SYSCALL(98,  sys_ni_syscall)                  /* 98 was sys_profil */
+__SYSCALL(99,  compat_sys_statfs)
+__SYSCALL(100, compat_sys_fstatfs)
+__SYSCALL(101, sys_ni_syscall)                  /* 101 was sys_ioperm */
+__SYSCALL(102, sys_ni_syscall)                  /* 102 was sys_socketcall */
+__SYSCALL(103, sys_syslog)
+__SYSCALL(104, compat_sys_setitimer)
+__SYSCALL(105, compat_sys_getitimer)
+__SYSCALL(106, compat_sys_newstat)
+__SYSCALL(107, compat_sys_newlstat)
+__SYSCALL(108, compat_sys_newfstat)
+__SYSCALL(109, sys_ni_syscall)                  /* 109 was sys_uname */
+__SYSCALL(110, sys_ni_syscall)                  /* 110 was sys_iopl */
+__SYSCALL(111, sys_vhangup)
+__SYSCALL(112, sys_ni_syscall)                  /* 112 was sys_idle */
+__SYSCALL(113, sys_ni_syscall)                  /* 113 was sys_syscall */
+__SYSCALL(114, compat_sys_wait4)
+__SYSCALL(115, sys_swapoff)
+__SYSCALL(116, compat_sys_sysinfo)
+__SYSCALL(117, sys_ni_syscall)                  /* 117 was sys_ipc */
+__SYSCALL(118, sys_fsync)
+__SYSCALL(119, compat_sys_sigreturn_wrapper)
+__SYSCALL(120, compat_sys_clone_wrapper)
+__SYSCALL(121, sys_setdomainname)
+__SYSCALL(122, sys_newuname)
+__SYSCALL(123, sys_ni_syscall)                  /* 123 was sys_modify_ldt */
+__SYSCALL(124, compat_sys_adjtimex)
+__SYSCALL(125, sys_mprotect)
+__SYSCALL(126, compat_sys_sigprocmask)
+__SYSCALL(127, sys_ni_syscall)                  /* 127 was sys_create_module */
+__SYSCALL(128, sys_init_module)
+__SYSCALL(129, sys_delete_module)
+__SYSCALL(130, sys_ni_syscall)                  /* 130 was sys_get_kernel_syms */
+__SYSCALL(131, sys_quotactl)
+__SYSCALL(132, sys_getpgid)
+__SYSCALL(133, sys_fchdir)
+__SYSCALL(134, sys_bdflush)
+__SYSCALL(135, sys_sysfs)
+__SYSCALL(136, sys_personality)
+__SYSCALL(137, sys_ni_syscall)                  /* 137 was sys_afs_syscall */
+__SYSCALL(138, sys_setfsuid16)
+__SYSCALL(139, sys_setfsgid16)
+__SYSCALL(140, sys_llseek)
+__SYSCALL(141, compat_sys_getdents)
+__SYSCALL(142, compat_sys_select)
+__SYSCALL(143, sys_flock)
+__SYSCALL(144, sys_msync)
+__SYSCALL(145, compat_sys_readv)
+__SYSCALL(146, compat_sys_writev)
+__SYSCALL(147, sys_getsid)
+__SYSCALL(148, sys_fdatasync)
+__SYSCALL(149, compat_sys_sysctl)
+__SYSCALL(150, sys_mlock)
+__SYSCALL(151, sys_munlock)
+__SYSCALL(152, sys_mlockall)
+__SYSCALL(153, sys_munlockall)
+__SYSCALL(154, sys_sched_setparam)
+__SYSCALL(155, sys_sched_getparam)
+__SYSCALL(156, sys_sched_setscheduler)
+__SYSCALL(157, sys_sched_getscheduler)
+__SYSCALL(158, sys_sched_yield)
+__SYSCALL(159, sys_sched_get_priority_max)
+__SYSCALL(160, sys_sched_get_priority_min)
+__SYSCALL(161, compat_sys_sched_rr_get_interval)
+__SYSCALL(162, compat_sys_nanosleep)
+__SYSCALL(163, sys_mremap)
+__SYSCALL(164, sys_setresuid16)
+__SYSCALL(165, sys_getresuid16)
+__SYSCALL(166, sys_ni_syscall)                  /* 166 was sys_vm86 */
+__SYSCALL(167, sys_ni_syscall)                  /* 167 was sys_query_module */
+__SYSCALL(168, sys_poll)
+__SYSCALL(169, sys_ni_syscall)
+__SYSCALL(170, sys_setresgid16)
+__SYSCALL(171, sys_getresgid16)
+__SYSCALL(172, sys_prctl)
+__SYSCALL(173, compat_sys_rt_sigreturn_wrapper)
+__SYSCALL(174, compat_sys_rt_sigaction)
+__SYSCALL(175, compat_sys_rt_sigprocmask)
+__SYSCALL(176, compat_sys_rt_sigpending)
+__SYSCALL(177, compat_sys_rt_sigtimedwait)
+__SYSCALL(178, compat_sys_rt_sigqueueinfo)
+__SYSCALL(179, compat_sys_rt_sigsuspend)
+__SYSCALL(180, compat_sys_pread64_wrapper)
+__SYSCALL(181, compat_sys_pwrite64_wrapper)
+__SYSCALL(182, sys_chown16)
+__SYSCALL(183, sys_getcwd)
+__SYSCALL(184, sys_capget)
+__SYSCALL(185, sys_capset)
+__SYSCALL(186, compat_sys_sigaltstack_wrapper)
+__SYSCALL(187, compat_sys_sendfile)
+__SYSCALL(188, sys_ni_syscall)                  /* 188 reserved */
+__SYSCALL(189, sys_ni_syscall)                  /* 189 reserved */
+__SYSCALL(190, compat_sys_vfork_wrapper)
+__SYSCALL(191, compat_sys_getrlimit)            /* SuS compliant getrlimit */
+__SYSCALL(192, sys_mmap_pgoff)
+__SYSCALL(193, compat_sys_truncate64_wrapper)
+__SYSCALL(194, compat_sys_ftruncate64_wrapper)
+__SYSCALL(195, sys_stat64)
+__SYSCALL(196, sys_lstat64)
+__SYSCALL(197, sys_fstat64)
+__SYSCALL(198, sys_lchown)
+__SYSCALL(199, sys_getuid)
+__SYSCALL(200, sys_getgid)
+__SYSCALL(201, sys_geteuid)
+__SYSCALL(202, sys_getegid)
+__SYSCALL(203, sys_setreuid)
+__SYSCALL(204, sys_setregid)
+__SYSCALL(205, sys_getgroups)
+__SYSCALL(206, sys_setgroups)
+__SYSCALL(207, sys_fchown)
+__SYSCALL(208, sys_setresuid)
+__SYSCALL(209, sys_getresuid)
+__SYSCALL(210, sys_setresgid)
+__SYSCALL(211, sys_getresgid)
+__SYSCALL(212, sys_chown)
+__SYSCALL(213, sys_setuid)
+__SYSCALL(214, sys_setgid)
+__SYSCALL(215, sys_setfsuid)
+__SYSCALL(216, sys_setfsgid)
+__SYSCALL(217, compat_sys_getdents64)
+__SYSCALL(218, sys_pivot_root)
+__SYSCALL(219, sys_mincore)
+__SYSCALL(220, sys_madvise)
+__SYSCALL(221, compat_sys_fcntl64)
+__SYSCALL(222, sys_ni_syscall)                  /* 222 for tux */
+__SYSCALL(223, sys_ni_syscall)                  /* 223 is unused */
+__SYSCALL(224, sys_gettid)
+__SYSCALL(225, compat_sys_readahead_wrapper)
+__SYSCALL(226, sys_setxattr)
+__SYSCALL(227, sys_lsetxattr)
+__SYSCALL(228, sys_fsetxattr)
+__SYSCALL(229, sys_getxattr)
+__SYSCALL(230, sys_lgetxattr)
+__SYSCALL(231, sys_fgetxattr)
+__SYSCALL(232, sys_listxattr)
+__SYSCALL(233, sys_llistxattr)
+__SYSCALL(234, sys_flistxattr)
+__SYSCALL(235, sys_removexattr)
+__SYSCALL(236, sys_lremovexattr)
+__SYSCALL(237, sys_fremovexattr)
+__SYSCALL(238, sys_tkill)
+__SYSCALL(239, sys_sendfile64)
+__SYSCALL(240, compat_sys_futex)
+__SYSCALL(241, compat_sys_sched_setaffinity)
+__SYSCALL(242, compat_sys_sched_getaffinity)
+__SYSCALL(243, compat_sys_io_setup)
+__SYSCALL(244, sys_io_destroy)
+__SYSCALL(245, compat_sys_io_getevents)
+__SYSCALL(246, compat_sys_io_submit)
+__SYSCALL(247, sys_io_cancel)
+__SYSCALL(248, sys_exit_group)
+__SYSCALL(249, compat_sys_lookup_dcookie)
+__SYSCALL(250, sys_epoll_create)
+__SYSCALL(251, sys_epoll_ctl)
+__SYSCALL(252, sys_epoll_wait)
+__SYSCALL(253, sys_remap_file_pages)
+__SYSCALL(254, sys_ni_syscall)                  /* 254 for set_thread_area */
+__SYSCALL(255, sys_ni_syscall)                  /* 255 for get_thread_area */
+__SYSCALL(256, sys_set_tid_address)
+__SYSCALL(257, compat_sys_timer_create)
+__SYSCALL(258, compat_sys_timer_settime)
+__SYSCALL(259, compat_sys_timer_gettime)
+__SYSCALL(260, sys_timer_getoverrun)
+__SYSCALL(261, sys_timer_delete)
+__SYSCALL(262, compat_sys_clock_settime)
+__SYSCALL(263, compat_sys_clock_gettime)
+__SYSCALL(264, compat_sys_clock_getres)
+__SYSCALL(265, compat_sys_clock_nanosleep)
+__SYSCALL(266, compat_sys_statfs64_wrapper)
+__SYSCALL(267, compat_sys_fstatfs64_wrapper)
+__SYSCALL(268, sys_tgkill)
+__SYSCALL(269, compat_sys_utimes)
+__SYSCALL(270, compat_sys_fadvise64_64_wrapper)
+__SYSCALL(271, sys_pciconfig_iobase)
+__SYSCALL(272, sys_pciconfig_read)
+__SYSCALL(273, sys_pciconfig_write)
+__SYSCALL(274, compat_sys_mq_open)
+__SYSCALL(275, sys_mq_unlink)
+__SYSCALL(276, compat_sys_mq_timedsend)
+__SYSCALL(277, compat_sys_mq_timedreceive)
+__SYSCALL(278, compat_sys_mq_notify)
+__SYSCALL(279, compat_sys_mq_getsetattr)
+__SYSCALL(280, compat_sys_waitid)
+__SYSCALL(281, sys_socket)
+__SYSCALL(282, sys_bind)
+__SYSCALL(283, sys_connect)
+__SYSCALL(284, sys_listen)
+__SYSCALL(285, sys_accept)
+__SYSCALL(286, sys_getsockname)
+__SYSCALL(287, sys_getpeername)
+__SYSCALL(288, sys_socketpair)
+__SYSCALL(289, sys_send)
+__SYSCALL(290, sys_sendto)
+__SYSCALL(291, compat_sys_recv)
+__SYSCALL(292, compat_sys_recvfrom)
+__SYSCALL(293, sys_shutdown)
+__SYSCALL(294, compat_sys_setsockopt)
+__SYSCALL(295, compat_sys_getsockopt)
+__SYSCALL(296, compat_sys_sendmsg)
+__SYSCALL(297, compat_sys_recvmsg)
+__SYSCALL(298, sys_semop)
+__SYSCALL(299, sys_semget)
+__SYSCALL(300, compat_sys_semctl)
+__SYSCALL(301, compat_sys_msgsnd)
+__SYSCALL(302, compat_sys_msgrcv)
+__SYSCALL(303, sys_msgget)
+__SYSCALL(304, compat_sys_msgctl)
+__SYSCALL(305, compat_sys_shmat)
+__SYSCALL(306, sys_shmdt)
+__SYSCALL(307, sys_shmget)
+__SYSCALL(308, compat_sys_shmctl)
+__SYSCALL(309, sys_add_key)
+__SYSCALL(310, sys_request_key)
+__SYSCALL(311, compat_sys_keyctl)
+__SYSCALL(312, compat_sys_semtimedop)
+__SYSCALL(313, sys_ni_syscall)
+__SYSCALL(314, sys_ioprio_set)
+__SYSCALL(315, sys_ioprio_get)
+__SYSCALL(316, sys_inotify_init)
+__SYSCALL(317, sys_inotify_add_watch)
+__SYSCALL(318, sys_inotify_rm_watch)
+__SYSCALL(319, compat_sys_mbind)
+__SYSCALL(320, compat_sys_get_mempolicy)
+__SYSCALL(321, compat_sys_set_mempolicy)
+__SYSCALL(322, compat_sys_openat)
+__SYSCALL(323, sys_mkdirat)
+__SYSCALL(324, sys_mknodat)
+__SYSCALL(325, sys_fchownat)
+__SYSCALL(326, compat_sys_futimesat)
+__SYSCALL(327, sys_fstatat64)
+__SYSCALL(328, sys_unlinkat)
+__SYSCALL(329, sys_renameat)
+__SYSCALL(330, sys_linkat)
+__SYSCALL(331, sys_symlinkat)
+__SYSCALL(332, sys_readlinkat)
+__SYSCALL(333, sys_fchmodat)
+__SYSCALL(334, sys_faccessat)
+__SYSCALL(335, compat_sys_pselect6)
+__SYSCALL(336, compat_sys_ppoll)
+__SYSCALL(337, sys_unshare)
+__SYSCALL(338, compat_sys_set_robust_list)
+__SYSCALL(339, compat_sys_get_robust_list)
+__SYSCALL(340, sys_splice)
+__SYSCALL(341, compat_sys_sync_file_range2_wrapper)
+__SYSCALL(342, sys_tee)
+__SYSCALL(343, compat_sys_vmsplice)
+__SYSCALL(344, compat_sys_move_pages)
+__SYSCALL(345, sys_getcpu)
+__SYSCALL(346, compat_sys_epoll_pwait)
+__SYSCALL(347, compat_sys_kexec_load)
+__SYSCALL(348, compat_sys_utimensat)
+__SYSCALL(349, compat_sys_signalfd)
+__SYSCALL(350, sys_timerfd_create)
+__SYSCALL(351, sys_eventfd)
+__SYSCALL(352, compat_sys_fallocate_wrapper)
+__SYSCALL(353, compat_sys_timerfd_settime)
+__SYSCALL(354, compat_sys_timerfd_gettime)
+__SYSCALL(355, compat_sys_signalfd4)
+__SYSCALL(356, sys_eventfd2)
+__SYSCALL(357, sys_epoll_create1)
+__SYSCALL(358, sys_dup3)
+__SYSCALL(359, sys_pipe2)
+__SYSCALL(360, sys_inotify_init1)
+__SYSCALL(361, compat_sys_preadv)
+__SYSCALL(362, compat_sys_pwritev)
+__SYSCALL(363, compat_sys_rt_tgsigqueueinfo)
+__SYSCALL(364, sys_perf_event_open)
+__SYSCALL(365, compat_sys_recvmmsg)
+__SYSCALL(366, sys_accept4)
+__SYSCALL(367, sys_fanotify_init)
+__SYSCALL(368, compat_sys_fanotify_mark_wrapper)
+__SYSCALL(369, sys_prlimit64)
+__SYSCALL(370, sys_name_to_handle_at)
+__SYSCALL(371, sys_open_by_handle_at)
+__SYSCALL(372, sys_clock_adjtime)
+__SYSCALL(373, sys_syncfs)
+#define __NR_compat_syscalls            374
 /*
- * This file contains the system call numbers.
+ * Compat syscall numbers used by the AArch64 kernel.
 */
+#define __NR_compat_restart_syscall     0
+#define __NR_compat_sigreturn           119
+#define __NR_compat_rt_sigreturn        173
-#ifdef __SYSCALL_COMPAT
-#define __NR_restart_syscall            0
-__SYSCALL(__NR_restart_syscall, sys_restart_syscall)
-#define __NR_exit                       1
-__SYSCALL(__NR_exit, sys_exit)
-#define __NR_fork                       2
-__SYSCALL(__NR_fork, sys_fork)
-#define __NR_read                       3
-__SYSCALL(__NR_read, sys_read)
-#define __NR_write                      4
-__SYSCALL(__NR_write, sys_write)
-#define __NR_open                       5
-__SYSCALL(__NR_open, sys_open)
-#define __NR_close                      6
-__SYSCALL(__NR_close, sys_close)
-__SYSCALL(7, sys_ni_syscall)            /* 7 was sys_waitpid */
-#define __NR_creat                      8
-__SYSCALL(__NR_creat, sys_creat)
-#define __NR_link                       9
-__SYSCALL(__NR_link, sys_link)
-#define __NR_unlink                     10
-__SYSCALL(__NR_unlink, sys_unlink)
-#define __NR_execve                     11
-__SYSCALL(__NR_execve, sys_execve)
-#define __NR_chdir                      12
-__SYSCALL(__NR_chdir, sys_chdir)
-__SYSCALL(13, sys_ni_syscall)           /* 13 was sys_time */
-#define __NR_mknod                      14
-__SYSCALL(__NR_mknod, sys_mknod)
-#define __NR_chmod                      15
-__SYSCALL(__NR_chmod, sys_chmod)
-#define __NR_lchown                     16
-__SYSCALL(__NR_lchown, sys_lchown16)
-__SYSCALL(17, sys_ni_syscall)           /* 17 was sys_break */
-__SYSCALL(18, sys_ni_syscall)           /* 18 was sys_stat */
-#define __NR_lseek                      19
-__SYSCALL(__NR_lseek, sys_lseek)
-#define __NR_getpid                     20
-__SYSCALL(__NR_getpid, sys_getpid)
-#define __NR_mount                      21
-__SYSCALL(__NR_mount, sys_mount)
-__SYSCALL(22, sys_ni_syscall)           /* 22 was sys_umount */
-#define __NR_setuid                     23
-__SYSCALL(__NR_setuid, sys_setuid16)
-#define __NR_getuid                     24
-__SYSCALL(__NR_getuid, sys_getuid16)
-__SYSCALL(25, sys_ni_syscall)           /* 25 was sys_stime */
-#define __NR_ptrace                     26
-__SYSCALL(__NR_ptrace, sys_ptrace)
-__SYSCALL(27, sys_ni_syscall)           /* 27 was sys_alarm */
-__SYSCALL(28, sys_ni_syscall)           /* 28 was sys_fstat */
-#define __NR_pause                      29
-__SYSCALL(__NR_pause, sys_pause)
-__SYSCALL(30, sys_ni_syscall)           /* 30 was sys_utime */
-__SYSCALL(31, sys_ni_syscall)           /* 31 was sys_stty */
-__SYSCALL(32, sys_ni_syscall)           /* 32 was sys_gtty */
-#define __NR_access                     33
-__SYSCALL(__NR_access, sys_access)
-#define __NR_nice                       34
-__SYSCALL(__NR_nice, sys_nice)
-__SYSCALL(35, sys_ni_syscall)           /* 35 was sys_ftime */
-#define __NR_sync                       36
-__SYSCALL(__NR_sync, sys_sync)
-#define __NR_kill                       37
-__SYSCALL(__NR_kill, sys_kill)
-#define __NR_rename                     38
-__SYSCALL(__NR_rename, sys_rename)
-#define __NR_mkdir                      39
-__SYSCALL(__NR_mkdir, sys_mkdir)
-#define __NR_rmdir                      40
-__SYSCALL(__NR_rmdir, sys_rmdir)
-#define __NR_dup                        41
-__SYSCALL(__NR_dup, sys_dup)
-#define __NR_pipe                       42
-__SYSCALL(__NR_pipe, sys_pipe)
-#define __NR_times                      43
-__SYSCALL(__NR_times, sys_times)
-__SYSCALL(44, sys_ni_syscall)           /* 44 was sys_prof */
-#define __NR_brk                        45
-__SYSCALL(__NR_brk, sys_brk)
-#define __NR_setgid                     46
-__SYSCALL(__NR_setgid, sys_setgid16)
-#define __NR_getgid                     47
-__SYSCALL(__NR_getgid, sys_getgid16)
-__SYSCALL(48, sys_ni_syscall)           /* 48 was sys_signal */
-#define __NR_geteuid                    49
-__SYSCALL(__NR_geteuid, sys_geteuid16)
-#define __NR_getegid                    50
-__SYSCALL(__NR_getegid, sys_getegid16)
-#define __NR_acct                       51
-__SYSCALL(__NR_acct, sys_acct)
-#define __NR_umount2                    52
-__SYSCALL(__NR_umount2, sys_umount)
-__SYSCALL(53, sys_ni_syscall)           /* 53 was sys_lock */
-#define __NR_ioctl                      54
-__SYSCALL(__NR_ioctl, sys_ioctl)
-#define __NR_fcntl                      55
-__SYSCALL(__NR_fcntl, sys_fcntl)
-__SYSCALL(56, sys_ni_syscall)           /* 56 was sys_mpx */
-#define __NR_setpgid                    57
-__SYSCALL(__NR_setpgid, sys_setpgid)
-__SYSCALL(58, sys_ni_syscall)           /* 58 was sys_ulimit */
-__SYSCALL(59, sys_ni_syscall)           /* 59 was sys_olduname */
-#define __NR_umask                      60
-__SYSCALL(__NR_umask, sys_umask)
-#define __NR_chroot                     61
-__SYSCALL(__NR_chroot, sys_chroot)
-#define __NR_ustat                      62
-__SYSCALL(__NR_ustat, sys_ustat)
-#define __NR_dup2                       63
-__SYSCALL(__NR_dup2, sys_dup2)
-#define __NR_getppid                    64
-__SYSCALL(__NR_getppid, sys_getppid)
-#define __NR_getpgrp                    65
-__SYSCALL(__NR_getpgrp, sys_getpgrp)
-#define __NR_setsid                     66
-__SYSCALL(__NR_setsid, sys_setsid)
-#define __NR_sigaction                  67
-__SYSCALL(__NR_sigaction, sys_sigaction)
-__SYSCALL(68, sys_ni_syscall)           /* 68 was sys_sgetmask */
-__SYSCALL(69, sys_ni_syscall)           /* 69 was sys_ssetmask */
-#define __NR_setreuid                   70
-__SYSCALL(__NR_setreuid, sys_setreuid16)
-#define __NR_setregid                   71
-__SYSCALL(__NR_setregid, sys_setregid16)
-#define __NR_sigsuspend                 72
-__SYSCALL(__NR_sigsuspend, sys_sigsuspend)
-#define __NR_sigpending                 73
-__SYSCALL(__NR_sigpending, sys_sigpending)
-#define __NR_sethostname                74
-__SYSCALL(__NR_sethostname, sys_sethostname)
-#define __NR_setrlimit                  75
-__SYSCALL(__NR_setrlimit, sys_setrlimit)
-__SYSCALL(76, sys_ni_syscall)           /* 76 was sys_getrlimit */
-#define __NR_getrusage                  77
-__SYSCALL(__NR_getrusage, sys_getrusage)
-#define __NR_gettimeofday               78
-__SYSCALL(__NR_gettimeofday, sys_gettimeofday)
-#define __NR_settimeofday               79
-__SYSCALL(__NR_settimeofday, sys_settimeofday)
-#define __NR_getgroups                  80
-__SYSCALL(__NR_getgroups, sys_getgroups16)
-#define __NR_setgroups                  81
-__SYSCALL(__NR_setgroups, sys_setgroups16)
-__SYSCALL(82, sys_ni_syscall)           /* 82 was sys_select */
-#define __NR_symlink                    83
-__SYSCALL(__NR_symlink, sys_symlink)
-__SYSCALL(84, sys_ni_syscall)           /* 84 was sys_lstat */
-#define __NR_readlink                   85
-__SYSCALL(__NR_readlink, sys_readlink)
-#define __NR_uselib                     86
-__SYSCALL(__NR_uselib, sys_uselib)
-#define __NR_swapon                     87
-__SYSCALL(__NR_swapon, sys_swapon)
-#define __NR_reboot                     88
-__SYSCALL(__NR_reboot, sys_reboot)
-__SYSCALL(89, sys_ni_syscall)           /* 89 was sys_readdir */
-__SYSCALL(90, sys_ni_syscall)           /* 90 was sys_mmap */
-#define __NR_munmap                     91
-__SYSCALL(__NR_munmap, sys_munmap)
-#define __NR_truncate                   92
-__SYSCALL(__NR_truncate, sys_truncate)
-#define __NR_ftruncate                  93
-__SYSCALL(__NR_ftruncate, sys_ftruncate)
-#define __NR_fchmod                     94
-__SYSCALL(__NR_fchmod, sys_fchmod)
-#define __NR_fchown                     95
-__SYSCALL(__NR_fchown, sys_fchown16)
-#define __NR_getpriority                96
-__SYSCALL(__NR_getpriority, sys_getpriority)
-#define __NR_setpriority                97
-__SYSCALL(__NR_setpriority, sys_setpriority)
-__SYSCALL(98, sys_ni_syscall)           /* 98 was sys_profil */
-#define __NR_statfs                     99
-__SYSCALL(__NR_statfs, sys_statfs)
-#define __NR_fstatfs                    100
-__SYSCALL(__NR_fstatfs, sys_fstatfs)
-__SYSCALL(101, sys_ni_syscall)          /* 101 was sys_ioperm */
-__SYSCALL(102, sys_ni_syscall)          /* 102 was sys_socketcall */
-#define __NR_syslog                     103
-__SYSCALL(__NR_syslog, sys_syslog)
-#define __NR_setitimer                  104
-__SYSCALL(__NR_setitimer, sys_setitimer)
-#define __NR_getitimer                  105
-__SYSCALL(__NR_getitimer, sys_getitimer)
-#define __NR_stat                       106
-__SYSCALL(__NR_stat, sys_newstat)
-#define __NR_lstat                      107
-__SYSCALL(__NR_lstat, sys_newlstat)
-#define __NR_fstat                      108
-__SYSCALL(__NR_fstat, sys_newfstat)
-__SYSCALL(109, sys_ni_syscall)          /* 109 was sys_uname */
-__SYSCALL(110, sys_ni_syscall)          /* 110 was sys_iopl */
-#define __NR_vhangup                    111
-__SYSCALL(__NR_vhangup, sys_vhangup)
-__SYSCALL(112, sys_ni_syscall)          /* 112 was sys_idle */
-__SYSCALL(113, sys_ni_syscall)          /* 113 was sys_syscall */
-#define __NR_wait4                      114
-__SYSCALL(__NR_wait4, sys_wait4)
-#define __NR_swapoff                    115
-__SYSCALL(__NR_swapoff, sys_swapoff)
-#define __NR_sysinfo                    116
-__SYSCALL(__NR_sysinfo, sys_sysinfo)
-__SYSCALL(117, sys_ni_syscall)          /* 117 was sys_ipc */
-#define __NR_fsync                      118
-__SYSCALL(__NR_fsync, sys_fsync)
-#define __NR_sigreturn                  119
-__SYSCALL(__NR_sigreturn, sys_sigreturn)
-#define __NR_clone                      120
-__SYSCALL(__NR_clone, sys_clone)
-#define __NR_setdomainname              121
-__SYSCALL(__NR_setdomainname, sys_setdomainname)
-#define __NR_uname                      122
-__SYSCALL(__NR_uname, sys_newuname)
-__SYSCALL(123, sys_ni_syscall)          /* 123 was sys_modify_ldt */
-#define __NR_adjtimex                   124
-__SYSCALL(__NR_adjtimex, sys_adjtimex)
-#define __NR_mprotect                   125
-__SYSCALL(__NR_mprotect, sys_mprotect)
-#define __NR_sigprocmask                126
-__SYSCALL(__NR_sigprocmask, sys_sigprocmask)
-__SYSCALL(127, sys_ni_syscall)          /* 127 was sys_create_module */
-#define __NR_init_module                128
-__SYSCALL(__NR_init_module, sys_init_module)
-#define __NR_delete_module              129
-__SYSCALL(__NR_delete_module, sys_delete_module)
-__SYSCALL(130, sys_ni_syscall)          /* 130 was sys_get_kernel_syms */
-#define __NR_quotactl                   131
-__SYSCALL(__NR_quotactl, sys_quotactl)
-#define __NR_getpgid                    132
-__SYSCALL(__NR_getpgid, sys_getpgid)
-#define __NR_fchdir                     133
-__SYSCALL(__NR_fchdir, sys_fchdir)
-#define __NR_bdflush                    134
-__SYSCALL(__NR_bdflush, sys_bdflush)
-#define __NR_sysfs                      135
-__SYSCALL(__NR_sysfs, sys_sysfs)
-#define __NR_personality                136
-__SYSCALL(__NR_personality, sys_personality)
-__SYSCALL(137, sys_ni_syscall)          /* 137 was sys_afs_syscall */
-#define __NR_setfsuid                   138
-__SYSCALL(__NR_setfsuid, sys_setfsuid16)
-#define __NR_setfsgid                   139
-__SYSCALL(__NR_setfsgid, sys_setfsgid16)
-#define __NR__llseek                    140
-__SYSCALL(__NR__llseek, sys_llseek)
-#define __NR_getdents                   141
-__SYSCALL(__NR_getdents, sys_getdents)
-#define __NR__newselect                 142
-__SYSCALL(__NR__newselect, sys_select)
-#define __NR_flock                      143
-__SYSCALL(__NR_flock, sys_flock)
-#define __NR_msync                      144
-__SYSCALL(__NR_msync, sys_msync)
-#define __NR_readv                      145
-__SYSCALL(__NR_readv, sys_readv)
-#define __NR_writev                     146
-__SYSCALL(__NR_writev, sys_writev)
-#define __NR_getsid                     147
-__SYSCALL(__NR_getsid, sys_getsid)
-#define __NR_fdatasync                  148
-__SYSCALL(__NR_fdatasync, sys_fdatasync)
-#define __NR__sysctl                    149
-__SYSCALL(__NR__sysctl, sys_sysctl)
-#define __NR_mlock                      150
-__SYSCALL(__NR_mlock, sys_mlock)
-#define __NR_munlock                    151
-__SYSCALL(__NR_munlock, sys_munlock)
-#define __NR_mlockall                   152
-__SYSCALL(__NR_mlockall, sys_mlockall)
-#define __NR_munlockall                 153
-__SYSCALL(__NR_munlockall, sys_munlockall)
-#define __NR_sched_setparam             154
-__SYSCALL(__NR_sched_setparam, sys_sched_setparam)
-#define __NR_sched_getparam             155
-__SYSCALL(__NR_sched_getparam, sys_sched_getparam)
-#define __NR_sched_setscheduler         156
-__SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler)
-#define __NR_sched_getscheduler         157
-__SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)
-#define __NR_sched_yield                158
-__SYSCALL(__NR_sched_yield, sys_sched_yield)
-#define __NR_sched_get_priority_max     159
-__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
-#define __NR_sched_get_priority_min     160
-__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
-#define __NR_sched_rr_get_interval      161
-__SYSCALL(__NR_sched_rr_get_interval, sys_sched_rr_get_interval)
-#define __NR_nanosleep                  162
-__SYSCALL(__NR_nanosleep, sys_nanosleep)
-#define __NR_mremap                     163
-__SYSCALL(__NR_mremap, sys_mremap)
-#define __NR_setresuid                  164
-__SYSCALL(__NR_setresuid, sys_setresuid16)
-#define __NR_getresuid                  165
-__SYSCALL(__NR_getresuid, sys_getresuid16)
-__SYSCALL(166, sys_ni_syscall)          /* 166 was sys_vm86 */
-__SYSCALL(167, sys_ni_syscall)          /* 167 was sys_query_module */
-#define __NR_poll                       168
-__SYSCALL(__NR_poll, sys_poll)
-#define __NR_nfsservctl                 169
-__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
-#define __NR_setresgid                  170
-__SYSCALL(__NR_setresgid, sys_setresgid16)
-#define __NR_getresgid                  171
-__SYSCALL(__NR_getresgid, sys_getresgid16)
-#define __NR_prctl                      172
-__SYSCALL(__NR_prctl, sys_prctl)
-#define __NR_rt_sigreturn               173
-__SYSCALL(__NR_rt_sigreturn, sys_rt_sigreturn)
-#define __NR_rt_sigaction               174
-__SYSCALL(__NR_rt_sigaction, sys_rt_sigaction)
-#define __NR_rt_sigprocmask             175
-__SYSCALL(__NR_rt_sigprocmask, sys_rt_sigprocmask)
-#define __NR_rt_sigpending              176
-__SYSCALL(__NR_rt_sigpending, sys_rt_sigpending)
-#define __NR_rt_sigtimedwait            177
-__SYSCALL(__NR_rt_sigtimedwait, sys_rt_sigtimedwait)
-#define __NR_rt_sigqueueinfo            178
-__SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo)
-#define __NR_rt_sigsuspend              179
-__SYSCALL(__NR_rt_sigsuspend, sys_rt_sigsuspend)
-#define __NR_pread64                    180
-__SYSCALL(__NR_pread64, sys_pread64)
-#define __NR_pwrite64                   181
-__SYSCALL(__NR_pwrite64, sys_pwrite64)
-#define __NR_chown                      182
-__SYSCALL(__NR_chown, sys_chown16)
-#define __NR_getcwd                     183
-__SYSCALL(__NR_getcwd, sys_getcwd)
-#define __NR_capget                     184
-__SYSCALL(__NR_capget, sys_capget)
-#define __NR_capset                     185
-__SYSCALL(__NR_capset, sys_capset)
-#define __NR_sigaltstack                186
-__SYSCALL(__NR_sigaltstack, sys_sigaltstack)
-#define __NR_sendfile                   187
-__SYSCALL(__NR_sendfile, sys_sendfile)
-__SYSCALL(188, sys_ni_syscall)          /* 188 reserved */
-__SYSCALL(189, sys_ni_syscall)          /* 189 reserved */
-#define __NR_vfork                      190
-__SYSCALL(__NR_vfork, sys_vfork)
-#define __NR_ugetrlimit                 191     /* SuS compliant getrlimit */
-__SYSCALL(__NR_ugetrlimit, sys_getrlimit)
-#define __NR_mmap2                      192
-__SYSCALL(__NR_mmap2, sys_mmap2)
-#define __NR_truncate64                 193
-__SYSCALL(__NR_truncate64, sys_truncate64)
-#define __NR_ftruncate64                194
-__SYSCALL(__NR_ftruncate64, sys_ftruncate64)
-#define __NR_stat64                     195
-__SYSCALL(__NR_stat64, sys_stat64)
-#define __NR_lstat64                    196
-__SYSCALL(__NR_lstat64, sys_lstat64)
-#define __NR_fstat64                    197
-__SYSCALL(__NR_fstat64, sys_fstat64)
-#define __NR_lchown32                   198
-__SYSCALL(__NR_lchown32, sys_lchown)
-#define __NR_getuid32                   199
-__SYSCALL(__NR_getuid32, sys_getuid)
-#define __NR_getgid32                   200
-__SYSCALL(__NR_getgid32, sys_getgid)
-#define __NR_geteuid32                  201
-__SYSCALL(__NR_geteuid32, sys_geteuid)
-#define __NR_getegid32                  202
-__SYSCALL(__NR_getegid32, sys_getegid)
-#define __NR_setreuid32                 203
-__SYSCALL(__NR_setreuid32, sys_setreuid)
-#define __NR_setregid32                 204
-__SYSCALL(__NR_setregid32, sys_setregid)
-#define __NR_getgroups32                205
-__SYSCALL(__NR_getgroups32, sys_getgroups)
-#define __NR_setgroups32                206
-__SYSCALL(__NR_setgroups32, sys_setgroups)
-#define __NR_fchown32                   207
-__SYSCALL(__NR_fchown32, sys_fchown)
-#define __NR_setresuid32                208
-__SYSCALL(__NR_setresuid32, sys_setresuid)
-#define __NR_getresuid32                209
-__SYSCALL(__NR_getresuid32, sys_getresuid)
-#define __NR_setresgid32                210
-__SYSCALL(__NR_setresgid32, sys_setresgid)
-#define __NR_getresgid32                211
-__SYSCALL(__NR_getresgid32, sys_getresgid)
-#define __NR_chown32                    212
-__SYSCALL(__NR_chown32, sys_chown)
-#define __NR_setuid32                   213
-__SYSCALL(__NR_setuid32, sys_setuid)
-#define __NR_setgid32                   214
-__SYSCALL(__NR_setgid32, sys_setgid)
-#define __NR_setfsuid32                 215
-__SYSCALL(__NR_setfsuid32, sys_setfsuid)
-#define __NR_setfsgid32                 216
-__SYSCALL(__NR_setfsgid32, sys_setfsgid)
-#define __NR_getdents64                 217
-__SYSCALL(__NR_getdents64, sys_getdents64)
-#define __NR_pivot_root                 218
-__SYSCALL(__NR_pivot_root, sys_pivot_root)
-#define __NR_mincore                    219
-__SYSCALL(__NR_mincore, sys_mincore)
-#define __NR_madvise                    220
-__SYSCALL(__NR_madvise, sys_madvise)
-#define __NR_fcntl64                    221
-__SYSCALL(__NR_fcntl64, sys_fcntl64)
-__SYSCALL(222, sys_ni_syscall)          /* 222 for tux */
-__SYSCALL(223, sys_ni_syscall)          /* 223 is unused */
-#define __NR_gettid                     224
-__SYSCALL(__NR_gettid, sys_gettid)
-#define __NR_readahead                  225
-__SYSCALL(__NR_readahead, sys_readahead)
-#define __NR_setxattr                   226
-__SYSCALL(__NR_setxattr, sys_setxattr)
-#define __NR_lsetxattr                  227
-__SYSCALL(__NR_lsetxattr, sys_lsetxattr)
-#define __NR_fsetxattr                  228
-__SYSCALL(__NR_fsetxattr, sys_fsetxattr)
-#define __NR_getxattr                   229
-__SYSCALL(__NR_getxattr, sys_getxattr)
-#define __NR_lgetxattr                  230
-__SYSCALL(__NR_lgetxattr, sys_lgetxattr)
-#define __NR_fgetxattr                  231
-__SYSCALL(__NR_fgetxattr, sys_fgetxattr)
-#define __NR_listxattr                  232
-__SYSCALL(__NR_listxattr, sys_listxattr)
-#define __NR_llistxattr                 233
-__SYSCALL(__NR_llistxattr, sys_llistxattr)
-#define __NR_flistxattr                 234
-__SYSCALL(__NR_flistxattr, sys_flistxattr)
-#define __NR_removexattr                235
-__SYSCALL(__NR_removexattr, sys_removexattr)
-#define __NR_lremovexattr               236
-__SYSCALL(__NR_lremovexattr, sys_lremovexattr)
-#define __NR_fremovexattr               237
-__SYSCALL(__NR_fremovexattr, sys_fremovexattr)
-#define __NR_tkill                      238
-__SYSCALL(__NR_tkill, sys_tkill)
-#define __NR_sendfile64                 239
-__SYSCALL(__NR_sendfile64, sys_sendfile64)
-#define __NR_futex                      240
-__SYSCALL(__NR_futex, sys_futex)
-#define __NR_sched_setaffinity          241
-__SYSCALL(__NR_sched_setaffinity, sys_sched_setaffinity)
-#define __NR_sched_getaffinity          242
-__SYSCALL(__NR_sched_getaffinity, sys_sched_getaffinity)
-#define __NR_io_setup                   243
-__SYSCALL(__NR_io_setup, sys_io_setup)
-#define __NR_io_destroy                 244
-__SYSCALL(__NR_io_destroy, sys_io_destroy)
-#define __NR_io_getevents               245
-__SYSCALL(__NR_io_getevents, sys_io_getevents)
-#define __NR_io_submit                  246
-__SYSCALL(__NR_io_submit, sys_io_submit)
-#define __NR_io_cancel                  247
-__SYSCALL(__NR_io_cancel, sys_io_cancel)
-#define __NR_exit_group                 248
-__SYSCALL(__NR_exit_group, sys_exit_group)
-#define __NR_lookup_dcookie             249
-__SYSCALL(__NR_lookup_dcookie, sys_lookup_dcookie)
-#define __NR_epoll_create               250
-__SYSCALL(__NR_epoll_create, sys_epoll_create)
-#define __NR_epoll_ctl                  251
-__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)
-#define __NR_epoll_wait                 252
-__SYSCALL(__NR_epoll_wait, sys_epoll_wait)
-#define __NR_remap_file_pages           253
-__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)
-__SYSCALL(254, sys_ni_syscall)          /* 254 for set_thread_area */
-__SYSCALL(255, sys_ni_syscall)          /* 255 for get_thread_area */
-#define __NR_set_tid_address            256
-__SYSCALL(__NR_set_tid_address, sys_set_tid_address)
-#define __NR_timer_create               257
-__SYSCALL(__NR_timer_create, sys_timer_create)
-#define __NR_timer_settime              258
-__SYSCALL(__NR_timer_settime, sys_timer_settime)
-#define __NR_timer_gettime              259
-__SYSCALL(__NR_timer_gettime, sys_timer_gettime)
-#define __NR_timer_getoverrun           260
-__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
-#define __NR_timer_delete               261
-__SYSCALL(__NR_timer_delete, sys_timer_delete)
-#define __NR_clock_settime              262
-__SYSCALL(__NR_clock_settime, sys_clock_settime)
-#define __NR_clock_gettime              263
-__SYSCALL(__NR_clock_gettime, sys_clock_gettime)
-#define __NR_clock_getres               264
-__SYSCALL(__NR_clock_getres, sys_clock_getres)
-#define __NR_clock_nanosleep            265
-__SYSCALL(__NR_clock_nanosleep, sys_clock_nanosleep)
-#define __NR_statfs64                   266
-__SYSCALL(__NR_statfs64, sys_statfs64)
-#define __NR_fstatfs64                  267
-__SYSCALL(__NR_fstatfs64, sys_fstatfs64)
-#define __NR_tgkill                     268
-__SYSCALL(__NR_tgkill, sys_tgkill)
-#define __NR_utimes                     269
-__SYSCALL(__NR_utimes, sys_utimes)
-#define __NR_fadvise64                  270
-__SYSCALL(__NR_fadvise64, sys_fadvise64_64)
-#define __NR_pciconfig_iobase           271
-__SYSCALL(__NR_pciconfig_iobase, sys_pciconfig_iobase)
-#define __NR_pciconfig_read             272
-__SYSCALL(__NR_pciconfig_read, sys_pciconfig_read)
-#define __NR_pciconfig_write            273
-__SYSCALL(__NR_pciconfig_write, sys_pciconfig_write)
-#define __NR_mq_open                    274
-__SYSCALL(__NR_mq_open, sys_mq_open)
-#define __NR_mq_unlink                  275
-__SYSCALL(__NR_mq_unlink, sys_mq_unlink)
-#define __NR_mq_timedsend               276
-__SYSCALL(__NR_mq_timedsend, sys_mq_timedsend)
-#define __NR_mq_timedreceive            277
-__SYSCALL(__NR_mq_timedreceive, sys_mq_timedreceive)
-#define __NR_mq_notify                  278
-__SYSCALL(__NR_mq_notify, sys_mq_notify)
-#define __NR_mq_getsetattr              279
-__SYSCALL(__NR_mq_getsetattr, sys_mq_getsetattr)
-#define __NR_waitid                     280
-__SYSCALL(__NR_waitid, sys_waitid)
-#define __NR_socket                     281
-__SYSCALL(__NR_socket, sys_socket)
-#define __NR_bind                       282
-__SYSCALL(__NR_bind, sys_bind)
-#define __NR_connect                    283
-__SYSCALL(__NR_connect, sys_connect)
-#define __NR_listen                     284
-__SYSCALL(__NR_listen, sys_listen)
-#define __NR_accept                     285
-__SYSCALL(__NR_accept, sys_accept)
-#define __NR_getsockname                286
-__SYSCALL(__NR_getsockname, sys_getsockname)
-#define __NR_getpeername                287
-__SYSCALL(__NR_getpeername, sys_getpeername)
-#define __NR_socketpair                 288
-__SYSCALL(__NR_socketpair, sys_socketpair)
-#define __NR_send                       289
-__SYSCALL(__NR_send, sys_send)
-#define __NR_sendto                     290
-__SYSCALL(__NR_sendto, sys_sendto)
-#define __NR_recv                       291
-__SYSCALL(__NR_recv, sys_recv)
-#define __NR_recvfrom                   292
-__SYSCALL(__NR_recvfrom, sys_recvfrom)
-#define __NR_shutdown                   293
-__SYSCALL(__NR_shutdown, sys_shutdown)
-#define __NR_setsockopt                 294
-__SYSCALL(__NR_setsockopt, sys_setsockopt)
-#define __NR_getsockopt                 295
-__SYSCALL(__NR_getsockopt, sys_getsockopt)
-#define __NR_sendmsg                    296
-__SYSCALL(__NR_sendmsg, sys_sendmsg)
-#define __NR_recvmsg                    297
-__SYSCALL(__NR_recvmsg, sys_recvmsg)
-#define __NR_semop                      298
-__SYSCALL(__NR_semop, sys_semop)
-#define __NR_semget                     299
-__SYSCALL(__NR_semget, sys_semget)
-#define __NR_semctl                     300
-__SYSCALL(__NR_semctl, sys_semctl)
-#define __NR_msgsnd                     301
-__SYSCALL(__NR_msgsnd, sys_msgsnd)
-#define __NR_msgrcv                     302
-__SYSCALL(__NR_msgrcv, sys_msgrcv)
-#define __NR_msgget                     303
-__SYSCALL(__NR_msgget, sys_msgget)
-#define __NR_msgctl                     304
-__SYSCALL(__NR_msgctl, sys_msgctl)
-#define __NR_shmat                      305
-__SYSCALL(__NR_shmat, sys_shmat)
-#define __NR_shmdt                      306
-__SYSCALL(__NR_shmdt, sys_shmdt)
-#define __NR_shmget                     307
-__SYSCALL(__NR_shmget, sys_shmget)
-#define __NR_shmctl                     308
-__SYSCALL(__NR_shmctl, sys_shmctl)
-#define __NR_add_key                    309
-__SYSCALL(__NR_add_key, sys_add_key)
-#define __NR_request_key                310
-__SYSCALL(__NR_request_key, sys_request_key)
-#define __NR_keyctl                     311
-__SYSCALL(__NR_keyctl, sys_keyctl)
-#define __NR_semtimedop                 312
-__SYSCALL(__NR_semtimedop, sys_semtimedop)
-#define __NR_vserver                    313
-__SYSCALL(__NR_vserver, sys_ni_syscall)
-#define __NR_ioprio_set                 314
-__SYSCALL(__NR_ioprio_set, sys_ioprio_set)
-#define __NR_ioprio_get                 315
-__SYSCALL(__NR_ioprio_get, sys_ioprio_get)
-#define __NR_inotify_init               316
-__SYSCALL(__NR_inotify_init, sys_inotify_init)
-#define __NR_inotify_add_watch          317
-__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)
-#define __NR_inotify_rm_watch           318
-__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
-#define __NR_mbind                      319
-__SYSCALL(__NR_mbind, sys_mbind)
-#define __NR_get_mempolicy              320
-__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)
-#define __NR_set_mempolicy              321
-__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)
-#define __NR_openat                     322
-__SYSCALL(__NR_openat, sys_openat)
-#define __NR_mkdirat                    323
-__SYSCALL(__NR_mkdirat, sys_mkdirat)
-#define __NR_mknodat                    324
-__SYSCALL(__NR_mknodat, sys_mknodat)
-#define __NR_fchownat                   325
-__SYSCALL(__NR_fchownat, sys_fchownat)
-#define __NR_futimesat                  326
-__SYSCALL(__NR_futimesat, sys_futimesat)
-#define __NR_fstatat64                  327
-__SYSCALL(__NR_fstatat64, sys_fstatat64)
-#define __NR_unlinkat                   328
-__SYSCALL(__NR_unlinkat, sys_unlinkat)
-#define __NR_renameat                   329
-__SYSCALL(__NR_renameat, sys_renameat)
-#define __NR_linkat                     330
-__SYSCALL(__NR_linkat, sys_linkat)
-#define __NR_symlinkat                  331
-__SYSCALL(__NR_symlinkat, sys_symlinkat)
-#define __NR_readlinkat                 332
-__SYSCALL(__NR_readlinkat, sys_readlinkat)
-#define __NR_fchmodat                   333
-__SYSCALL(__NR_fchmodat, sys_fchmodat)
-#define __NR_faccessat                  334
-__SYSCALL(__NR_faccessat, sys_faccessat)
-#define __NR_pselect6                   335
-__SYSCALL(__NR_pselect6, sys_pselect6)
-#define __NR_ppoll                      336
-__SYSCALL(__NR_ppoll, sys_ppoll)
-#define __NR_unshare                    337
-__SYSCALL(__NR_unshare, sys_unshare)
-#define __NR_set_robust_list            338
-__SYSCALL(__NR_set_robust_list, sys_set_robust_list)
-#define __NR_get_robust_list            339
-__SYSCALL(__NR_get_robust_list, sys_get_robust_list)
-#define __NR_splice                     340
-__SYSCALL(__NR_splice, sys_splice)
-#define __NR_sync_file_range2           341
-__SYSCALL(__NR_sync_file_range2, sys_sync_file_range2)
-#define __NR_tee                        342
-__SYSCALL(__NR_tee, sys_tee)
-#define __NR_vmsplice                   343
-__SYSCALL(__NR_vmsplice, sys_vmsplice)
-#define __NR_move_pages                 344
-__SYSCALL(__NR_move_pages, sys_move_pages)
-#define __NR_getcpu                     345
-__SYSCALL(__NR_getcpu, sys_getcpu)
-#define __NR_epoll_pwait                346
-__SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)
-#define __NR_kexec_load                 347
-__SYSCALL(__NR_kexec_load, sys_kexec_load)
-#define __NR_utimensat                  348
-__SYSCALL(__NR_utimensat, sys_utimensat)
-#define __NR_signalfd                   349
-__SYSCALL(__NR_signalfd, sys_signalfd)
-#define __NR_timerfd_create             350
-__SYSCALL(__NR_timerfd_create, sys_timerfd_create)
-#define __NR_eventfd                    351
-__SYSCALL(__NR_eventfd, sys_eventfd)
-#define __NR_fallocate                  352
-__SYSCALL(__NR_fallocate, sys_fallocate)
-#define __NR_timerfd_settime            353
-__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime)
-#define __NR_timerfd_gettime            354
-__SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime)
-#define __NR_signalfd4                  355
-__SYSCALL(__NR_signalfd4, sys_signalfd4)
-#define __NR_eventfd2                   356
-__SYSCALL(__NR_eventfd2, sys_eventfd2)
-#define __NR_epoll_create1              357
-__SYSCALL(__NR_epoll_create1, sys_epoll_create1)
-#define __NR_dup3                       358
-__SYSCALL(__NR_dup3, sys_dup3)
-#define __NR_pipe2                      359
-__SYSCALL(__NR_pipe2, sys_pipe2)
-#define __NR_inotify_init1              360
-__SYSCALL(__NR_inotify_init1, sys_inotify_init1)
-#define __NR_preadv                     361
-__SYSCALL(__NR_preadv, sys_preadv)
-#define __NR_pwritev                    362
-__SYSCALL(__NR_pwritev, sys_pwritev)
-#define __NR_rt_tgsigqueueinfo          363
-__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_event_open            364
-__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
-#define __NR_recvmmsg                   365
-__SYSCALL(__NR_recvmmsg, sys_recvmmsg)
-#define __NR_accept4                    366
-__SYSCALL(__NR_accept4, sys_accept4)
-#define __NR_fanotify_init              367
-__SYSCALL(__NR_fanotify_init, sys_fanotify_init)
-#define __NR_fanotify_mark              368
-__SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)
-#define __NR_prlimit64                  369
-__SYSCALL(__NR_prlimit64, sys_prlimit64)
-#define __NR_name_to_handle_at          370
-__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
-#define __NR_open_by_handle_at          371
-__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)
-#define __NR_clock_adjtime              372
-__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)
-#define __NR_syncfs                     373
-__SYSCALL(__NR_syncfs, sys_syncfs)
 /*
 * The following SVCs are ARM private.
@@ -737,19 +412,3 @@ __SYSCALL(__NR_syncfs, sys_syncfs)
 #define __ARM_NR_COMPAT_BASE            0x0f0000
 #define __ARM_NR_compat_cacheflush      (__ARM_NR_COMPAT_BASE+2)
 #define __ARM_NR_compat_set_tls         (__ARM_NR_COMPAT_BASE+5)
-#endif  /* __SYSCALL_COMPAT */
-#define __NR_compat_syscalls            374
-#define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION
-#define __ARCH_WANT_COMPAT_STAT64
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
-#define __ARCH_WANT_COMPAT_SYS_SENDFILE
diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild
index baebb3da1d4..ca5b65f75c7 100644
--- a/arch/arm64/include/uapi/asm/Kbuild
+++ b/arch/arm64/include/uapi/asm/Kbuild
@@ -1,3 +1,17 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += fcntl.h
+header-y += hwcap.h
+header-y += param.h
+header-y += ptrace.h
+header-y += setup.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += stat.h
+header-y += statfs.h
+header-y += unistd.h
diff --git a/arch/arm64/include/asm/auxvec.h b/arch/arm64/include/uapi/asm/auxvec.h
index 22d6d888585..22d6d888585 100644
--- a/arch/arm64/include/asm/auxvec.h
+++ b/arch/arm64/include/uapi/asm/auxvec.h
diff --git a/arch/arm64/include/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h
index fce9c2924fa..fce9c2924fa 100644
--- a/arch/arm64/include/asm/bitsperlong.h
+++ b/arch/arm64/include/uapi/asm/bitsperlong.h
diff --git a/arch/arm64/include/asm/byteorder.h b/arch/arm64/include/uapi/asm/byteorder.h
index 2b92046aafc..2b92046aafc 100644
--- a/arch/arm64/include/asm/byteorder.h
+++ b/arch/arm64/include/uapi/asm/byteorder.h
diff --git a/arch/arm64/include/asm/fcntl.h b/arch/arm64/include/uapi/asm/fcntl.h
index cd2e630c235..cd2e630c235 100644
--- a/arch/arm64/include/asm/fcntl.h
+++ b/arch/arm64/include/uapi/asm/fcntl.h
diff --git a/arch/arm64/include/uapi/asm/hwcap.h b/arch/arm64/include/uapi/asm/hwcap.h
new file mode 100644
index 00000000000..eea497578b8
--- /dev/null
+++ b/arch/arm64/include/uapi/asm/hwcap.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _UAPI__ASM_HWCAP_H
+#define _UAPI__ASM_HWCAP_H
+/*
+ * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
+ */
+#define HWCAP_FP                (1 << 0)
+#define HWCAP_ASIMD             (1 << 1)
+#endif /* _UAPI__ASM_HWCAP_H */
diff --git a/arch/arm64/include/asm/param.h b/arch/arm64/include/uapi/asm/param.h
index 8e3a281d448..8e3a281d448 100644
--- a/arch/arm64/include/asm/param.h
+++ b/arch/arm64/include/uapi/asm/param.h
diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..9b131b4efa0
--- /dev/null
+++ b/arch/arm64/include/uapi/asm/ptrace.h
@@ -0,0 +1,91 @@
+/*
+ * Based on arch/arm/include/asm/ptrace.h
+ *
+ * Copyright (C) 1996-2003 Russell King
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _UAPI__ASM_PTRACE_H
+#define _UAPI__ASM_PTRACE_H
+#include <linux/types.h>
+#include <asm/hwcap.h>
+/*
+ * PSR bits
+ */
+#define PSR_MODE_EL0t   0x00000000
+#define PSR_MODE_EL1t   0x00000004
+#define PSR_MODE_EL1h   0x00000005
+#define PSR_MODE_EL2t   0x00000008
+#define PSR_MODE_EL2h   0x00000009
+#define PSR_MODE_EL3t   0x0000000c
+#define PSR_MODE_EL3h   0x0000000d
+#define PSR_MODE_MASK   0x0000000f
+/* AArch32 CPSR bits */
+#define PSR_MODE32_BIT          0x00000010
+/* AArch64 SPSR bits */
+#define PSR_F_BIT       0x00000040
+#define PSR_I_BIT       0x00000080
+#define PSR_A_BIT       0x00000100
+#define PSR_D_BIT       0x00000200
+#define PSR_Q_BIT       0x08000000
+#define PSR_V_BIT       0x10000000
+#define PSR_C_BIT       0x20000000
+#define PSR_Z_BIT       0x40000000
+#define PSR_N_BIT       0x80000000
+/*
+ * Groups of PSR bits
+ */
+#define PSR_f           0xff000000      /* Flags                */
+#define PSR_s           0x00ff0000      /* Status               */
+#define PSR_x           0x0000ff00      /* Extension            */
+#define PSR_c           0x000000ff      /* Control              */
+#ifndef __ASSEMBLY__
+/*
+ * User structures for general purpose, floating point and debug registers.
+ */
+struct user_pt_regs {
+        __u64           regs[31];
+        __u64           sp;
+        __u64           pc;
+        __u64           pstate;
+};
+struct user_fpsimd_state {
+        __uint128_t     vregs[32];
+        __u32           fpsr;
+        __u32           fpcr;
+};
+struct user_hwdebug_state {
+        __u32           dbg_info;
+        struct {
+                __u64   addr;
+                __u32   ctrl;
+        }               dbg_regs[16];
+};
+#endif /* __ASSEMBLY__ */
+#endif /* _UAPI__ASM_PTRACE_H */
diff --git a/arch/arm64/include/asm/setup.h b/arch/arm64/include/uapi/asm/setup.h
index 9cf2e46fbbd..9cf2e46fbbd 100644
--- a/arch/arm64/include/asm/setup.h
+++ b/arch/arm64/include/uapi/asm/setup.h
diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h
new file mode 100644
index 00000000000..690ad51cc90
--- /dev/null
+++ b/arch/arm64/include/uapi/asm/sigcontext.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _UAPI__ASM_SIGCONTEXT_H
+#define _UAPI__ASM_SIGCONTEXT_H
+#include <linux/types.h>
+/*
+ * Signal context structure - contains all info to do with the state
+ * before the signal handler was invoked.
+ */
+struct sigcontext {
+        __u64 fault_address;
+        /* AArch64 registers */
+        __u64 regs[31];
+        __u64 sp;
+        __u64 pc;
+        __u64 pstate;
+        /* 4K reserved for FP/SIMD state and future expansion */
+        __u8 __reserved[4096] __attribute__((__aligned__(16)));
+};
+/*
+ * Header to be used at the beginning of structures extending the user
+ * context. Such structures must be placed after the rt_sigframe on the stack
+ * and be 16-byte aligned. The last structure must be a dummy one with the
+ * magic and size set to 0.
+ */
+struct _aarch64_ctx {
+        __u32 magic;
+        __u32 size;
+};
+#define FPSIMD_MAGIC    0x46508001
+struct fpsimd_context {
+        struct _aarch64_ctx head;
+        __u32 fpsr;
+        __u32 fpcr;
+        __uint128_t vregs[32];
+};
+#endif /* _UAPI__ASM_SIGCONTEXT_H */
diff --git a/arch/arm64/include/asm/siginfo.h b/arch/arm64/include/uapi/asm/siginfo.h
index 5a74a0853db..5a74a0853db 100644
--- a/arch/arm64/include/asm/siginfo.h
+++ b/arch/arm64/include/uapi/asm/siginfo.h
diff --git a/arch/arm64/include/asm/signal.h b/arch/arm64/include/uapi/asm/signal.h
index 8d1e7236431..8d1e7236431 100644
--- a/arch/arm64/include/asm/signal.h
+++ b/arch/arm64/include/uapi/asm/signal.h
diff --git a/arch/arm64/include/uapi/asm/stat.h b/arch/arm64/include/uapi/asm/stat.h
new file mode 100644
index 00000000000..eeb702e5074
--- /dev/null
+++ b/arch/arm64/include/uapi/asm/stat.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <asm-generic/stat.h>
diff --git a/arch/arm64/include/asm/statfs.h b/arch/arm64/include/uapi/asm/statfs.h
index 6f621905097..6f621905097 100644
--- a/arch/arm64/include/asm/statfs.h
+++ b/arch/arm64/include/uapi/asm/statfs.h
diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..1caadc24e3f
--- /dev/null
+++ b/arch/arm64/include/uapi/asm/unistd.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <asm-generic/unistd.h>
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 6538928ff1a..a6f3f7da688 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -26,6 +26,7 @@
 #include <asm/errno.h>
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
+#include <asm/unistd32.h>
 /*
 * Bad Abort numbers
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index ac3550ecc7b..2ea3968367c 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -823,11 +823,11 @@ static int compat_ptrace_read_user(struct task_struct *tsk, compat_ulong_t off,
        if (off & 3)
                return -EIO;
-        if (off == PT_TEXT_ADDR)
+        if (off == COMPAT_PT_TEXT_ADDR)
                tmp = tsk->mm->start_code;
-        else if (off == PT_DATA_ADDR)
+        else if (off == COMPAT_PT_DATA_ADDR)
                tmp = tsk->mm->start_data;
-        else if (off == PT_TEXT_END_ADDR)
+        else if (off == COMPAT_PT_TEXT_END_ADDR)
                tmp = tsk->mm->end_code;
        else if (off < sizeof(compat_elf_gregset_t))
                return copy_regset_to_user(tsk, &user_aarch32_view,
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index 0790a87a434..4654824747a 100644
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -18,8 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define __SYSCALL_COMPAT
 #include <linux/compat.h>
 #include <linux/signal.h>
 #include <linux/syscalls.h>
@@ -28,7 +26,7 @@
 #include <asm/fpsimd.h>
 #include <asm/signal32.h>
 #include <asm/uaccess.h>
-#include <asm/unistd.h>
+#include <asm/unistd32.h>
 struct compat_sigaction {
        compat_uptr_t                   sa_handler;
@@ -126,19 +124,19 @@ struct compat_rt_sigframe {
 * For ARM syscalls, the syscall number has to be loaded into r7.
 * We do not support an OABI userspace.
 */
-#define MOV_R7_NR_SIGRETURN     (0xe3a07000 | __NR_sigreturn)
+#define MOV_R7_NR_SIGRETURN     (0xe3a07000 | __NR_compat_sigreturn)
-#define SVC_SYS_SIGRETURN       (0xef000000 | __NR_sigreturn)
+#define SVC_SYS_SIGRETURN       (0xef000000 | __NR_compat_sigreturn)
-#define MOV_R7_NR_RT_SIGRETURN  (0xe3a07000 | __NR_rt_sigreturn)
+#define MOV_R7_NR_RT_SIGRETURN  (0xe3a07000 | __NR_compat_rt_sigreturn)
-#define SVC_SYS_RT_SIGRETURN    (0xef000000 | __NR_rt_sigreturn)
+#define SVC_SYS_RT_SIGRETURN    (0xef000000 | __NR_compat_rt_sigreturn)
 /*
 * For Thumb syscalls, we also pass the syscall number via r7. We therefore
 * need two 16-bit instructions.
 */
-#define SVC_THUMB_SIGRETURN     (((0xdf00 | __NR_sigreturn) << 16) | \
+#define SVC_THUMB_SIGRETURN     (((0xdf00 | __NR_compat_sigreturn) << 16) | \
-                                   0x2700 | __NR_sigreturn)
+                                   0x2700 | __NR_compat_sigreturn)
-#define SVC_THUMB_RT_SIGRETURN  (((0xdf00 | __NR_rt_sigreturn) << 16) | \
+#define SVC_THUMB_RT_SIGRETURN  (((0xdf00 | __NR_compat_rt_sigreturn) << 16) | \
-                                   0x2700 | __NR_rt_sigreturn)
+                                   0x2700 | __NR_compat_rt_sigreturn)
 const compat_ulong_t aarch32_sigret_code[6] = {
        /*
@@ -819,5 +817,5 @@ asmlinkage int compat_sys_rt_sigqueueinfo(int pid, int sig,
 void compat_setup_restart_syscall(struct pt_regs *regs)
 {
-       regs->regs[7] = __NR_restart_syscall;
+       regs->regs[7] = __NR_compat_restart_syscall;
 }
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c
index 905fcfb0ddd..b120df37de3 100644
--- a/arch/arm64/kernel/sys.c
+++ b/arch/arm64/kernel/sys.c
@@ -50,13 +50,13 @@ asmlinkage long sys_execve(const char __user *filenamei,
                           struct pt_regs *regs)
 {
        long error;
-        char * filename;
+        struct filename *filename;
        filename = getname(filenamei);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
 out:
        return error;
diff --git a/arch/arm64/kernel/sys32.S b/arch/arm64/kernel/sys32.S
index 5e4dc93cc31..54c4aec47a0 100644
--- a/arch/arm64/kernel/sys32.S
+++ b/arch/arm64/kernel/sys32.S
@@ -147,136 +147,12 @@ compat_sys_fanotify_mark_wrapper:
        b       sys_fanotify_mark
 ENDPROC(compat_sys_fanotify_mark_wrapper)
-/*
- * Use the compat system call wrappers.
- */
-#define sys_fork                compat_sys_fork_wrapper
-#define sys_open                compat_sys_open
-#define sys_execve              compat_sys_execve_wrapper
-#define sys_lseek               compat_sys_lseek_wrapper
-#define sys_mount               compat_sys_mount
-#define sys_ptrace              compat_sys_ptrace
-#define sys_times               compat_sys_times
-#define sys_ioctl               compat_sys_ioctl
-#define sys_fcntl               compat_sys_fcntl
-#define sys_ustat               compat_sys_ustat
-#define sys_sigaction           compat_sys_sigaction
-#define sys_sigsuspend          compat_sys_sigsuspend
-#define sys_sigpending          compat_sys_sigpending
-#define sys_setrlimit           compat_sys_setrlimit
-#define sys_getrusage           compat_sys_getrusage
-#define sys_gettimeofday        compat_sys_gettimeofday
-#define sys_settimeofday        compat_sys_settimeofday
-#define sys_statfs              compat_sys_statfs
-#define sys_fstatfs             compat_sys_fstatfs
-#define sys_setitimer           compat_sys_setitimer
-#define sys_getitimer           compat_sys_getitimer
-#define sys_newstat             compat_sys_newstat
-#define sys_newlstat            compat_sys_newlstat
-#define sys_newfstat            compat_sys_newfstat
-#define sys_wait4               compat_sys_wait4
-#define sys_sysinfo             compat_sys_sysinfo
-#define sys_sigreturn           compat_sys_sigreturn_wrapper
-#define sys_clone               compat_sys_clone_wrapper
-#define sys_adjtimex            compat_sys_adjtimex
-#define sys_sigprocmask         compat_sys_sigprocmask
-#define sys_getdents            compat_sys_getdents
-#define sys_select              compat_sys_select
-#define sys_readv               compat_sys_readv
-#define sys_writev              compat_sys_writev
-#define sys_sysctl              compat_sys_sysctl
-#define sys_sched_rr_get_interval compat_sys_sched_rr_get_interval
-#define sys_nanosleep           compat_sys_nanosleep
-#define sys_rt_sigreturn        compat_sys_rt_sigreturn_wrapper
-#define sys_rt_sigaction        compat_sys_rt_sigaction
-#define sys_rt_sigprocmask      compat_sys_rt_sigprocmask
-#define sys_rt_sigpending       compat_sys_rt_sigpending
-#define sys_rt_sigtimedwait     compat_sys_rt_sigtimedwait
-#define sys_rt_sigqueueinfo     compat_sys_rt_sigqueueinfo
-#define sys_rt_sigsuspend       compat_sys_rt_sigsuspend
-#define sys_pread64             compat_sys_pread64_wrapper
-#define sys_pwrite64            compat_sys_pwrite64_wrapper
-#define sys_sigaltstack         compat_sys_sigaltstack_wrapper
-#define sys_sendfile            compat_sys_sendfile
-#define sys_vfork               compat_sys_vfork_wrapper
-#define sys_getrlimit           compat_sys_getrlimit
-#define sys_mmap2               sys_mmap_pgoff
-#define sys_truncate64          compat_sys_truncate64_wrapper
-#define sys_ftruncate64         compat_sys_ftruncate64_wrapper
-#define sys_getdents64          compat_sys_getdents64
-#define sys_fcntl64             compat_sys_fcntl64
-#define sys_readahead           compat_sys_readahead_wrapper
-#define sys_futex               compat_sys_futex
-#define sys_sched_setaffinity   compat_sys_sched_setaffinity
-#define sys_sched_getaffinity   compat_sys_sched_getaffinity
-#define sys_io_setup            compat_sys_io_setup
-#define sys_io_getevents        compat_sys_io_getevents
-#define sys_io_submit           compat_sys_io_submit
-#define sys_lookup_dcookie      compat_sys_lookup_dcookie
-#define sys_timer_create        compat_sys_timer_create
-#define sys_timer_settime       compat_sys_timer_settime
-#define sys_timer_gettime       compat_sys_timer_gettime
-#define sys_clock_settime       compat_sys_clock_settime
-#define sys_clock_gettime       compat_sys_clock_gettime
-#define sys_clock_getres        compat_sys_clock_getres
-#define sys_clock_nanosleep     compat_sys_clock_nanosleep
-#define sys_statfs64            compat_sys_statfs64_wrapper
-#define sys_fstatfs64           compat_sys_fstatfs64_wrapper
-#define sys_utimes              compat_sys_utimes
-#define sys_fadvise64_64        compat_sys_fadvise64_64_wrapper
-#define sys_mq_open             compat_sys_mq_open
-#define sys_mq_timedsend        compat_sys_mq_timedsend
-#define sys_mq_timedreceive     compat_sys_mq_timedreceive
-#define sys_mq_notify           compat_sys_mq_notify
-#define sys_mq_getsetattr       compat_sys_mq_getsetattr
-#define sys_waitid              compat_sys_waitid
-#define sys_recv                compat_sys_recv
-#define sys_recvfrom            compat_sys_recvfrom
-#define sys_setsockopt          compat_sys_setsockopt
-#define sys_getsockopt          compat_sys_getsockopt
-#define sys_sendmsg             compat_sys_sendmsg
-#define sys_recvmsg             compat_sys_recvmsg
-#define sys_semctl              compat_sys_semctl
-#define sys_msgsnd              compat_sys_msgsnd
-#define sys_msgrcv              compat_sys_msgrcv
-#define sys_msgctl              compat_sys_msgctl
-#define sys_shmat               compat_sys_shmat
-#define sys_shmctl              compat_sys_shmctl
-#define sys_keyctl              compat_sys_keyctl
-#define sys_semtimedop          compat_sys_semtimedop
-#define sys_mbind               compat_sys_mbind
-#define sys_get_mempolicy       compat_sys_get_mempolicy
-#define sys_set_mempolicy       compat_sys_set_mempolicy
-#define sys_openat              compat_sys_openat
-#define sys_futimesat           compat_sys_futimesat
-#define sys_pselect6            compat_sys_pselect6
-#define sys_ppoll               compat_sys_ppoll
-#define sys_set_robust_list     compat_sys_set_robust_list
-#define sys_get_robust_list     compat_sys_get_robust_list
-#define sys_sync_file_range2    compat_sys_sync_file_range2_wrapper
-#define sys_vmsplice            compat_sys_vmsplice
-#define sys_move_pages          compat_sys_move_pages
-#define sys_epoll_pwait         compat_sys_epoll_pwait
-#define sys_kexec_load          compat_sys_kexec_load
-#define sys_utimensat           compat_sys_utimensat
-#define sys_signalfd            compat_sys_signalfd
-#define sys_fallocate           compat_sys_fallocate_wrapper
-#define sys_timerfd_settime     compat_sys_timerfd_settime
-#define sys_timerfd_gettime     compat_sys_timerfd_gettime
-#define sys_signalfd4           compat_sys_signalfd4
-#define sys_preadv              compat_sys_preadv
-#define sys_pwritev             compat_sys_pwritev
-#define sys_rt_tgsigqueueinfo   compat_sys_rt_tgsigqueueinfo
-#define sys_recvmmsg            compat_sys_recvmmsg
-#define sys_fanotify_mark       compat_sys_fanotify_mark_wrapper
 #undef __SYSCALL
 #define __SYSCALL(x, y)         .quad   y       // x
-#define __SYSCALL_COMPAT
 /*
 * The system calls table must be 4KB aligned.
 */
        .align  12
 ENTRY(compat_sys_call_table)
-#include <asm/unistd.h>
+#include <asm/unistd32.h>
diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c
index 93f10e27dc7..906e3bd270b 100644
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@ -18,8 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define __SYSCALL_COMPAT
 #include <linux/compat.h>
 #include <linux/personality.h>
 #include <linux/sched.h>
@@ -28,7 +26,7 @@
 #include <linux/uaccess.h>
 #include <asm/cacheflush.h>
-#include <asm/unistd.h>
+#include <asm/unistd32.h>
 asmlinkage int compat_sys_fork(struct pt_regs *regs)
 {
@@ -56,14 +54,14 @@ asmlinkage int compat_sys_execve(const char __user *filenamei,
                                 struct pt_regs *regs)
 {
        int error;
-        char * filename;
+        struct filename *filename;
        filename = getname(filenamei);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = compat_do_execve(filename, compat_ptr(argv), compat_ptr(envp),
+        error = compat_do_execve(filename->name, compat_ptr(argv),
-                                 regs);
+                                        compat_ptr(envp), regs);
        putname(filename);
 out:
        return error;
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 5ade51c8a87..06e73bf665e 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -15,6 +15,8 @@ config AVR32
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CLOCKEVENTS
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
        help
          AVR32 is a high-performance 32-bit RISC microprocessor core,
          designed for cost-sensitive embedded applications, with particular
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild
index be0433ee5a8..4807ded352c 100644
--- a/arch/avr32/include/asm/Kbuild
+++ b/arch/avr32/include/asm/Kbuild
@@ -1,6 +1,3 @@
-include include/asm-generic/Kbuild.asm
 generic-y       += clkdev.h
 generic-y       += exec.h
-header-y        += cachectl.h
diff --git a/arch/avr32/include/asm/module.h b/arch/avr32/include/asm/module.h
index 451444538a1..3f083d385a6 100644
--- a/arch/avr32/include/asm/module.h
+++ b/arch/avr32/include/asm/module.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_AVR32_MODULE_H
 #define __ASM_AVR32_MODULE_H
+#include <asm-generic/module.h>
 struct mod_arch_syminfo {
        unsigned long got_offset;
        int got_initialized;
@@ -17,10 +19,6 @@ struct mod_arch_specific {
        struct mod_arch_syminfo *syminfo;
 };
-#define Elf_Shdr                Elf32_Shdr
-#define Elf_Sym                 Elf32_Sym
-#define Elf_Ehdr                Elf32_Ehdr
 #define MODULE_PROC_FAMILY "AVR32v1"
 #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
diff --git a/arch/avr32/include/asm/param.h b/arch/avr32/include/asm/param.h
index 34bc8d4c3b2..009a167aea1 100644
--- a/arch/avr32/include/asm/param.h
+++ b/arch/avr32/include/asm/param.h
@@ -1,23 +1,9 @@
 #ifndef __ASM_AVR32_PARAM_H
 #define __ASM_AVR32_PARAM_H
-#ifdef __KERNEL__
+#include <uapi/asm/param.h>
 # define HZ             CONFIG_HZ
 # define USER_HZ        100             /* User interfaces are in "ticks" */
 # define CLOCKS_PER_SEC (USER_HZ)       /* frequency at which times() counts */
-#endif
-#ifndef HZ
-# define HZ             100
-#endif
-/* TODO: Should be configurable */
-#define EXEC_PAGESIZE   4096
-#ifndef NOGROUP
-# define NOGROUP        (-1)
-#endif
-#define MAXHOSTNAMELEN  64
 #endif /* __ASM_AVR32_PARAM_H */
diff --git a/arch/avr32/include/asm/ptrace.h b/arch/avr32/include/asm/ptrace.h
index c67a007f672..8d3c412fc65 100644
--- a/arch/avr32/include/asm/ptrace.h
+++ b/arch/avr32/include/asm/ptrace.h
@@ -8,119 +8,9 @@
 #ifndef __ASM_AVR32_PTRACE_H
 #define __ASM_AVR32_PTRACE_H
-#define PTRACE_GETREGS          12
+#include <uapi/asm/ptrace.h>
-#define PTRACE_SETREGS          13
-/*
- * Status Register bits
- */
-#define SR_H            0x20000000
-#define SR_J            0x10000000
-#define SR_DM           0x08000000
-#define SR_D            0x04000000
-#define MODE_NMI        0x01c00000
-#define MODE_EXCEPTION  0x01800000
-#define MODE_INT3       0x01400000
-#define MODE_INT2       0x01000000
-#define MODE_INT1       0x00c00000
-#define MODE_INT0       0x00800000
-#define MODE_SUPERVISOR 0x00400000
-#define MODE_USER       0x00000000
-#define MODE_MASK       0x01c00000
-#define SR_EM           0x00200000
-#define SR_I3M          0x00100000
-#define SR_I2M          0x00080000
-#define SR_I1M          0x00040000
-#define SR_I0M          0x00020000
-#define SR_GM           0x00010000
-#define SR_H_BIT        29
-#define SR_J_BIT        28
-#define SR_DM_BIT       27
-#define SR_D_BIT        26
-#define MODE_SHIFT      22
-#define SR_EM_BIT       21
-#define SR_I3M_BIT      20
-#define SR_I2M_BIT      19
-#define SR_I1M_BIT      18
-#define SR_I0M_BIT      17
-#define SR_GM_BIT       16
-/* The user-visible part */
-#define SR_L            0x00000020
-#define SR_Q            0x00000010
-#define SR_V            0x00000008
-#define SR_N            0x00000004
-#define SR_Z            0x00000002
-#define SR_C            0x00000001
-#define SR_L_BIT        5
-#define SR_Q_BIT        4
-#define SR_V_BIT        3
-#define SR_N_BIT        2
-#define SR_Z_BIT        1
-#define SR_C_BIT        0
-/*
- * The order is defined by the stmts instruction. r0 is stored first,
- * so it gets the highest address.
- *
- * Registers 0-12 are general-purpose registers (r12 is normally used for
- * the function return value).
- * Register 13 is the stack pointer
- * Register 14 is the link register
- * Register 15 is the program counter (retrieved from the RAR sysreg)
- */
-#define FRAME_SIZE_FULL 72
-#define REG_R12_ORIG    68
-#define REG_R0          64
-#define REG_R1          60
-#define REG_R2          56
-#define REG_R3          52
-#define REG_R4          48
-#define REG_R5          44
-#define REG_R6          40
-#define REG_R7          36
-#define REG_R8          32
-#define REG_R9          28
-#define REG_R10         24
-#define REG_R11         20
-#define REG_R12         16
-#define REG_SP          12
-#define REG_LR           8
-#define FRAME_SIZE_MIN   8
-#define REG_PC           4
-#define REG_SR           0
 #ifndef __ASSEMBLY__
-struct pt_regs {
-        /* These are always saved */
-        unsigned long sr;
-        unsigned long pc;
-        /* These are sometimes saved */
-        unsigned long lr;
-        unsigned long sp;
-        unsigned long r12;
-        unsigned long r11;
-        unsigned long r10;
-        unsigned long r9;
-        unsigned long r8;
-        unsigned long r7;
-        unsigned long r6;
-        unsigned long r5;
-        unsigned long r4;
-        unsigned long r3;
-        unsigned long r2;
-        unsigned long r1;
-        unsigned long r0;
-        /* Only saved on system call */
-        unsigned long r12_orig;
-};
-#ifdef __KERNEL__
 #include <asm/ocd.h>
@@ -150,8 +40,5 @@ static __inline__ int valid_user_regs(struct pt_regs *regs)
 }
-#endif /* __KERNEL__ */
 #endif /* ! __ASSEMBLY__ */
 #endif /* __ASM_AVR32_PTRACE_H */
diff --git a/arch/avr32/include/asm/setup.h b/arch/avr32/include/asm/setup.h
index 160543dbec7..73490ae0c47 100644
--- a/arch/avr32/include/asm/setup.h
+++ b/arch/avr32/include/asm/setup.h
@@ -11,9 +11,8 @@
 #ifndef __ASM_AVR32_SETUP_H__
 #define __ASM_AVR32_SETUP_H__
-#define COMMAND_LINE_SIZE 256
+#include <uapi/asm/setup.h>
-#ifdef __KERNEL__
 /* Magic number indicating that a tag table is present */
 #define ATAG_MAGIC      0xa2a25441
@@ -142,6 +141,4 @@ void setup_processor(void);
 #endif /* !__ASSEMBLY__ */
-#endif  /*  __KERNEL__  */
 #endif /* __ASM_AVR32_SETUP_H__ */
diff --git a/arch/avr32/include/asm/signal.h b/arch/avr32/include/asm/signal.h
index ae56849fdb2..4d502fd6bad 100644
--- a/arch/avr32/include/asm/signal.h
+++ b/arch/avr32/include/asm/signal.h
@@ -8,12 +8,8 @@
 #ifndef __ASM_AVR32_SIGNAL_H
 #define __ASM_AVR32_SIGNAL_H
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-#ifdef __KERNEL__
 /* Most things should be clean enough to redefine this at will, if care
   is taken to make libc match.  */
@@ -27,94 +23,6 @@ typedef struct {
        unsigned long sig[_NSIG_WORDS];
 } sigset_t;
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-#define NSIG            32
-typedef unsigned long sigset_t;
-#endif /* __KERNEL__ */
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        (_NSIG-1)
-/*
- * SA_FLAGS values:
- *
- * SA_NOCLDSTOP         flag to turn off SIGCHLD when children stop.
- * SA_NOCLDWAIT         flag on SIGCHLD to inhibit zombies.
- * SA_SIGINFO           deliver the signal with SIGINFO structs
- * SA_ONSTACK           indicates that a registered stack_t will be used.
- * SA_RESTART           flag to get restarting signals (which were the default long ago)
- * SA_NODEFER           prevents the current signal from being masked in the handler.
- * SA_RESETHAND         clears the handler when the signal is delivered.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOCLDWAIT    0x00000002
-#define SA_SIGINFO      0x00000004
-#define SA_RESTORER     0x04000000
-#define SA_ONSTACK      0x08000000
-#define SA_RESTART      0x10000000
-#define SA_NODEFER      0x40000000
-#define SA_RESETHAND    0x80000000
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-#include <asm-generic/signal-defs.h>
-#ifdef __KERNEL__
 struct sigaction {
        __sighandler_t sa_handler;
        unsigned long sa_flags;
@@ -125,37 +33,10 @@ struct sigaction {
 struct k_sigaction {
        struct sigaction sa;
 };
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-struct sigaction {
-        union {
-                __sighandler_t _sa_handler;
-                void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-#endif /* __KERNEL__ */
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-#ifdef __KERNEL__
 #include <asm/sigcontext.h>
 #undef __HAVE_ARCH_SIG_BITOPS
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif /* __KERNEL__ */
 #endif
diff --git a/arch/avr32/include/asm/termios.h b/arch/avr32/include/asm/termios.h
index dd7e9da2548..9d594376dbd 100644
--- a/arch/avr32/include/asm/termios.h
+++ b/arch/avr32/include/asm/termios.h
@@ -8,45 +8,8 @@
 #ifndef __ASM_AVR32_TERMIOS_H
 #define __ASM_AVR32_TERMIOS_H
-#include <asm/termbits.h>
+#include <uapi/asm/termios.h>
-#include <asm/ioctls.h>
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-#define NCC 8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-/* modem lines */
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-#ifdef __KERNEL__
 /*      intr=^C         quit=^\         erase=del       kill=^U
        eof=^D          vtime=\0        vmin=\1         sxtc=\0
        start=^Q        stop=^S         susp=^Z         eol=\0
@@ -57,6 +20,4 @@ struct termio {
 #include <asm-generic/termios-base.h>
-#endif  /* __KERNEL__ */
 #endif  /* __ASM_AVR32_TERMIOS_H */
diff --git a/arch/avr32/include/asm/thread_info.h b/arch/avr32/include/asm/thread_info.h
index e5deda4691d..6dc62e1f94c 100644
--- a/arch/avr32/include/asm/thread_info.h
+++ b/arch/avr32/include/asm/thread_info.h
@@ -77,8 +77,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
 #define TIF_SIGPENDING          1       /* signal pending */
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
-                                           TIF_NEED_RESCHED */
 #define TIF_BREAKPOINT          4       /* enter monitor mode on return */
 #define TIF_SINGLE_STEP         5       /* single step in progress */
 #define TIF_MEMDIE              6       /* is terminating due to OOM killer */
@@ -91,10 +89,9 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
+#define _TIF_BREAKPOINT         (1 << TIF_BREAKPOINT)
 #define _TIF_SINGLE_STEP        (1 << TIF_SINGLE_STEP)
 #define _TIF_MEMDIE             (1 << TIF_MEMDIE)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
 #define _TIF_CPU_GOING_TO_SLEEP (1 << TIF_CPU_GOING_TO_SLEEP)
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
@@ -102,17 +99,14 @@ static inline struct thread_info *current_thread_info(void)
 /* work to do on interrupt/exception return */
 #define _TIF_WORK_MASK                          \
-        ((1 << TIF_SIGPENDING)                  \
+        (_TIF_SIGPENDING                        \
         | _TIF_NOTIFY_RESUME                   \
-         | (1 << TIF_NEED_RESCHED)              \
+         | _TIF_NEED_RESCHED                    \
-         | (1 << TIF_POLLING_NRFLAG)            \
+         | _TIF_BREAKPOINT)
-         | (1 << TIF_BREAKPOINT)                \
-         | (1 << TIF_RESTORE_SIGMASK))
 /* work to do on any return to userspace */
-#define _TIF_ALLWORK_MASK       (_TIF_WORK_MASK | (1 << TIF_SYSCALL_TRACE) | \
+#define _TIF_ALLWORK_MASK       (_TIF_WORK_MASK | _TIF_SYSCALL_TRACE)
-                                 _TIF_NOTIFY_RESUME)
 /* work to do on return from debug mode */
-#define _TIF_DBGWORK_MASK       (_TIF_WORK_MASK & ~(1 << TIF_BREAKPOINT))
+#define _TIF_DBGWORK_MASK       (_TIF_WORK_MASK & ~_TIF_BREAKPOINT)
 #endif /* __ASM_AVR32_THREAD_INFO_H */
diff --git a/arch/avr32/include/asm/types.h b/arch/avr32/include/asm/types.h
index 9bb2d8b2e6c..59324058069 100644
--- a/arch/avr32/include/asm/types.h
+++ b/arch/avr32/include/asm/types.h
@@ -8,16 +8,12 @@
 #ifndef __ASM_AVR32_TYPES_H
 #define __ASM_AVR32_TYPES_H
-#include <asm-generic/int-ll64.h>
+#include <uapi/asm/types.h>
 /*
 * These aren't exported outside the kernel to avoid name space clashes
 */
-#ifdef __KERNEL__
 #define BITS_PER_LONG 32
-#endif /* __KERNEL__ */
 #endif /* __ASM_AVR32_TYPES_H */
diff --git a/arch/avr32/include/asm/unistd.h b/arch/avr32/include/asm/unistd.h
index 1358e366f4b..157b4bd3d5e 100644
--- a/arch/avr32/include/asm/unistd.h
+++ b/arch/avr32/include/asm/unistd.h
@@ -8,300 +8,8 @@
 #ifndef __ASM_AVR32_UNISTD_H
 #define __ASM_AVR32_UNISTD_H
-/*
+#include <uapi/asm/unistd.h>
- * This file contains the system call numbers.
- */
-#define __NR_restart_syscall      0
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_umask                7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_chown               16
-#define __NR_lchown              17
-#define __NR_lseek               18
-#define __NR__llseek             19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount2             22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_pause               28
-#define __NR_utime               29
-#define __NR_stat                30
-#define __NR_fstat               31
-#define __NR_lstat               32
-#define __NR_access              33
-#define __NR_chroot              34
-#define __NR_sync                35
-#define __NR_fsync               36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_clone               44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_getcwd              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_setfsuid            52
-#define __NR_setfsgid            53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_setpgid             56
-#define __NR_mremap              57
-#define __NR_setresuid           58
-#define __NR_getresuid           59
-#define __NR_setreuid            60
-#define __NR_setregid            61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_rt_sigaction        67
-#define __NR_rt_sigreturn        68
-#define __NR_rt_sigprocmask      69
-#define __NR_rt_sigpending       70
-#define __NR_rt_sigtimedwait     71
-#define __NR_rt_sigqueueinfo     72
-#define __NR_rt_sigsuspend       73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* SuS compliant getrlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_fchdir              84
-#define __NR_readlink            85
-#define __NR_pread               86
-#define __NR_pwrite              87
-#define __NR_swapon              88
-#define __NR_reboot              89
-#define __NR_mmap2               90
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-#define __NR_wait4               98
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-#define __NR_vhangup            101
-#define __NR_sigaltstack        102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_swapoff            106
-#define __NR_sysinfo            107
-/* 108 was __NR_ipc for a little while */
-#define __NR_sendfile           109
-#define __NR_setdomainname      110
-#define __NR_uname              111
-#define __NR_adjtimex           112
-#define __NR_mprotect           113
-#define __NR_vfork              114
-#define __NR_init_module        115
-#define __NR_delete_module      116
-#define __NR_quotactl           117
-#define __NR_getpgid            118
-#define __NR_bdflush            119
-#define __NR_sysfs              120
-#define __NR_personality        121
-#define __NR_afs_syscall        122 /* Syscall for Andrew File System */
-#define __NR_getdents           123
-#define __NR_flock              124
-#define __NR_msync              125
-#define __NR_readv              126
-#define __NR_writev             127
-#define __NR_getsid             128
-#define __NR_fdatasync          129
-#define __NR__sysctl            130
-#define __NR_mlock              131
-#define __NR_munlock            132
-#define __NR_mlockall           133
-#define __NR_munlockall         134
-#define __NR_sched_setparam             135
-#define __NR_sched_getparam             136
-#define __NR_sched_setscheduler         137
-#define __NR_sched_getscheduler         138
-#define __NR_sched_yield                139
-#define __NR_sched_get_priority_max     140
-#define __NR_sched_get_priority_min     141
-#define __NR_sched_rr_get_interval      142
-#define __NR_nanosleep          143
-#define __NR_poll               144
-#define __NR_nfsservctl         145
-#define __NR_setresgid          146
-#define __NR_getresgid          147
-#define __NR_prctl              148
-#define __NR_socket             149
-#define __NR_bind               150
-#define __NR_connect            151
-#define __NR_listen             152
-#define __NR_accept             153
-#define __NR_getsockname        154
-#define __NR_getpeername        155
-#define __NR_socketpair         156
-#define __NR_send               157
-#define __NR_recv               158
-#define __NR_sendto             159
-#define __NR_recvfrom           160
-#define __NR_shutdown           161
-#define __NR_setsockopt         162
-#define __NR_getsockopt         163
-#define __NR_sendmsg            164
-#define __NR_recvmsg            165
-#define __NR_truncate64         166
-#define __NR_ftruncate64        167
-#define __NR_stat64             168
-#define __NR_lstat64            169
-#define __NR_fstat64            170
-#define __NR_pivot_root         171
-#define __NR_mincore            172
-#define __NR_madvise            173
-#define __NR_getdents64         174
-#define __NR_fcntl64            175
-#define __NR_gettid             176
-#define __NR_readahead          177
-#define __NR_setxattr           178
-#define __NR_lsetxattr          179
-#define __NR_fsetxattr          180
-#define __NR_getxattr           181
-#define __NR_lgetxattr          182
-#define __NR_fgetxattr          183
-#define __NR_listxattr          184
-#define __NR_llistxattr         185
-#define __NR_flistxattr         186
-#define __NR_removexattr        187
-#define __NR_lremovexattr       188
-#define __NR_fremovexattr       189
-#define __NR_tkill              190
-#define __NR_sendfile64         191
-#define __NR_futex              192
-#define __NR_sched_setaffinity  193
-#define __NR_sched_getaffinity  194
-#define __NR_capget             195
-#define __NR_capset             196
-#define __NR_io_setup           197
-#define __NR_io_destroy         198
-#define __NR_io_getevents       199
-#define __NR_io_submit          200
-#define __NR_io_cancel          201
-#define __NR_fadvise64          202
-#define __NR_exit_group         203
-#define __NR_lookup_dcookie     204
-#define __NR_epoll_create       205
-#define __NR_epoll_ctl          206
-#define __NR_epoll_wait         207
-#define __NR_remap_file_pages   208
-#define __NR_set_tid_address    209
-#define __NR_timer_create       210
-#define __NR_timer_settime      211
-#define __NR_timer_gettime      212
-#define __NR_timer_getoverrun   213
-#define __NR_timer_delete       214
-#define __NR_clock_settime      215
-#define __NR_clock_gettime      216
-#define __NR_clock_getres       217
-#define __NR_clock_nanosleep    218
-#define __NR_statfs64           219
-#define __NR_fstatfs64          220
-#define __NR_tgkill             221
-                                /* 222 reserved for tux */
-#define __NR_utimes             223
-#define __NR_fadvise64_64       224
-#define __NR_cacheflush         225
-#define __NR_vserver            226
-#define __NR_mq_open            227
-#define __NR_mq_unlink          228
-#define __NR_mq_timedsend       229
-#define __NR_mq_timedreceive    230
-#define __NR_mq_notify          231
-#define __NR_mq_getsetattr      232
-#define __NR_kexec_load         233
-#define __NR_waitid             234
-#define __NR_add_key            235
-#define __NR_request_key        236
-#define __NR_keyctl             237
-#define __NR_ioprio_set         238
-#define __NR_ioprio_get         239
-#define __NR_inotify_init       240
-#define __NR_inotify_add_watch  241
-#define __NR_inotify_rm_watch   242
-#define __NR_openat             243
-#define __NR_mkdirat            244
-#define __NR_mknodat            245
-#define __NR_fchownat           246
-#define __NR_futimesat          247
-#define __NR_fstatat64          248
-#define __NR_unlinkat           249
-#define __NR_renameat           250
-#define __NR_linkat             251
-#define __NR_symlinkat          252
-#define __NR_readlinkat         253
-#define __NR_fchmodat           254
-#define __NR_faccessat          255
-#define __NR_pselect6           256
-#define __NR_ppoll              257
-#define __NR_unshare            258
-#define __NR_set_robust_list    259
-#define __NR_get_robust_list    260
-#define __NR_splice             261
-#define __NR_sync_file_range    262
-#define __NR_tee                263
-#define __NR_vmsplice           264
-#define __NR_epoll_pwait        265
-#define __NR_msgget             266
-#define __NR_msgsnd             267
-#define __NR_msgrcv             268
-#define __NR_msgctl             269
-#define __NR_semget             270
-#define __NR_semop              271
-#define __NR_semctl             272
-#define __NR_semtimedop         273
-#define __NR_shmat              274
-#define __NR_shmget             275
-#define __NR_shmdt              276
-#define __NR_shmctl             277
-#define __NR_utimensat          278
-#define __NR_signalfd           279
-/* 280 was __NR_timerfd */
-#define __NR_eventfd            281
-#define __NR_setns              283
-#ifdef __KERNEL__
 #define NR_syscalls             284
 /* Old stuff */
@@ -340,6 +48,4 @@
 */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-#endif /* __KERNEL__ */
 #endif /* __ASM_AVR32_UNISTD_H */
diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild
index baebb3da1d4..df53e7a4677 100644
--- a/arch/avr32/include/uapi/asm/Kbuild
+++ b/arch/avr32/include/uapi/asm/Kbuild
@@ -1,3 +1,35 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += cachectl.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += param.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += ptrace.h
+header-y += resource.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += shmbuf.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += unistd.h
diff --git a/arch/avr32/include/asm/auxvec.h b/arch/avr32/include/uapi/asm/auxvec.h
index d5dd435bf8f..d5dd435bf8f 100644
--- a/arch/avr32/include/asm/auxvec.h
+++ b/arch/avr32/include/uapi/asm/auxvec.h
diff --git a/arch/avr32/include/asm/bitsperlong.h b/arch/avr32/include/uapi/asm/bitsperlong.h
index 6dc0bb0c13b..6dc0bb0c13b 100644
--- a/arch/avr32/include/asm/bitsperlong.h
+++ b/arch/avr32/include/uapi/asm/bitsperlong.h
diff --git a/arch/avr32/include/asm/byteorder.h b/arch/avr32/include/uapi/asm/byteorder.h
index 50abc21619a..50abc21619a 100644
--- a/arch/avr32/include/asm/byteorder.h
+++ b/arch/avr32/include/uapi/asm/byteorder.h
diff --git a/arch/avr32/include/asm/cachectl.h b/arch/avr32/include/uapi/asm/cachectl.h
index 4faf1ce6006..4faf1ce6006 100644
--- a/arch/avr32/include/asm/cachectl.h
+++ b/arch/avr32/include/uapi/asm/cachectl.h
diff --git a/arch/avr32/include/asm/errno.h b/arch/avr32/include/uapi/asm/errno.h
index 558a7249f06..558a7249f06 100644
--- a/arch/avr32/include/asm/errno.h
+++ b/arch/avr32/include/uapi/asm/errno.h
diff --git a/arch/avr32/include/asm/fcntl.h b/arch/avr32/include/uapi/asm/fcntl.h
index 14c0c4402b1..14c0c4402b1 100644
--- a/arch/avr32/include/asm/fcntl.h
+++ b/arch/avr32/include/uapi/asm/fcntl.h
diff --git a/arch/avr32/include/asm/ioctl.h b/arch/avr32/include/uapi/asm/ioctl.h
index c8472c1398e..c8472c1398e 100644
--- a/arch/avr32/include/asm/ioctl.h
+++ b/arch/avr32/include/uapi/asm/ioctl.h
diff --git a/arch/avr32/include/asm/ioctls.h b/arch/avr32/include/uapi/asm/ioctls.h
index 909cf66feaf..909cf66feaf 100644
--- a/arch/avr32/include/asm/ioctls.h
+++ b/arch/avr32/include/uapi/asm/ioctls.h
diff --git a/arch/avr32/include/asm/ipcbuf.h b/arch/avr32/include/uapi/asm/ipcbuf.h
index 84c7e51cb6d..84c7e51cb6d 100644
--- a/arch/avr32/include/asm/ipcbuf.h
+++ b/arch/avr32/include/uapi/asm/ipcbuf.h
diff --git a/arch/avr32/include/asm/kvm_para.h b/arch/avr32/include/uapi/asm/kvm_para.h
index 14fab8f0b95..14fab8f0b95 100644
--- a/arch/avr32/include/asm/kvm_para.h
+++ b/arch/avr32/include/uapi/asm/kvm_para.h
diff --git a/arch/avr32/include/asm/mman.h b/arch/avr32/include/uapi/asm/mman.h
index 8eebf89f5ab..8eebf89f5ab 100644
--- a/arch/avr32/include/asm/mman.h
+++ b/arch/avr32/include/uapi/asm/mman.h
diff --git a/arch/avr32/include/asm/msgbuf.h b/arch/avr32/include/uapi/asm/msgbuf.h
index ac18bc4da7f..ac18bc4da7f 100644
--- a/arch/avr32/include/asm/msgbuf.h
+++ b/arch/avr32/include/uapi/asm/msgbuf.h
diff --git a/arch/avr32/include/uapi/asm/param.h b/arch/avr32/include/uapi/asm/param.h
new file mode 100644
index 00000000000..d28aa5ee6d3
--- /dev/null
+++ b/arch/avr32/include/uapi/asm/param.h
@@ -0,0 +1,18 @@
+#ifndef _UAPI__ASM_AVR32_PARAM_H
+#define _UAPI__ASM_AVR32_PARAM_H
+#ifndef HZ
+# define HZ             100
+#endif
+/* TODO: Should be configurable */
+#define EXEC_PAGESIZE   4096
+#ifndef NOGROUP
+# define NOGROUP        (-1)
+#endif
+#define MAXHOSTNAMELEN  64
+#endif /* _UAPI__ASM_AVR32_PARAM_H */
diff --git a/arch/avr32/include/asm/poll.h b/arch/avr32/include/uapi/asm/poll.h
index c98509d3149..c98509d3149 100644
--- a/arch/avr32/include/asm/poll.h
+++ b/arch/avr32/include/uapi/asm/poll.h
diff --git a/arch/avr32/include/asm/posix_types.h b/arch/avr32/include/uapi/asm/posix_types.h
index 9ba9e749b3f..9ba9e749b3f 100644
--- a/arch/avr32/include/asm/posix_types.h
+++ b/arch/avr32/include/uapi/asm/posix_types.h
diff --git a/arch/avr32/include/uapi/asm/ptrace.h b/arch/avr32/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..fe8c16275bc
--- /dev/null
+++ b/arch/avr32/include/uapi/asm/ptrace.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPI__ASM_AVR32_PTRACE_H
+#define _UAPI__ASM_AVR32_PTRACE_H
+#define PTRACE_GETREGS          12
+#define PTRACE_SETREGS          13
+/*
+ * Status Register bits
+ */
+#define SR_H            0x20000000
+#define SR_J            0x10000000
+#define SR_DM           0x08000000
+#define SR_D            0x04000000
+#define MODE_NMI        0x01c00000
+#define MODE_EXCEPTION  0x01800000
+#define MODE_INT3       0x01400000
+#define MODE_INT2       0x01000000
+#define MODE_INT1       0x00c00000
+#define MODE_INT0       0x00800000
+#define MODE_SUPERVISOR 0x00400000
+#define MODE_USER       0x00000000
+#define MODE_MASK       0x01c00000
+#define SR_EM           0x00200000
+#define SR_I3M          0x00100000
+#define SR_I2M          0x00080000
+#define SR_I1M          0x00040000
+#define SR_I0M          0x00020000
+#define SR_GM           0x00010000
+#define SR_H_BIT        29
+#define SR_J_BIT        28
+#define SR_DM_BIT       27
+#define SR_D_BIT        26
+#define MODE_SHIFT      22
+#define SR_EM_BIT       21
+#define SR_I3M_BIT      20
+#define SR_I2M_BIT      19
+#define SR_I1M_BIT      18
+#define SR_I0M_BIT      17
+#define SR_GM_BIT       16
+/* The user-visible part */
+#define SR_L            0x00000020
+#define SR_Q            0x00000010
+#define SR_V            0x00000008
+#define SR_N            0x00000004
+#define SR_Z            0x00000002
+#define SR_C            0x00000001
+#define SR_L_BIT        5
+#define SR_Q_BIT        4
+#define SR_V_BIT        3
+#define SR_N_BIT        2
+#define SR_Z_BIT        1
+#define SR_C_BIT        0
+/*
+ * The order is defined by the stmts instruction. r0 is stored first,
+ * so it gets the highest address.
+ *
+ * Registers 0-12 are general-purpose registers (r12 is normally used for
+ * the function return value).
+ * Register 13 is the stack pointer
+ * Register 14 is the link register
+ * Register 15 is the program counter (retrieved from the RAR sysreg)
+ */
+#define FRAME_SIZE_FULL 72
+#define REG_R12_ORIG    68
+#define REG_R0          64
+#define REG_R1          60
+#define REG_R2          56
+#define REG_R3          52
+#define REG_R4          48
+#define REG_R5          44
+#define REG_R6          40
+#define REG_R7          36
+#define REG_R8          32
+#define REG_R9          28
+#define REG_R10         24
+#define REG_R11         20
+#define REG_R12         16
+#define REG_SP          12
+#define REG_LR           8
+#define FRAME_SIZE_MIN   8
+#define REG_PC           4
+#define REG_SR           0
+#ifndef __ASSEMBLY__
+struct pt_regs {
+        /* These are always saved */
+        unsigned long sr;
+        unsigned long pc;
+        /* These are sometimes saved */
+        unsigned long lr;
+        unsigned long sp;
+        unsigned long r12;
+        unsigned long r11;
+        unsigned long r10;
+        unsigned long r9;
+        unsigned long r8;
+        unsigned long r7;
+        unsigned long r6;
+        unsigned long r5;
+        unsigned long r4;
+        unsigned long r3;
+        unsigned long r2;
+        unsigned long r1;
+        unsigned long r0;
+        /* Only saved on system call */
+        unsigned long r12_orig;
+};
+#endif /* ! __ASSEMBLY__ */
+#endif /* _UAPI__ASM_AVR32_PTRACE_H */
diff --git a/arch/avr32/include/asm/resource.h b/arch/avr32/include/uapi/asm/resource.h
index c6dd101472b..c6dd101472b 100644
--- a/arch/avr32/include/asm/resource.h
+++ b/arch/avr32/include/uapi/asm/resource.h
diff --git a/arch/avr32/include/asm/sembuf.h b/arch/avr32/include/uapi/asm/sembuf.h
index e472216e0c9..e472216e0c9 100644
--- a/arch/avr32/include/asm/sembuf.h
+++ b/arch/avr32/include/uapi/asm/sembuf.h
diff --git a/arch/avr32/include/uapi/asm/setup.h b/arch/avr32/include/uapi/asm/setup.h
new file mode 100644
index 00000000000..e58aa9356fa
--- /dev/null
+++ b/arch/avr32/include/uapi/asm/setup.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * Based on linux/include/asm-arm/setup.h
+ *   Copyright (C) 1997-1999 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPI__ASM_AVR32_SETUP_H__
+#define _UAPI__ASM_AVR32_SETUP_H__
+#define COMMAND_LINE_SIZE 256
+#endif /* _UAPI__ASM_AVR32_SETUP_H__ */
diff --git a/arch/avr32/include/asm/shmbuf.h b/arch/avr32/include/uapi/asm/shmbuf.h
index c62fba41739..c62fba41739 100644
--- a/arch/avr32/include/asm/shmbuf.h
+++ b/arch/avr32/include/uapi/asm/shmbuf.h
diff --git a/arch/avr32/include/asm/sigcontext.h b/arch/avr32/include/uapi/asm/sigcontext.h
index e04062b5f39..e04062b5f39 100644
--- a/arch/avr32/include/asm/sigcontext.h
+++ b/arch/avr32/include/uapi/asm/sigcontext.h
diff --git a/arch/avr32/include/asm/siginfo.h b/arch/avr32/include/uapi/asm/siginfo.h
index 5ee93f40a8a..5ee93f40a8a 100644
--- a/arch/avr32/include/asm/siginfo.h
+++ b/arch/avr32/include/uapi/asm/siginfo.h
diff --git a/arch/avr32/include/uapi/asm/signal.h b/arch/avr32/include/uapi/asm/signal.h
new file mode 100644
index 00000000000..eb46f61adb7
--- /dev/null
+++ b/arch/avr32/include/uapi/asm/signal.h
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPI__ASM_AVR32_SIGNAL_H
+#define _UAPI__ASM_AVR32_SIGNAL_H
+#include <linux/types.h>
+/* Avoid too many header ordering problems.  */
+struct siginfo;
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+#define NSIG            32
+typedef unsigned long sigset_t;
+#endif /* __KERNEL__ */
+#define SIGHUP           1
+#define SIGINT           2
+#define SIGQUIT          3
+#define SIGILL           4
+#define SIGTRAP          5
+#define SIGABRT          6
+#define SIGIOT           6
+#define SIGBUS           7
+#define SIGFPE           8
+#define SIGKILL          9
+#define SIGUSR1         10
+#define SIGSEGV         11
+#define SIGUSR2         12
+#define SIGPIPE         13
+#define SIGALRM         14
+#define SIGTERM         15
+#define SIGSTKFLT       16
+#define SIGCHLD         17
+#define SIGCONT         18
+#define SIGSTOP         19
+#define SIGTSTP         20
+#define SIGTTIN         21
+#define SIGTTOU         22
+#define SIGURG          23
+#define SIGXCPU         24
+#define SIGXFSZ         25
+#define SIGVTALRM       26
+#define SIGPROF         27
+#define SIGWINCH        28
+#define SIGIO           29
+#define SIGPOLL         SIGIO
+/*
+#define SIGLOST         29
+*/
+#define SIGPWR          30
+#define SIGSYS          31
+#define SIGUNUSED       31
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        (_NSIG-1)
+/*
+ * SA_FLAGS values:
+ *
+ * SA_NOCLDSTOP         flag to turn off SIGCHLD when children stop.
+ * SA_NOCLDWAIT         flag on SIGCHLD to inhibit zombies.
+ * SA_SIGINFO           deliver the signal with SIGINFO structs
+ * SA_ONSTACK           indicates that a registered stack_t will be used.
+ * SA_RESTART           flag to get restarting signals (which were the default long ago)
+ * SA_NODEFER           prevents the current signal from being masked in the handler.
+ * SA_RESETHAND         clears the handler when the signal is delivered.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_NOCLDSTOP    0x00000001
+#define SA_NOCLDWAIT    0x00000002
+#define SA_SIGINFO      0x00000004
+#define SA_RESTORER     0x04000000
+#define SA_ONSTACK      0x08000000
+#define SA_RESTART      0x10000000
+#define SA_NODEFER      0x40000000
+#define SA_RESETHAND    0x80000000
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+/*
+ * sigaltstack controls
+ */
+#define SS_ONSTACK      1
+#define SS_DISABLE      2
+#define MINSIGSTKSZ     2048
+#define SIGSTKSZ        8192
+#include <asm-generic/signal-defs.h>
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+struct sigaction {
+        union {
+                __sighandler_t _sa_handler;
+                void (*_sa_sigaction)(int, struct siginfo *, void *);
+        } _u;
+        sigset_t sa_mask;
+        unsigned long sa_flags;
+        void (*sa_restorer)(void);
+};
+#define sa_handler      _u._sa_handler
+#define sa_sigaction    _u._sa_sigaction
+#endif /* __KERNEL__ */
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        int ss_flags;
+        size_t ss_size;
+} stack_t;
+#endif /* _UAPI__ASM_AVR32_SIGNAL_H */
diff --git a/arch/avr32/include/asm/socket.h b/arch/avr32/include/uapi/asm/socket.h
index a473f8c6a9a..a473f8c6a9a 100644
--- a/arch/avr32/include/asm/socket.h
+++ b/arch/avr32/include/uapi/asm/socket.h
diff --git a/arch/avr32/include/asm/sockios.h b/arch/avr32/include/uapi/asm/sockios.h
index 0802d742f97..0802d742f97 100644
--- a/arch/avr32/include/asm/sockios.h
+++ b/arch/avr32/include/uapi/asm/sockios.h
diff --git a/arch/avr32/include/asm/stat.h b/arch/avr32/include/uapi/asm/stat.h
index e72881e1023..e72881e1023 100644
--- a/arch/avr32/include/asm/stat.h
+++ b/arch/avr32/include/uapi/asm/stat.h
diff --git a/arch/avr32/include/asm/statfs.h b/arch/avr32/include/uapi/asm/statfs.h
index 2961bd18c50..2961bd18c50 100644
--- a/arch/avr32/include/asm/statfs.h
+++ b/arch/avr32/include/uapi/asm/statfs.h
diff --git a/arch/avr32/include/asm/swab.h b/arch/avr32/include/uapi/asm/swab.h
index 14cc737bbca..14cc737bbca 100644
--- a/arch/avr32/include/asm/swab.h
+++ b/arch/avr32/include/uapi/asm/swab.h
diff --git a/arch/avr32/include/asm/termbits.h b/arch/avr32/include/uapi/asm/termbits.h
index 366adc5ebb1..366adc5ebb1 100644
--- a/arch/avr32/include/asm/termbits.h
+++ b/arch/avr32/include/uapi/asm/termbits.h
diff --git a/arch/avr32/include/uapi/asm/termios.h b/arch/avr32/include/uapi/asm/termios.h
new file mode 100644
index 00000000000..b8ef8ea6335
--- /dev/null
+++ b/arch/avr32/include/uapi/asm/termios.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPI__ASM_AVR32_TERMIOS_H
+#define _UAPI__ASM_AVR32_TERMIOS_H
+#include <asm/termbits.h>
+#include <asm/ioctls.h>
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+#define NCC 8
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        unsigned char c_line;           /* line discipline */
+        unsigned char c_cc[NCC];        /* control characters */
+};
+/* modem lines */
+#define TIOCM_LE        0x001
+#define TIOCM_DTR       0x002
+#define TIOCM_RTS       0x004
+#define TIOCM_ST        0x008
+#define TIOCM_SR        0x010
+#define TIOCM_CTS       0x020
+#define TIOCM_CAR       0x040
+#define TIOCM_RNG       0x080
+#define TIOCM_DSR       0x100
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+#endif /* _UAPI__ASM_AVR32_TERMIOS_H */
diff --git a/arch/avr32/include/uapi/asm/types.h b/arch/avr32/include/uapi/asm/types.h
new file mode 100644
index 00000000000..bb34ad349df
--- /dev/null
+++ b/arch/avr32/include/uapi/asm/types.h
@@ -0,0 +1,8 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <asm-generic/int-ll64.h>
diff --git a/arch/avr32/include/uapi/asm/unistd.h b/arch/avr32/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..3eaa68753ad
--- /dev/null
+++ b/arch/avr32/include/uapi/asm/unistd.h
@@ -0,0 +1,305 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef _UAPI__ASM_AVR32_UNISTD_H
+#define _UAPI__ASM_AVR32_UNISTD_H
+/*
+ * This file contains the system call numbers.
+ */
+#define __NR_restart_syscall      0
+#define __NR_exit                 1
+#define __NR_fork                 2
+#define __NR_read                 3
+#define __NR_write                4
+#define __NR_open                 5
+#define __NR_close                6
+#define __NR_umask                7
+#define __NR_creat                8
+#define __NR_link                 9
+#define __NR_unlink              10
+#define __NR_execve              11
+#define __NR_chdir               12
+#define __NR_time                13
+#define __NR_mknod               14
+#define __NR_chmod               15
+#define __NR_chown               16
+#define __NR_lchown              17
+#define __NR_lseek               18
+#define __NR__llseek             19
+#define __NR_getpid              20
+#define __NR_mount               21
+#define __NR_umount2             22
+#define __NR_setuid              23
+#define __NR_getuid              24
+#define __NR_stime               25
+#define __NR_ptrace              26
+#define __NR_alarm               27
+#define __NR_pause               28
+#define __NR_utime               29
+#define __NR_stat                30
+#define __NR_fstat               31
+#define __NR_lstat               32
+#define __NR_access              33
+#define __NR_chroot              34
+#define __NR_sync                35
+#define __NR_fsync               36
+#define __NR_kill                37
+#define __NR_rename              38
+#define __NR_mkdir               39
+#define __NR_rmdir               40
+#define __NR_dup                 41
+#define __NR_pipe                42
+#define __NR_times               43
+#define __NR_clone               44
+#define __NR_brk                 45
+#define __NR_setgid              46
+#define __NR_getgid              47
+#define __NR_getcwd              48
+#define __NR_geteuid             49
+#define __NR_getegid             50
+#define __NR_acct                51
+#define __NR_setfsuid            52
+#define __NR_setfsgid            53
+#define __NR_ioctl               54
+#define __NR_fcntl               55
+#define __NR_setpgid             56
+#define __NR_mremap              57
+#define __NR_setresuid           58
+#define __NR_getresuid           59
+#define __NR_setreuid            60
+#define __NR_setregid            61
+#define __NR_ustat               62
+#define __NR_dup2                63
+#define __NR_getppid             64
+#define __NR_getpgrp             65
+#define __NR_setsid              66
+#define __NR_rt_sigaction        67
+#define __NR_rt_sigreturn        68
+#define __NR_rt_sigprocmask      69
+#define __NR_rt_sigpending       70
+#define __NR_rt_sigtimedwait     71
+#define __NR_rt_sigqueueinfo     72
+#define __NR_rt_sigsuspend       73
+#define __NR_sethostname         74
+#define __NR_setrlimit           75
+#define __NR_getrlimit           76     /* SuS compliant getrlimit */
+#define __NR_getrusage           77
+#define __NR_gettimeofday        78
+#define __NR_settimeofday        79
+#define __NR_getgroups           80
+#define __NR_setgroups           81
+#define __NR_select              82
+#define __NR_symlink             83
+#define __NR_fchdir              84
+#define __NR_readlink            85
+#define __NR_pread               86
+#define __NR_pwrite              87
+#define __NR_swapon              88
+#define __NR_reboot              89
+#define __NR_mmap2               90
+#define __NR_munmap              91
+#define __NR_truncate            92
+#define __NR_ftruncate           93
+#define __NR_fchmod              94
+#define __NR_fchown              95
+#define __NR_getpriority         96
+#define __NR_setpriority         97
+#define __NR_wait4               98
+#define __NR_statfs              99
+#define __NR_fstatfs            100
+#define __NR_vhangup            101
+#define __NR_sigaltstack        102
+#define __NR_syslog             103
+#define __NR_setitimer          104
+#define __NR_getitimer          105
+#define __NR_swapoff            106
+#define __NR_sysinfo            107
+/* 108 was __NR_ipc for a little while */
+#define __NR_sendfile           109
+#define __NR_setdomainname      110
+#define __NR_uname              111
+#define __NR_adjtimex           112
+#define __NR_mprotect           113
+#define __NR_vfork              114
+#define __NR_init_module        115
+#define __NR_delete_module      116
+#define __NR_quotactl           117
+#define __NR_getpgid            118
+#define __NR_bdflush            119
+#define __NR_sysfs              120
+#define __NR_personality        121
+#define __NR_afs_syscall        122 /* Syscall for Andrew File System */
+#define __NR_getdents           123
+#define __NR_flock              124
+#define __NR_msync              125
+#define __NR_readv              126
+#define __NR_writev             127
+#define __NR_getsid             128
+#define __NR_fdatasync          129
+#define __NR__sysctl            130
+#define __NR_mlock              131
+#define __NR_munlock            132
+#define __NR_mlockall           133
+#define __NR_munlockall         134
+#define __NR_sched_setparam             135
+#define __NR_sched_getparam             136
+#define __NR_sched_setscheduler         137
+#define __NR_sched_getscheduler         138
+#define __NR_sched_yield                139
+#define __NR_sched_get_priority_max     140
+#define __NR_sched_get_priority_min     141
+#define __NR_sched_rr_get_interval      142
+#define __NR_nanosleep          143
+#define __NR_poll               144
+#define __NR_nfsservctl         145
+#define __NR_setresgid          146
+#define __NR_getresgid          147
+#define __NR_prctl              148
+#define __NR_socket             149
+#define __NR_bind               150
+#define __NR_connect            151
+#define __NR_listen             152
+#define __NR_accept             153
+#define __NR_getsockname        154
+#define __NR_getpeername        155
+#define __NR_socketpair         156
+#define __NR_send               157
+#define __NR_recv               158
+#define __NR_sendto             159
+#define __NR_recvfrom           160
+#define __NR_shutdown           161
+#define __NR_setsockopt         162
+#define __NR_getsockopt         163
+#define __NR_sendmsg            164
+#define __NR_recvmsg            165
+#define __NR_truncate64         166
+#define __NR_ftruncate64        167
+#define __NR_stat64             168
+#define __NR_lstat64            169
+#define __NR_fstat64            170
+#define __NR_pivot_root         171
+#define __NR_mincore            172
+#define __NR_madvise            173
+#define __NR_getdents64         174
+#define __NR_fcntl64            175
+#define __NR_gettid             176
+#define __NR_readahead          177
+#define __NR_setxattr           178
+#define __NR_lsetxattr          179
+#define __NR_fsetxattr          180
+#define __NR_getxattr           181
+#define __NR_lgetxattr          182
+#define __NR_fgetxattr          183
+#define __NR_listxattr          184
+#define __NR_llistxattr         185
+#define __NR_flistxattr         186
+#define __NR_removexattr        187
+#define __NR_lremovexattr       188
+#define __NR_fremovexattr       189
+#define __NR_tkill              190
+#define __NR_sendfile64         191
+#define __NR_futex              192
+#define __NR_sched_setaffinity  193
+#define __NR_sched_getaffinity  194
+#define __NR_capget             195
+#define __NR_capset             196
+#define __NR_io_setup           197
+#define __NR_io_destroy         198
+#define __NR_io_getevents       199
+#define __NR_io_submit          200
+#define __NR_io_cancel          201
+#define __NR_fadvise64          202
+#define __NR_exit_group         203
+#define __NR_lookup_dcookie     204
+#define __NR_epoll_create       205
+#define __NR_epoll_ctl          206
+#define __NR_epoll_wait         207
+#define __NR_remap_file_pages   208
+#define __NR_set_tid_address    209
+#define __NR_timer_create       210
+#define __NR_timer_settime      211
+#define __NR_timer_gettime      212
+#define __NR_timer_getoverrun   213
+#define __NR_timer_delete       214
+#define __NR_clock_settime      215
+#define __NR_clock_gettime      216
+#define __NR_clock_getres       217
+#define __NR_clock_nanosleep    218
+#define __NR_statfs64           219
+#define __NR_fstatfs64          220
+#define __NR_tgkill             221
+                                /* 222 reserved for tux */
+#define __NR_utimes             223
+#define __NR_fadvise64_64       224
+#define __NR_cacheflush         225
+#define __NR_vserver            226
+#define __NR_mq_open            227
+#define __NR_mq_unlink          228
+#define __NR_mq_timedsend       229
+#define __NR_mq_timedreceive    230
+#define __NR_mq_notify          231
+#define __NR_mq_getsetattr      232
+#define __NR_kexec_load         233
+#define __NR_waitid             234
+#define __NR_add_key            235
+#define __NR_request_key        236
+#define __NR_keyctl             237
+#define __NR_ioprio_set         238
+#define __NR_ioprio_get         239
+#define __NR_inotify_init       240
+#define __NR_inotify_add_watch  241
+#define __NR_inotify_rm_watch   242
+#define __NR_openat             243
+#define __NR_mkdirat            244
+#define __NR_mknodat            245
+#define __NR_fchownat           246
+#define __NR_futimesat          247
+#define __NR_fstatat64          248
+#define __NR_unlinkat           249
+#define __NR_renameat           250
+#define __NR_linkat             251
+#define __NR_symlinkat          252
+#define __NR_readlinkat         253
+#define __NR_fchmodat           254
+#define __NR_faccessat          255
+#define __NR_pselect6           256
+#define __NR_ppoll              257
+#define __NR_unshare            258
+#define __NR_set_robust_list    259
+#define __NR_get_robust_list    260
+#define __NR_splice             261
+#define __NR_sync_file_range    262
+#define __NR_tee                263
+#define __NR_vmsplice           264
+#define __NR_epoll_pwait        265
+#define __NR_msgget             266
+#define __NR_msgsnd             267
+#define __NR_msgrcv             268
+#define __NR_msgctl             269
+#define __NR_semget             270
+#define __NR_semop              271
+#define __NR_semctl             272
+#define __NR_semtimedop         273
+#define __NR_shmat              274
+#define __NR_shmget             275
+#define __NR_shmdt              276
+#define __NR_shmctl             277
+#define __NR_utimensat          278
+#define __NR_signalfd           279
+/* 280 was __NR_timerfd */
+#define __NR_eventfd            281
+#define __NR_setns              283
+#endif /* _UAPI__ASM_AVR32_UNISTD_H */
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index 92c5af98a6f..1bb0a8abd79 100644
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -388,14 +388,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
                          struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname(ufilename);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, uargv, uenvp, regs);
+        error = do_execve(filename->name, uargv, uenvp, regs);
        putname(filename);
 out:
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index d552a854dac..5e01c3a40ce 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -15,7 +15,6 @@
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
-#include <linux/freezer.h>
 #include <linux/tracehook.h>
 #include <asm/uaccess.h>
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index ccd9193932b..b6f3ad5441c 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -43,6 +43,8 @@ config BLACKFIN
        select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
        select GENERIC_SMP_IDLE_THREAD
        select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
 config GENERIC_CSUM
        def_bool y
diff --git a/arch/blackfin/include/asm/module.h b/arch/blackfin/include/asm/module.h
index ed5689b82c9..231a149b3f7 100644
--- a/arch/blackfin/include/asm/module.h
+++ b/arch/blackfin/include/asm/module.h
@@ -7,9 +7,7 @@
 #ifndef _ASM_BFIN_MODULE_H
 #define _ASM_BFIN_MODULE_H
-#define Elf_Shdr        Elf32_Shdr
+#include <asm-generic/module.h>
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
 struct mod_arch_specific {
        Elf_Shdr        *text_l1;
diff --git a/arch/blackfin/include/asm/thread_info.h b/arch/blackfin/include/asm/thread_info.h
index 53ad10005ae..3894005337b 100644
--- a/arch/blackfin/include/asm/thread_info.h
+++ b/arch/blackfin/include/asm/thread_info.h
@@ -96,8 +96,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
 #define TIF_SIGPENDING          1       /* signal pending */
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
-                                           TIF_NEED_RESCHED */
 #define TIF_MEMDIE              4       /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
 #define TIF_IRQ_SYNC            7       /* sync pipeline stage */
@@ -108,8 +106,6 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_IRQ_SYNC           (1<<TIF_IRQ_SYNC)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 62bcea7dcc6..bb1cc721fcf 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -213,14 +213,14 @@ asmlinkage int sys_execve(const char __user *name,
                          const char __user *const __user *envp)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        struct pt_regs *regs = (struct pt_regs *)((&name) + 6);
        filename = getname(name);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                return error;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
        return error;
 }
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
index 6682b73a852..6ed20a1a4af 100644
--- a/arch/blackfin/kernel/signal.c
+++ b/arch/blackfin/kernel/signal.c
@@ -10,7 +10,6 @@
 #include <linux/tty.h>
 #include <linux/personality.h>
 #include <linux/binfmts.h>
-#include <linux/freezer.h>
 #include <linux/uaccess.h>
 #include <linux/tracehook.h>
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 983c859e40b..aee1b569ee6 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -17,6 +17,8 @@ config C6X
        select OF
        select OF_EARLY_FLATTREE
        select GENERIC_CLOCKEVENTS
+        select GENERIC_KERNEL_THREAD
+        select MODULES_USE_ELF_RELA
 config MMU
        def_bool n
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index 4e4e98da819..112a496d835 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -1,4 +1,3 @@
-include include/asm-generic/Kbuild.asm
 generic-y += atomic.h
 generic-y += auxvec.h
diff --git a/arch/c6x/include/asm/module.h b/arch/c6x/include/asm/module.h
index a453f9744f4..5c7269c7ef7 100644
--- a/arch/c6x/include/asm/module.h
+++ b/arch/c6x/include/asm/module.h
@@ -13,17 +13,7 @@
 #ifndef _ASM_C6X_MODULE_H
 #define _ASM_C6X_MODULE_H
-#define Elf_Shdr        Elf32_Shdr
+#include <asm-generic/module.h>
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-#define Elf_Addr        Elf32_Addr
-#define Elf_Word        Elf32_Word
-/*
- * This file contains the C6x architecture specific module code.
- */
-struct mod_arch_specific {
-};
 struct loaded_sections {
        unsigned int new_vaddr;
diff --git a/arch/c6x/include/asm/processor.h b/arch/c6x/include/asm/processor.h
index c50af7ef1c9..b9eb3da7f27 100644
--- a/arch/c6x/include/asm/processor.h
+++ b/arch/c6x/include/asm/processor.h
@@ -92,8 +92,6 @@ static inline void release_thread(struct task_struct *dead_task)
 {
 }
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 #define copy_segments(tsk, mm)          do { } while (0)
 #define release_segments(mm)            do { } while (0)
diff --git a/arch/c6x/include/asm/ptrace.h b/arch/c6x/include/asm/ptrace.h
index b04ff596425..76da6ad6610 100644
--- a/arch/c6x/include/asm/ptrace.h
+++ b/arch/c6x/include/asm/ptrace.h
@@ -11,156 +11,13 @@
 #ifndef _ASM_C6X_PTRACE_H
 #define _ASM_C6X_PTRACE_H
-#define BKPT_OPCODE     0x56454314      /* illegal opcode */
+#include <uapi/asm/ptrace.h>
-#ifdef _BIG_ENDIAN
-#define PT_LO(odd, even)  odd
-#define PT_HI(odd, even)  even
-#else
-#define PT_LO(odd, even)  even
-#define PT_HI(odd, even)  odd
-#endif
-#define PT_A4_ORG  PT_LO(1, 0)
-#define PT_TSR     PT_HI(1, 0)
-#define PT_ILC     PT_LO(3, 2)
-#define PT_RILC    PT_HI(3, 2)
-#define PT_CSR     PT_LO(5, 4)
-#define PT_PC      PT_HI(5, 4)
-#define PT_B16     PT_LO(7, 6)
-#define PT_B17     PT_HI(7, 6)
-#define PT_B18     PT_LO(9, 8)
-#define PT_B19     PT_HI(9, 8)
-#define PT_B20     PT_LO(11, 10)
-#define PT_B21     PT_HI(11, 10)
-#define PT_B22     PT_LO(13, 12)
-#define PT_B23     PT_HI(13, 12)
-#define PT_B24     PT_LO(15, 14)
-#define PT_B25     PT_HI(15, 14)
-#define PT_B26     PT_LO(17, 16)
-#define PT_B27     PT_HI(17, 16)
-#define PT_B28     PT_LO(19, 18)
-#define PT_B29     PT_HI(19, 18)
-#define PT_B30     PT_LO(21, 20)
-#define PT_B31     PT_HI(21, 20)
-#define PT_B0      PT_LO(23, 22)
-#define PT_B1      PT_HI(23, 22)
-#define PT_B2      PT_LO(25, 24)
-#define PT_B3      PT_HI(25, 24)
-#define PT_B4      PT_LO(27, 26)
-#define PT_B5      PT_HI(27, 26)
-#define PT_B6      PT_LO(29, 28)
-#define PT_B7      PT_HI(29, 28)
-#define PT_B8      PT_LO(31, 30)
-#define PT_B9      PT_HI(31, 30)
-#define PT_B10     PT_LO(33, 32)
-#define PT_B11     PT_HI(33, 32)
-#define PT_B12     PT_LO(35, 34)
-#define PT_B13     PT_HI(35, 34)
-#define PT_A16     PT_LO(37, 36)
-#define PT_A17     PT_HI(37, 36)
-#define PT_A18     PT_LO(39, 38)
-#define PT_A19     PT_HI(39, 38)
-#define PT_A20     PT_LO(41, 40)
-#define PT_A21     PT_HI(41, 40)
-#define PT_A22     PT_LO(43, 42)
-#define PT_A23     PT_HI(43, 42)
-#define PT_A24     PT_LO(45, 44)
-#define PT_A25     PT_HI(45, 44)
-#define PT_A26     PT_LO(47, 46)
-#define PT_A27     PT_HI(47, 46)
-#define PT_A28     PT_LO(49, 48)
-#define PT_A29     PT_HI(49, 48)
-#define PT_A30     PT_LO(51, 50)
-#define PT_A31     PT_HI(51, 50)
-#define PT_A0      PT_LO(53, 52)
-#define PT_A1      PT_HI(53, 52)
-#define PT_A2      PT_LO(55, 54)
-#define PT_A3      PT_HI(55, 54)
-#define PT_A4      PT_LO(57, 56)
-#define PT_A5      PT_HI(57, 56)
-#define PT_A6      PT_LO(59, 58)
-#define PT_A7      PT_HI(59, 58)
-#define PT_A8      PT_LO(61, 60)
-#define PT_A9      PT_HI(61, 60)
-#define PT_A10     PT_LO(63, 62)
-#define PT_A11     PT_HI(63, 62)
-#define PT_A12     PT_LO(65, 64)
-#define PT_A13     PT_HI(65, 64)
-#define PT_A14     PT_LO(67, 66)
-#define PT_A15     PT_HI(67, 66)
-#define PT_B14     PT_LO(69, 68)
-#define PT_B15     PT_HI(69, 68)
-#define NR_PTREGS  70
-#define PT_DP      PT_B14  /* Data Segment Pointer (B14) */
-#define PT_SP      PT_B15  /* Stack Pointer (B15)  */
-#define PTRACE_GETFDPIC         31      /* get the ELF fdpic loadmap address */
-#define PTRACE_GETFDPIC_EXEC    0       /* [addr] request the executable loadmap */
-#define PTRACE_GETFDPIC_INTERP  1       /* [addr] request the interpreter loadmap */
 #ifndef __ASSEMBLY__
 #ifdef _BIG_ENDIAN
-#define REG_PAIR(odd, even) unsigned long odd; unsigned long even
 #else
-#define REG_PAIR(odd, even) unsigned long even; unsigned long odd
 #endif
-/*
- * this struct defines the way the registers are stored on the
- * stack during a system call. fields defined with REG_PAIR
- * are saved and restored using double-word memory operations
- * which means the word ordering of the pair depends on endianess.
- */
-struct pt_regs {
-        REG_PAIR(tsr, orig_a4);
-        REG_PAIR(rilc, ilc);
-        REG_PAIR(pc, csr);
-        REG_PAIR(b17, b16);
-        REG_PAIR(b19, b18);
-        REG_PAIR(b21, b20);
-        REG_PAIR(b23, b22);
-        REG_PAIR(b25, b24);
-        REG_PAIR(b27, b26);
-        REG_PAIR(b29, b28);
-        REG_PAIR(b31, b30);
-        REG_PAIR(b1, b0);
-        REG_PAIR(b3, b2);
-        REG_PAIR(b5, b4);
-        REG_PAIR(b7, b6);
-        REG_PAIR(b9, b8);
-        REG_PAIR(b11, b10);
-        REG_PAIR(b13, b12);
-        REG_PAIR(a17, a16);
-        REG_PAIR(a19, a18);
-        REG_PAIR(a21, a20);
-        REG_PAIR(a23, a22);
-        REG_PAIR(a25, a24);
-        REG_PAIR(a27, a26);
-        REG_PAIR(a29, a28);
-        REG_PAIR(a31, a30);
-        REG_PAIR(a1, a0);
-        REG_PAIR(a3, a2);
-        REG_PAIR(a5, a4);
-        REG_PAIR(a7, a6);
-        REG_PAIR(a9, a8);
-        REG_PAIR(a11, a10);
-        REG_PAIR(a13, a12);
-        REG_PAIR(a15, a14);
-        REG_PAIR(sp, dp);
-};
-#ifdef __KERNEL__
 #include <linux/linkage.h>
 #define user_mode(regs) ((((regs)->tsr) & 0x40) != 0)
@@ -174,6 +31,5 @@ extern void show_regs(struct pt_regs *);
 extern asmlinkage unsigned long syscall_trace_entry(struct pt_regs *regs);
 extern asmlinkage void syscall_trace_exit(struct pt_regs *regs);
-#endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_C6X_PTRACE_H */
diff --git a/arch/c6x/include/asm/syscalls.h b/arch/c6x/include/asm/syscalls.h
index aed53da703c..e7b8991dc07 100644
--- a/arch/c6x/include/asm/syscalls.h
+++ b/arch/c6x/include/asm/syscalls.h
@@ -44,11 +44,6 @@ extern int sys_cache_sync(unsigned long s, unsigned long e);
 struct pt_regs;
 extern asmlinkage long sys_c6x_clone(struct pt_regs *regs);
-extern asmlinkage long sys_c6x_execve(const char __user *name,
-                                      const char __user *const __user *argv,
-                                      const char __user *const __user *envp,
-                                      struct pt_regs *regs);
 #include <asm-generic/syscalls.h>
diff --git a/arch/c6x/include/asm/thread_info.h b/arch/c6x/include/asm/thread_info.h
index 1710bcbb8d0..4c8dc562bd9 100644
--- a/arch/c6x/include/asm/thread_info.h
+++ b/arch/c6x/include/asm/thread_info.h
@@ -97,7 +97,6 @@ struct thread_info *current_thread_info(void)
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
 #define TIF_RESTORE_SIGMASK     4       /* restore signal mask in do_signal() */
-#define TIF_POLLING_NRFLAG      16      /* true if polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17      /* OOM killer killed process */
 #define TIF_WORK_MASK           0x00007FFE /* work on irq/exception return */
diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild
index baebb3da1d4..c312b424c43 100644
--- a/arch/c6x/include/uapi/asm/Kbuild
+++ b/arch/c6x/include/uapi/asm/Kbuild
@@ -1,3 +1,10 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += byteorder.h
+header-y += kvm_para.h
+header-y += ptrace.h
+header-y += setup.h
+header-y += sigcontext.h
+header-y += swab.h
+header-y += unistd.h
diff --git a/arch/c6x/include/asm/byteorder.h b/arch/c6x/include/uapi/asm/byteorder.h
index 166038db342..166038db342 100644
--- a/arch/c6x/include/asm/byteorder.h
+++ b/arch/c6x/include/uapi/asm/byteorder.h
diff --git a/arch/c6x/include/asm/kvm_para.h b/arch/c6x/include/uapi/asm/kvm_para.h
index 14fab8f0b95..14fab8f0b95 100644
--- a/arch/c6x/include/asm/kvm_para.h
+++ b/arch/c6x/include/uapi/asm/kvm_para.h
diff --git a/arch/c6x/include/uapi/asm/ptrace.h b/arch/c6x/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..cc0a4d99151
--- /dev/null
+++ b/arch/c6x/include/uapi/asm/ptrace.h
@@ -0,0 +1,163 @@
+/*
+ *  Copyright (C) 2004, 2006, 2009, 2010 Texas Instruments Incorporated
+ *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)
+ *
+ *  Updated for 2.6.34: Mark Salter <msalter@redhat.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+#ifndef _UAPI_ASM_C6X_PTRACE_H
+#define _UAPI_ASM_C6X_PTRACE_H
+#define BKPT_OPCODE     0x56454314      /* illegal opcode */
+#ifdef _BIG_ENDIAN
+#define PT_LO(odd, even)  odd
+#define PT_HI(odd, even)  even
+#else
+#define PT_LO(odd, even)  even
+#define PT_HI(odd, even)  odd
+#endif
+#define PT_A4_ORG  PT_LO(1, 0)
+#define PT_TSR     PT_HI(1, 0)
+#define PT_ILC     PT_LO(3, 2)
+#define PT_RILC    PT_HI(3, 2)
+#define PT_CSR     PT_LO(5, 4)
+#define PT_PC      PT_HI(5, 4)
+#define PT_B16     PT_LO(7, 6)
+#define PT_B17     PT_HI(7, 6)
+#define PT_B18     PT_LO(9, 8)
+#define PT_B19     PT_HI(9, 8)
+#define PT_B20     PT_LO(11, 10)
+#define PT_B21     PT_HI(11, 10)
+#define PT_B22     PT_LO(13, 12)
+#define PT_B23     PT_HI(13, 12)
+#define PT_B24     PT_LO(15, 14)
+#define PT_B25     PT_HI(15, 14)
+#define PT_B26     PT_LO(17, 16)
+#define PT_B27     PT_HI(17, 16)
+#define PT_B28     PT_LO(19, 18)
+#define PT_B29     PT_HI(19, 18)
+#define PT_B30     PT_LO(21, 20)
+#define PT_B31     PT_HI(21, 20)
+#define PT_B0      PT_LO(23, 22)
+#define PT_B1      PT_HI(23, 22)
+#define PT_B2      PT_LO(25, 24)
+#define PT_B3      PT_HI(25, 24)
+#define PT_B4      PT_LO(27, 26)
+#define PT_B5      PT_HI(27, 26)
+#define PT_B6      PT_LO(29, 28)
+#define PT_B7      PT_HI(29, 28)
+#define PT_B8      PT_LO(31, 30)
+#define PT_B9      PT_HI(31, 30)
+#define PT_B10     PT_LO(33, 32)
+#define PT_B11     PT_HI(33, 32)
+#define PT_B12     PT_LO(35, 34)
+#define PT_B13     PT_HI(35, 34)
+#define PT_A16     PT_LO(37, 36)
+#define PT_A17     PT_HI(37, 36)
+#define PT_A18     PT_LO(39, 38)
+#define PT_A19     PT_HI(39, 38)
+#define PT_A20     PT_LO(41, 40)
+#define PT_A21     PT_HI(41, 40)
+#define PT_A22     PT_LO(43, 42)
+#define PT_A23     PT_HI(43, 42)
+#define PT_A24     PT_LO(45, 44)
+#define PT_A25     PT_HI(45, 44)
+#define PT_A26     PT_LO(47, 46)
+#define PT_A27     PT_HI(47, 46)
+#define PT_A28     PT_LO(49, 48)
+#define PT_A29     PT_HI(49, 48)
+#define PT_A30     PT_LO(51, 50)
+#define PT_A31     PT_HI(51, 50)
+#define PT_A0      PT_LO(53, 52)
+#define PT_A1      PT_HI(53, 52)
+#define PT_A2      PT_LO(55, 54)
+#define PT_A3      PT_HI(55, 54)
+#define PT_A4      PT_LO(57, 56)
+#define PT_A5      PT_HI(57, 56)
+#define PT_A6      PT_LO(59, 58)
+#define PT_A7      PT_HI(59, 58)
+#define PT_A8      PT_LO(61, 60)
+#define PT_A9      PT_HI(61, 60)
+#define PT_A10     PT_LO(63, 62)
+#define PT_A11     PT_HI(63, 62)
+#define PT_A12     PT_LO(65, 64)
+#define PT_A13     PT_HI(65, 64)
+#define PT_A14     PT_LO(67, 66)
+#define PT_A15     PT_HI(67, 66)
+#define PT_B14     PT_LO(69, 68)
+#define PT_B15     PT_HI(69, 68)
+#define NR_PTREGS  70
+#define PT_DP      PT_B14  /* Data Segment Pointer (B14) */
+#define PT_SP      PT_B15  /* Stack Pointer (B15)  */
+#define PTRACE_GETFDPIC         31      /* get the ELF fdpic loadmap address */
+#define PTRACE_GETFDPIC_EXEC    0       /* [addr] request the executable loadmap */
+#define PTRACE_GETFDPIC_INTERP  1       /* [addr] request the interpreter loadmap */
+#ifndef __ASSEMBLY__
+#ifdef _BIG_ENDIAN
+#define REG_PAIR(odd, even) unsigned long odd; unsigned long even
+#else
+#define REG_PAIR(odd, even) unsigned long even; unsigned long odd
+#endif
+/*
+ * this struct defines the way the registers are stored on the
+ * stack during a system call. fields defined with REG_PAIR
+ * are saved and restored using double-word memory operations
+ * which means the word ordering of the pair depends on endianess.
+ */
+struct pt_regs {
+        REG_PAIR(tsr, orig_a4);
+        REG_PAIR(rilc, ilc);
+        REG_PAIR(pc, csr);
+        REG_PAIR(b17, b16);
+        REG_PAIR(b19, b18);
+        REG_PAIR(b21, b20);
+        REG_PAIR(b23, b22);
+        REG_PAIR(b25, b24);
+        REG_PAIR(b27, b26);
+        REG_PAIR(b29, b28);
+        REG_PAIR(b31, b30);
+        REG_PAIR(b1, b0);
+        REG_PAIR(b3, b2);
+        REG_PAIR(b5, b4);
+        REG_PAIR(b7, b6);
+        REG_PAIR(b9, b8);
+        REG_PAIR(b11, b10);
+        REG_PAIR(b13, b12);
+        REG_PAIR(a17, a16);
+        REG_PAIR(a19, a18);
+        REG_PAIR(a21, a20);
+        REG_PAIR(a23, a22);
+        REG_PAIR(a25, a24);
+        REG_PAIR(a27, a26);
+        REG_PAIR(a29, a28);
+        REG_PAIR(a31, a30);
+        REG_PAIR(a1, a0);
+        REG_PAIR(a3, a2);
+        REG_PAIR(a5, a4);
+        REG_PAIR(a7, a6);
+        REG_PAIR(a9, a8);
+        REG_PAIR(a11, a10);
+        REG_PAIR(a13, a12);
+        REG_PAIR(a15, a14);
+        REG_PAIR(sp, dp);
+};
+#endif /* __ASSEMBLY__ */
+#endif /* _UAPI_ASM_C6X_PTRACE_H */
diff --git a/arch/c6x/include/asm/setup.h b/arch/c6x/include/uapi/asm/setup.h
index a01e31896fa..a01e31896fa 100644
--- a/arch/c6x/include/asm/setup.h
+++ b/arch/c6x/include/uapi/asm/setup.h
diff --git a/arch/c6x/include/asm/sigcontext.h b/arch/c6x/include/uapi/asm/sigcontext.h
index eb702f39cde..eb702f39cde 100644
--- a/arch/c6x/include/asm/sigcontext.h
+++ b/arch/c6x/include/uapi/asm/sigcontext.h
diff --git a/arch/c6x/include/asm/swab.h b/arch/c6x/include/uapi/asm/swab.h
index fd4bb0520e5..fd4bb0520e5 100644
--- a/arch/c6x/include/asm/swab.h
+++ b/arch/c6x/include/uapi/asm/swab.h
diff --git a/arch/c6x/include/asm/unistd.h b/arch/c6x/include/uapi/asm/unistd.h
index ed2259043ee..4ff747d12da 100644
--- a/arch/c6x/include/asm/unistd.h
+++ b/arch/c6x/include/uapi/asm/unistd.h
@@ -14,6 +14,9 @@
 *   more details.
 */
+#define __ARCH_WANT_KERNEL_EXECVE
+#define __ARCH_WANT_SYS_EXECVE
 /* Use the standard ABI for syscalls. */
 #include <asm-generic/unistd.h>
diff --git a/arch/c6x/kernel/asm-offsets.c b/arch/c6x/kernel/asm-offsets.c
index 759ad6d207b..60f1e437745 100644
--- a/arch/c6x/kernel/asm-offsets.c
+++ b/arch/c6x/kernel/asm-offsets.c
@@ -116,7 +116,6 @@ void foo(void)
        DEFINE(_TIF_NOTIFY_RESUME, (1<<TIF_NOTIFY_RESUME));
        DEFINE(_TIF_SIGPENDING, (1<<TIF_SIGPENDING));
        DEFINE(_TIF_NEED_RESCHED, (1<<TIF_NEED_RESCHED));
-        DEFINE(_TIF_POLLING_NRFLAG, (1<<TIF_POLLING_NRFLAG));
        DEFINE(_TIF_ALLWORK_MASK, TIF_ALLWORK_MASK);
        DEFINE(_TIF_WORK_MASK, TIF_WORK_MASK);
diff --git a/arch/c6x/kernel/entry.S b/arch/c6x/kernel/entry.S
index 30b37e5f4a6..5449c36018f 100644
--- a/arch/c6x/kernel/entry.S
+++ b/arch/c6x/kernel/entry.S
@@ -400,6 +400,32 @@ ret_from_fork_2:
        STW     .D2T2   B0,*+SP(REGS_A4+8)
 ENDPROC(ret_from_fork)
+ENTRY(ret_from_kernel_thread)
+#ifdef CONFIG_C6X_BIG_KERNEL
+        MVKL    .S1     schedule_tail,A0
+        MVKH    .S1     schedule_tail,A0
+        B       .S2X    A0
+#else
+        B       .S2     schedule_tail
+#endif
+        LDW     .D2T2   *+SP(REGS_A0+8),B10 /* get fn  */
+        ADDKPC  .S2     0f,B3,3
+0:
+        B       .S2     B10                /* call fn */
+        LDW     .D2T1   *+SP(REGS_A1+8),A4 /* get arg */
+        MVKL    .S2     sys_exit,B11
+        MVKH    .S2     sys_exit,B11
+        ADDKPC  .S2     0f,B3,1
+0:
+        BNOP    .S2     B11,5   /* jump to sys_exit */
+ENDPROC(ret_from_kernel_thread)
+ENTRY(ret_from_kernel_execve)
+        GET_THREAD_INFO A12
+        BNOP    .S2     syscall_exit,4
+        ADD     .D2X    A4,-8,SP
+ENDPROC(ret_from_kernel_execve)
        ;;
        ;; These are the interrupt handlers, responsible for calling __do_IRQ()
        ;; int6 is used for syscalls (see _system_call entry)
@@ -593,13 +619,6 @@ ENTRY(sys_sigaltstack)
        NOP     4
 ENDPROC(sys_sigaltstack)
-        ;; kernel_execve
-ENTRY(kernel_execve)
-        MVK     .S2     __NR_execve,B0
-        SWE
-        BNOP    .S2     B3,5
-ENDPROC(kernel_execve)
        ;;
        ;; Special system calls
        ;; return address is in B3
@@ -628,29 +647,6 @@ ENTRY(sys_rt_sigreturn)
 #endif
 ENDPROC(sys_rt_sigreturn)
-ENTRY(sys_execve)
-        ADDAW   .D2     SP,2,B6         ; put regs addr in 4th parameter
-                                        ; & adjust regs stack addr
-        LDW     .D2T2   *+SP(REGS_B4+8),B4
-        ;; c6x_execve(char *name, char **argv,
-        ;;            char **envp, struct pt_regs *regs)
-#ifdef CONFIG_C6X_BIG_KERNEL
- ||     MVKL    .S1     sys_c6x_execve,A0
-        MVKH    .S1     sys_c6x_execve,A0
-        B       .S2X    A0
-#else
- ||     B       .S2     sys_c6x_execve
-#endif
-        STW     .D2T2   B3,*SP--[2]
-        ADDKPC  .S2     ret_from_c6x_execve,B3,3
-ret_from_c6x_execve:
-        LDW     .D2T2   *++SP[2],B3
-        NOP     4
-        BNOP    .S2     B3,5
-ENDPROC(sys_execve)
 ENTRY(sys_pread_c6x)
        MV      .D2X    A8,B7
 #ifdef CONFIG_C6X_BIG_KERNEL
diff --git a/arch/c6x/kernel/process.c b/arch/c6x/kernel/process.c
index 45e924a636a..2770d9a9a84 100644
--- a/arch/c6x/kernel/process.c
+++ b/arch/c6x/kernel/process.c
@@ -25,6 +25,7 @@ void	(*c6x_restart)(void);
 void    (*c6x_halt)(void);
 extern asmlinkage void ret_from_fork(void);
+extern asmlinkage void ret_from_kernel_thread(void);
 /*
 * power off function, if any
@@ -103,37 +104,6 @@ void machine_power_off(void)
        halt_loop();
 }
-static void kernel_thread_helper(int dummy, void *arg, int (*fn)(void *))
-{
-        do_exit(fn(arg));
-}
-/*
- * Create a kernel thread
- */
-int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-        struct pt_regs regs;
-        /*
-         * copy_thread sets a4 to zero (child return from fork)
-         * so we can't just set things up to directly return to
-         * fn.
-         */
-        memset(&regs, 0, sizeof(regs));
-        regs.b4 = (unsigned long) arg;
-        regs.a6 = (unsigned long) fn;
-        regs.pc = (unsigned long) kernel_thread_helper;
-        local_save_flags(regs.csr);
-        regs.csr |= 1;
-        regs.tsr = 5; /* Set GEE and GIE in TSR */
-        /* Ok, create the new process.. */
-        return do_fork(flags | CLONE_VM | CLONE_UNTRACED, -1, &regs,
-                       0, NULL, NULL);
-}
-EXPORT_SYMBOL(kernel_thread);
 void flush_thread(void)
 {
 }
@@ -191,22 +161,24 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
        childregs = task_pt_regs(p);
-        *childregs = *regs;
+        if (!regs) {
-        childregs->a4 = 0;
-        if (usp == -1)
                /* case of  __kernel_thread: we return to supervisor space */
+                memset(childregs, 0, sizeof(struct pt_regs));
                childregs->sp = (unsigned long)(childregs + 1);
-        else
+                p->thread.pc = (unsigned long) ret_from_kernel_thread;
+                childregs->a0 = usp;            /* function */
+                childregs->a1 = ustk_size;      /* argument */
+        } else {
                /* Otherwise use the given stack */
+                *childregs = *regs;
                childregs->sp = usp;
+                p->thread.pc = (unsigned long) ret_from_fork;
+        }
        /* Set usp/ksp */
        p->thread.usp = childregs->sp;
-        /* switch_to uses stack to save/restore 14 callee-saved regs */
        thread_saved_ksp(p) = (unsigned long)childregs - 8;
-        p->thread.pc = (unsigned int) ret_from_fork;
+        p->thread.wchan = p->thread.pc;
-        p->thread.wchan = (unsigned long) ret_from_fork;
 #ifdef __DSBT__
        {
                unsigned long dp;
@@ -221,28 +193,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
        return 0;
 }
-/*
- * c6x_execve() executes a new program.
- */
-SYSCALL_DEFINE4(c6x_execve, const char __user *, name,
-                const char __user *const __user *, argv,
-                const char __user *const __user *, envp,
-                struct pt_regs *, regs)
-{
-        int error;
-        char *filename;
-        filename = getname(name);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                goto out;
-        error = do_execve(filename, argv, envp, regs);
-        putname(filename);
-out:
-        return error;
-}
 unsigned long get_wchan(struct task_struct *p)
 {
        return p->thread.wchan;
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index a118163b04e..a67244473a3 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -48,6 +48,7 @@ config CRIS
        select GENERIC_IOMAP
        select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32
        select GENERIC_CMOS_UPDATE
+        select MODULES_USE_ELF_RELA
 config HZ
        int
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c
index bee8df43c20..15ac7150371 100644
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
@@ -212,14 +212,14 @@ asmlinkage int sys_execve(const char *fname,
                          struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname(fname);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
 out:
        return error;
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 0570e8ce603..4e999224635 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -224,7 +224,7 @@ sys_execve(const char *fname,
           struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname(fname);
        error = PTR_ERR(filename);
@@ -232,7 +232,7 @@ sys_execve(const char *fname,
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
 out:
        return error;
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index ff1bf7fcae8..6d43a951b5e 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -10,3 +10,4 @@ header-y += sync_serial.h
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += module.h
diff --git a/arch/cris/include/asm/module.h b/arch/cris/include/asm/module.h
deleted file mode 100644
index 7ee72311bd7..00000000000
--- a/arch/cris/include/asm/module.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ASM_CRIS_MODULE_H
-#define _ASM_CRIS_MODULE_H
-/* cris is simple */
-struct mod_arch_specific { };
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-#endif /* _ASM_CRIS_MODULE_H */
diff --git a/arch/cris/include/asm/thread_info.h b/arch/cris/include/asm/thread_info.h
index 5b1c448df5c..07c8c40c52b 100644
--- a/arch/cris/include/asm/thread_info.h
+++ b/arch/cris/include/asm/thread_info.h
@@ -78,15 +78,12 @@ struct thread_info {
 #define TIF_SIGPENDING          2       /* signal pending */
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
 #define TIF_RESTORE_SIGMASK     9       /* restore signal mask in do_signal() */
-#define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17      /* is terminating due to OOM killer */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
 #define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 9d262645f66..b7412504f08 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -12,6 +12,7 @@ config FRV
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CPU_DEVICES
        select ARCH_WANT_IPC_PARSE_VERSION
+        select GENERIC_KERNEL_THREAD
 config ZONE_DMA
        bool
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild
index 251bd712557..4a159da2363 100644
--- a/arch/frv/include/asm/Kbuild
+++ b/arch/frv/include/asm/Kbuild
@@ -1,6 +1,3 @@
-include include/asm-generic/Kbuild.asm
-header-y += registers.h
-header-y += termios.h
 generic-y += clkdev.h
 generic-y += exec.h
diff --git a/arch/frv/include/asm/module.h b/arch/frv/include/asm/module.h
index 3d5c6360289..a8848f09a21 100644
--- a/arch/frv/include/asm/module.h
+++ b/arch/frv/include/asm/module.h
@@ -11,13 +11,7 @@
 #ifndef _ASM_MODULE_H
 #define _ASM_MODULE_H
-struct mod_arch_specific
+#include <asm-generic/module.h>
-{
-};
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
 /*
 * Include the architecture version.
diff --git a/arch/frv/include/asm/processor.h b/arch/frv/include/asm/processor.h
index dccb9d16231..a34f309e580 100644
--- a/arch/frv/include/asm/processor.h
+++ b/arch/frv/include/asm/processor.h
@@ -92,14 +92,12 @@ extern struct task_struct *__kernel_current_task;
 /*
 * do necessary setup to start up a newly executed thread.
- * - need to discard the frame stacked by init() invoking the execve syscall
 */
 #define start_thread(_regs, _pc, _usp)                  \
 do {                                                    \
-        __frame = __kernel_frame0_ptr;                  \
+        _regs->pc       = (_pc);                        \
-        __frame->pc     = (_pc);                        \
+        _regs->psr      &= ~PSR_S;                      \
-        __frame->psr    &= ~PSR_S;                      \
+        _regs->sp       = (_usp);                       \
-        __frame->sp     = (_usp);                       \
 } while(0)
 /* Free all resources held by a thread. */
@@ -107,7 +105,6 @@ static inline void release_thread(struct task_struct *dead_task)
 {
 }
-extern asmlinkage int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 extern asmlinkage void save_user_regs(struct user_context *target);
 extern asmlinkage void *restore_user_regs(const struct user_context *target, ...);
diff --git a/arch/frv/include/asm/ptrace.h b/arch/frv/include/asm/ptrace.h
index ef6635ca4ec..034f1793419 100644
--- a/arch/frv/include/asm/ptrace.h
+++ b/arch/frv/include/asm/ptrace.h
@@ -11,58 +11,10 @@
 #ifndef _ASM_PTRACE_H
 #define _ASM_PTRACE_H
-#include <asm/registers.h>
-#ifdef __KERNEL__
 #include <asm/irq_regs.h>
+#include <uapi/asm/ptrace.h>
 #define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0)
-#endif
-#define PT_PSR          0
-#define PT_ISR          1
-#define PT_CCR          2
-#define PT_CCCR         3
-#define PT_LR           4
-#define PT_LCR          5
-#define PT_PC           6
-#define PT__STATUS      7       /* exception status */
-#define PT_SYSCALLNO    8       /* syscall number or -1 */
-#define PT_ORIG_GR8     9       /* saved GR8 for signal handling */
-#define PT_GNER0        10
-#define PT_GNER1        11
-#define PT_IACC0H       12
-#define PT_IACC0L       13
-#define PT_GR(j)        ( 14 + (j))     /* GRj for 0<=j<=63 */
-#define PT_FR(j)        ( 78 + (j))     /* FRj for 0<=j<=63 */
-#define PT_FNER(j)      (142 + (j))     /* FNERj for 0<=j<=1 */
-#define PT_MSR(j)       (144 + (j))     /* MSRj for 0<=j<=2 */
-#define PT_ACC(j)       (146 + (j))     /* ACCj for 0<=j<=7 */
-#define PT_ACCG(jklm)   (154 + (jklm))  /* ACCGjklm for 0<=jklm<=1 (reads four regs per slot) */
-#define PT_FSR(j)       (156 + (j))     /* FSRj for 0<=j<=0 */
-#define PT__GPEND       78
-#define PT__END         157
-#define PT_TBR          PT_GR(0)
-#define PT_SP           PT_GR(1)
-#define PT_FP           PT_GR(2)
-#define PT_PREV_FRAME   PT_GR(28)       /* previous exception frame pointer (old gr28 value) */
-#define PT_CURR_TASK    PT_GR(29)       /* current task */
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS        14
-#define PTRACE_SETFPREGS        15
-#define PTRACE_GETFDPIC         31      /* get the ELF fdpic loadmap address */
-#define PTRACE_GETFDPIC_EXEC    0       /* [addr] request the executable loadmap */
-#define PTRACE_GETFDPIC_INTERP  1       /* [addr] request the interpreter loadmap */
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 struct task_struct;
@@ -76,6 +28,7 @@ register struct pt_regs *__frame asm("gr28");
 #define user_mode(regs)                 (!((regs)->psr & PSR_S))
 #define instruction_pointer(regs)       ((regs)->pc)
 #define user_stack_pointer(regs)        ((regs)->sp)
+#define current_pt_regs()               (__frame)
 extern unsigned long user_stack(const struct pt_regs *);
 #define profile_pc(regs) ((regs)->pc)
@@ -85,5 +38,4 @@ extern unsigned long user_stack(const struct pt_regs *);
 #define arch_has_single_step()  (1)
 #endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #endif /* _ASM_PTRACE_H */
diff --git a/arch/frv/include/asm/setup.h b/arch/frv/include/asm/setup.h
index afd787ceede..aa76f2eac09 100644
--- a/arch/frv/include/asm/setup.h
+++ b/arch/frv/include/asm/setup.h
@@ -8,15 +8,12 @@
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
 #ifndef _ASM_SETUP_H
 #define _ASM_SETUP_H
-#define COMMAND_LINE_SIZE       512
-#ifdef __KERNEL__
 #include <linux/init.h>
+#include <uapi/asm/setup.h>
 #ifndef __ASSEMBLY__
@@ -26,6 +23,4 @@ extern unsigned long __initdata num_mappedpages;
 #endif /* !__ASSEMBLY__ */
-#endif  /*  __KERNEL__  */
 #endif /* _ASM_SETUP_H */
diff --git a/arch/frv/include/asm/signal.h b/arch/frv/include/asm/signal.h
index f071e813dcb..599500a3102 100644
--- a/arch/frv/include/asm/signal.h
+++ b/arch/frv/include/asm/signal.h
@@ -1,21 +1,8 @@
 #ifndef _ASM_SIGNAL_H
 #define _ASM_SIGNAL_H
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
-#ifndef __KERNEL__
-/* Here we must cater to libcs that poke about in kernel headers.  */
-#define NSIG            32
-typedef unsigned long sigset_t;
-#endif /* !__KERNEL__ */
-#define SA_RESTORER     0x04000000 /* to get struct sigaction correct */
-#include <asm-generic/signal.h>
-#ifdef __KERNEL__
 struct old_sigaction {
        __sighandler_t sa_handler;
        old_sigset_t sa_mask;
@@ -23,22 +10,4 @@ struct old_sigaction {
        __sigrestore_t sa_restorer;
 };
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-#endif /* __KERNEL__ */
 #endif /* _ASM_SIGNAL_H */
diff --git a/arch/frv/include/asm/termios.h b/arch/frv/include/asm/termios.h
index b4868aafe79..9f753fc0953 100644
--- a/arch/frv/include/asm/termios.h
+++ b/arch/frv/include/asm/termios.h
@@ -1,27 +1,8 @@
 #ifndef _ASM_TERMIOS_H
 #define _ASM_TERMIOS_H
-#include <asm/termbits.h>
+#include <uapi/asm/termios.h>
-#include <asm/ioctls.h>
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-#define NCC 8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-#ifdef __KERNEL__
 /*      intr=^C         quit=^|         erase=del       kill=^U
        eof=^D          vtime=\0        vmin=\1         sxtc=\0
        start=^Q        stop=^S         susp=^Z         eol=\0
@@ -29,30 +10,5 @@ struct termio {
        eol2=\0
 */
 #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-#endif
-/* modem lines */
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-#ifdef __KERNEL__
 #include <asm-generic/termios-base.h>
-#endif
 #endif /* _ASM_TERMIOS_H */
diff --git a/arch/frv/include/asm/thread_info.h b/arch/frv/include/asm/thread_info.h
index 0ff03a33c81..bebd7eadc77 100644
--- a/arch/frv/include/asm/thread_info.h
+++ b/arch/frv/include/asm/thread_info.h
@@ -94,7 +94,6 @@ register struct thread_info *__current_thread_info asm("gr15");
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
 #define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
 #define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
-#define TIF_POLLING_NRFLAG      6       /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              7       /* is terminating due to OOM killer */
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
@@ -102,8 +101,6 @@ register struct thread_info *__current_thread_info asm("gr15");
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 /* work to do on interrupt/exception return */
 #define _TIF_WORK_MASK          \
diff --git a/arch/frv/include/asm/types.h b/arch/frv/include/asm/types.h
index 390a612f3a5..6bc63650d83 100644
--- a/arch/frv/include/asm/types.h
+++ b/arch/frv/include/asm/types.h
@@ -8,19 +8,15 @@
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
 #ifndef _ASM_TYPES_H
 #define _ASM_TYPES_H
-#include <asm-generic/int-ll64.h>
+#include <uapi/asm/types.h>
 /*
 * These aren't exported outside the kernel to avoid name space clashes
 */
-#ifdef __KERNEL__
 #define BITS_PER_LONG 32
-#endif /* __KERNEL__ */
 #endif /* _ASM_TYPES_H */
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h
index 67f23a311db..266a5b25a0c 100644
--- a/arch/frv/include/asm/unistd.h
+++ b/arch/frv/include/asm/unistd.h
@@ -1,351 +1,8 @@
 #ifndef _ASM_UNISTD_H_
 #define _ASM_UNISTD_H_
-/*
+#include <uapi/asm/unistd.h>
- * This file contains the system call numbers.
- */
-#define __NR_restart_syscall      0
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lchown              16
-#define __NR_break               17
-#define __NR_oldstat             18
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_ftime               35
-#define __NR_sync                36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_prof                44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_lock                53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_mpx                 56
-#define __NR_setpgid             57
-#define __NR_ulimit              58
-// #define __NR_oldolduname      /* 59 */ obsolete
-#define __NR_umask               60
-#define __NR_chroot              61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_sigaction           67
-#define __NR_sgetmask            68
-#define __NR_ssetmask            69
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_oldlstat            84
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-#define __NR_readdir             89
-// #define __NR_mmap             90     /* obsolete - not implemented */
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-// #define __NR_profil           /* 98 */ obsolete
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-// #define __NR_ioperm          /* 101 */ not supported
-#define __NR_socketcall         102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_stat               106
-#define __NR_lstat              107
-#define __NR_fstat              108
-// #define __NR_olduname                /* 109 */ obsolete
-// #define __NR_iopl            /* 110 */ not supported
-#define __NR_vhangup            111
-// #define __NR_idle            /* 112 */ Obsolete
-// #define __NR_vm86old         /* 113 */ not supported
-#define __NR_wait4              114
-#define __NR_swapoff            115
-#define __NR_sysinfo            116
-#define __NR_ipc                117
-#define __NR_fsync              118
-#define __NR_sigreturn          119
-#define __NR_clone              120
-#define __NR_setdomainname      121
-#define __NR_uname              122
-// #define __NR_modify_ldt      /* 123 */ not supported
-#define __NR_cacheflush         123
-#define __NR_adjtimex           124
-#define __NR_mprotect           125
-#define __NR_sigprocmask        126
-#define __NR_create_module      127
-#define __NR_init_module        128
-#define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
-#define __NR_quotactl           131
-#define __NR_getpgid            132
-#define __NR_fchdir             133
-#define __NR_bdflush            134
-#define __NR_sysfs              135
-#define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
-#define __NR_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#define __NR_flock              143
-#define __NR_msync              144
-#define __NR_readv              145
-#define __NR_writev             146
-#define __NR_getsid             147
-#define __NR_fdatasync          148
-#define __NR__sysctl            149
-#define __NR_mlock              150
-#define __NR_munlock            151
-#define __NR_mlockall           152
-#define __NR_munlockall         153
-#define __NR_sched_setparam             154
-#define __NR_sched_getparam             155
-#define __NR_sched_setscheduler         156
-#define __NR_sched_getscheduler         157
-#define __NR_sched_yield                158
-#define __NR_sched_get_priority_max     159
-#define __NR_sched_get_priority_min     160
-#define __NR_sched_rr_get_interval      161
-#define __NR_nanosleep          162
-#define __NR_mremap             163
-#define __NR_setresuid          164
-#define __NR_getresuid          165
-// #define __NR_vm86            /* 166 */ not supported
-#define __NR_query_module       167
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-#define __NR_setresgid          170
-#define __NR_getresgid          171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn       173
-#define __NR_rt_sigaction       174
-#define __NR_rt_sigprocmask     175
-#define __NR_rt_sigpending      176
-#define __NR_rt_sigtimedwait    177
-#define __NR_rt_sigqueueinfo    178
-#define __NR_rt_sigsuspend      179
-#define __NR_pread64            180
-#define __NR_pwrite64           181
-#define __NR_chown              182
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-#define __NR_getpmsg            188     /* some people actually want streams */
-#define __NR_putpmsg            189     /* some people actually want streams */
-#define __NR_vfork              190
-#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#define __NR_lchown32           198
-#define __NR_getuid32           199
-#define __NR_getgid32           200
-#define __NR_geteuid32          201
-#define __NR_getegid32          202
-#define __NR_setreuid32         203
-#define __NR_setregid32         204
-#define __NR_getgroups32        205
-#define __NR_setgroups32        206
-#define __NR_fchown32           207
-#define __NR_setresuid32        208
-#define __NR_getresuid32        209
-#define __NR_setresgid32        210
-#define __NR_getresgid32        211
-#define __NR_chown32            212
-#define __NR_setuid32           213
-#define __NR_setgid32           214
-#define __NR_setfsuid32         215
-#define __NR_setfsgid32         216
-#define __NR_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-#define __NR_getdents64         220
-#define __NR_fcntl64            221
-#define __NR_security           223     /* syscall for security modules */
-#define __NR_gettid             224
-#define __NR_readahead          225
-#define __NR_setxattr           226
-#define __NR_lsetxattr          227
-#define __NR_fsetxattr          228
-#define __NR_getxattr           229
-#define __NR_lgetxattr          230
-#define __NR_fgetxattr          231
-#define __NR_listxattr          232
-#define __NR_llistxattr         233
-#define __NR_flistxattr         234
-#define __NR_removexattr        235
-#define __NR_lremovexattr       236
-#define __NR_fremovexattr       237
-#define __NR_tkill              238
-#define __NR_sendfile64         239
-#define __NR_futex              240
-#define __NR_sched_setaffinity  241
-#define __NR_sched_getaffinity  242
-#define __NR_set_thread_area    243
-#define __NR_get_thread_area    244
-#define __NR_io_setup           245
-#define __NR_io_destroy         246
-#define __NR_io_getevents       247
-#define __NR_io_submit          248
-#define __NR_io_cancel          249
-#define __NR_fadvise64          250
-#define __NR_exit_group         252
-#define __NR_lookup_dcookie     253
-#define __NR_epoll_create       254
-#define __NR_epoll_ctl          255
-#define __NR_epoll_wait         256
-#define __NR_remap_file_pages   257
-#define __NR_set_tid_address    258
-#define __NR_timer_create       259
-#define __NR_timer_settime      (__NR_timer_create+1)
-#define __NR_timer_gettime      (__NR_timer_create+2)
-#define __NR_timer_getoverrun   (__NR_timer_create+3)
-#define __NR_timer_delete       (__NR_timer_create+4)
-#define __NR_clock_settime      (__NR_timer_create+5)
-#define __NR_clock_gettime      (__NR_timer_create+6)
-#define __NR_clock_getres       (__NR_timer_create+7)
-#define __NR_clock_nanosleep    (__NR_timer_create+8)
-#define __NR_statfs64           268
-#define __NR_fstatfs64          269
-#define __NR_tgkill             270
-#define __NR_utimes             271
-#define __NR_fadvise64_64       272
-#define __NR_vserver            273
-#define __NR_mbind              274
-#define __NR_get_mempolicy      275
-#define __NR_set_mempolicy      276
-#define __NR_mq_open            277
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_kexec_load         283
-#define __NR_waitid             284
-/* #define __NR_sys_setaltroot  285 */
-#define __NR_add_key            286
-#define __NR_request_key        287
-#define __NR_keyctl             288
-#define __NR_ioprio_set         289
-#define __NR_ioprio_get         290
-#define __NR_inotify_init       291
-#define __NR_inotify_add_watch  292
-#define __NR_inotify_rm_watch   293
-#define __NR_migrate_pages      294
-#define __NR_openat             295
-#define __NR_mkdirat            296
-#define __NR_mknodat            297
-#define __NR_fchownat           298
-#define __NR_futimesat          299
-#define __NR_fstatat64          300
-#define __NR_unlinkat           301
-#define __NR_renameat           302
-#define __NR_linkat             303
-#define __NR_symlinkat          304
-#define __NR_readlinkat         305
-#define __NR_fchmodat           306
-#define __NR_faccessat          307
-#define __NR_pselect6           308
-#define __NR_ppoll              309
-#define __NR_unshare            310
-#define __NR_set_robust_list    311
-#define __NR_get_robust_list    312
-#define __NR_splice             313
-#define __NR_sync_file_range    314
-#define __NR_tee                315
-#define __NR_vmsplice           316
-#define __NR_move_pages         317
-#define __NR_getcpu             318
-#define __NR_epoll_pwait        319
-#define __NR_utimensat          320
-#define __NR_signalfd           321
-#define __NR_timerfd_create     322
-#define __NR_eventfd            323
-#define __NR_fallocate          324
-#define __NR_timerfd_settime    325
-#define __NR_timerfd_gettime    326
-#define __NR_signalfd4          327
-#define __NR_eventfd2           328
-#define __NR_epoll_create1      329
-#define __NR_dup3               330
-#define __NR_pipe2              331
-#define __NR_inotify_init1      332
-#define __NR_preadv             333
-#define __NR_pwritev            334
-#define __NR_rt_tgsigqueueinfo  335
-#define __NR_perf_event_open    336
-#define __NR_setns              337
-#ifdef __KERNEL__
 #define NR_syscalls 338
@@ -372,6 +29,8 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_SYS_EXECVE
+#define __ARCH_WANT_KERNEL_EXECVE
 /*
 * "Conditional" syscalls
@@ -383,5 +42,4 @@
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
 #endif
-#endif /* __KERNEL__ */
 #endif /* _ASM_UNISTD_H_ */
diff --git a/arch/frv/include/uapi/asm/Kbuild b/arch/frv/include/uapi/asm/Kbuild
index baebb3da1d4..42a2b33461c 100644
--- a/arch/frv/include/uapi/asm/Kbuild
+++ b/arch/frv/include/uapi/asm/Kbuild
@@ -1,3 +1,35 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += param.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += ptrace.h
+header-y += registers.h
+header-y += resource.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += shmbuf.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += unistd.h
diff --git a/arch/frv/include/asm/auxvec.h b/arch/frv/include/uapi/asm/auxvec.h
index 07710778fa1..07710778fa1 100644
--- a/arch/frv/include/asm/auxvec.h
+++ b/arch/frv/include/uapi/asm/auxvec.h
diff --git a/arch/frv/include/asm/bitsperlong.h b/arch/frv/include/uapi/asm/bitsperlong.h
index 6dc0bb0c13b..6dc0bb0c13b 100644
--- a/arch/frv/include/asm/bitsperlong.h
+++ b/arch/frv/include/uapi/asm/bitsperlong.h
diff --git a/arch/frv/include/asm/byteorder.h b/arch/frv/include/uapi/asm/byteorder.h
index f29b7593e08..f29b7593e08 100644
--- a/arch/frv/include/asm/byteorder.h
+++ b/arch/frv/include/uapi/asm/byteorder.h
diff --git a/arch/frv/include/asm/errno.h b/arch/frv/include/uapi/asm/errno.h
index d010795ceef..d010795ceef 100644
--- a/arch/frv/include/asm/errno.h
+++ b/arch/frv/include/uapi/asm/errno.h
diff --git a/arch/frv/include/asm/fcntl.h b/arch/frv/include/uapi/asm/fcntl.h
index 46ab12db573..46ab12db573 100644
--- a/arch/frv/include/asm/fcntl.h
+++ b/arch/frv/include/uapi/asm/fcntl.h
diff --git a/arch/frv/include/asm/ioctl.h b/arch/frv/include/uapi/asm/ioctl.h
index b279fe06dfe..b279fe06dfe 100644
--- a/arch/frv/include/asm/ioctl.h
+++ b/arch/frv/include/uapi/asm/ioctl.h
diff --git a/arch/frv/include/asm/ioctls.h b/arch/frv/include/uapi/asm/ioctls.h
index 2f9fb436ec3..2f9fb436ec3 100644
--- a/arch/frv/include/asm/ioctls.h
+++ b/arch/frv/include/uapi/asm/ioctls.h
diff --git a/arch/frv/include/asm/ipcbuf.h b/arch/frv/include/uapi/asm/ipcbuf.h
index 84c7e51cb6d..84c7e51cb6d 100644
--- a/arch/frv/include/asm/ipcbuf.h
+++ b/arch/frv/include/uapi/asm/ipcbuf.h
diff --git a/arch/frv/include/asm/kvm_para.h b/arch/frv/include/uapi/asm/kvm_para.h
index 14fab8f0b95..14fab8f0b95 100644
--- a/arch/frv/include/asm/kvm_para.h
+++ b/arch/frv/include/uapi/asm/kvm_para.h
diff --git a/arch/frv/include/asm/mman.h b/arch/frv/include/uapi/asm/mman.h
index 8eebf89f5ab..8eebf89f5ab 100644
--- a/arch/frv/include/asm/mman.h
+++ b/arch/frv/include/uapi/asm/mman.h
diff --git a/arch/frv/include/asm/msgbuf.h b/arch/frv/include/uapi/asm/msgbuf.h
index 97ceb55a06f..97ceb55a06f 100644
--- a/arch/frv/include/asm/msgbuf.h
+++ b/arch/frv/include/uapi/asm/msgbuf.h
diff --git a/arch/frv/include/asm/param.h b/arch/frv/include/uapi/asm/param.h
index a52dca9a956..a52dca9a956 100644
--- a/arch/frv/include/asm/param.h
+++ b/arch/frv/include/uapi/asm/param.h
diff --git a/arch/frv/include/asm/poll.h b/arch/frv/include/uapi/asm/poll.h
index 0d01479ccc5..0d01479ccc5 100644
--- a/arch/frv/include/asm/poll.h
+++ b/arch/frv/include/uapi/asm/poll.h
diff --git a/arch/frv/include/asm/posix_types.h b/arch/frv/include/uapi/asm/posix_types.h
index fe512af74a5..fe512af74a5 100644
--- a/arch/frv/include/asm/posix_types.h
+++ b/arch/frv/include/uapi/asm/posix_types.h
diff --git a/arch/frv/include/uapi/asm/ptrace.h b/arch/frv/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..3887e493468
--- /dev/null
+++ b/arch/frv/include/uapi/asm/ptrace.h
@@ -0,0 +1,60 @@
+/* ptrace.h: ptrace() relevant definitions
+ *
+ * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_PTRACE_H
+#define _UAPI_ASM_PTRACE_H
+#include <asm/registers.h>
+#define PT_PSR          0
+#define PT_ISR          1
+#define PT_CCR          2
+#define PT_CCCR         3
+#define PT_LR           4
+#define PT_LCR          5
+#define PT_PC           6
+#define PT__STATUS      7       /* exception status */
+#define PT_SYSCALLNO    8       /* syscall number or -1 */
+#define PT_ORIG_GR8     9       /* saved GR8 for signal handling */
+#define PT_GNER0        10
+#define PT_GNER1        11
+#define PT_IACC0H       12
+#define PT_IACC0L       13
+#define PT_GR(j)        ( 14 + (j))     /* GRj for 0<=j<=63 */
+#define PT_FR(j)        ( 78 + (j))     /* FRj for 0<=j<=63 */
+#define PT_FNER(j)      (142 + (j))     /* FNERj for 0<=j<=1 */
+#define PT_MSR(j)       (144 + (j))     /* MSRj for 0<=j<=2 */
+#define PT_ACC(j)       (146 + (j))     /* ACCj for 0<=j<=7 */
+#define PT_ACCG(jklm)   (154 + (jklm))  /* ACCGjklm for 0<=jklm<=1 (reads four regs per slot) */
+#define PT_FSR(j)       (156 + (j))     /* FSRj for 0<=j<=0 */
+#define PT__GPEND       78
+#define PT__END         157
+#define PT_TBR          PT_GR(0)
+#define PT_SP           PT_GR(1)
+#define PT_FP           PT_GR(2)
+#define PT_PREV_FRAME   PT_GR(28)       /* previous exception frame pointer (old gr28 value) */
+#define PT_CURR_TASK    PT_GR(29)       /* current task */
+/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
+#define PTRACE_GETREGS          12
+#define PTRACE_SETREGS          13
+#define PTRACE_GETFPREGS        14
+#define PTRACE_SETFPREGS        15
+#define PTRACE_GETFDPIC         31      /* get the ELF fdpic loadmap address */
+#define PTRACE_GETFDPIC_EXEC    0       /* [addr] request the executable loadmap */
+#define PTRACE_GETFDPIC_INTERP  1       /* [addr] request the interpreter loadmap */
+#endif /* _UAPI_ASM_PTRACE_H */
diff --git a/arch/frv/include/asm/registers.h b/arch/frv/include/uapi/asm/registers.h
index 9666119fcf6..9666119fcf6 100644
--- a/arch/frv/include/asm/registers.h
+++ b/arch/frv/include/uapi/asm/registers.h
diff --git a/arch/frv/include/asm/resource.h b/arch/frv/include/uapi/asm/resource.h
index 5fc60548fd0..5fc60548fd0 100644
--- a/arch/frv/include/asm/resource.h
+++ b/arch/frv/include/uapi/asm/resource.h
diff --git a/arch/frv/include/asm/sembuf.h b/arch/frv/include/uapi/asm/sembuf.h
index 164b12786d6..164b12786d6 100644
--- a/arch/frv/include/asm/sembuf.h
+++ b/arch/frv/include/uapi/asm/sembuf.h
diff --git a/arch/frv/include/uapi/asm/setup.h b/arch/frv/include/uapi/asm/setup.h
new file mode 100644
index 00000000000..fbf3fc96aae
--- /dev/null
+++ b/arch/frv/include/uapi/asm/setup.h
@@ -0,0 +1,18 @@
+/* setup.h: setup stuff
+ *
+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_SETUP_H
+#define _UAPI_ASM_SETUP_H
+#define COMMAND_LINE_SIZE       512
+#endif /* _UAPI_ASM_SETUP_H */
diff --git a/arch/frv/include/asm/shmbuf.h b/arch/frv/include/uapi/asm/shmbuf.h
index 4c6e711a477..4c6e711a477 100644
--- a/arch/frv/include/asm/shmbuf.h
+++ b/arch/frv/include/uapi/asm/shmbuf.h
diff --git a/arch/frv/include/asm/sigcontext.h b/arch/frv/include/uapi/asm/sigcontext.h
index 3b263f3cc96..3b263f3cc96 100644
--- a/arch/frv/include/asm/sigcontext.h
+++ b/arch/frv/include/uapi/asm/sigcontext.h
diff --git a/arch/frv/include/asm/siginfo.h b/arch/frv/include/uapi/asm/siginfo.h
index d3fd1ca4565..d3fd1ca4565 100644
--- a/arch/frv/include/asm/siginfo.h
+++ b/arch/frv/include/uapi/asm/siginfo.h
diff --git a/arch/frv/include/uapi/asm/signal.h b/arch/frv/include/uapi/asm/signal.h
new file mode 100644
index 00000000000..bf3b162f9be
--- /dev/null
+++ b/arch/frv/include/uapi/asm/signal.h
@@ -0,0 +1,36 @@
+#ifndef _UAPI_ASM_SIGNAL_H
+#define _UAPI_ASM_SIGNAL_H
+#include <linux/types.h>
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+#define NSIG            32
+typedef unsigned long sigset_t;
+#endif /* !__KERNEL__ */
+#define SA_RESTORER     0x04000000 /* to get struct sigaction correct */
+#include <asm-generic/signal.h>
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+struct sigaction {
+        union {
+          __sighandler_t _sa_handler;
+          void (*_sa_sigaction)(int, struct siginfo *, void *);
+        } _u;
+        sigset_t sa_mask;
+        unsigned long sa_flags;
+        void (*sa_restorer)(void);
+};
+#define sa_handler      _u._sa_handler
+#define sa_sigaction    _u._sa_sigaction
+#endif /* __KERNEL__ */
+#endif /* _UAPI_ASM_SIGNAL_H */
diff --git a/arch/frv/include/asm/socket.h b/arch/frv/include/uapi/asm/socket.h
index a5b1d7dbb20..a5b1d7dbb20 100644
--- a/arch/frv/include/asm/socket.h
+++ b/arch/frv/include/uapi/asm/socket.h
diff --git a/arch/frv/include/asm/sockios.h b/arch/frv/include/uapi/asm/sockios.h
index 5dbdd13e6de..5dbdd13e6de 100644
--- a/arch/frv/include/asm/sockios.h
+++ b/arch/frv/include/uapi/asm/sockios.h
diff --git a/arch/frv/include/asm/stat.h b/arch/frv/include/uapi/asm/stat.h
index ce56de9b37b..ce56de9b37b 100644
--- a/arch/frv/include/asm/stat.h
+++ b/arch/frv/include/uapi/asm/stat.h
diff --git a/arch/frv/include/asm/statfs.h b/arch/frv/include/uapi/asm/statfs.h
index 741f586045b..741f586045b 100644
--- a/arch/frv/include/asm/statfs.h
+++ b/arch/frv/include/uapi/asm/statfs.h
diff --git a/arch/frv/include/asm/swab.h b/arch/frv/include/uapi/asm/swab.h
index f305834b479..f305834b479 100644
--- a/arch/frv/include/asm/swab.h
+++ b/arch/frv/include/uapi/asm/swab.h
diff --git a/arch/frv/include/asm/termbits.h b/arch/frv/include/uapi/asm/termbits.h
index 7722e19cc34..7722e19cc34 100644
--- a/arch/frv/include/asm/termbits.h
+++ b/arch/frv/include/uapi/asm/termbits.h
diff --git a/arch/frv/include/uapi/asm/termios.h b/arch/frv/include/uapi/asm/termios.h
new file mode 100644
index 00000000000..edcc08a2238
--- /dev/null
+++ b/arch/frv/include/uapi/asm/termios.h
@@ -0,0 +1,46 @@
+#ifndef _UAPI_ASM_TERMIOS_H
+#define _UAPI_ASM_TERMIOS_H
+#include <asm/termbits.h>
+#include <asm/ioctls.h>
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+#define NCC 8
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        unsigned char c_line;           /* line discipline */
+        unsigned char c_cc[NCC];        /* control characters */
+};
+/* modem lines */
+#define TIOCM_LE        0x001
+#define TIOCM_DTR       0x002
+#define TIOCM_RTS       0x004
+#define TIOCM_ST        0x008
+#define TIOCM_SR        0x010
+#define TIOCM_CTS       0x020
+#define TIOCM_CAR       0x040
+#define TIOCM_RNG       0x080
+#define TIOCM_DSR       0x100
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+#endif /* _UAPI_ASM_TERMIOS_H */
diff --git a/arch/frv/include/uapi/asm/types.h b/arch/frv/include/uapi/asm/types.h
new file mode 100644
index 00000000000..cf23149943f
--- /dev/null
+++ b/arch/frv/include/uapi/asm/types.h
@@ -0,0 +1,11 @@
+/* types.h: FRV types
+ *
+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#include <asm-generic/int-ll64.h>
diff --git a/arch/frv/include/uapi/asm/unistd.h b/arch/frv/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..9e2612ff1c9
--- /dev/null
+++ b/arch/frv/include/uapi/asm/unistd.h
@@ -0,0 +1,348 @@
+#ifndef _UAPI_ASM_UNISTD_H_
+#define _UAPI_ASM_UNISTD_H_
+/*
+ * This file contains the system call numbers.
+ */
+#define __NR_restart_syscall      0
+#define __NR_exit                 1
+#define __NR_fork                 2
+#define __NR_read                 3
+#define __NR_write                4
+#define __NR_open                 5
+#define __NR_close                6
+#define __NR_waitpid              7
+#define __NR_creat                8
+#define __NR_link                 9
+#define __NR_unlink              10
+#define __NR_execve              11
+#define __NR_chdir               12
+#define __NR_time                13
+#define __NR_mknod               14
+#define __NR_chmod               15
+#define __NR_lchown              16
+#define __NR_break               17
+#define __NR_oldstat             18
+#define __NR_lseek               19
+#define __NR_getpid              20
+#define __NR_mount               21
+#define __NR_umount              22
+#define __NR_setuid              23
+#define __NR_getuid              24
+#define __NR_stime               25
+#define __NR_ptrace              26
+#define __NR_alarm               27
+#define __NR_oldfstat            28
+#define __NR_pause               29
+#define __NR_utime               30
+#define __NR_stty                31
+#define __NR_gtty                32
+#define __NR_access              33
+#define __NR_nice                34
+#define __NR_ftime               35
+#define __NR_sync                36
+#define __NR_kill                37
+#define __NR_rename              38
+#define __NR_mkdir               39
+#define __NR_rmdir               40
+#define __NR_dup                 41
+#define __NR_pipe                42
+#define __NR_times               43
+#define __NR_prof                44
+#define __NR_brk                 45
+#define __NR_setgid              46
+#define __NR_getgid              47
+#define __NR_signal              48
+#define __NR_geteuid             49
+#define __NR_getegid             50
+#define __NR_acct                51
+#define __NR_umount2             52
+#define __NR_lock                53
+#define __NR_ioctl               54
+#define __NR_fcntl               55
+#define __NR_mpx                 56
+#define __NR_setpgid             57
+#define __NR_ulimit              58
+// #define __NR_oldolduname      /* 59 */ obsolete
+#define __NR_umask               60
+#define __NR_chroot              61
+#define __NR_ustat               62
+#define __NR_dup2                63
+#define __NR_getppid             64
+#define __NR_getpgrp             65
+#define __NR_setsid              66
+#define __NR_sigaction           67
+#define __NR_sgetmask            68
+#define __NR_ssetmask            69
+#define __NR_setreuid            70
+#define __NR_setregid            71
+#define __NR_sigsuspend          72
+#define __NR_sigpending          73
+#define __NR_sethostname         74
+#define __NR_setrlimit           75
+#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
+#define __NR_getrusage           77
+#define __NR_gettimeofday        78
+#define __NR_settimeofday        79
+#define __NR_getgroups           80
+#define __NR_setgroups           81
+#define __NR_select              82
+#define __NR_symlink             83
+#define __NR_oldlstat            84
+#define __NR_readlink            85
+#define __NR_uselib              86
+#define __NR_swapon              87
+#define __NR_reboot              88
+#define __NR_readdir             89
+// #define __NR_mmap             90     /* obsolete - not implemented */
+#define __NR_munmap              91
+#define __NR_truncate            92
+#define __NR_ftruncate           93
+#define __NR_fchmod              94
+#define __NR_fchown              95
+#define __NR_getpriority         96
+#define __NR_setpriority         97
+// #define __NR_profil           /* 98 */ obsolete
+#define __NR_statfs              99
+#define __NR_fstatfs            100
+// #define __NR_ioperm          /* 101 */ not supported
+#define __NR_socketcall         102
+#define __NR_syslog             103
+#define __NR_setitimer          104
+#define __NR_getitimer          105
+#define __NR_stat               106
+#define __NR_lstat              107
+#define __NR_fstat              108
+// #define __NR_olduname                /* 109 */ obsolete
+// #define __NR_iopl            /* 110 */ not supported
+#define __NR_vhangup            111
+// #define __NR_idle            /* 112 */ Obsolete
+// #define __NR_vm86old         /* 113 */ not supported
+#define __NR_wait4              114
+#define __NR_swapoff            115
+#define __NR_sysinfo            116
+#define __NR_ipc                117
+#define __NR_fsync              118
+#define __NR_sigreturn          119
+#define __NR_clone              120
+#define __NR_setdomainname      121
+#define __NR_uname              122
+// #define __NR_modify_ldt      /* 123 */ not supported
+#define __NR_cacheflush         123
+#define __NR_adjtimex           124
+#define __NR_mprotect           125
+#define __NR_sigprocmask        126
+#define __NR_create_module      127
+#define __NR_init_module        128
+#define __NR_delete_module      129
+#define __NR_get_kernel_syms    130
+#define __NR_quotactl           131
+#define __NR_getpgid            132
+#define __NR_fchdir             133
+#define __NR_bdflush            134
+#define __NR_sysfs              135
+#define __NR_personality        136
+#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
+#define __NR_setfsuid           138
+#define __NR_setfsgid           139
+#define __NR__llseek            140
+#define __NR_getdents           141
+#define __NR__newselect         142
+#define __NR_flock              143
+#define __NR_msync              144
+#define __NR_readv              145
+#define __NR_writev             146
+#define __NR_getsid             147
+#define __NR_fdatasync          148
+#define __NR__sysctl            149
+#define __NR_mlock              150
+#define __NR_munlock            151
+#define __NR_mlockall           152
+#define __NR_munlockall         153
+#define __NR_sched_setparam             154
+#define __NR_sched_getparam             155
+#define __NR_sched_setscheduler         156
+#define __NR_sched_getscheduler         157
+#define __NR_sched_yield                158
+#define __NR_sched_get_priority_max     159
+#define __NR_sched_get_priority_min     160
+#define __NR_sched_rr_get_interval      161
+#define __NR_nanosleep          162
+#define __NR_mremap             163
+#define __NR_setresuid          164
+#define __NR_getresuid          165
+// #define __NR_vm86            /* 166 */ not supported
+#define __NR_query_module       167
+#define __NR_poll               168
+#define __NR_nfsservctl         169
+#define __NR_setresgid          170
+#define __NR_getresgid          171
+#define __NR_prctl              172
+#define __NR_rt_sigreturn       173
+#define __NR_rt_sigaction       174
+#define __NR_rt_sigprocmask     175
+#define __NR_rt_sigpending      176
+#define __NR_rt_sigtimedwait    177
+#define __NR_rt_sigqueueinfo    178
+#define __NR_rt_sigsuspend      179
+#define __NR_pread64            180
+#define __NR_pwrite64           181
+#define __NR_chown              182
+#define __NR_getcwd             183
+#define __NR_capget             184
+#define __NR_capset             185
+#define __NR_sigaltstack        186
+#define __NR_sendfile           187
+#define __NR_getpmsg            188     /* some people actually want streams */
+#define __NR_putpmsg            189     /* some people actually want streams */
+#define __NR_vfork              190
+#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
+#define __NR_mmap2              192
+#define __NR_truncate64         193
+#define __NR_ftruncate64        194
+#define __NR_stat64             195
+#define __NR_lstat64            196
+#define __NR_fstat64            197
+#define __NR_lchown32           198
+#define __NR_getuid32           199
+#define __NR_getgid32           200
+#define __NR_geteuid32          201
+#define __NR_getegid32          202
+#define __NR_setreuid32         203
+#define __NR_setregid32         204
+#define __NR_getgroups32        205
+#define __NR_setgroups32        206
+#define __NR_fchown32           207
+#define __NR_setresuid32        208
+#define __NR_getresuid32        209
+#define __NR_setresgid32        210
+#define __NR_getresgid32        211
+#define __NR_chown32            212
+#define __NR_setuid32           213
+#define __NR_setgid32           214
+#define __NR_setfsuid32         215
+#define __NR_setfsgid32         216
+#define __NR_pivot_root         217
+#define __NR_mincore            218
+#define __NR_madvise            219
+#define __NR_getdents64         220
+#define __NR_fcntl64            221
+#define __NR_security           223     /* syscall for security modules */
+#define __NR_gettid             224
+#define __NR_readahead          225
+#define __NR_setxattr           226
+#define __NR_lsetxattr          227
+#define __NR_fsetxattr          228
+#define __NR_getxattr           229
+#define __NR_lgetxattr          230
+#define __NR_fgetxattr          231
+#define __NR_listxattr          232
+#define __NR_llistxattr         233
+#define __NR_flistxattr         234
+#define __NR_removexattr        235
+#define __NR_lremovexattr       236
+#define __NR_fremovexattr       237
+#define __NR_tkill              238
+#define __NR_sendfile64         239
+#define __NR_futex              240
+#define __NR_sched_setaffinity  241
+#define __NR_sched_getaffinity  242
+#define __NR_set_thread_area    243
+#define __NR_get_thread_area    244
+#define __NR_io_setup           245
+#define __NR_io_destroy         246
+#define __NR_io_getevents       247
+#define __NR_io_submit          248
+#define __NR_io_cancel          249
+#define __NR_fadvise64          250
+#define __NR_exit_group         252
+#define __NR_lookup_dcookie     253
+#define __NR_epoll_create       254
+#define __NR_epoll_ctl          255
+#define __NR_epoll_wait         256
+#define __NR_remap_file_pages   257
+#define __NR_set_tid_address    258
+#define __NR_timer_create       259
+#define __NR_timer_settime      (__NR_timer_create+1)
+#define __NR_timer_gettime      (__NR_timer_create+2)
+#define __NR_timer_getoverrun   (__NR_timer_create+3)
+#define __NR_timer_delete       (__NR_timer_create+4)
+#define __NR_clock_settime      (__NR_timer_create+5)
+#define __NR_clock_gettime      (__NR_timer_create+6)
+#define __NR_clock_getres       (__NR_timer_create+7)
+#define __NR_clock_nanosleep    (__NR_timer_create+8)
+#define __NR_statfs64           268
+#define __NR_fstatfs64          269
+#define __NR_tgkill             270
+#define __NR_utimes             271
+#define __NR_fadvise64_64       272
+#define __NR_vserver            273
+#define __NR_mbind              274
+#define __NR_get_mempolicy      275
+#define __NR_set_mempolicy      276
+#define __NR_mq_open            277
+#define __NR_mq_unlink          (__NR_mq_open+1)
+#define __NR_mq_timedsend       (__NR_mq_open+2)
+#define __NR_mq_timedreceive    (__NR_mq_open+3)
+#define __NR_mq_notify          (__NR_mq_open+4)
+#define __NR_mq_getsetattr      (__NR_mq_open+5)
+#define __NR_kexec_load         283
+#define __NR_waitid             284
+/* #define __NR_sys_setaltroot  285 */
+#define __NR_add_key            286
+#define __NR_request_key        287
+#define __NR_keyctl             288
+#define __NR_ioprio_set         289
+#define __NR_ioprio_get         290
+#define __NR_inotify_init       291
+#define __NR_inotify_add_watch  292
+#define __NR_inotify_rm_watch   293
+#define __NR_migrate_pages      294
+#define __NR_openat             295
+#define __NR_mkdirat            296
+#define __NR_mknodat            297
+#define __NR_fchownat           298
+#define __NR_futimesat          299
+#define __NR_fstatat64          300
+#define __NR_unlinkat           301
+#define __NR_renameat           302
+#define __NR_linkat             303
+#define __NR_symlinkat          304
+#define __NR_readlinkat         305
+#define __NR_fchmodat           306
+#define __NR_faccessat          307
+#define __NR_pselect6           308
+#define __NR_ppoll              309
+#define __NR_unshare            310
+#define __NR_set_robust_list    311
+#define __NR_get_robust_list    312
+#define __NR_splice             313
+#define __NR_sync_file_range    314
+#define __NR_tee                315
+#define __NR_vmsplice           316
+#define __NR_move_pages         317
+#define __NR_getcpu             318
+#define __NR_epoll_pwait        319
+#define __NR_utimensat          320
+#define __NR_signalfd           321
+#define __NR_timerfd_create     322
+#define __NR_eventfd            323
+#define __NR_fallocate          324
+#define __NR_timerfd_settime    325
+#define __NR_timerfd_gettime    326
+#define __NR_signalfd4          327
+#define __NR_eventfd2           328
+#define __NR_epoll_create1      329
+#define __NR_dup3               330
+#define __NR_pipe2              331
+#define __NR_inotify_init1      332
+#define __NR_preadv             333
+#define __NR_pwritev            334
+#define __NR_rt_tgsigqueueinfo  335
+#define __NR_perf_event_open    336
+#define __NR_setns              337
+#endif /* _UAPI_ASM_UNISTD_H_ */
diff --git a/arch/frv/kernel/Makefile b/arch/frv/kernel/Makefile
index ad4087b6996..3cbb3294b9f 100644
--- a/arch/frv/kernel/Makefile
+++ b/arch/frv/kernel/Makefile
@@ -7,8 +7,8 @@ heads-$(CONFIG_MMU)		:= head-mmu-fr451.o
 extra-y:= head.o vmlinux.lds
-obj-y := $(heads-y) entry.o entry-table.o break.o switch_to.o kernel_thread.o \
+obj-y := $(heads-y) entry.o entry-table.o break.o switch_to.o \
-         kernel_execve.o process.o traps.o ptrace.o signal.o dma.o \
+         process.o traps.o ptrace.o signal.o dma.o \
         sys_frv.o time.o setup.o frv_ksyms.o \
         debug-stub.o irq.o sleep.o uaccess.o
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S
index 7d5e000fd32..00273296031 100644
--- a/arch/frv/kernel/entry.S
+++ b/arch/frv/kernel/entry.S
@@ -863,6 +863,19 @@ ret_from_fork:
        setlos.p        #0,gr8
        bra             __syscall_exit
+        .globl          ret_from_kernel_thread
+ret_from_kernel_thread:
+        lddi.p          @(gr28,#REG_GR(8)),gr20
+        call            schedule_tail
+        or.p            gr20,gr20,gr8
+        calll           @(gr21,gr0)
+        bra             sys_exit
+        .globl          ret_from_kernel_execve
+ret_from_kernel_execve:
+        ori             gr28,0,sp
+        bra             __syscall_exit
 ###################################################################################################
 #
 # Return to user mode is not as complex as all this looks,
diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c
index a89803b58b9..86c516d96dc 100644
--- a/arch/frv/kernel/frv_ksyms.c
+++ b/arch/frv/kernel/frv_ksyms.c
@@ -30,7 +30,6 @@ EXPORT_SYMBOL(ip_fast_csum);
 EXPORT_SYMBOL(local_irq_count);
 EXPORT_SYMBOL(local_bh_count);
 #endif
-EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(__res_bus_clock_speed_HZ);
 EXPORT_SYMBOL(__page_offset);
diff --git a/arch/frv/kernel/kernel_execve.S b/arch/frv/kernel/kernel_execve.S
deleted file mode 100644
index 9b074a16a05..00000000000
--- a/arch/frv/kernel/kernel_execve.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/* in-kernel program execution
- *
- * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <linux/linkage.h>
-#include <asm/unistd.h>
-###############################################################################
-#
-# Do a system call from kernel instead of calling sys_execve so we end up with
-# proper pt_regs.
-#
-# int kernel_execve(const char *filename, char *const argv[], char *const envp[])
-#
-# On entry: GR8/GR9/GR10: arguments to function
-# On return: GR8: syscall return.
-#
-###############################################################################
-        .globl          kernel_execve
-        .type           kernel_execve,@function
-kernel_execve:
-        setlos          __NR_execve,gr7
-        tira            gr0,#0
-        bralr
-        .size           kernel_execve,.-kernel_execve
diff --git a/arch/frv/kernel/kernel_thread.S b/arch/frv/kernel/kernel_thread.S
deleted file mode 100644
index f0e52943f92..00000000000
--- a/arch/frv/kernel/kernel_thread.S
+++ /dev/null
@@ -1,77 +0,0 @@
-/* kernel_thread.S: kernel thread creation
- *
- * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <linux/linkage.h>
-#include <linux/kern_levels.h>
-#include <asm/unistd.h>
-#define CLONE_VM        0x00000100      /* set if VM shared between processes */
-        .section .rodata
-kernel_thread_emsg:
-        .asciz  KERN_ERR "failed to create kernel thread: error=%d\n"
-        .text
-        .balign         4
-###############################################################################
-#
-# Create a kernel thread
-#
-# int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-#
-###############################################################################
-        .globl          kernel_thread
-        .type           kernel_thread,@function
-kernel_thread:
-        or.p            gr8,gr0,gr4
-        or              gr9,gr0,gr5
-        # start by forking the current process, but with shared VM
-        setlos.p        #__NR_clone,gr7         ; syscall number
-        ori             gr10,#CLONE_VM,gr8      ; first syscall arg     [clone_flags]
-        sethi.p         #0xe4e4,gr9             ; second syscall arg    [newsp]
-        setlo           #0xe4e4,gr9
-        setlos.p        #0,gr10                 ; third syscall arg     [parent_tidptr]
-        setlos          #0,gr11                 ; fourth syscall arg    [child_tidptr]
-        tira            gr0,#0
-        setlos.p        #4095,gr7
-        andcc           gr8,gr8,gr0,icc0
-        addcc.p         gr8,gr7,gr0,icc1
-        bnelr           icc0,#2
-        bc              icc1,#0,kernel_thread_error
-        # now invoke the work function
-        or              gr5,gr0,gr8
-        calll           @(gr4,gr0)
-        # and finally exit the thread
-        setlos          #__NR_exit,gr7          ; syscall number
-        tira            gr0,#0
-kernel_thread_error:
-        subi            sp,#8,sp
-        movsg           lr,gr4
-        sti             gr8,@(sp,#0)
-        sti.p           gr4,@(sp,#4)
-        or              gr8,gr0,gr9
-        sethi.p         %hi(kernel_thread_emsg),gr8
-        setlo           %lo(kernel_thread_emsg),gr8
-        call            printk
-        ldi             @(sp,#4),gr4
-        ldi             @(sp,#0),gr8
-        subi            sp,#8,sp
-        jmpl            @(gr4,gr0)
-        .size           kernel_thread,.-kernel_thread
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 2eb7fa5bf9d..655d90d20bb 100644
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -38,6 +38,7 @@
 #include "local.h"
 asmlinkage void ret_from_fork(void);
+asmlinkage void ret_from_kernel_thread(void);
 #include <asm/pgalloc.h>
@@ -172,32 +173,13 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
 * set up the kernel stack and exception frames for a new process
 */
 int copy_thread(unsigned long clone_flags,
-                unsigned long usp, unsigned long topstk,
+                unsigned long usp, unsigned long arg,
                struct task_struct *p, struct pt_regs *regs)
 {
-        struct pt_regs *childregs0, *childregs, *regs0;
+        struct pt_regs *childregs;
-        regs0 = __kernel_frame0_ptr;
+        childregs = (struct pt_regs *)
-        childregs0 = (struct pt_regs *)
                (task_stack_page(p) + THREAD_SIZE - FRV_FRAME0_SIZE);
-        childregs = childregs0;
-        /* set up the userspace frame (the only place that the USP is stored) */
-        *childregs0 = *regs0;
-        childregs0->gr8         = 0;
-        childregs0->sp          = usp;
-        childregs0->next_frame  = NULL;
-        /* set up the return kernel frame if called from kernel_thread() */
-        if (regs != regs0) {
-                childregs--;
-                *childregs = *regs;
-                childregs->sp = (unsigned long) childregs0;
-                childregs->next_frame = childregs0;
-                childregs->gr15 = (unsigned long) task_thread_info(p);
-                childregs->gr29 = (unsigned long) p;
-        }
        p->set_child_tid = p->clear_child_tid = NULL;
@@ -206,8 +188,25 @@ int copy_thread(unsigned long clone_flags,
        p->thread.sp     = (unsigned long) childregs;
        p->thread.fp     = 0;
        p->thread.lr     = 0;
-        p->thread.pc     = (unsigned long) ret_from_fork;
+        p->thread.frame0 = childregs;
-        p->thread.frame0 = childregs0;
+        if (unlikely(!regs)) {
+                memset(childregs, 0, sizeof(struct pt_regs));
+                childregs->gr9 = usp; /* function */
+                childregs->gr8 = arg;
+                chilregs->psr = PSR_S;
+                p->thread.pc = (unsigned long) ret_from_kernel_thread;
+                save_user_regs(p->thread.user);
+                return 0;
+        }
+        /* set up the userspace frame (the only place that the USP is stored) */
+        *childregs = *regs;
+        childregs->sp           = usp;
+        childregs->next_frame   = NULL;
+        p->thread.pc = (unsigned long) ret_from_fork;
        /* the new TLS pointer is passed in as arg #5 to sys_clone() */
        if (clone_flags & CLONE_SETTLS)
@@ -218,25 +217,6 @@ int copy_thread(unsigned long clone_flags,
        return 0;
 } /* end copy_thread() */
-/*
- * sys_execve() executes a new program.
- */
-asmlinkage int sys_execve(const char __user *name,
-                          const char __user *const __user *argv,
-                          const char __user *const __user *envp)
-{
-        int error;
-        char * filename;
-        filename = getname(name);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                return error;
-        error = do_execve(filename, argv, envp, __frame);
-        putname(filename);
-        return error;
-}
 unsigned long get_wchan(struct task_struct *p)
 {
        struct pt_regs *regs0;
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 864c2f0d497..535810a3217 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -20,7 +20,6 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/personality.h>
-#include <linux/freezer.h>
 #include <linux/tracehook.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
@@ -298,10 +297,6 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
        __frame->lr   = (unsigned long) &frame->retcode;
        __frame->gr8  = sig;
-        /* the tracer may want to single-step inside the handler */
-        if (test_thread_flag(TIF_SINGLESTEP))
-                ptrace_notify(SIGTRAP);
 #if DEBUG_SIG
        printk("SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
               sig, current->comm, current->pid, frame, __frame->pc,
@@ -400,10 +395,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        __frame->gr8 = sig;
        __frame->gr9 = (unsigned long) &frame->info;
-        /* the tracer may want to single-step inside the handler */
-        if (test_thread_flag(TIF_SINGLESTEP))
-                ptrace_notify(SIGTRAP);
 #if DEBUG_SIG
        printk("SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
               sig, current->comm, current->pid, frame, __frame->pc,
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 90462eb23d0..98fabd10e95 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -7,6 +7,7 @@ config H8300
        select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
+        select MODULES_USE_ELF_RELA
 config SYMBOL_PREFIX
        string
diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
index fccd81eddff..50bbf387b2f 100644
--- a/arch/h8300/include/asm/Kbuild
+++ b/arch/h8300/include/asm/Kbuild
@@ -2,3 +2,4 @@ include include/asm-generic/Kbuild.asm
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += module.h
diff --git a/arch/h8300/include/asm/module.h b/arch/h8300/include/asm/module.h
deleted file mode 100644
index 8e46724b7c0..00000000000
--- a/arch/h8300/include/asm/module.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _ASM_H8300_MODULE_H
-#define _ASM_H8300_MODULE_H
-/*
- * This file contains the H8/300 architecture specific module code.
- */
-struct mod_arch_specific { };
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-#endif /* _ASM_H8/300_MODULE_H */
diff --git a/arch/h8300/include/asm/thread_info.h b/arch/h8300/include/asm/thread_info.h
index 9c126e0c09a..ec2f7777c65 100644
--- a/arch/h8300/include/asm/thread_info.h
+++ b/arch/h8300/include/asm/thread_info.h
@@ -85,8 +85,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
 #define TIF_SIGPENDING          1       /* signal pending */
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
-                                           TIF_NEED_RESCHED */
 #define TIF_MEMDIE              4       /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
 #define TIF_NOTIFY_RESUME       6       /* callback before returning to user */
@@ -95,11 +93,10 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
-#define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
+#define _TIF_WORK_MASK          (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
+                                 _TIF_NOTIFY_RESUME)
 #endif /* __KERNEL__ */
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index f153ed1a4c0..e8dc1393a13 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -217,14 +217,14 @@ asmlinkage int sys_execve(const char *name,
                          int dummy, ...)
 {
        int error;
-        char * filename;
+        struct filename *filename;
        struct pt_regs *regs = (struct pt_regs *) ((unsigned char *)&dummy-4);
        filename = getname(name);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                return error;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
        return error;
 }
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c
index 5adaadaf921..0e81b96c642 100644
--- a/arch/h8300/kernel/signal.c
+++ b/arch/h8300/kernel/signal.c
@@ -38,7 +38,6 @@
 #include <linux/personality.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
-#include <linux/freezer.h>
 #include <linux/tracehook.h>
 #include <asm/setup.h>
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index b2fdfb700f5..0744f7d7b1f 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -30,6 +30,7 @@ config HEXAGON
        select KTIME_SCALAR
        select GENERIC_CLOCKEVENTS
        select GENERIC_CLOCKEVENTS_BROADCAST
+        select MODULES_USE_ELF_RELA
        ---help---
          Qualcomm Hexagon is a processor architecture designed for high
          performance and low power across a wide variety of applications.
diff --git a/arch/hexagon/include/asm/thread_info.h b/arch/hexagon/include/asm/thread_info.h
index 4f936a7ee84..e4a0aad69cb 100644
--- a/arch/hexagon/include/asm/thread_info.h
+++ b/arch/hexagon/include/asm/thread_info.h
@@ -120,10 +120,8 @@ register struct thread_info *__current_thread_info asm(QUOTED_THREADINFO_REG);
 #define TIF_SIGPENDING          2       /* signal pending */
 #define TIF_NEED_RESCHED        3       /* rescheduling necessary */
 #define TIF_SINGLESTEP          4       /* restore ss @ return to usr mode */
-#define TIF_IRET                5       /* return with iret */
 #define TIF_RESTORE_SIGMASK     6       /* restore sig mask in do_signal() */
 /* true if poll_idle() is polling TIF_NEED_RESCHED */
-#define TIF_POLLING_NRFLAG      16
 #define TIF_MEMDIE              17      /* OOM killer killed process */
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
@@ -131,9 +129,6 @@ register struct thread_info *__current_thread_info asm(QUOTED_THREADINFO_REG);
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
-#define _TIF_IRET               (1 << TIF_IRET)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 /* work to do on interrupt/exception return - All but TIF_SYSCALL_TRACE */
 #define _TIF_WORK_MASK          (0x0000FFFF & ~_TIF_SYSCALL_TRACE)
diff --git a/arch/hexagon/kernel/signal.c b/arch/hexagon/kernel/signal.c
index 304b0808d07..1ea16bec7b9 100644
--- a/arch/hexagon/kernel/signal.c
+++ b/arch/hexagon/kernel/signal.c
@@ -20,7 +20,6 @@
 #include <linux/linkage.h>
 #include <linux/syscalls.h>
-#include <linux/freezer.h>
 #include <linux/tracehook.h>
 #include <asm/registers.h>
 #include <asm/thread_info.h>
diff --git a/arch/hexagon/kernel/syscall.c b/arch/hexagon/kernel/syscall.c
index 553cd60ee65..25a9bfe3445 100644
--- a/arch/hexagon/kernel/syscall.c
+++ b/arch/hexagon/kernel/syscall.c
@@ -40,7 +40,7 @@ asmlinkage int sys_execve(char __user *ufilename,
                          const char __user *const __user *envp)
 {
        struct pt_regs *pregs = current_thread_info()->regs;
-        char *filename;
+        struct filename *filename;
        int retval;
        filename = getname(ufilename);
@@ -48,7 +48,7 @@ asmlinkage int sys_execve(char __user *ufilename,
        if (IS_ERR(filename))
                return retval;
-        retval = do_execve(filename, argv, envp, pregs);
+        retval = do_execve(filename->name, argv, envp, pregs);
        putname(filename);
        return retval;
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3c720ef6c32..3279646120e 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -39,7 +39,9 @@ config IA64
        select ARCH_TASK_STRUCT_ALLOCATOR
        select ARCH_THREAD_INFO_ALLOCATOR
        select ARCH_CLOCKSOURCE_DATA
-        select GENERIC_TIME_VSYSCALL
+        select GENERIC_TIME_VSYSCALL_OLD
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index 562f5931584..4a159da2363 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -1,17 +1,3 @@
-include include/asm-generic/Kbuild.asm
-header-y += break.h
-header-y += cmpxchg.h
-header-y += fpu.h
-header-y += gcc_intrin.h
-header-y += ia64regs.h
-header-y += intel_intrin.h
-header-y += intrinsics.h
-header-y += perfmon.h
-header-y += perfmon_default_smpl.h
-header-y += ptrace_offsets.h
-header-y += rse.h
-header-y += ucontext.h
-header-y += ustack.h
 generic-y += clkdev.h
 generic-y += exec.h
diff --git a/arch/ia64/include/asm/gcc_intrin.h b/arch/ia64/include/asm/gcc_intrin.h
index 21ddee54ada..f9495b1757a 100644
--- a/arch/ia64/include/asm/gcc_intrin.h
+++ b/arch/ia64/include/asm/gcc_intrin.h
@@ -1,621 +1,12 @@
-#ifndef _ASM_IA64_GCC_INTRIN_H
-#define _ASM_IA64_GCC_INTRIN_H
 /*
 *
 * Copyright (C) 2002,2003 Jun Nakajima <jun.nakajima@intel.com>
 * Copyright (C) 2002,2003 Suresh Siddha <suresh.b.siddha@intel.com>
 */
+#ifndef _ASM_IA64_GCC_INTRIN_H
+#define _ASM_IA64_GCC_INTRIN_H
-#include <linux/types.h>
+#include <uapi/asm/gcc_intrin.h>
-#include <linux/compiler.h>
-/* define this macro to get some asm stmts included in 'c' files */
-#define ASM_SUPPORTED
-/* Optimization barrier */
-/* The "volatile" is due to gcc bugs */
-#define ia64_barrier()  asm volatile ("":::"memory")
-#define ia64_stop()     asm volatile (";;"::)
-#define ia64_invala_gr(regnum)  asm volatile ("invala.e r%0" :: "i"(regnum))
-#define ia64_invala_fr(regnum)  asm volatile ("invala.e f%0" :: "i"(regnum))
-#define ia64_flushrs() asm volatile ("flushrs;;":::"memory")
-#define ia64_loadrs() asm volatile ("loadrs;;":::"memory")
-extern void ia64_bad_param_for_setreg (void);
-extern void ia64_bad_param_for_getreg (void);
-#ifdef __KERNEL__
 register unsigned long ia64_r13 asm ("r13") __used;
-#endif
-#define ia64_native_setreg(regnum, val)                                         \
-({                                                                              \
-        switch (regnum) {                                                       \
-            case _IA64_REG_PSR_L:                                               \
-                    asm volatile ("mov psr.l=%0" :: "r"(val) : "memory");       \
-                    break;                                                      \
-            case _IA64_REG_AR_KR0 ... _IA64_REG_AR_EC:                          \
-                    asm volatile ("mov ar%0=%1" ::                              \
-                                          "i" (regnum - _IA64_REG_AR_KR0),      \
-                                          "r"(val): "memory");                  \
-                    break;                                                      \
-            case _IA64_REG_CR_DCR ... _IA64_REG_CR_LRR1:                        \
-                    asm volatile ("mov cr%0=%1" ::                              \
-                                          "i" (regnum - _IA64_REG_CR_DCR),      \
-                                          "r"(val): "memory" );                 \
-                    break;                                                      \
-            case _IA64_REG_SP:                                                  \
-                    asm volatile ("mov r12=%0" ::                               \
-                                          "r"(val): "memory");                  \
-                    break;                                                      \
-            case _IA64_REG_GP:                                                  \
-                    asm volatile ("mov gp=%0" :: "r"(val) : "memory");          \
-                break;                                                          \
-            default:                                                            \
-                    ia64_bad_param_for_setreg();                                \
-                    break;                                                      \
-        }                                                                       \
-})
-#define ia64_native_getreg(regnum)                                              \
-({                                                                              \
-        __u64 ia64_intri_res;                                                   \
-                                                                                \
-        switch (regnum) {                                                       \
-        case _IA64_REG_GP:                                                      \
-                asm volatile ("mov %0=gp" : "=r"(ia64_intri_res));              \
-                break;                                                          \
-        case _IA64_REG_IP:                                                      \
-                asm volatile ("mov %0=ip" : "=r"(ia64_intri_res));              \
-                break;                                                          \
-        case _IA64_REG_PSR:                                                     \
-                asm volatile ("mov %0=psr" : "=r"(ia64_intri_res));             \
-                break;                                                          \
-        case _IA64_REG_TP:      /* for current() */                             \
-                ia64_intri_res = ia64_r13;                                      \
-                break;                                                          \
-        case _IA64_REG_AR_KR0 ... _IA64_REG_AR_EC:                              \
-                asm volatile ("mov %0=ar%1" : "=r" (ia64_intri_res)             \
-                                      : "i"(regnum - _IA64_REG_AR_KR0));        \
-                break;                                                          \
-        case _IA64_REG_CR_DCR ... _IA64_REG_CR_LRR1:                            \
-                asm volatile ("mov %0=cr%1" : "=r" (ia64_intri_res)             \
-                                      : "i" (regnum - _IA64_REG_CR_DCR));       \
-                break;                                                          \
-        case _IA64_REG_SP:                                                      \
-                asm volatile ("mov %0=sp" : "=r" (ia64_intri_res));             \
-                break;                                                          \
-        default:                                                                \
-                ia64_bad_param_for_getreg();                                    \
-                break;                                                          \
-        }                                                                       \
-        ia64_intri_res;                                                         \
-})
-#define ia64_hint_pause 0
-#define ia64_hint(mode)                                         \
-({                                                              \
-        switch (mode) {                                         \
-        case ia64_hint_pause:                                   \
-                asm volatile ("hint @pause" ::: "memory");      \
-                break;                                          \
-        }                                                       \
-})
-/* Integer values for mux1 instruction */
-#define ia64_mux1_brcst 0
-#define ia64_mux1_mix   8
-#define ia64_mux1_shuf  9
-#define ia64_mux1_alt  10
-#define ia64_mux1_rev  11
-#define ia64_mux1(x, mode)                                                      \
-({                                                                              \
-        __u64 ia64_intri_res;                                                   \
-                                                                                \
-        switch (mode) {                                                         \
-        case ia64_mux1_brcst:                                                   \
-                asm ("mux1 %0=%1,@brcst" : "=r" (ia64_intri_res) : "r" (x));    \
-                break;                                                          \
-        case ia64_mux1_mix:                                                     \
-                asm ("mux1 %0=%1,@mix" : "=r" (ia64_intri_res) : "r" (x));      \
-                break;                                                          \
-        case ia64_mux1_shuf:                                                    \
-                asm ("mux1 %0=%1,@shuf" : "=r" (ia64_intri_res) : "r" (x));     \
-                break;                                                          \
-        case ia64_mux1_alt:                                                     \
-                asm ("mux1 %0=%1,@alt" : "=r" (ia64_intri_res) : "r" (x));      \
-                break;                                                          \
-        case ia64_mux1_rev:                                                     \
-                asm ("mux1 %0=%1,@rev" : "=r" (ia64_intri_res) : "r" (x));      \
-                break;                                                          \
-        }                                                                       \
-        ia64_intri_res;                                                         \
-})
-#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-# define ia64_popcnt(x)         __builtin_popcountl(x)
-#else
-# define ia64_popcnt(x)                                         \
-  ({                                                            \
-        __u64 ia64_intri_res;                                   \
-        asm ("popcnt %0=%1" : "=r" (ia64_intri_res) : "r" (x)); \
-                                                                \
-        ia64_intri_res;                                         \
-  })
-#endif
-#define ia64_getf_exp(x)                                        \
-({                                                              \
-        long ia64_intri_res;                                    \
-                                                                \
-        asm ("getf.exp %0=%1" : "=r"(ia64_intri_res) : "f"(x)); \
-                                                                \
-        ia64_intri_res;                                         \
-})
-#define ia64_shrp(a, b, count)                                                          \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm ("shrp %0=%1,%2,%3" : "=r"(ia64_intri_res) : "r"(a), "r"(b), "i"(count));   \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_ldfs(regnum, x)                                    \
-({                                                              \
-        register double __f__ asm ("f"#regnum);                 \
-        asm volatile ("ldfs %0=[%1]" :"=f"(__f__): "r"(x));     \
-})
-#define ia64_ldfd(regnum, x)                                    \
-({                                                              \
-        register double __f__ asm ("f"#regnum);                 \
-        asm volatile ("ldfd %0=[%1]" :"=f"(__f__): "r"(x));     \
-})
-#define ia64_ldfe(regnum, x)                                    \
-({                                                              \
-        register double __f__ asm ("f"#regnum);                 \
-        asm volatile ("ldfe %0=[%1]" :"=f"(__f__): "r"(x));     \
-})
-#define ia64_ldf8(regnum, x)                                    \
-({                                                              \
-        register double __f__ asm ("f"#regnum);                 \
-        asm volatile ("ldf8 %0=[%1]" :"=f"(__f__): "r"(x));     \
-})
-#define ia64_ldf_fill(regnum, x)                                \
-({                                                              \
-        register double __f__ asm ("f"#regnum);                 \
-        asm volatile ("ldf.fill %0=[%1]" :"=f"(__f__): "r"(x)); \
-})
-#define ia64_st4_rel_nta(m, val)                                        \
-({                                                                      \
-        asm volatile ("st4.rel.nta [%0] = %1\n\t" :: "r"(m), "r"(val)); \
-})
-#define ia64_stfs(x, regnum)                                            \
-({                                                                      \
-        register double __f__ asm ("f"#regnum);                         \
-        asm volatile ("stfs [%0]=%1" :: "r"(x), "f"(__f__) : "memory"); \
-})
-#define ia64_stfd(x, regnum)                                            \
-({                                                                      \
-        register double __f__ asm ("f"#regnum);                         \
-        asm volatile ("stfd [%0]=%1" :: "r"(x), "f"(__f__) : "memory"); \
-})
-#define ia64_stfe(x, regnum)                                            \
-({                                                                      \
-        register double __f__ asm ("f"#regnum);                         \
-        asm volatile ("stfe [%0]=%1" :: "r"(x), "f"(__f__) : "memory"); \
-})
-#define ia64_stf8(x, regnum)                                            \
-({                                                                      \
-        register double __f__ asm ("f"#regnum);                         \
-        asm volatile ("stf8 [%0]=%1" :: "r"(x), "f"(__f__) : "memory"); \
-})
-#define ia64_stf_spill(x, regnum)                                               \
-({                                                                              \
-        register double __f__ asm ("f"#regnum);                                 \
-        asm volatile ("stf.spill [%0]=%1" :: "r"(x), "f"(__f__) : "memory");    \
-})
-#define ia64_fetchadd4_acq(p, inc)                                              \
-({                                                                              \
-                                                                                \
-        __u64 ia64_intri_res;                                                   \
-        asm volatile ("fetchadd4.acq %0=[%1],%2"                                \
-                                : "=r"(ia64_intri_res) : "r"(p), "i" (inc)      \
-                                : "memory");                                    \
-                                                                                \
-        ia64_intri_res;                                                         \
-})
-#define ia64_fetchadd4_rel(p, inc)                                              \
-({                                                                              \
-        __u64 ia64_intri_res;                                                   \
-        asm volatile ("fetchadd4.rel %0=[%1],%2"                                \
-                                : "=r"(ia64_intri_res) : "r"(p), "i" (inc)      \
-                                : "memory");                                    \
-                                                                                \
-        ia64_intri_res;                                                         \
-})
-#define ia64_fetchadd8_acq(p, inc)                                              \
-({                                                                              \
-                                                                                \
-        __u64 ia64_intri_res;                                                   \
-        asm volatile ("fetchadd8.acq %0=[%1],%2"                                \
-                                : "=r"(ia64_intri_res) : "r"(p), "i" (inc)      \
-                                : "memory");                                    \
-                                                                                \
-        ia64_intri_res;                                                         \
-})
-#define ia64_fetchadd8_rel(p, inc)                                              \
-({                                                                              \
-        __u64 ia64_intri_res;                                                   \
-        asm volatile ("fetchadd8.rel %0=[%1],%2"                                \
-                                : "=r"(ia64_intri_res) : "r"(p), "i" (inc)      \
-                                : "memory");                                    \
-                                                                                \
-        ia64_intri_res;                                                         \
-})
-#define ia64_xchg1(ptr,x)                                                       \
-({                                                                              \
-        __u64 ia64_intri_res;                                                   \
-        asm volatile ("xchg1 %0=[%1],%2"                                        \
-                      : "=r" (ia64_intri_res) : "r" (ptr), "r" (x) : "memory"); \
-        ia64_intri_res;                                                         \
-})
-#define ia64_xchg2(ptr,x)                                               \
-({                                                                      \
-        __u64 ia64_intri_res;                                           \
-        asm volatile ("xchg2 %0=[%1],%2" : "=r" (ia64_intri_res)        \
-                      : "r" (ptr), "r" (x) : "memory");                 \
-        ia64_intri_res;                                                 \
-})
-#define ia64_xchg4(ptr,x)                                               \
-({                                                                      \
-        __u64 ia64_intri_res;                                           \
-        asm volatile ("xchg4 %0=[%1],%2" : "=r" (ia64_intri_res)        \
-                      : "r" (ptr), "r" (x) : "memory");                 \
-        ia64_intri_res;                                                 \
-})
-#define ia64_xchg8(ptr,x)                                               \
-({                                                                      \
-        __u64 ia64_intri_res;                                           \
-        asm volatile ("xchg8 %0=[%1],%2" : "=r" (ia64_intri_res)        \
-                      : "r" (ptr), "r" (x) : "memory");                 \
-        ia64_intri_res;                                                 \
-})
-#define ia64_cmpxchg1_acq(ptr, new, old)                                                \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
-        asm volatile ("cmpxchg1.acq %0=[%1],%2,ar.ccv":                                 \
-                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_cmpxchg1_rel(ptr, new, old)                                                \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
-        asm volatile ("cmpxchg1.rel %0=[%1],%2,ar.ccv":                                 \
-                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_cmpxchg2_acq(ptr, new, old)                                                \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
-        asm volatile ("cmpxchg2.acq %0=[%1],%2,ar.ccv":                                 \
-                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_cmpxchg2_rel(ptr, new, old)                                                \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
-                                                                                        \
-        asm volatile ("cmpxchg2.rel %0=[%1],%2,ar.ccv":                                 \
-                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_cmpxchg4_acq(ptr, new, old)                                                \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
-        asm volatile ("cmpxchg4.acq %0=[%1],%2,ar.ccv":                                 \
-                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_cmpxchg4_rel(ptr, new, old)                                                \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
-        asm volatile ("cmpxchg4.rel %0=[%1],%2,ar.ccv":                                 \
-                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_cmpxchg8_acq(ptr, new, old)                                                \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
-        asm volatile ("cmpxchg8.acq %0=[%1],%2,ar.ccv":                                 \
-                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_cmpxchg8_rel(ptr, new, old)                                                \
-({                                                                                      \
-        __u64 ia64_intri_res;                                                           \
-        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
-                                                                                        \
-        asm volatile ("cmpxchg8.rel %0=[%1],%2,ar.ccv":                                 \
-                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
-        ia64_intri_res;                                                                 \
-})
-#define ia64_mf()       asm volatile ("mf" ::: "memory")
-#define ia64_mfa()      asm volatile ("mf.a" ::: "memory")
-#define ia64_invala() asm volatile ("invala" ::: "memory")
-#define ia64_native_thash(addr)                                                 \
-({                                                                              \
-        unsigned long ia64_intri_res;                                           \
-        asm volatile ("thash %0=%1" : "=r"(ia64_intri_res) : "r" (addr));       \
-        ia64_intri_res;                                                         \
-})
-#define ia64_srlz_i()   asm volatile (";; srlz.i ;;" ::: "memory")
-#define ia64_srlz_d()   asm volatile (";; srlz.d" ::: "memory");
-#ifdef HAVE_SERIALIZE_DIRECTIVE
-# define ia64_dv_serialize_data()               asm volatile (".serialize.data");
-# define ia64_dv_serialize_instruction()        asm volatile (".serialize.instruction");
-#else
-# define ia64_dv_serialize_data()
-# define ia64_dv_serialize_instruction()
-#endif
-#define ia64_nop(x)     asm volatile ("nop %0"::"i"(x));
-#define ia64_itci(addr) asm volatile ("itc.i %0;;" :: "r"(addr) : "memory")
-#define ia64_itcd(addr) asm volatile ("itc.d %0;;" :: "r"(addr) : "memory")
-#define ia64_itri(trnum, addr) asm volatile ("itr.i itr[%0]=%1"                         \
-                                             :: "r"(trnum), "r"(addr) : "memory")
-#define ia64_itrd(trnum, addr) asm volatile ("itr.d dtr[%0]=%1"                         \
-                                             :: "r"(trnum), "r"(addr) : "memory")
-#define ia64_tpa(addr)                                                          \
-({                                                                              \
-        unsigned long ia64_pa;                                                  \
-        asm volatile ("tpa %0 = %1" : "=r"(ia64_pa) : "r"(addr) : "memory");    \
-        ia64_pa;                                                                \
-})
-#define __ia64_set_dbr(index, val)                                              \
-        asm volatile ("mov dbr[%0]=%1" :: "r"(index), "r"(val) : "memory")
-#define ia64_set_ibr(index, val)                                                \
-        asm volatile ("mov ibr[%0]=%1" :: "r"(index), "r"(val) : "memory")
-#define ia64_set_pkr(index, val)                                                \
-        asm volatile ("mov pkr[%0]=%1" :: "r"(index), "r"(val) : "memory")
-#define ia64_set_pmc(index, val)                                                \
-        asm volatile ("mov pmc[%0]=%1" :: "r"(index), "r"(val) : "memory")
-#define ia64_set_pmd(index, val)                                                \
-        asm volatile ("mov pmd[%0]=%1" :: "r"(index), "r"(val) : "memory")
-#define ia64_native_set_rr(index, val)                                                  \
-        asm volatile ("mov rr[%0]=%1" :: "r"(index), "r"(val) : "memory");
-#define ia64_native_get_cpuid(index)                                                    \
-({                                                                                      \
-        unsigned long ia64_intri_res;                                                   \
-        asm volatile ("mov %0=cpuid[%r1]" : "=r"(ia64_intri_res) : "rO"(index));        \
-        ia64_intri_res;                                                                 \
-})
-#define __ia64_get_dbr(index)                                                   \
-({                                                                              \
-        unsigned long ia64_intri_res;                                           \
-        asm volatile ("mov %0=dbr[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
-        ia64_intri_res;                                                         \
-})
-#define ia64_get_ibr(index)                                                     \
-({                                                                              \
-        unsigned long ia64_intri_res;                                           \
-        asm volatile ("mov %0=ibr[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
-        ia64_intri_res;                                                         \
-})
-#define ia64_get_pkr(index)                                                     \
-({                                                                              \
-        unsigned long ia64_intri_res;                                           \
-        asm volatile ("mov %0=pkr[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
-        ia64_intri_res;                                                         \
-})
-#define ia64_get_pmc(index)                                                     \
-({                                                                              \
-        unsigned long ia64_intri_res;                                           \
-        asm volatile ("mov %0=pmc[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
-        ia64_intri_res;                                                         \
-})
-#define ia64_native_get_pmd(index)                                              \
-({                                                                              \
-        unsigned long ia64_intri_res;                                           \
-        asm volatile ("mov %0=pmd[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
-        ia64_intri_res;                                                         \
-})
-#define ia64_native_get_rr(index)                                               \
-({                                                                              \
-        unsigned long ia64_intri_res;                                           \
-        asm volatile ("mov %0=rr[%1]" : "=r"(ia64_intri_res) : "r" (index));    \
-        ia64_intri_res;                                                         \
-})
-#define ia64_native_fc(addr)    asm volatile ("fc %0" :: "r"(addr) : "memory")
-#define ia64_sync_i()   asm volatile (";; sync.i" ::: "memory")
-#define ia64_native_ssm(mask)   asm volatile ("ssm %0":: "i"((mask)) : "memory")
-#define ia64_native_rsm(mask)   asm volatile ("rsm %0":: "i"((mask)) : "memory")
-#define ia64_sum(mask)  asm volatile ("sum %0":: "i"((mask)) : "memory")
-#define ia64_rum(mask)  asm volatile ("rum %0":: "i"((mask)) : "memory")
-#define ia64_ptce(addr) asm volatile ("ptc.e %0" :: "r"(addr))
-#define ia64_native_ptcga(addr, size)                                           \
-do {                                                                            \
-        asm volatile ("ptc.ga %0,%1" :: "r"(addr), "r"(size) : "memory");       \
-        ia64_dv_serialize_data();                                               \
-} while (0)
-#define ia64_ptcl(addr, size)                                                   \
-do {                                                                            \
-        asm volatile ("ptc.l %0,%1" :: "r"(addr), "r"(size) : "memory");        \
-        ia64_dv_serialize_data();                                               \
-} while (0)
-#define ia64_ptri(addr, size)                                           \
-        asm volatile ("ptr.i %0,%1" :: "r"(addr), "r"(size) : "memory")
-#define ia64_ptrd(addr, size)                                           \
-        asm volatile ("ptr.d %0,%1" :: "r"(addr), "r"(size) : "memory")
-#define ia64_ttag(addr)                                                 \
-({                                                                        \
-        __u64 ia64_intri_res;                                              \
-        asm volatile ("ttag %0=%1" : "=r"(ia64_intri_res) : "r" (addr));   \
-        ia64_intri_res;                                                  \
-})
-/* Values for lfhint in ia64_lfetch and ia64_lfetch_fault */
-#define ia64_lfhint_none   0
-#define ia64_lfhint_nt1    1
-#define ia64_lfhint_nt2    2
-#define ia64_lfhint_nta    3
-#define ia64_lfetch(lfhint, y)                                  \
-({                                                              \
-        switch (lfhint) {                                       \
-        case ia64_lfhint_none:                                  \
-                asm volatile ("lfetch [%0]" : : "r"(y));        \
-                break;                                          \
-        case ia64_lfhint_nt1:                                   \
-                asm volatile ("lfetch.nt1 [%0]" : : "r"(y));    \
-                break;                                          \
-        case ia64_lfhint_nt2:                                   \
-                asm volatile ("lfetch.nt2 [%0]" : : "r"(y));    \
-                break;                                          \
-        case ia64_lfhint_nta:                                   \
-                asm volatile ("lfetch.nta [%0]" : : "r"(y));    \
-                break;                                          \
-        }                                                       \
-})
-#define ia64_lfetch_excl(lfhint, y)                                     \
-({                                                                      \
-        switch (lfhint) {                                               \
-        case ia64_lfhint_none:                                          \
-                asm volatile ("lfetch.excl [%0]" :: "r"(y));            \
-                break;                                                  \
-        case ia64_lfhint_nt1:                                           \
-                asm volatile ("lfetch.excl.nt1 [%0]" :: "r"(y));        \
-                break;                                                  \
-        case ia64_lfhint_nt2:                                           \
-                asm volatile ("lfetch.excl.nt2 [%0]" :: "r"(y));        \
-                break;                                                  \
-        case ia64_lfhint_nta:                                           \
-                asm volatile ("lfetch.excl.nta [%0]" :: "r"(y));        \
-                break;                                                  \
-        }                                                               \
-})
-#define ia64_lfetch_fault(lfhint, y)                                    \
-({                                                                      \
-        switch (lfhint) {                                               \
-        case ia64_lfhint_none:                                          \
-                asm volatile ("lfetch.fault [%0]" : : "r"(y));          \
-                break;                                                  \
-        case ia64_lfhint_nt1:                                           \
-                asm volatile ("lfetch.fault.nt1 [%0]" : : "r"(y));      \
-                break;                                                  \
-        case ia64_lfhint_nt2:                                           \
-                asm volatile ("lfetch.fault.nt2 [%0]" : : "r"(y));      \
-                break;                                                  \
-        case ia64_lfhint_nta:                                           \
-                asm volatile ("lfetch.fault.nta [%0]" : : "r"(y));      \
-                break;                                                  \
-        }                                                               \
-})
-#define ia64_lfetch_fault_excl(lfhint, y)                               \
-({                                                                      \
-        switch (lfhint) {                                               \
-        case ia64_lfhint_none:                                          \
-                asm volatile ("lfetch.fault.excl [%0]" :: "r"(y));      \
-                break;                                                  \
-        case ia64_lfhint_nt1:                                           \
-                asm volatile ("lfetch.fault.excl.nt1 [%0]" :: "r"(y));  \
-                break;                                                  \
-        case ia64_lfhint_nt2:                                           \
-                asm volatile ("lfetch.fault.excl.nt2 [%0]" :: "r"(y));  \
-                break;                                                  \
-        case ia64_lfhint_nta:                                           \
-                asm volatile ("lfetch.fault.excl.nta [%0]" :: "r"(y));  \
-                break;                                                  \
-        }                                                               \
-})
-#define ia64_native_intrin_local_irq_restore(x)                 \
-do {                                                            \
-        asm volatile (";;   cmp.ne p6,p7=%0,r0;;"               \
-                      "(p6) ssm psr.i;"                         \
-                      "(p7) rsm psr.i;;"                        \
-                      "(p6) srlz.d"                             \
-                      :: "r"((x)) : "p6", "p7", "memory");      \
-} while (0)
 #endif /* _ASM_IA64_GCC_INTRIN_H */
diff --git a/arch/ia64/include/asm/intrinsics.h b/arch/ia64/include/asm/intrinsics.h
index d129e367e76..20477ea111b 100644
--- a/arch/ia64/include/asm/intrinsics.h
+++ b/arch/ia64/include/asm/intrinsics.h
@@ -1,99 +1,16 @@
-#ifndef _ASM_IA64_INTRINSICS_H
-#define _ASM_IA64_INTRINSICS_H
 /*
 * Compiler-dependent intrinsics.
 *
 * Copyright (C) 2002-2003 Hewlett-Packard Co
 *      David Mosberger-Tang <davidm@hpl.hp.com>
 */
+#ifndef _ASM_IA64_INTRINSICS_H
+#define _ASM_IA64_INTRINSICS_H
-#ifndef __ASSEMBLY__
-#include <linux/types.h>
-/* include compiler specific intrinsics */
-#include <asm/ia64regs.h>
-#ifdef __INTEL_COMPILER
-# include <asm/intel_intrin.h>
-#else
-# include <asm/gcc_intrin.h>
-#endif
-#include <asm/cmpxchg.h>
-#define ia64_native_get_psr_i() (ia64_native_getreg(_IA64_REG_PSR) & IA64_PSR_I)
-#define ia64_native_set_rr0_to_rr4(val0, val1, val2, val3, val4)        \
-do {                                                                    \
-        ia64_native_set_rr(0x0000000000000000UL, (val0));               \
-        ia64_native_set_rr(0x2000000000000000UL, (val1));               \
-        ia64_native_set_rr(0x4000000000000000UL, (val2));               \
-        ia64_native_set_rr(0x6000000000000000UL, (val3));               \
-        ia64_native_set_rr(0x8000000000000000UL, (val4));               \
-} while (0)
-/*
- * Force an unresolved reference if someone tries to use
- * ia64_fetch_and_add() with a bad value.
- */
-extern unsigned long __bad_size_for_ia64_fetch_and_add (void);
-extern unsigned long __bad_increment_for_ia64_fetch_and_add (void);
-#define IA64_FETCHADD(tmp,v,n,sz,sem)                                           \
-({                                                                              \
-        switch (sz) {                                                           \
-              case 4:                                                           \
-                tmp = ia64_fetchadd4_##sem((unsigned int *) v, n);              \
-                break;                                                          \
-                                                                                \
-              case 8:                                                           \
-                tmp = ia64_fetchadd8_##sem((unsigned long *) v, n);             \
-                break;                                                          \
-                                                                                \
-              default:                                                          \
-                __bad_size_for_ia64_fetch_and_add();                            \
-        }                                                                       \
-})
-#define ia64_fetchadd(i,v,sem)                                                          \
-({                                                                                      \
-        __u64 _tmp;                                                                     \
-        volatile __typeof__(*(v)) *_v = (v);                                            \
-        /* Can't use a switch () here: gcc isn't always smart enough for that... */     \
-        if ((i) == -16)                                                                 \
-                IA64_FETCHADD(_tmp, _v, -16, sizeof(*(v)), sem);                        \
-        else if ((i) == -8)                                                             \
-                IA64_FETCHADD(_tmp, _v, -8, sizeof(*(v)), sem);                         \
-        else if ((i) == -4)                                                             \
-                IA64_FETCHADD(_tmp, _v, -4, sizeof(*(v)), sem);                         \
-        else if ((i) == -1)                                                             \
-                IA64_FETCHADD(_tmp, _v, -1, sizeof(*(v)), sem);                         \
-        else if ((i) == 1)                                                              \
-                IA64_FETCHADD(_tmp, _v, 1, sizeof(*(v)), sem);                          \
-        else if ((i) == 4)                                                              \
-                IA64_FETCHADD(_tmp, _v, 4, sizeof(*(v)), sem);                          \
-        else if ((i) == 8)                                                              \
-                IA64_FETCHADD(_tmp, _v, 8, sizeof(*(v)), sem);                          \
-        else if ((i) == 16)                                                             \
-                IA64_FETCHADD(_tmp, _v, 16, sizeof(*(v)), sem);                         \
-        else                                                                            \
-                _tmp = __bad_increment_for_ia64_fetch_and_add();                        \
-        (__typeof__(*(v))) (_tmp);      /* return old value */                          \
-})
-#define ia64_fetch_and_add(i,v) (ia64_fetchadd(i, v, rel) + (i)) /* return new value */
-#endif
-#ifdef __KERNEL__
 #include <asm/paravirt_privop.h>
-#endif
+#include <uapi/asm/intrinsics.h>
 #ifndef __ASSEMBLY__
-#define IA64_INTRINSIC_API(name)        ia64_native_ ## name
-#define IA64_INTRINSIC_MACRO(name)      ia64_native_ ## name
-#if defined(__KERNEL__)
 #if defined(CONFIG_PARAVIRT)
 # undef IA64_INTRINSIC_API
 # undef IA64_INTRINSIC_MACRO
@@ -104,36 +21,5 @@ extern unsigned long __bad_increment_for_ia64_fetch_and_add (void);
 # endif
 #define IA64_INTRINSIC_MACRO(name)      paravirt_ ## name
 #endif
-#endif
-/************************************************/
-/* Instructions paravirtualized for correctness */
-/************************************************/
-/* fc, thash, get_cpuid, get_pmd, get_eflags, set_eflags */
-/* Note that "ttag" and "cover" are also privilege-sensitive; "ttag"
- * is not currently used (though it may be in a long-format VHPT system!)
- */
-#define ia64_fc                         IA64_INTRINSIC_API(fc)
-#define ia64_thash                      IA64_INTRINSIC_API(thash)
-#define ia64_get_cpuid                  IA64_INTRINSIC_API(get_cpuid)
-#define ia64_get_pmd                    IA64_INTRINSIC_API(get_pmd)
-/************************************************/
-/* Instructions paravirtualized for performance */
-/************************************************/
-#define ia64_ssm                        IA64_INTRINSIC_MACRO(ssm)
-#define ia64_rsm                        IA64_INTRINSIC_MACRO(rsm)
-#define ia64_getreg                     IA64_INTRINSIC_MACRO(getreg)
-#define ia64_setreg                     IA64_INTRINSIC_API(setreg)
-#define ia64_set_rr                     IA64_INTRINSIC_API(set_rr)
-#define ia64_get_rr                     IA64_INTRINSIC_API(get_rr)
-#define ia64_ptcga                      IA64_INTRINSIC_API(ptcga)
-#define ia64_get_psr_i                  IA64_INTRINSIC_API(get_psr_i)
-#define ia64_intrin_local_irq_restore   \
-        IA64_INTRINSIC_API(intrin_local_irq_restore)
-#define ia64_set_rr0_to_rr4             IA64_INTRINSIC_API(set_rr0_to_rr4)
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_IA64_INTRINSICS_H */
diff --git a/arch/ia64/include/asm/kvm_para.h b/arch/ia64/include/asm/kvm_para.h
index 2019cb99335..47c00f91043 100644
--- a/arch/ia64/include/asm/kvm_para.h
+++ b/arch/ia64/include/asm/kvm_para.h
@@ -1,6 +1,3 @@
-#ifndef __IA64_KVM_PARA_H
-#define __IA64_KVM_PARA_H
 /*
 * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
 *
@@ -18,8 +15,11 @@
 * Place - Suite 330, Boston, MA 02111-1307 USA.
 *
 */
+#ifndef __IA64_KVM_PARA_H
+#define __IA64_KVM_PARA_H
+#include <uapi/asm/kvm_para.h>
-#ifdef __KERNEL__
 static inline unsigned int kvm_arch_para_features(void)
 {
@@ -32,5 +32,3 @@ static inline bool kvm_check_and_clear_guest_paused(void)
 }
 #endif
-#endif
diff --git a/arch/ia64/include/asm/mman.h b/arch/ia64/include/asm/mman.h
index 4459028e5aa..fdd5f5229f7 100644
--- a/arch/ia64/include/asm/mman.h
+++ b/arch/ia64/include/asm/mman.h
@@ -1,23 +1,17 @@
-#ifndef _ASM_IA64_MMAN_H
-#define _ASM_IA64_MMAN_H
 /*
 * Based on <asm-i386/mman.h>.
 *
 * Modified 1998-2000, 2002
 *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
 */
+#ifndef _ASM_IA64_MMAN_H
+#define _ASM_IA64_MMAN_H
-#include <asm-generic/mman.h>
+#include <uapi/asm/mman.h>
-#define MAP_GROWSUP     0x0200          /* register stack-like segment */
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 #define arch_mmap_check ia64_mmap_check
 int ia64_mmap_check(unsigned long addr, unsigned long len,
                unsigned long flags);
 #endif
-#endif
 #endif /* _ASM_IA64_MMAN_H */
diff --git a/arch/ia64/include/asm/module.h b/arch/ia64/include/asm/module.h
index 908eaef42a0..dfba22a872c 100644
--- a/arch/ia64/include/asm/module.h
+++ b/arch/ia64/include/asm/module.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_IA64_MODULE_H
 #define _ASM_IA64_MODULE_H
+#include <asm-generic/module.h>
 /*
 * IA-64-specific support for kernel module loader.
 *
@@ -29,10 +31,6 @@ struct mod_arch_specific {
        unsigned int next_got_entry;    /* index of next available got entry */
 };
-#define Elf_Shdr        Elf64_Shdr
-#define Elf_Sym         Elf64_Sym
-#define Elf_Ehdr        Elf64_Ehdr
 #define MODULE_PROC_FAMILY      "ia64"
 #define MODULE_ARCH_VERMAGIC    MODULE_PROC_FAMILY \
        "gcc-" __stringify(__GNUC__) "." __stringify(__GNUC_MINOR__)
diff --git a/arch/ia64/include/asm/param.h b/arch/ia64/include/asm/param.h
index 0964c32c135..1295913d6a8 100644
--- a/arch/ia64/include/asm/param.h
+++ b/arch/ia64/include/asm/param.h
@@ -1,6 +1,3 @@
-#ifndef _ASM_IA64_PARAM_H
-#define _ASM_IA64_PARAM_H
 /*
 * Fundamental kernel parameters.
 *
@@ -9,25 +6,12 @@
 * Modified 1998, 1999, 2002-2003
 *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
 */
+#ifndef _ASM_IA64_PARAM_H
+#define _ASM_IA64_PARAM_H
-#define EXEC_PAGESIZE   65536
+#include <uapi/asm/param.h>
-#ifndef NOGROUP
-# define NOGROUP        (-1)
-#endif
-#define MAXHOSTNAMELEN  64      /* max length of hostname */
-#ifdef __KERNEL__
 # define HZ             CONFIG_HZ
 # define USER_HZ        HZ
 # define CLOCKS_PER_SEC HZ      /* frequency at which times() counts */
-#else
-   /*
-    * Technically, this is wrong, but some old apps still refer to it.  The proper way to
-    * get the HZ value is via sysconf(_SC_CLK_TCK).
-    */
-# define HZ 1024
-#endif
 #endif /* _ASM_IA64_PARAM_H */
diff --git a/arch/ia64/include/asm/perfmon.h b/arch/ia64/include/asm/perfmon.h
index d551183fee9..15476dd3a8b 100644
--- a/arch/ia64/include/asm/perfmon.h
+++ b/arch/ia64/include/asm/perfmon.h
@@ -2,179 +2,12 @@
 * Copyright (C) 2001-2003 Hewlett-Packard Co
 *               Stephane Eranian <eranian@hpl.hp.com>
 */
 #ifndef _ASM_IA64_PERFMON_H
 #define _ASM_IA64_PERFMON_H
-/*
+#include <uapi/asm/perfmon.h>
- * perfmon commands supported on all CPU models
- */
-#define PFM_WRITE_PMCS          0x01
-#define PFM_WRITE_PMDS          0x02
-#define PFM_READ_PMDS           0x03
-#define PFM_STOP                0x04
-#define PFM_START               0x05
-#define PFM_ENABLE              0x06 /* obsolete */
-#define PFM_DISABLE             0x07 /* obsolete */
-#define PFM_CREATE_CONTEXT      0x08
-#define PFM_DESTROY_CONTEXT     0x09 /* obsolete use close() */
-#define PFM_RESTART             0x0a
-#define PFM_PROTECT_CONTEXT     0x0b /* obsolete */
-#define PFM_GET_FEATURES        0x0c
-#define PFM_DEBUG               0x0d
-#define PFM_UNPROTECT_CONTEXT   0x0e /* obsolete */
-#define PFM_GET_PMC_RESET_VAL   0x0f
-#define PFM_LOAD_CONTEXT        0x10
-#define PFM_UNLOAD_CONTEXT      0x11
-/*
- * PMU model specific commands (may not be supported on all PMU models)
- */
-#define PFM_WRITE_IBRS          0x20
-#define PFM_WRITE_DBRS          0x21
-/*
- * context flags
- */
-#define PFM_FL_NOTIFY_BLOCK      0x01   /* block task on user level notifications */
-#define PFM_FL_SYSTEM_WIDE       0x02   /* create a system wide context */
-#define PFM_FL_OVFL_NO_MSG       0x80   /* do not post overflow/end messages for notification */
-/*
- * event set flags
- */
-#define PFM_SETFL_EXCL_IDLE      0x01   /* exclude idle task (syswide only) XXX: DO NOT USE YET */
-/*
- * PMC flags
- */
-#define PFM_REGFL_OVFL_NOTIFY   0x1     /* send notification on overflow */
-#define PFM_REGFL_RANDOM        0x2     /* randomize sampling interval   */
-/*
- * PMD/PMC/IBR/DBR return flags (ignored on input)
- *
- * Those flags are used on output and must be checked in case EAGAIN is returned
- * by any of the calls using a pfarg_reg_t or pfarg_dbreg_t structure.
- */
-#define PFM_REG_RETFL_NOTAVAIL  (1UL<<31) /* set if register is implemented but not available */
-#define PFM_REG_RETFL_EINVAL    (1UL<<30) /* set if register entry is invalid */
-#define PFM_REG_RETFL_MASK      (PFM_REG_RETFL_NOTAVAIL|PFM_REG_RETFL_EINVAL)
-#define PFM_REG_HAS_ERROR(flag) (((flag) & PFM_REG_RETFL_MASK) != 0)
-typedef unsigned char pfm_uuid_t[16];   /* custom sampling buffer identifier type */
-/*
- * Request structure used to define a context
- */
-typedef struct {
-        pfm_uuid_t     ctx_smpl_buf_id;  /* which buffer format to use (if needed) */
-        unsigned long  ctx_flags;        /* noblock/block */
-        unsigned short ctx_nextra_sets;  /* number of extra event sets (you always get 1) */
-        unsigned short ctx_reserved1;    /* for future use */
-        int            ctx_fd;           /* return arg: unique identification for context */
-        void           *ctx_smpl_vaddr;  /* return arg: virtual address of sampling buffer, is used */
-        unsigned long  ctx_reserved2[11];/* for future use */
-} pfarg_context_t;
-/*
- * Request structure used to write/read a PMC or PMD
- */
-typedef struct {
-        unsigned int    reg_num;           /* which register */
-        unsigned short  reg_set;           /* event set for this register */
-        unsigned short  reg_reserved1;     /* for future use */
-        unsigned long   reg_value;         /* initial pmc/pmd value */
-        unsigned long   reg_flags;         /* input: pmc/pmd flags, return: reg error */
-        unsigned long   reg_long_reset;    /* reset after buffer overflow notification */
-        unsigned long   reg_short_reset;   /* reset after counter overflow */
-        unsigned long   reg_reset_pmds[4]; /* which other counters to reset on overflow */
-        unsigned long   reg_random_seed;   /* seed value when randomization is used */
-        unsigned long   reg_random_mask;   /* bitmask used to limit random value */
-        unsigned long   reg_last_reset_val;/* return: PMD last reset value */
-        unsigned long   reg_smpl_pmds[4];  /* which pmds are accessed when PMC overflows */
-        unsigned long   reg_smpl_eventid;  /* opaque sampling event identifier */
-        unsigned long   reg_reserved2[3];   /* for future use */
-} pfarg_reg_t;
-typedef struct {
-        unsigned int    dbreg_num;              /* which debug register */
-        unsigned short  dbreg_set;              /* event set for this register */
-        unsigned short  dbreg_reserved1;        /* for future use */
-        unsigned long   dbreg_value;            /* value for debug register */
-        unsigned long   dbreg_flags;            /* return: dbreg error */
-        unsigned long   dbreg_reserved2[1];     /* for future use */
-} pfarg_dbreg_t;
-typedef struct {
-        unsigned int    ft_version;     /* perfmon: major [16-31], minor [0-15] */
-        unsigned int    ft_reserved;    /* reserved for future use */
-        unsigned long   reserved[4];    /* for future use */
-} pfarg_features_t;
-typedef struct {
-        pid_t           load_pid;          /* process to load the context into */
-        unsigned short  load_set;          /* first event set to load */
-        unsigned short  load_reserved1;    /* for future use */
-        unsigned long   load_reserved2[3]; /* for future use */
-} pfarg_load_t;
-typedef struct {
-        int             msg_type;               /* generic message header */
-        int             msg_ctx_fd;             /* generic message header */
-        unsigned long   msg_ovfl_pmds[4];       /* which PMDs overflowed */
-        unsigned short  msg_active_set;         /* active set at the time of overflow */
-        unsigned short  msg_reserved1;          /* for future use */
-        unsigned int    msg_reserved2;          /* for future use */
-        unsigned long   msg_tstamp;             /* for perf tuning/debug */
-} pfm_ovfl_msg_t;
-typedef struct {
-        int             msg_type;               /* generic message header */
-        int             msg_ctx_fd;             /* generic message header */
-        unsigned long   msg_tstamp;             /* for perf tuning */
-} pfm_end_msg_t;
-typedef struct {
-        int             msg_type;               /* type of the message */
-        int             msg_ctx_fd;             /* unique identifier for the context */
-        unsigned long   msg_tstamp;             /* for perf tuning */
-} pfm_gen_msg_t;
-#define PFM_MSG_OVFL    1       /* an overflow happened */
-#define PFM_MSG_END     2       /* task to which context was attached ended */
-typedef union {
-        pfm_ovfl_msg_t  pfm_ovfl_msg;
-        pfm_end_msg_t   pfm_end_msg;
-        pfm_gen_msg_t   pfm_gen_msg;
-} pfm_msg_t;
-/*
- * Define the version numbers for both perfmon as a whole and the sampling buffer format.
- */
-#define PFM_VERSION_MAJ          2U
-#define PFM_VERSION_MIN          0U
-#define PFM_VERSION              (((PFM_VERSION_MAJ&0xffff)<<16)|(PFM_VERSION_MIN & 0xffff))
-#define PFM_VERSION_MAJOR(x)     (((x)>>16) & 0xffff)
-#define PFM_VERSION_MINOR(x)     ((x) & 0xffff)
-/*
- * miscellaneous architected definitions
- */
-#define PMU_FIRST_COUNTER       4       /* first counting monitor (PMC/PMD) */
-#define PMU_MAX_PMCS            256     /* maximum architected number of PMC registers */
-#define PMU_MAX_PMDS            256     /* maximum architected number of PMD registers */
-#ifdef __KERNEL__
 extern long perfmonctl(int fd, int cmd, void *arg, int narg);
 typedef struct {
@@ -274,6 +107,4 @@ typedef struct {
 extern pfm_sysctl_t pfm_sysctl;
-#endif /* __KERNEL__ */
 #endif /* _ASM_IA64_PERFMON_H */
diff --git a/arch/ia64/include/asm/ptrace.h b/arch/ia64/include/asm/ptrace.h
index 68c98f5b3ca..b0e973649cb 100644
--- a/arch/ia64/include/asm/ptrace.h
+++ b/arch/ia64/include/asm/ptrace.h
@@ -1,6 +1,3 @@
-#ifndef _ASM_IA64_PTRACE_H
-#define _ASM_IA64_PTRACE_H
 /*
 * Copyright (C) 1998-2004 Hewlett-Packard Co
 *      David Mosberger-Tang <davidm@hpl.hp.com>
@@ -15,52 +12,13 @@
 *  6/17/99     D. Mosberger    added second unat member to "struct switch_stack"
 *
 */
-/*
+#ifndef _ASM_IA64_PTRACE_H
- * When a user process is blocked, its state looks as follows:
+#define _ASM_IA64_PTRACE_H
- *
- *            +----------------------+  ------- IA64_STK_OFFSET
- *            |                      |   ^
- *            | struct pt_regs       |   |
- *            |                      |   |
- *            +----------------------+   |
- *            |                      |   |
- *            |    memory stack      |   |
- *            | (growing downwards)  |   |
- *            //.....................//  |
- *                                       |
- *            //.....................//  |
- *            |                      |   |
- *            +----------------------+   |
- *            | struct switch_stack  |   |
- *            |                      |   |
- *            +----------------------+   |
- *            |                      |   |
- *            //.....................//  |
- *                                       |
- *            //.....................//  |
- *            |                      |   |
- *            |  register stack      |   |
- *            | (growing upwards)    |   |
- *            |                      |   |
- *            +----------------------+   |  --- IA64_RBS_OFFSET
- *            |  struct thread_info  |   |  ^
- *            +----------------------+   |  |
- *            |                      |   |  |
- *            |  struct task_struct  |   |  |
- * current -> |                      |   |  |
- *            +----------------------+ -------
- *
- * Note that ar.ec is not saved explicitly in pt_reg or switch_stack.
- * This is because ar.ec is saved as part of ar.pfs.
- */
-#include <asm/fpu.h>
-#ifdef __KERNEL__
 #ifndef ASM_OFFSETS_C
 #include <asm/asm-offsets.h>
 #endif
+#include <uapi/asm/ptrace.h>
 /*
 * Base-2 logarithm of number of pages to allocate per task structure
@@ -81,155 +39,8 @@
 #define KERNEL_STACK_SIZE               IA64_STK_OFFSET
-#endif /* __KERNEL__ */
 #ifndef __ASSEMBLY__
-/*
- * This struct defines the way the registers are saved on system
- * calls.
- *
- * We don't save all floating point register because the kernel
- * is compiled to use only a very small subset, so the other are
- * untouched.
- *
- * THIS STRUCTURE MUST BE A MULTIPLE 16-BYTE IN SIZE
- * (because the memory stack pointer MUST ALWAYS be aligned this way)
- *
- */
-struct pt_regs {
-        /* The following registers are saved by SAVE_MIN: */
-        unsigned long b6;               /* scratch */
-        unsigned long b7;               /* scratch */
-        unsigned long ar_csd;           /* used by cmp8xchg16 (scratch) */
-        unsigned long ar_ssd;           /* reserved for future use (scratch) */
-        unsigned long r8;               /* scratch (return value register 0) */
-        unsigned long r9;               /* scratch (return value register 1) */
-        unsigned long r10;              /* scratch (return value register 2) */
-        unsigned long r11;              /* scratch (return value register 3) */
-        unsigned long cr_ipsr;          /* interrupted task's psr */
-        unsigned long cr_iip;           /* interrupted task's instruction pointer */
-        /*
-         * interrupted task's function state; if bit 63 is cleared, it
-         * contains syscall's ar.pfs.pfm:
-         */
-        unsigned long cr_ifs;
-        unsigned long ar_unat;          /* interrupted task's NaT register (preserved) */
-        unsigned long ar_pfs;           /* prev function state  */
-        unsigned long ar_rsc;           /* RSE configuration */
-        /* The following two are valid only if cr_ipsr.cpl > 0 || ti->flags & _TIF_MCA_INIT */
-        unsigned long ar_rnat;          /* RSE NaT */
-        unsigned long ar_bspstore;      /* RSE bspstore */
-        unsigned long pr;               /* 64 predicate registers (1 bit each) */
-        unsigned long b0;               /* return pointer (bp) */
-        unsigned long loadrs;           /* size of dirty partition << 16 */
-        unsigned long r1;               /* the gp pointer */
-        unsigned long r12;              /* interrupted task's memory stack pointer */
-        unsigned long r13;              /* thread pointer */
-        unsigned long ar_fpsr;          /* floating point status (preserved) */
-        unsigned long r15;              /* scratch */
-        /* The remaining registers are NOT saved for system calls.  */
-        unsigned long r14;              /* scratch */
-        unsigned long r2;               /* scratch */
-        unsigned long r3;               /* scratch */
-        /* The following registers are saved by SAVE_REST: */
-        unsigned long r16;              /* scratch */
-        unsigned long r17;              /* scratch */
-        unsigned long r18;              /* scratch */
-        unsigned long r19;              /* scratch */
-        unsigned long r20;              /* scratch */
-        unsigned long r21;              /* scratch */
-        unsigned long r22;              /* scratch */
-        unsigned long r23;              /* scratch */
-        unsigned long r24;              /* scratch */
-        unsigned long r25;              /* scratch */
-        unsigned long r26;              /* scratch */
-        unsigned long r27;              /* scratch */
-        unsigned long r28;              /* scratch */
-        unsigned long r29;              /* scratch */
-        unsigned long r30;              /* scratch */
-        unsigned long r31;              /* scratch */
-        unsigned long ar_ccv;           /* compare/exchange value (scratch) */
-        /*
-         * Floating point registers that the kernel considers scratch:
-         */
-        struct ia64_fpreg f6;           /* scratch */
-        struct ia64_fpreg f7;           /* scratch */
-        struct ia64_fpreg f8;           /* scratch */
-        struct ia64_fpreg f9;           /* scratch */
-        struct ia64_fpreg f10;          /* scratch */
-        struct ia64_fpreg f11;          /* scratch */
-};
-/*
- * This structure contains the addition registers that need to
- * preserved across a context switch.  This generally consists of
- * "preserved" registers.
- */
-struct switch_stack {
-        unsigned long caller_unat;      /* user NaT collection register (preserved) */
-        unsigned long ar_fpsr;          /* floating-point status register */
-        struct ia64_fpreg f2;           /* preserved */
-        struct ia64_fpreg f3;           /* preserved */
-        struct ia64_fpreg f4;           /* preserved */
-        struct ia64_fpreg f5;           /* preserved */
-        struct ia64_fpreg f12;          /* scratch, but untouched by kernel */
-        struct ia64_fpreg f13;          /* scratch, but untouched by kernel */
-        struct ia64_fpreg f14;          /* scratch, but untouched by kernel */
-        struct ia64_fpreg f15;          /* scratch, but untouched by kernel */
-        struct ia64_fpreg f16;          /* preserved */
-        struct ia64_fpreg f17;          /* preserved */
-        struct ia64_fpreg f18;          /* preserved */
-        struct ia64_fpreg f19;          /* preserved */
-        struct ia64_fpreg f20;          /* preserved */
-        struct ia64_fpreg f21;          /* preserved */
-        struct ia64_fpreg f22;          /* preserved */
-        struct ia64_fpreg f23;          /* preserved */
-        struct ia64_fpreg f24;          /* preserved */
-        struct ia64_fpreg f25;          /* preserved */
-        struct ia64_fpreg f26;          /* preserved */
-        struct ia64_fpreg f27;          /* preserved */
-        struct ia64_fpreg f28;          /* preserved */
-        struct ia64_fpreg f29;          /* preserved */
-        struct ia64_fpreg f30;          /* preserved */
-        struct ia64_fpreg f31;          /* preserved */
-        unsigned long r4;               /* preserved */
-        unsigned long r5;               /* preserved */
-        unsigned long r6;               /* preserved */
-        unsigned long r7;               /* preserved */
-        unsigned long b0;               /* so we can force a direct return in copy_thread */
-        unsigned long b1;
-        unsigned long b2;
-        unsigned long b3;
-        unsigned long b4;
-        unsigned long b5;
-        unsigned long ar_pfs;           /* previous function state */
-        unsigned long ar_lc;            /* loop counter (preserved) */
-        unsigned long ar_unat;          /* NaT bits for r4-r7 */
-        unsigned long ar_rnat;          /* RSE NaT collection register */
-        unsigned long ar_bspstore;      /* RSE dirty base (preserved) */
-        unsigned long pr;               /* 64 predicate registers (1 bit each) */
-};
-#ifdef __KERNEL__
 #include <asm/current.h>
 #include <asm/page.h>
@@ -331,46 +142,5 @@ static inline long regs_return_value(struct pt_regs *regs)
  #define arch_has_single_step()  (1)
  #define arch_has_block_step()   (1)
-#endif /* !__KERNEL__ */
-/* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */
-struct pt_all_user_regs {
-        unsigned long nat;
-        unsigned long cr_iip;
-        unsigned long cfm;
-        unsigned long cr_ipsr;
-        unsigned long pr;
-        unsigned long gr[32];
-        unsigned long br[8];
-        unsigned long ar[128];
-        struct ia64_fpreg fr[128];
-};
 #endif /* !__ASSEMBLY__ */
-/* indices to application-registers array in pt_all_user_regs */
-#define PT_AUR_RSC      16
-#define PT_AUR_BSP      17
-#define PT_AUR_BSPSTORE 18
-#define PT_AUR_RNAT     19
-#define PT_AUR_CCV      32
-#define PT_AUR_UNAT     36
-#define PT_AUR_FPSR     40
-#define PT_AUR_PFS      64
-#define PT_AUR_LC       65
-#define PT_AUR_EC       66
-/*
- * The numbers chosen here are somewhat arbitrary but absolutely MUST
- * not overlap with any of the number assigned in <linux/ptrace.h>.
- */
-#define PTRACE_SINGLEBLOCK      12      /* resume execution until next branch */
-#define PTRACE_OLD_GETSIGINFO   13      /* (replaced by PTRACE_GETSIGINFO in <linux/ptrace.h>)  */
-#define PTRACE_OLD_SETSIGINFO   14      /* (replaced by PTRACE_SETSIGINFO in <linux/ptrace.h>)  */
-#define PTRACE_GETREGS          18      /* get all registers (pt_all_user_regs) in one shot */
-#define PTRACE_SETREGS          19      /* set all registers (pt_all_user_regs) in one shot */
-#define PTRACE_OLDSETOPTIONS    21
 #endif /* _ASM_IA64_PTRACE_H */
diff --git a/arch/ia64/include/asm/siginfo.h b/arch/ia64/include/asm/siginfo.h
index c8fcaa2ac48..6f2e2dd0f28 100644
--- a/arch/ia64/include/asm/siginfo.h
+++ b/arch/ia64/include/asm/siginfo.h
@@ -1,124 +1,14 @@
-#ifndef _ASM_IA64_SIGINFO_H
-#define _ASM_IA64_SIGINFO_H
 /*
 * Based on <asm-i386/siginfo.h>.
 *
 * Modified 1998-2002
 *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
 */
+#ifndef _ASM_IA64_SIGINFO_H
+#define _ASM_IA64_SIGINFO_H
-#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
-#define HAVE_ARCH_SIGINFO_T
-#define HAVE_ARCH_COPY_SIGINFO
-#define HAVE_ARCH_COPY_SIGINFO_TO_USER
-#include <asm-generic/siginfo.h>
-typedef struct siginfo {
-        int si_signo;
-        int si_errno;
-        int si_code;
-        int __pad0;
-        union {
-                int _pad[SI_PAD_SIZE];
-                /* kill() */
-                struct {
-                        pid_t _pid;             /* sender's pid */
-                        uid_t _uid;             /* sender's uid */
-                } _kill;
-                /* POSIX.1b timers */
-                struct {
-                        timer_t _tid;           /* timer id */
-                        int _overrun;           /* overrun count */
-                        char _pad[sizeof(__ARCH_SI_UID_T) - sizeof(int)];
-                        sigval_t _sigval;       /* must overlay ._rt._sigval! */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-                /* POSIX.1b signals */
-                struct {
-                        pid_t _pid;             /* sender's pid */
-                        uid_t _uid;             /* sender's uid */
-                        sigval_t _sigval;
-                } _rt;
-                /* SIGCHLD */
-                struct {
-                        pid_t _pid;             /* which child */
-                        uid_t _uid;             /* sender's uid */
-                        int _status;            /* exit code */
-                        clock_t _utime;
-                        clock_t _stime;
-                } _sigchld;
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        void __user *_addr;     /* faulting insn/memory ref. */
-                        int _imm;               /* immediate value for "break" */
-                        unsigned int _flags;    /* see below */
-                        unsigned long _isr;     /* isr */
-                        short _addr_lsb;        /* lsb of faulting address */
-                } _sigfault;
-                /* SIGPOLL */
-                struct {
-                        long _band;     /* POLL_IN, POLL_OUT, POLL_MSG (XPG requires a "long") */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-} siginfo_t;
-#define si_imm          _sifields._sigfault._imm        /* as per UNIX SysV ABI spec */
-#define si_flags        _sifields._sigfault._flags
-/*
- * si_isr is valid for SIGILL, SIGFPE, SIGSEGV, SIGBUS, and SIGTRAP provided that
- * si_code is non-zero and __ISR_VALID is set in si_flags.
- */
-#define si_isr          _sifields._sigfault._isr
-/*
- * Flag values for si_flags:
- */
-#define __ISR_VALID_BIT 0
-#define __ISR_VALID     (1 << __ISR_VALID_BIT)
-/*
- * SIGILL si_codes
- */
-#define ILL_BADIADDR    (__SI_FAULT|9)  /* unimplemented instruction address */
-#define __ILL_BREAK     (__SI_FAULT|10) /* illegal break */
-#define __ILL_BNDMOD    (__SI_FAULT|11) /* bundle-update (modification) in progress */
-#undef NSIGILL
-#define NSIGILL         11
-/*
- * SIGFPE si_codes
- */
-#define __FPE_DECOVF    (__SI_FAULT|9)  /* decimal overflow */
-#define __FPE_DECDIV    (__SI_FAULT|10) /* decimal division by zero */
-#define __FPE_DECERR    (__SI_FAULT|11) /* packed decimal error */
-#define __FPE_INVASC    (__SI_FAULT|12) /* invalid ASCII digit */
-#define __FPE_INVDEC    (__SI_FAULT|13) /* invalid decimal digit */
-#undef NSIGFPE
-#define NSIGFPE         13
-/*
- * SIGSEGV si_codes
- */
-#define __SEGV_PSTKOVF  (__SI_FAULT|3)  /* paragraph stack overflow */
-#undef NSIGSEGV
-#define NSIGSEGV        3
-#undef NSIGTRAP
-#define NSIGTRAP        4
-#ifdef __KERNEL__
 #include <linux/string.h>
+#include <uapi/asm/siginfo.h>
 static inline void
 copy_siginfo (siginfo_t *to, siginfo_t *from)
@@ -130,6 +20,4 @@ copy_siginfo (siginfo_t *to, siginfo_t *from)
                memcpy(to, from, 4*sizeof(int) + sizeof(from->_sifields._sigchld));
 }
-#endif /* __KERNEL__ */
 #endif /* _ASM_IA64_SIGINFO_H */
diff --git a/arch/ia64/include/asm/signal.h b/arch/ia64/include/asm/signal.h
index b166248d49a..aecda5b9eb4 100644
--- a/arch/ia64/include/asm/signal.h
+++ b/arch/ia64/include/asm/signal.h
@@ -1,6 +1,3 @@
-#ifndef _ASM_IA64_SIGNAL_H
-#define _ASM_IA64_SIGNAL_H
 /*
 * Modified 1998-2001, 2003
 *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
@@ -8,129 +5,18 @@
 * Unfortunately, this file is being included by bits/signal.h in
 * glibc-2.x.  Hence the #ifdef __KERNEL__ ugliness.
 */
+#ifndef _ASM_IA64_SIGNAL_H
+#define _ASM_IA64_SIGNAL_H
-#define SIGHUP           1
+#include <uapi/asm/signal.h>
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-/* signal 31 is no longer "unused", but the SIGUNUSED macro remains for backwards compatibility */
-#define SIGUNUSED       31
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOCLDWAIT    0x00000002
-#define SA_SIGINFO      0x00000004
-#define SA_ONSTACK      0x08000000
-#define SA_RESTART      0x10000000
-#define SA_NODEFER      0x40000000
-#define SA_RESETHAND    0x80000000
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-#define SA_RESTORER     0x04000000
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-/*
- * The minimum stack size needs to be fairly large because we want to
- * be sure that an app compiled for today's CPUs will continue to run
- * on all future CPU models.  The CPU model matters because the signal
- * frame needs to have space for the complete machine state, including
- * all physical stacked registers.  The number of physical stacked
- * registers is CPU model dependent, but given that the width of
- * ar.rsc.loadrs is 14 bits, we can assume that they'll never take up
- * more than 16KB of space.
- */
-#if 1
-  /*
-   * This is a stupid typo: the value was _meant_ to be 131072 (0x20000), but I typed it
-   * in wrong. ;-(  To preserve backwards compatibility, we leave the kernel at the
-   * incorrect value and fix libc only.
-   */
-# define MINSIGSTKSZ    131027  /* min. stack size for sigaltstack() */
-#else
-# define MINSIGSTKSZ    131072  /* min. stack size for sigaltstack() */
-#endif
-#define SIGSTKSZ        262144  /* default stack size for sigaltstack() */
-#ifdef __KERNEL__
 #define _NSIG           64
 #define _NSIG_BPW       64
 #define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-#endif /* __KERNEL__ */
-#include <asm-generic/signal-defs.h>
 # ifndef __ASSEMBLY__
-#  include <linux/types.h>
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-#ifdef __KERNEL__
 /* Most things should be clean enough to redefine this at will, if care
   is taken to make libc match.  */
@@ -154,7 +40,5 @@ struct k_sigaction {
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif /* __KERNEL__ */
 # endif /* !__ASSEMBLY__ */
 #endif /* _ASM_IA64_SIGNAL_H */
diff --git a/arch/ia64/include/asm/termios.h b/arch/ia64/include/asm/termios.h
index 689d218c0c2..a42f870ca4f 100644
--- a/arch/ia64/include/asm/termios.h
+++ b/arch/ia64/include/asm/termios.h
@@ -1,52 +1,14 @@
-#ifndef _ASM_IA64_TERMIOS_H
-#define _ASM_IA64_TERMIOS_H
 /*
 * Modified 1999
 *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
 *
 * 99/01/28     Added N_IRDA and N_SMSBLOCK
 */
+#ifndef _ASM_IA64_TERMIOS_H
+#define _ASM_IA64_TERMIOS_H
-#include <asm/termbits.h>
+#include <uapi/asm/termios.h>
-#include <asm/ioctls.h>
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-#define NCC 8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-/* modem lines */
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-# ifdef __KERNEL__
 /*      intr=^C         quit=^\         erase=del       kill=^U
        eof=^D          vtime=\0        vmin=\1         sxtc=\0
@@ -92,6 +54,4 @@ struct termio {
 #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
 #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
-# endif /* __KERNEL__ */
 #endif /* _ASM_IA64_TERMIOS_H */
diff --git a/arch/ia64/include/asm/thread_info.h b/arch/ia64/include/asm/thread_info.h
index f7ee8537831..ff2ae413658 100644
--- a/arch/ia64/include/asm/thread_info.h
+++ b/arch/ia64/include/asm/thread_info.h
@@ -106,7 +106,6 @@ struct thread_info {
 #define TIF_SYSCALL_AUDIT       3       /* syscall auditing active */
 #define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
 #define TIF_NOTIFY_RESUME       6       /* resumption notification requested */
-#define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17      /* is terminating due to OOM killer */
 #define TIF_MCA_INIT            18      /* this task is processing MCA or INIT */
 #define TIF_DB_DISABLED         19      /* debug trap disabled for fsyscall */
@@ -119,7 +118,6 @@ struct thread_info {
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_MCA_INIT           (1 << TIF_MCA_INIT)
 #define _TIF_DB_DISABLED        (1 << TIF_DB_DISABLED)
 #define _TIF_RESTORE_RSE        (1 << TIF_RESTORE_RSE)
diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
index 3f5b122d997..4c351b169da 100644
--- a/arch/ia64/include/asm/types.h
+++ b/arch/ia64/include/asm/types.h
@@ -1,6 +1,3 @@
-#ifndef _ASM_IA64_TYPES_H
-#define _ASM_IA64_TYPES_H
 /*
 * This file is never included by application software unless explicitly
 * requested (e.g., via linux/types.h) in which case the application is
@@ -13,32 +10,22 @@
 * Modified 1998-2000, 2002
 *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
 */
+#ifndef _ASM_IA64_TYPES_H
+#define _ASM_IA64_TYPES_H
-#ifdef __KERNEL__
 #include <asm-generic/int-ll64.h>
-#else
+#include <uapi/asm/types.h>
-#include <asm-generic/int-l64.h>
-#endif
 #ifdef __ASSEMBLY__
-# define __IA64_UL(x)           (x)
-# define __IA64_UL_CONST(x)     x
 #else
-# define __IA64_UL(x)           ((unsigned long)(x))
-# define __IA64_UL_CONST(x)     x##UL
 /*
 * These aren't exported outside the kernel to avoid name space clashes
 */
-# ifdef __KERNEL__
 struct fnptr {
        unsigned long ip;
        unsigned long gp;
 };
-# endif /* __KERNEL__ */
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_IA64_TYPES_H */
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 7a3bd252494..8b3ff2f5b86 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -1,331 +1,14 @@
-#ifndef _ASM_IA64_UNISTD_H
-#define _ASM_IA64_UNISTD_H
 /*
 * IA-64 Linux syscall numbers and inline-functions.
 *
 * Copyright (C) 1998-2005 Hewlett-Packard Co
 *      David Mosberger-Tang <davidm@hpl.hp.com>
 */
+#ifndef _ASM_IA64_UNISTD_H
+#define _ASM_IA64_UNISTD_H
-#include <asm/break.h>
+#include <uapi/asm/unistd.h>
-#define __BREAK_SYSCALL                 __IA64_BREAK_SYSCALL
-#define __NR_ni_syscall                 1024
-#define __NR_exit                       1025
-#define __NR_read                       1026
-#define __NR_write                      1027
-#define __NR_open                       1028
-#define __NR_close                      1029
-#define __NR_creat                      1030
-#define __NR_link                       1031
-#define __NR_unlink                     1032
-#define __NR_execve                     1033
-#define __NR_chdir                      1034
-#define __NR_fchdir                     1035
-#define __NR_utimes                     1036
-#define __NR_mknod                      1037
-#define __NR_chmod                      1038
-#define __NR_chown                      1039
-#define __NR_lseek                      1040
-#define __NR_getpid                     1041
-#define __NR_getppid                    1042
-#define __NR_mount                      1043
-#define __NR_umount                     1044
-#define __NR_setuid                     1045
-#define __NR_getuid                     1046
-#define __NR_geteuid                    1047
-#define __NR_ptrace                     1048
-#define __NR_access                     1049
-#define __NR_sync                       1050
-#define __NR_fsync                      1051
-#define __NR_fdatasync                  1052
-#define __NR_kill                       1053
-#define __NR_rename                     1054
-#define __NR_mkdir                      1055
-#define __NR_rmdir                      1056
-#define __NR_dup                        1057
-#define __NR_pipe                       1058
-#define __NR_times                      1059
-#define __NR_brk                        1060
-#define __NR_setgid                     1061
-#define __NR_getgid                     1062
-#define __NR_getegid                    1063
-#define __NR_acct                       1064
-#define __NR_ioctl                      1065
-#define __NR_fcntl                      1066
-#define __NR_umask                      1067
-#define __NR_chroot                     1068
-#define __NR_ustat                      1069
-#define __NR_dup2                       1070
-#define __NR_setreuid                   1071
-#define __NR_setregid                   1072
-#define __NR_getresuid                  1073
-#define __NR_setresuid                  1074
-#define __NR_getresgid                  1075
-#define __NR_setresgid                  1076
-#define __NR_getgroups                  1077
-#define __NR_setgroups                  1078
-#define __NR_getpgid                    1079
-#define __NR_setpgid                    1080
-#define __NR_setsid                     1081
-#define __NR_getsid                     1082
-#define __NR_sethostname                1083
-#define __NR_setrlimit                  1084
-#define __NR_getrlimit                  1085
-#define __NR_getrusage                  1086
-#define __NR_gettimeofday               1087
-#define __NR_settimeofday               1088
-#define __NR_select                     1089
-#define __NR_poll                       1090
-#define __NR_symlink                    1091
-#define __NR_readlink                   1092
-#define __NR_uselib                     1093
-#define __NR_swapon                     1094
-#define __NR_swapoff                    1095
-#define __NR_reboot                     1096
-#define __NR_truncate                   1097
-#define __NR_ftruncate                  1098
-#define __NR_fchmod                     1099
-#define __NR_fchown                     1100
-#define __NR_getpriority                1101
-#define __NR_setpriority                1102
-#define __NR_statfs                     1103
-#define __NR_fstatfs                    1104
-#define __NR_gettid                     1105
-#define __NR_semget                     1106
-#define __NR_semop                      1107
-#define __NR_semctl                     1108
-#define __NR_msgget                     1109
-#define __NR_msgsnd                     1110
-#define __NR_msgrcv                     1111
-#define __NR_msgctl                     1112
-#define __NR_shmget                     1113
-#define __NR_shmat                      1114
-#define __NR_shmdt                      1115
-#define __NR_shmctl                     1116
-/* also known as klogctl() in GNU libc: */
-#define __NR_syslog                     1117
-#define __NR_setitimer                  1118
-#define __NR_getitimer                  1119
-/* 1120 was __NR_old_stat */
-/* 1121 was __NR_old_lstat */
-/* 1122 was __NR_old_fstat */
-#define __NR_vhangup                    1123
-#define __NR_lchown                     1124
-#define __NR_remap_file_pages           1125
-#define __NR_wait4                      1126
-#define __NR_sysinfo                    1127
-#define __NR_clone                      1128
-#define __NR_setdomainname              1129
-#define __NR_uname                      1130
-#define __NR_adjtimex                   1131
-/* 1132 was __NR_create_module */
-#define __NR_init_module                1133
-#define __NR_delete_module              1134
-/* 1135 was __NR_get_kernel_syms */
-/* 1136 was __NR_query_module */
-#define __NR_quotactl                   1137
-#define __NR_bdflush                    1138
-#define __NR_sysfs                      1139
-#define __NR_personality                1140
-#define __NR_afs_syscall                1141
-#define __NR_setfsuid                   1142
-#define __NR_setfsgid                   1143
-#define __NR_getdents                   1144
-#define __NR_flock                      1145
-#define __NR_readv                      1146
-#define __NR_writev                     1147
-#define __NR_pread64                    1148
-#define __NR_pwrite64                   1149
-#define __NR__sysctl                    1150
-#define __NR_mmap                       1151
-#define __NR_munmap                     1152
-#define __NR_mlock                      1153
-#define __NR_mlockall                   1154
-#define __NR_mprotect                   1155
-#define __NR_mremap                     1156
-#define __NR_msync                      1157
-#define __NR_munlock                    1158
-#define __NR_munlockall                 1159
-#define __NR_sched_getparam             1160
-#define __NR_sched_setparam             1161
-#define __NR_sched_getscheduler         1162
-#define __NR_sched_setscheduler         1163
-#define __NR_sched_yield                1164
-#define __NR_sched_get_priority_max     1165
-#define __NR_sched_get_priority_min     1166
-#define __NR_sched_rr_get_interval      1167
-#define __NR_nanosleep                  1168
-#define __NR_nfsservctl                 1169
-#define __NR_prctl                      1170
-/* 1171 is reserved for backwards compatibility with old __NR_getpagesize */
-#define __NR_mmap2                      1172
-#define __NR_pciconfig_read             1173
-#define __NR_pciconfig_write            1174
-#define __NR_perfmonctl                 1175
-#define __NR_sigaltstack                1176
-#define __NR_rt_sigaction               1177
-#define __NR_rt_sigpending              1178
-#define __NR_rt_sigprocmask             1179
-#define __NR_rt_sigqueueinfo            1180
-#define __NR_rt_sigreturn               1181
-#define __NR_rt_sigsuspend              1182
-#define __NR_rt_sigtimedwait            1183
-#define __NR_getcwd                     1184
-#define __NR_capget                     1185
-#define __NR_capset                     1186
-#define __NR_sendfile                   1187
-#define __NR_getpmsg                    1188
-#define __NR_putpmsg                    1189
-#define __NR_socket                     1190
-#define __NR_bind                       1191
-#define __NR_connect                    1192
-#define __NR_listen                     1193
-#define __NR_accept                     1194
-#define __NR_getsockname                1195
-#define __NR_getpeername                1196
-#define __NR_socketpair                 1197
-#define __NR_send                       1198
-#define __NR_sendto                     1199
-#define __NR_recv                       1200
-#define __NR_recvfrom                   1201
-#define __NR_shutdown                   1202
-#define __NR_setsockopt                 1203
-#define __NR_getsockopt                 1204
-#define __NR_sendmsg                    1205
-#define __NR_recvmsg                    1206
-#define __NR_pivot_root                 1207
-#define __NR_mincore                    1208
-#define __NR_madvise                    1209
-#define __NR_stat                       1210
-#define __NR_lstat                      1211
-#define __NR_fstat                      1212
-#define __NR_clone2                     1213
-#define __NR_getdents64                 1214
-#define __NR_getunwind                  1215
-#define __NR_readahead                  1216
-#define __NR_setxattr                   1217
-#define __NR_lsetxattr                  1218
-#define __NR_fsetxattr                  1219
-#define __NR_getxattr                   1220
-#define __NR_lgetxattr                  1221
-#define __NR_fgetxattr                  1222
-#define __NR_listxattr                  1223
-#define __NR_llistxattr                 1224
-#define __NR_flistxattr                 1225
-#define __NR_removexattr                1226
-#define __NR_lremovexattr               1227
-#define __NR_fremovexattr               1228
-#define __NR_tkill                      1229
-#define __NR_futex                      1230
-#define __NR_sched_setaffinity          1231
-#define __NR_sched_getaffinity          1232
-#define __NR_set_tid_address            1233
-#define __NR_fadvise64                  1234
-#define __NR_tgkill                     1235
-#define __NR_exit_group                 1236
-#define __NR_lookup_dcookie             1237
-#define __NR_io_setup                   1238
-#define __NR_io_destroy                 1239
-#define __NR_io_getevents               1240
-#define __NR_io_submit                  1241
-#define __NR_io_cancel                  1242
-#define __NR_epoll_create               1243
-#define __NR_epoll_ctl                  1244
-#define __NR_epoll_wait                 1245
-#define __NR_restart_syscall            1246
-#define __NR_semtimedop                 1247
-#define __NR_timer_create               1248
-#define __NR_timer_settime              1249
-#define __NR_timer_gettime              1250
-#define __NR_timer_getoverrun           1251
-#define __NR_timer_delete               1252
-#define __NR_clock_settime              1253
-#define __NR_clock_gettime              1254
-#define __NR_clock_getres               1255
-#define __NR_clock_nanosleep            1256
-#define __NR_fstatfs64                  1257
-#define __NR_statfs64                   1258
-#define __NR_mbind                      1259
-#define __NR_get_mempolicy              1260
-#define __NR_set_mempolicy              1261
-#define __NR_mq_open                    1262
-#define __NR_mq_unlink                  1263
-#define __NR_mq_timedsend               1264
-#define __NR_mq_timedreceive            1265
-#define __NR_mq_notify                  1266
-#define __NR_mq_getsetattr              1267
-#define __NR_kexec_load                 1268
-#define __NR_vserver                    1269
-#define __NR_waitid                     1270
-#define __NR_add_key                    1271
-#define __NR_request_key                1272
-#define __NR_keyctl                     1273
-#define __NR_ioprio_set                 1274
-#define __NR_ioprio_get                 1275
-#define __NR_move_pages                 1276
-#define __NR_inotify_init               1277
-#define __NR_inotify_add_watch          1278
-#define __NR_inotify_rm_watch           1279
-#define __NR_migrate_pages              1280
-#define __NR_openat                     1281
-#define __NR_mkdirat                    1282
-#define __NR_mknodat                    1283
-#define __NR_fchownat                   1284
-#define __NR_futimesat                  1285
-#define __NR_newfstatat                 1286
-#define __NR_unlinkat                   1287
-#define __NR_renameat                   1288
-#define __NR_linkat                     1289
-#define __NR_symlinkat                  1290
-#define __NR_readlinkat                 1291
-#define __NR_fchmodat                   1292
-#define __NR_faccessat                  1293
-#define __NR_pselect6                   1294
-#define __NR_ppoll                      1295
-#define __NR_unshare                    1296
-#define __NR_splice                     1297
-#define __NR_set_robust_list            1298
-#define __NR_get_robust_list            1299
-#define __NR_sync_file_range            1300
-#define __NR_tee                        1301
-#define __NR_vmsplice                   1302
-#define __NR_fallocate                  1303
-#define __NR_getcpu                     1304
-#define __NR_epoll_pwait                1305
-#define __NR_utimensat                  1306
-#define __NR_signalfd                   1307
-#define __NR_timerfd                    1308
-#define __NR_eventfd                    1309
-#define __NR_timerfd_create             1310
-#define __NR_timerfd_settime            1311
-#define __NR_timerfd_gettime            1312
-#define __NR_signalfd4                  1313
-#define __NR_eventfd2                   1314
-#define __NR_epoll_create1              1315
-#define __NR_dup3                       1316
-#define __NR_pipe2                      1317
-#define __NR_inotify_init1              1318
-#define __NR_preadv                     1319
-#define __NR_pwritev                    1320
-#define __NR_rt_tgsigqueueinfo          1321
-#define __NR_recvmmsg                   1322
-#define __NR_fanotify_init              1323
-#define __NR_fanotify_mark              1324
-#define __NR_prlimit64                  1325
-#define __NR_name_to_handle_at          1326
-#define __NR_open_by_handle_at          1327
-#define __NR_clock_adjtime              1328
-#define __NR_syncfs                     1329
-#define __NR_setns                      1330
-#define __NR_sendmmsg                   1331
-#define __NR_process_vm_readv           1332
-#define __NR_process_vm_writev          1333
-#define __NR_accept4                    1334
-#ifdef __KERNEL__
 #define NR_syscalls                     311 /* length of syscall table */
@@ -382,5 +65,4 @@ asmlinkage long sys_rt_sigaction(int sig,
 #define cond_syscall(x) asmlinkage long x (void) __attribute__((weak,alias("sys_ni_syscall")))
 #endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #endif /* _ASM_IA64_UNISTD_H */
diff --git a/arch/ia64/include/asm/ustack.h b/arch/ia64/include/asm/ustack.h
index 504167c35b8..b275401b96d 100644
--- a/arch/ia64/include/asm/ustack.h
+++ b/arch/ia64/include/asm/ustack.h
@@ -1,20 +1,11 @@
 #ifndef _ASM_IA64_USTACK_H
 #define _ASM_IA64_USTACK_H
-/*
- * Constants for the user stack size
- */
-#ifdef __KERNEL__
 #include <asm/page.h>
+#include <uapi/asm/ustack.h>
 /* The absolute hard limit for stack size is 1/2 of the mappable space in the region */
 #define MAX_USER_STACK_SIZE     (RGN_MAP_LIMIT/2)
 #define STACK_TOP               (0x6000000000000000UL + RGN_MAP_LIMIT)
 #define STACK_TOP_MAX           STACK_TOP
-#endif
-/* Make a default stack size of 2GiB */
-#define DEFAULT_USER_STACK_SIZE (1UL << 31)
 #endif /* _ASM_IA64_USTACK_H */
diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild
index baebb3da1d4..30cafac9370 100644
--- a/arch/ia64/include/uapi/asm/Kbuild
+++ b/arch/ia64/include/uapi/asm/Kbuild
@@ -1,3 +1,48 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += break.h
+header-y += byteorder.h
+header-y += cmpxchg.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += fpu.h
+header-y += gcc_intrin.h
+header-y += ia64regs.h
+header-y += intel_intrin.h
+header-y += intrinsics.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += kvm.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += param.h
+header-y += perfmon.h
+header-y += perfmon_default_smpl.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += ptrace.h
+header-y += ptrace_offsets.h
+header-y += resource.h
+header-y += rse.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += shmbuf.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += ucontext.h
+header-y += unistd.h
+header-y += ustack.h
diff --git a/arch/ia64/include/asm/auxvec.h b/arch/ia64/include/uapi/asm/auxvec.h
index 58277fc650e..58277fc650e 100644
--- a/arch/ia64/include/asm/auxvec.h
+++ b/arch/ia64/include/uapi/asm/auxvec.h
diff --git a/arch/ia64/include/asm/bitsperlong.h b/arch/ia64/include/uapi/asm/bitsperlong.h
index ec4db3c970b..ec4db3c970b 100644
--- a/arch/ia64/include/asm/bitsperlong.h
+++ b/arch/ia64/include/uapi/asm/bitsperlong.h
diff --git a/arch/ia64/include/asm/break.h b/arch/ia64/include/uapi/asm/break.h
index e90c40ec9ed..e90c40ec9ed 100644
--- a/arch/ia64/include/asm/break.h
+++ b/arch/ia64/include/uapi/asm/break.h
diff --git a/arch/ia64/include/asm/byteorder.h b/arch/ia64/include/uapi/asm/byteorder.h
index a8dd7355815..a8dd7355815 100644
--- a/arch/ia64/include/asm/byteorder.h
+++ b/arch/ia64/include/uapi/asm/byteorder.h
diff --git a/arch/ia64/include/asm/cmpxchg.h b/arch/ia64/include/uapi/asm/cmpxchg.h
index 4f37dbbb864..4f37dbbb864 100644
--- a/arch/ia64/include/asm/cmpxchg.h
+++ b/arch/ia64/include/uapi/asm/cmpxchg.h
diff --git a/arch/ia64/include/asm/errno.h b/arch/ia64/include/uapi/asm/errno.h
index 4c82b503d92..4c82b503d92 100644
--- a/arch/ia64/include/asm/errno.h
+++ b/arch/ia64/include/uapi/asm/errno.h
diff --git a/arch/ia64/include/asm/fcntl.h b/arch/ia64/include/uapi/asm/fcntl.h
index 1dd275dc8f6..1dd275dc8f6 100644
--- a/arch/ia64/include/asm/fcntl.h
+++ b/arch/ia64/include/uapi/asm/fcntl.h
diff --git a/arch/ia64/include/asm/fpu.h b/arch/ia64/include/uapi/asm/fpu.h
index b6395ad1500..b6395ad1500 100644
--- a/arch/ia64/include/asm/fpu.h
+++ b/arch/ia64/include/uapi/asm/fpu.h
diff --git a/arch/ia64/include/uapi/asm/gcc_intrin.h b/arch/ia64/include/uapi/asm/gcc_intrin.h
new file mode 100644
index 00000000000..61d0d011197
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/gcc_intrin.h
@@ -0,0 +1,618 @@
+/*
+ *
+ * Copyright (C) 2002,2003 Jun Nakajima <jun.nakajima@intel.com>
+ * Copyright (C) 2002,2003 Suresh Siddha <suresh.b.siddha@intel.com>
+ */
+#ifndef _UAPI_ASM_IA64_GCC_INTRIN_H
+#define _UAPI_ASM_IA64_GCC_INTRIN_H
+#include <linux/types.h>
+#include <linux/compiler.h>
+/* define this macro to get some asm stmts included in 'c' files */
+#define ASM_SUPPORTED
+/* Optimization barrier */
+/* The "volatile" is due to gcc bugs */
+#define ia64_barrier()  asm volatile ("":::"memory")
+#define ia64_stop()     asm volatile (";;"::)
+#define ia64_invala_gr(regnum)  asm volatile ("invala.e r%0" :: "i"(regnum))
+#define ia64_invala_fr(regnum)  asm volatile ("invala.e f%0" :: "i"(regnum))
+#define ia64_flushrs() asm volatile ("flushrs;;":::"memory")
+#define ia64_loadrs() asm volatile ("loadrs;;":::"memory")
+extern void ia64_bad_param_for_setreg (void);
+extern void ia64_bad_param_for_getreg (void);
+#define ia64_native_setreg(regnum, val)                                         \
+({                                                                              \
+        switch (regnum) {                                                       \
+            case _IA64_REG_PSR_L:                                               \
+                    asm volatile ("mov psr.l=%0" :: "r"(val) : "memory");       \
+                    break;                                                      \
+            case _IA64_REG_AR_KR0 ... _IA64_REG_AR_EC:                          \
+                    asm volatile ("mov ar%0=%1" ::                              \
+                                          "i" (regnum - _IA64_REG_AR_KR0),      \
+                                          "r"(val): "memory");                  \
+                    break;                                                      \
+            case _IA64_REG_CR_DCR ... _IA64_REG_CR_LRR1:                        \
+                    asm volatile ("mov cr%0=%1" ::                              \
+                                          "i" (regnum - _IA64_REG_CR_DCR),      \
+                                          "r"(val): "memory" );                 \
+                    break;                                                      \
+            case _IA64_REG_SP:                                                  \
+                    asm volatile ("mov r12=%0" ::                               \
+                                          "r"(val): "memory");                  \
+                    break;                                                      \
+            case _IA64_REG_GP:                                                  \
+                    asm volatile ("mov gp=%0" :: "r"(val) : "memory");          \
+                break;                                                          \
+            default:                                                            \
+                    ia64_bad_param_for_setreg();                                \
+                    break;                                                      \
+        }                                                                       \
+})
+#define ia64_native_getreg(regnum)                                              \
+({                                                                              \
+        __u64 ia64_intri_res;                                                   \
+                                                                                \
+        switch (regnum) {                                                       \
+        case _IA64_REG_GP:                                                      \
+                asm volatile ("mov %0=gp" : "=r"(ia64_intri_res));              \
+                break;                                                          \
+        case _IA64_REG_IP:                                                      \
+                asm volatile ("mov %0=ip" : "=r"(ia64_intri_res));              \
+                break;                                                          \
+        case _IA64_REG_PSR:                                                     \
+                asm volatile ("mov %0=psr" : "=r"(ia64_intri_res));             \
+                break;                                                          \
+        case _IA64_REG_TP:      /* for current() */                             \
+                ia64_intri_res = ia64_r13;                                      \
+                break;                                                          \
+        case _IA64_REG_AR_KR0 ... _IA64_REG_AR_EC:                              \
+                asm volatile ("mov %0=ar%1" : "=r" (ia64_intri_res)             \
+                                      : "i"(regnum - _IA64_REG_AR_KR0));        \
+                break;                                                          \
+        case _IA64_REG_CR_DCR ... _IA64_REG_CR_LRR1:                            \
+                asm volatile ("mov %0=cr%1" : "=r" (ia64_intri_res)             \
+                                      : "i" (regnum - _IA64_REG_CR_DCR));       \
+                break;                                                          \
+        case _IA64_REG_SP:                                                      \
+                asm volatile ("mov %0=sp" : "=r" (ia64_intri_res));             \
+                break;                                                          \
+        default:                                                                \
+                ia64_bad_param_for_getreg();                                    \
+                break;                                                          \
+        }                                                                       \
+        ia64_intri_res;                                                         \
+})
+#define ia64_hint_pause 0
+#define ia64_hint(mode)                                         \
+({                                                              \
+        switch (mode) {                                         \
+        case ia64_hint_pause:                                   \
+                asm volatile ("hint @pause" ::: "memory");      \
+                break;                                          \
+        }                                                       \
+})
+/* Integer values for mux1 instruction */
+#define ia64_mux1_brcst 0
+#define ia64_mux1_mix   8
+#define ia64_mux1_shuf  9
+#define ia64_mux1_alt  10
+#define ia64_mux1_rev  11
+#define ia64_mux1(x, mode)                                                      \
+({                                                                              \
+        __u64 ia64_intri_res;                                                   \
+                                                                                \
+        switch (mode) {                                                         \
+        case ia64_mux1_brcst:                                                   \
+                asm ("mux1 %0=%1,@brcst" : "=r" (ia64_intri_res) : "r" (x));    \
+                break;                                                          \
+        case ia64_mux1_mix:                                                     \
+                asm ("mux1 %0=%1,@mix" : "=r" (ia64_intri_res) : "r" (x));      \
+                break;                                                          \
+        case ia64_mux1_shuf:                                                    \
+                asm ("mux1 %0=%1,@shuf" : "=r" (ia64_intri_res) : "r" (x));     \
+                break;                                                          \
+        case ia64_mux1_alt:                                                     \
+                asm ("mux1 %0=%1,@alt" : "=r" (ia64_intri_res) : "r" (x));      \
+                break;                                                          \
+        case ia64_mux1_rev:                                                     \
+                asm ("mux1 %0=%1,@rev" : "=r" (ia64_intri_res) : "r" (x));      \
+                break;                                                          \
+        }                                                                       \
+        ia64_intri_res;                                                         \
+})
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+# define ia64_popcnt(x)         __builtin_popcountl(x)
+#else
+# define ia64_popcnt(x)                                         \
+  ({                                                            \
+        __u64 ia64_intri_res;                                   \
+        asm ("popcnt %0=%1" : "=r" (ia64_intri_res) : "r" (x)); \
+                                                                \
+        ia64_intri_res;                                         \
+  })
+#endif
+#define ia64_getf_exp(x)                                        \
+({                                                              \
+        long ia64_intri_res;                                    \
+                                                                \
+        asm ("getf.exp %0=%1" : "=r"(ia64_intri_res) : "f"(x)); \
+                                                                \
+        ia64_intri_res;                                         \
+})
+#define ia64_shrp(a, b, count)                                                          \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm ("shrp %0=%1,%2,%3" : "=r"(ia64_intri_res) : "r"(a), "r"(b), "i"(count));   \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_ldfs(regnum, x)                                    \
+({                                                              \
+        register double __f__ asm ("f"#regnum);                 \
+        asm volatile ("ldfs %0=[%1]" :"=f"(__f__): "r"(x));     \
+})
+#define ia64_ldfd(regnum, x)                                    \
+({                                                              \
+        register double __f__ asm ("f"#regnum);                 \
+        asm volatile ("ldfd %0=[%1]" :"=f"(__f__): "r"(x));     \
+})
+#define ia64_ldfe(regnum, x)                                    \
+({                                                              \
+        register double __f__ asm ("f"#regnum);                 \
+        asm volatile ("ldfe %0=[%1]" :"=f"(__f__): "r"(x));     \
+})
+#define ia64_ldf8(regnum, x)                                    \
+({                                                              \
+        register double __f__ asm ("f"#regnum);                 \
+        asm volatile ("ldf8 %0=[%1]" :"=f"(__f__): "r"(x));     \
+})
+#define ia64_ldf_fill(regnum, x)                                \
+({                                                              \
+        register double __f__ asm ("f"#regnum);                 \
+        asm volatile ("ldf.fill %0=[%1]" :"=f"(__f__): "r"(x)); \
+})
+#define ia64_st4_rel_nta(m, val)                                        \
+({                                                                      \
+        asm volatile ("st4.rel.nta [%0] = %1\n\t" :: "r"(m), "r"(val)); \
+})
+#define ia64_stfs(x, regnum)                                            \
+({                                                                      \
+        register double __f__ asm ("f"#regnum);                         \
+        asm volatile ("stfs [%0]=%1" :: "r"(x), "f"(__f__) : "memory"); \
+})
+#define ia64_stfd(x, regnum)                                            \
+({                                                                      \
+        register double __f__ asm ("f"#regnum);                         \
+        asm volatile ("stfd [%0]=%1" :: "r"(x), "f"(__f__) : "memory"); \
+})
+#define ia64_stfe(x, regnum)                                            \
+({                                                                      \
+        register double __f__ asm ("f"#regnum);                         \
+        asm volatile ("stfe [%0]=%1" :: "r"(x), "f"(__f__) : "memory"); \
+})
+#define ia64_stf8(x, regnum)                                            \
+({                                                                      \
+        register double __f__ asm ("f"#regnum);                         \
+        asm volatile ("stf8 [%0]=%1" :: "r"(x), "f"(__f__) : "memory"); \
+})
+#define ia64_stf_spill(x, regnum)                                               \
+({                                                                              \
+        register double __f__ asm ("f"#regnum);                                 \
+        asm volatile ("stf.spill [%0]=%1" :: "r"(x), "f"(__f__) : "memory");    \
+})
+#define ia64_fetchadd4_acq(p, inc)                                              \
+({                                                                              \
+                                                                                \
+        __u64 ia64_intri_res;                                                   \
+        asm volatile ("fetchadd4.acq %0=[%1],%2"                                \
+                                : "=r"(ia64_intri_res) : "r"(p), "i" (inc)      \
+                                : "memory");                                    \
+                                                                                \
+        ia64_intri_res;                                                         \
+})
+#define ia64_fetchadd4_rel(p, inc)                                              \
+({                                                                              \
+        __u64 ia64_intri_res;                                                   \
+        asm volatile ("fetchadd4.rel %0=[%1],%2"                                \
+                                : "=r"(ia64_intri_res) : "r"(p), "i" (inc)      \
+                                : "memory");                                    \
+                                                                                \
+        ia64_intri_res;                                                         \
+})
+#define ia64_fetchadd8_acq(p, inc)                                              \
+({                                                                              \
+                                                                                \
+        __u64 ia64_intri_res;                                                   \
+        asm volatile ("fetchadd8.acq %0=[%1],%2"                                \
+                                : "=r"(ia64_intri_res) : "r"(p), "i" (inc)      \
+                                : "memory");                                    \
+                                                                                \
+        ia64_intri_res;                                                         \
+})
+#define ia64_fetchadd8_rel(p, inc)                                              \
+({                                                                              \
+        __u64 ia64_intri_res;                                                   \
+        asm volatile ("fetchadd8.rel %0=[%1],%2"                                \
+                                : "=r"(ia64_intri_res) : "r"(p), "i" (inc)      \
+                                : "memory");                                    \
+                                                                                \
+        ia64_intri_res;                                                         \
+})
+#define ia64_xchg1(ptr,x)                                                       \
+({                                                                              \
+        __u64 ia64_intri_res;                                                   \
+        asm volatile ("xchg1 %0=[%1],%2"                                        \
+                      : "=r" (ia64_intri_res) : "r" (ptr), "r" (x) : "memory"); \
+        ia64_intri_res;                                                         \
+})
+#define ia64_xchg2(ptr,x)                                               \
+({                                                                      \
+        __u64 ia64_intri_res;                                           \
+        asm volatile ("xchg2 %0=[%1],%2" : "=r" (ia64_intri_res)        \
+                      : "r" (ptr), "r" (x) : "memory");                 \
+        ia64_intri_res;                                                 \
+})
+#define ia64_xchg4(ptr,x)                                               \
+({                                                                      \
+        __u64 ia64_intri_res;                                           \
+        asm volatile ("xchg4 %0=[%1],%2" : "=r" (ia64_intri_res)        \
+                      : "r" (ptr), "r" (x) : "memory");                 \
+        ia64_intri_res;                                                 \
+})
+#define ia64_xchg8(ptr,x)                                               \
+({                                                                      \
+        __u64 ia64_intri_res;                                           \
+        asm volatile ("xchg8 %0=[%1],%2" : "=r" (ia64_intri_res)        \
+                      : "r" (ptr), "r" (x) : "memory");                 \
+        ia64_intri_res;                                                 \
+})
+#define ia64_cmpxchg1_acq(ptr, new, old)                                                \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
+        asm volatile ("cmpxchg1.acq %0=[%1],%2,ar.ccv":                                 \
+                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_cmpxchg1_rel(ptr, new, old)                                                \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
+        asm volatile ("cmpxchg1.rel %0=[%1],%2,ar.ccv":                                 \
+                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_cmpxchg2_acq(ptr, new, old)                                                \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
+        asm volatile ("cmpxchg2.acq %0=[%1],%2,ar.ccv":                                 \
+                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_cmpxchg2_rel(ptr, new, old)                                                \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
+                                                                                        \
+        asm volatile ("cmpxchg2.rel %0=[%1],%2,ar.ccv":                                 \
+                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_cmpxchg4_acq(ptr, new, old)                                                \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
+        asm volatile ("cmpxchg4.acq %0=[%1],%2,ar.ccv":                                 \
+                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_cmpxchg4_rel(ptr, new, old)                                                \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
+        asm volatile ("cmpxchg4.rel %0=[%1],%2,ar.ccv":                                 \
+                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_cmpxchg8_acq(ptr, new, old)                                                \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
+        asm volatile ("cmpxchg8.acq %0=[%1],%2,ar.ccv":                                 \
+                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_cmpxchg8_rel(ptr, new, old)                                                \
+({                                                                                      \
+        __u64 ia64_intri_res;                                                           \
+        asm volatile ("mov ar.ccv=%0;;" :: "rO"(old));                                  \
+                                                                                        \
+        asm volatile ("cmpxchg8.rel %0=[%1],%2,ar.ccv":                                 \
+                              "=r"(ia64_intri_res) : "r"(ptr), "r"(new) : "memory");    \
+        ia64_intri_res;                                                                 \
+})
+#define ia64_mf()       asm volatile ("mf" ::: "memory")
+#define ia64_mfa()      asm volatile ("mf.a" ::: "memory")
+#define ia64_invala() asm volatile ("invala" ::: "memory")
+#define ia64_native_thash(addr)                                                 \
+({                                                                              \
+        unsigned long ia64_intri_res;                                           \
+        asm volatile ("thash %0=%1" : "=r"(ia64_intri_res) : "r" (addr));       \
+        ia64_intri_res;                                                         \
+})
+#define ia64_srlz_i()   asm volatile (";; srlz.i ;;" ::: "memory")
+#define ia64_srlz_d()   asm volatile (";; srlz.d" ::: "memory");
+#ifdef HAVE_SERIALIZE_DIRECTIVE
+# define ia64_dv_serialize_data()               asm volatile (".serialize.data");
+# define ia64_dv_serialize_instruction()        asm volatile (".serialize.instruction");
+#else
+# define ia64_dv_serialize_data()
+# define ia64_dv_serialize_instruction()
+#endif
+#define ia64_nop(x)     asm volatile ("nop %0"::"i"(x));
+#define ia64_itci(addr) asm volatile ("itc.i %0;;" :: "r"(addr) : "memory")
+#define ia64_itcd(addr) asm volatile ("itc.d %0;;" :: "r"(addr) : "memory")
+#define ia64_itri(trnum, addr) asm volatile ("itr.i itr[%0]=%1"                         \
+                                             :: "r"(trnum), "r"(addr) : "memory")
+#define ia64_itrd(trnum, addr) asm volatile ("itr.d dtr[%0]=%1"                         \
+                                             :: "r"(trnum), "r"(addr) : "memory")
+#define ia64_tpa(addr)                                                          \
+({                                                                              \
+        unsigned long ia64_pa;                                                  \
+        asm volatile ("tpa %0 = %1" : "=r"(ia64_pa) : "r"(addr) : "memory");    \
+        ia64_pa;                                                                \
+})
+#define __ia64_set_dbr(index, val)                                              \
+        asm volatile ("mov dbr[%0]=%1" :: "r"(index), "r"(val) : "memory")
+#define ia64_set_ibr(index, val)                                                \
+        asm volatile ("mov ibr[%0]=%1" :: "r"(index), "r"(val) : "memory")
+#define ia64_set_pkr(index, val)                                                \
+        asm volatile ("mov pkr[%0]=%1" :: "r"(index), "r"(val) : "memory")
+#define ia64_set_pmc(index, val)                                                \
+        asm volatile ("mov pmc[%0]=%1" :: "r"(index), "r"(val) : "memory")
+#define ia64_set_pmd(index, val)                                                \
+        asm volatile ("mov pmd[%0]=%1" :: "r"(index), "r"(val) : "memory")
+#define ia64_native_set_rr(index, val)                                                  \
+        asm volatile ("mov rr[%0]=%1" :: "r"(index), "r"(val) : "memory");
+#define ia64_native_get_cpuid(index)                                                    \
+({                                                                                      \
+        unsigned long ia64_intri_res;                                                   \
+        asm volatile ("mov %0=cpuid[%r1]" : "=r"(ia64_intri_res) : "rO"(index));        \
+        ia64_intri_res;                                                                 \
+})
+#define __ia64_get_dbr(index)                                                   \
+({                                                                              \
+        unsigned long ia64_intri_res;                                           \
+        asm volatile ("mov %0=dbr[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
+        ia64_intri_res;                                                         \
+})
+#define ia64_get_ibr(index)                                                     \
+({                                                                              \
+        unsigned long ia64_intri_res;                                           \
+        asm volatile ("mov %0=ibr[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
+        ia64_intri_res;                                                         \
+})
+#define ia64_get_pkr(index)                                                     \
+({                                                                              \
+        unsigned long ia64_intri_res;                                           \
+        asm volatile ("mov %0=pkr[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
+        ia64_intri_res;                                                         \
+})
+#define ia64_get_pmc(index)                                                     \
+({                                                                              \
+        unsigned long ia64_intri_res;                                           \
+        asm volatile ("mov %0=pmc[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
+        ia64_intri_res;                                                         \
+})
+#define ia64_native_get_pmd(index)                                              \
+({                                                                              \
+        unsigned long ia64_intri_res;                                           \
+        asm volatile ("mov %0=pmd[%1]" : "=r"(ia64_intri_res) : "r"(index));    \
+        ia64_intri_res;                                                         \
+})
+#define ia64_native_get_rr(index)                                               \
+({                                                                              \
+        unsigned long ia64_intri_res;                                           \
+        asm volatile ("mov %0=rr[%1]" : "=r"(ia64_intri_res) : "r" (index));    \
+        ia64_intri_res;                                                         \
+})
+#define ia64_native_fc(addr)    asm volatile ("fc %0" :: "r"(addr) : "memory")
+#define ia64_sync_i()   asm volatile (";; sync.i" ::: "memory")
+#define ia64_native_ssm(mask)   asm volatile ("ssm %0":: "i"((mask)) : "memory")
+#define ia64_native_rsm(mask)   asm volatile ("rsm %0":: "i"((mask)) : "memory")
+#define ia64_sum(mask)  asm volatile ("sum %0":: "i"((mask)) : "memory")
+#define ia64_rum(mask)  asm volatile ("rum %0":: "i"((mask)) : "memory")
+#define ia64_ptce(addr) asm volatile ("ptc.e %0" :: "r"(addr))
+#define ia64_native_ptcga(addr, size)                                           \
+do {                                                                            \
+        asm volatile ("ptc.ga %0,%1" :: "r"(addr), "r"(size) : "memory");       \
+        ia64_dv_serialize_data();                                               \
+} while (0)
+#define ia64_ptcl(addr, size)                                                   \
+do {                                                                            \
+        asm volatile ("ptc.l %0,%1" :: "r"(addr), "r"(size) : "memory");        \
+        ia64_dv_serialize_data();                                               \
+} while (0)
+#define ia64_ptri(addr, size)                                           \
+        asm volatile ("ptr.i %0,%1" :: "r"(addr), "r"(size) : "memory")
+#define ia64_ptrd(addr, size)                                           \
+        asm volatile ("ptr.d %0,%1" :: "r"(addr), "r"(size) : "memory")
+#define ia64_ttag(addr)                                                 \
+({                                                                        \
+        __u64 ia64_intri_res;                                              \
+        asm volatile ("ttag %0=%1" : "=r"(ia64_intri_res) : "r" (addr));   \
+        ia64_intri_res;                                                  \
+})
+/* Values for lfhint in ia64_lfetch and ia64_lfetch_fault */
+#define ia64_lfhint_none   0
+#define ia64_lfhint_nt1    1
+#define ia64_lfhint_nt2    2
+#define ia64_lfhint_nta    3
+#define ia64_lfetch(lfhint, y)                                  \
+({                                                              \
+        switch (lfhint) {                                       \
+        case ia64_lfhint_none:                                  \
+                asm volatile ("lfetch [%0]" : : "r"(y));        \
+                break;                                          \
+        case ia64_lfhint_nt1:                                   \
+                asm volatile ("lfetch.nt1 [%0]" : : "r"(y));    \
+                break;                                          \
+        case ia64_lfhint_nt2:                                   \
+                asm volatile ("lfetch.nt2 [%0]" : : "r"(y));    \
+                break;                                          \
+        case ia64_lfhint_nta:                                   \
+                asm volatile ("lfetch.nta [%0]" : : "r"(y));    \
+                break;                                          \
+        }                                                       \
+})
+#define ia64_lfetch_excl(lfhint, y)                                     \
+({                                                                      \
+        switch (lfhint) {                                               \
+        case ia64_lfhint_none:                                          \
+                asm volatile ("lfetch.excl [%0]" :: "r"(y));            \
+                break;                                                  \
+        case ia64_lfhint_nt1:                                           \
+                asm volatile ("lfetch.excl.nt1 [%0]" :: "r"(y));        \
+                break;                                                  \
+        case ia64_lfhint_nt2:                                           \
+                asm volatile ("lfetch.excl.nt2 [%0]" :: "r"(y));        \
+                break;                                                  \
+        case ia64_lfhint_nta:                                           \
+                asm volatile ("lfetch.excl.nta [%0]" :: "r"(y));        \
+                break;                                                  \
+        }                                                               \
+})
+#define ia64_lfetch_fault(lfhint, y)                                    \
+({                                                                      \
+        switch (lfhint) {                                               \
+        case ia64_lfhint_none:                                          \
+                asm volatile ("lfetch.fault [%0]" : : "r"(y));          \
+                break;                                                  \
+        case ia64_lfhint_nt1:                                           \
+                asm volatile ("lfetch.fault.nt1 [%0]" : : "r"(y));      \
+                break;                                                  \
+        case ia64_lfhint_nt2:                                           \
+                asm volatile ("lfetch.fault.nt2 [%0]" : : "r"(y));      \
+                break;                                                  \
+        case ia64_lfhint_nta:                                           \
+                asm volatile ("lfetch.fault.nta [%0]" : : "r"(y));      \
+                break;                                                  \
+        }                                                               \
+})
+#define ia64_lfetch_fault_excl(lfhint, y)                               \
+({                                                                      \
+        switch (lfhint) {                                               \
+        case ia64_lfhint_none:                                          \
+                asm volatile ("lfetch.fault.excl [%0]" :: "r"(y));      \
+                break;                                                  \
+        case ia64_lfhint_nt1:                                           \
+                asm volatile ("lfetch.fault.excl.nt1 [%0]" :: "r"(y));  \
+                break;                                                  \
+        case ia64_lfhint_nt2:                                           \
+                asm volatile ("lfetch.fault.excl.nt2 [%0]" :: "r"(y));  \
+                break;                                                  \
+        case ia64_lfhint_nta:                                           \
+                asm volatile ("lfetch.fault.excl.nta [%0]" :: "r"(y));  \
+                break;                                                  \
+        }                                                               \
+})
+#define ia64_native_intrin_local_irq_restore(x)                 \
+do {                                                            \
+        asm volatile (";;   cmp.ne p6,p7=%0,r0;;"               \
+                      "(p6) ssm psr.i;"                         \
+                      "(p7) rsm psr.i;;"                        \
+                      "(p6) srlz.d"                             \
+                      :: "r"((x)) : "p6", "p7", "memory");      \
+} while (0)
+#endif /* _UAPI_ASM_IA64_GCC_INTRIN_H */
diff --git a/arch/ia64/include/asm/ia64regs.h b/arch/ia64/include/uapi/asm/ia64regs.h
index 1757f1c11ad..1757f1c11ad 100644
--- a/arch/ia64/include/asm/ia64regs.h
+++ b/arch/ia64/include/uapi/asm/ia64regs.h
diff --git a/arch/ia64/include/asm/intel_intrin.h b/arch/ia64/include/uapi/asm/intel_intrin.h
index 53cec577558..53cec577558 100644
--- a/arch/ia64/include/asm/intel_intrin.h
+++ b/arch/ia64/include/uapi/asm/intel_intrin.h
diff --git a/arch/ia64/include/uapi/asm/intrinsics.h b/arch/ia64/include/uapi/asm/intrinsics.h
new file mode 100644
index 00000000000..5829978ff46
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/intrinsics.h
@@ -0,0 +1,124 @@
+/*
+ * Compiler-dependent intrinsics.
+ *
+ * Copyright (C) 2002-2003 Hewlett-Packard Co
+ *      David Mosberger-Tang <davidm@hpl.hp.com>
+ */
+#ifndef _UAPI_ASM_IA64_INTRINSICS_H
+#define _UAPI_ASM_IA64_INTRINSICS_H
+#ifndef __ASSEMBLY__
+#include <linux/types.h>
+/* include compiler specific intrinsics */
+#include <asm/ia64regs.h>
+#ifdef __INTEL_COMPILER
+# include <asm/intel_intrin.h>
+#else
+# include <asm/gcc_intrin.h>
+#endif
+#include <asm/cmpxchg.h>
+#define ia64_native_get_psr_i() (ia64_native_getreg(_IA64_REG_PSR) & IA64_PSR_I)
+#define ia64_native_set_rr0_to_rr4(val0, val1, val2, val3, val4)        \
+do {                                                                    \
+        ia64_native_set_rr(0x0000000000000000UL, (val0));               \
+        ia64_native_set_rr(0x2000000000000000UL, (val1));               \
+        ia64_native_set_rr(0x4000000000000000UL, (val2));               \
+        ia64_native_set_rr(0x6000000000000000UL, (val3));               \
+        ia64_native_set_rr(0x8000000000000000UL, (val4));               \
+} while (0)
+/*
+ * Force an unresolved reference if someone tries to use
+ * ia64_fetch_and_add() with a bad value.
+ */
+extern unsigned long __bad_size_for_ia64_fetch_and_add (void);
+extern unsigned long __bad_increment_for_ia64_fetch_and_add (void);
+#define IA64_FETCHADD(tmp,v,n,sz,sem)                                           \
+({                                                                              \
+        switch (sz) {                                                           \
+              case 4:                                                           \
+                tmp = ia64_fetchadd4_##sem((unsigned int *) v, n);              \
+                break;                                                          \
+                                                                                \
+              case 8:                                                           \
+                tmp = ia64_fetchadd8_##sem((unsigned long *) v, n);             \
+                break;                                                          \
+                                                                                \
+              default:                                                          \
+                __bad_size_for_ia64_fetch_and_add();                            \
+        }                                                                       \
+})
+#define ia64_fetchadd(i,v,sem)                                                          \
+({                                                                                      \
+        __u64 _tmp;                                                                     \
+        volatile __typeof__(*(v)) *_v = (v);                                            \
+        /* Can't use a switch () here: gcc isn't always smart enough for that... */     \
+        if ((i) == -16)                                                                 \
+                IA64_FETCHADD(_tmp, _v, -16, sizeof(*(v)), sem);                        \
+        else if ((i) == -8)                                                             \
+                IA64_FETCHADD(_tmp, _v, -8, sizeof(*(v)), sem);                         \
+        else if ((i) == -4)                                                             \
+                IA64_FETCHADD(_tmp, _v, -4, sizeof(*(v)), sem);                         \
+        else if ((i) == -1)                                                             \
+                IA64_FETCHADD(_tmp, _v, -1, sizeof(*(v)), sem);                         \
+        else if ((i) == 1)                                                              \
+                IA64_FETCHADD(_tmp, _v, 1, sizeof(*(v)), sem);                          \
+        else if ((i) == 4)                                                              \
+                IA64_FETCHADD(_tmp, _v, 4, sizeof(*(v)), sem);                          \
+        else if ((i) == 8)                                                              \
+                IA64_FETCHADD(_tmp, _v, 8, sizeof(*(v)), sem);                          \
+        else if ((i) == 16)                                                             \
+                IA64_FETCHADD(_tmp, _v, 16, sizeof(*(v)), sem);                         \
+        else                                                                            \
+                _tmp = __bad_increment_for_ia64_fetch_and_add();                        \
+        (__typeof__(*(v))) (_tmp);      /* return old value */                          \
+})
+#define ia64_fetch_and_add(i,v) (ia64_fetchadd(i, v, rel) + (i)) /* return new value */
+#endif
+#ifndef __ASSEMBLY__
+#define IA64_INTRINSIC_API(name)        ia64_native_ ## name
+#define IA64_INTRINSIC_MACRO(name)      ia64_native_ ## name
+/************************************************/
+/* Instructions paravirtualized for correctness */
+/************************************************/
+/* fc, thash, get_cpuid, get_pmd, get_eflags, set_eflags */
+/* Note that "ttag" and "cover" are also privilege-sensitive; "ttag"
+ * is not currently used (though it may be in a long-format VHPT system!)
+ */
+#define ia64_fc                         IA64_INTRINSIC_API(fc)
+#define ia64_thash                      IA64_INTRINSIC_API(thash)
+#define ia64_get_cpuid                  IA64_INTRINSIC_API(get_cpuid)
+#define ia64_get_pmd                    IA64_INTRINSIC_API(get_pmd)
+/************************************************/
+/* Instructions paravirtualized for performance */
+/************************************************/
+#define ia64_ssm                        IA64_INTRINSIC_MACRO(ssm)
+#define ia64_rsm                        IA64_INTRINSIC_MACRO(rsm)
+#define ia64_getreg                     IA64_INTRINSIC_MACRO(getreg)
+#define ia64_setreg                     IA64_INTRINSIC_API(setreg)
+#define ia64_set_rr                     IA64_INTRINSIC_API(set_rr)
+#define ia64_get_rr                     IA64_INTRINSIC_API(get_rr)
+#define ia64_ptcga                      IA64_INTRINSIC_API(ptcga)
+#define ia64_get_psr_i                  IA64_INTRINSIC_API(get_psr_i)
+#define ia64_intrin_local_irq_restore   \
+        IA64_INTRINSIC_API(intrin_local_irq_restore)
+#define ia64_set_rr0_to_rr4             IA64_INTRINSIC_API(set_rr0_to_rr4)
+#endif /* !__ASSEMBLY__ */
+#endif /* _UAPI_ASM_IA64_INTRINSICS_H */
diff --git a/arch/ia64/include/asm/ioctl.h b/arch/ia64/include/uapi/asm/ioctl.h
index b279fe06dfe..b279fe06dfe 100644
--- a/arch/ia64/include/asm/ioctl.h
+++ b/arch/ia64/include/uapi/asm/ioctl.h
diff --git a/arch/ia64/include/asm/ioctls.h b/arch/ia64/include/uapi/asm/ioctls.h
index f3aab5512e9..f3aab5512e9 100644
--- a/arch/ia64/include/asm/ioctls.h
+++ b/arch/ia64/include/uapi/asm/ioctls.h
diff --git a/arch/ia64/include/asm/ipcbuf.h b/arch/ia64/include/uapi/asm/ipcbuf.h
index 84c7e51cb6d..84c7e51cb6d 100644
--- a/arch/ia64/include/asm/ipcbuf.h
+++ b/arch/ia64/include/uapi/asm/ipcbuf.h
diff --git a/arch/ia64/include/asm/kvm.h b/arch/ia64/include/uapi/asm/kvm.h
index ec6c6b30123..ec6c6b30123 100644
--- a/arch/ia64/include/asm/kvm.h
+++ b/arch/ia64/include/uapi/asm/kvm.h
diff --git a/arch/ia64/include/uapi/asm/kvm_para.h b/arch/ia64/include/uapi/asm/kvm_para.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/kvm_para.h
diff --git a/arch/ia64/include/uapi/asm/mman.h b/arch/ia64/include/uapi/asm/mman.h
new file mode 100644
index 00000000000..8740819adc5
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/mman.h
@@ -0,0 +1,16 @@
+/*
+ * Based on <asm-i386/mman.h>.
+ *
+ * Modified 1998-2000, 2002
+ *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
+ */
+#ifndef _UAPI_ASM_IA64_MMAN_H
+#define _UAPI_ASM_IA64_MMAN_H
+#include <asm-generic/mman.h>
+#define MAP_GROWSUP     0x0200          /* register stack-like segment */
+#endif /* _UAPI_ASM_IA64_MMAN_H */
diff --git a/arch/ia64/include/asm/msgbuf.h b/arch/ia64/include/uapi/asm/msgbuf.h
index 6c64c0d2aae..6c64c0d2aae 100644
--- a/arch/ia64/include/asm/msgbuf.h
+++ b/arch/ia64/include/uapi/asm/msgbuf.h
diff --git a/arch/ia64/include/uapi/asm/param.h b/arch/ia64/include/uapi/asm/param.h
new file mode 100644
index 00000000000..d7da41d9497
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/param.h
@@ -0,0 +1,29 @@
+/*
+ * Fundamental kernel parameters.
+ *
+ * Based on <asm-i386/param.h>.
+ *
+ * Modified 1998, 1999, 2002-2003
+ *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
+ */
+#ifndef _UAPI_ASM_IA64_PARAM_H
+#define _UAPI_ASM_IA64_PARAM_H
+#define EXEC_PAGESIZE   65536
+#ifndef NOGROUP
+# define NOGROUP        (-1)
+#endif
+#define MAXHOSTNAMELEN  64      /* max length of hostname */
+#ifndef __KERNEL__
+   /*
+    * Technically, this is wrong, but some old apps still refer to it.  The proper way to
+    * get the HZ value is via sysconf(_SC_CLK_TCK).
+    */
+# define HZ 1024
+#endif
+#endif /* _UAPI_ASM_IA64_PARAM_H */
diff --git a/arch/ia64/include/uapi/asm/perfmon.h b/arch/ia64/include/uapi/asm/perfmon.h
new file mode 100644
index 00000000000..1a10a2dd58a
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/perfmon.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2001-2003 Hewlett-Packard Co
+ *               Stephane Eranian <eranian@hpl.hp.com>
+ */
+#ifndef _UAPI_ASM_IA64_PERFMON_H
+#define _UAPI_ASM_IA64_PERFMON_H
+/*
+ * perfmon commands supported on all CPU models
+ */
+#define PFM_WRITE_PMCS          0x01
+#define PFM_WRITE_PMDS          0x02
+#define PFM_READ_PMDS           0x03
+#define PFM_STOP                0x04
+#define PFM_START               0x05
+#define PFM_ENABLE              0x06 /* obsolete */
+#define PFM_DISABLE             0x07 /* obsolete */
+#define PFM_CREATE_CONTEXT      0x08
+#define PFM_DESTROY_CONTEXT     0x09 /* obsolete use close() */
+#define PFM_RESTART             0x0a
+#define PFM_PROTECT_CONTEXT     0x0b /* obsolete */
+#define PFM_GET_FEATURES        0x0c
+#define PFM_DEBUG               0x0d
+#define PFM_UNPROTECT_CONTEXT   0x0e /* obsolete */
+#define PFM_GET_PMC_RESET_VAL   0x0f
+#define PFM_LOAD_CONTEXT        0x10
+#define PFM_UNLOAD_CONTEXT      0x11
+/*
+ * PMU model specific commands (may not be supported on all PMU models)
+ */
+#define PFM_WRITE_IBRS          0x20
+#define PFM_WRITE_DBRS          0x21
+/*
+ * context flags
+ */
+#define PFM_FL_NOTIFY_BLOCK      0x01   /* block task on user level notifications */
+#define PFM_FL_SYSTEM_WIDE       0x02   /* create a system wide context */
+#define PFM_FL_OVFL_NO_MSG       0x80   /* do not post overflow/end messages for notification */
+/*
+ * event set flags
+ */
+#define PFM_SETFL_EXCL_IDLE      0x01   /* exclude idle task (syswide only) XXX: DO NOT USE YET */
+/*
+ * PMC flags
+ */
+#define PFM_REGFL_OVFL_NOTIFY   0x1     /* send notification on overflow */
+#define PFM_REGFL_RANDOM        0x2     /* randomize sampling interval   */
+/*
+ * PMD/PMC/IBR/DBR return flags (ignored on input)
+ *
+ * Those flags are used on output and must be checked in case EAGAIN is returned
+ * by any of the calls using a pfarg_reg_t or pfarg_dbreg_t structure.
+ */
+#define PFM_REG_RETFL_NOTAVAIL  (1UL<<31) /* set if register is implemented but not available */
+#define PFM_REG_RETFL_EINVAL    (1UL<<30) /* set if register entry is invalid */
+#define PFM_REG_RETFL_MASK      (PFM_REG_RETFL_NOTAVAIL|PFM_REG_RETFL_EINVAL)
+#define PFM_REG_HAS_ERROR(flag) (((flag) & PFM_REG_RETFL_MASK) != 0)
+typedef unsigned char pfm_uuid_t[16];   /* custom sampling buffer identifier type */
+/*
+ * Request structure used to define a context
+ */
+typedef struct {
+        pfm_uuid_t     ctx_smpl_buf_id;  /* which buffer format to use (if needed) */
+        unsigned long  ctx_flags;        /* noblock/block */
+        unsigned short ctx_nextra_sets;  /* number of extra event sets (you always get 1) */
+        unsigned short ctx_reserved1;    /* for future use */
+        int            ctx_fd;           /* return arg: unique identification for context */
+        void           *ctx_smpl_vaddr;  /* return arg: virtual address of sampling buffer, is used */
+        unsigned long  ctx_reserved2[11];/* for future use */
+} pfarg_context_t;
+/*
+ * Request structure used to write/read a PMC or PMD
+ */
+typedef struct {
+        unsigned int    reg_num;           /* which register */
+        unsigned short  reg_set;           /* event set for this register */
+        unsigned short  reg_reserved1;     /* for future use */
+        unsigned long   reg_value;         /* initial pmc/pmd value */
+        unsigned long   reg_flags;         /* input: pmc/pmd flags, return: reg error */
+        unsigned long   reg_long_reset;    /* reset after buffer overflow notification */
+        unsigned long   reg_short_reset;   /* reset after counter overflow */
+        unsigned long   reg_reset_pmds[4]; /* which other counters to reset on overflow */
+        unsigned long   reg_random_seed;   /* seed value when randomization is used */
+        unsigned long   reg_random_mask;   /* bitmask used to limit random value */
+        unsigned long   reg_last_reset_val;/* return: PMD last reset value */
+        unsigned long   reg_smpl_pmds[4];  /* which pmds are accessed when PMC overflows */
+        unsigned long   reg_smpl_eventid;  /* opaque sampling event identifier */
+        unsigned long   reg_reserved2[3];   /* for future use */
+} pfarg_reg_t;
+typedef struct {
+        unsigned int    dbreg_num;              /* which debug register */
+        unsigned short  dbreg_set;              /* event set for this register */
+        unsigned short  dbreg_reserved1;        /* for future use */
+        unsigned long   dbreg_value;            /* value for debug register */
+        unsigned long   dbreg_flags;            /* return: dbreg error */
+        unsigned long   dbreg_reserved2[1];     /* for future use */
+} pfarg_dbreg_t;
+typedef struct {
+        unsigned int    ft_version;     /* perfmon: major [16-31], minor [0-15] */
+        unsigned int    ft_reserved;    /* reserved for future use */
+        unsigned long   reserved[4];    /* for future use */
+} pfarg_features_t;
+typedef struct {
+        pid_t           load_pid;          /* process to load the context into */
+        unsigned short  load_set;          /* first event set to load */
+        unsigned short  load_reserved1;    /* for future use */
+        unsigned long   load_reserved2[3]; /* for future use */
+} pfarg_load_t;
+typedef struct {
+        int             msg_type;               /* generic message header */
+        int             msg_ctx_fd;             /* generic message header */
+        unsigned long   msg_ovfl_pmds[4];       /* which PMDs overflowed */
+        unsigned short  msg_active_set;         /* active set at the time of overflow */
+        unsigned short  msg_reserved1;          /* for future use */
+        unsigned int    msg_reserved2;          /* for future use */
+        unsigned long   msg_tstamp;             /* for perf tuning/debug */
+} pfm_ovfl_msg_t;
+typedef struct {
+        int             msg_type;               /* generic message header */
+        int             msg_ctx_fd;             /* generic message header */
+        unsigned long   msg_tstamp;             /* for perf tuning */
+} pfm_end_msg_t;
+typedef struct {
+        int             msg_type;               /* type of the message */
+        int             msg_ctx_fd;             /* unique identifier for the context */
+        unsigned long   msg_tstamp;             /* for perf tuning */
+} pfm_gen_msg_t;
+#define PFM_MSG_OVFL    1       /* an overflow happened */
+#define PFM_MSG_END     2       /* task to which context was attached ended */
+typedef union {
+        pfm_ovfl_msg_t  pfm_ovfl_msg;
+        pfm_end_msg_t   pfm_end_msg;
+        pfm_gen_msg_t   pfm_gen_msg;
+} pfm_msg_t;
+/*
+ * Define the version numbers for both perfmon as a whole and the sampling buffer format.
+ */
+#define PFM_VERSION_MAJ          2U
+#define PFM_VERSION_MIN          0U
+#define PFM_VERSION              (((PFM_VERSION_MAJ&0xffff)<<16)|(PFM_VERSION_MIN & 0xffff))
+#define PFM_VERSION_MAJOR(x)     (((x)>>16) & 0xffff)
+#define PFM_VERSION_MINOR(x)     ((x) & 0xffff)
+/*
+ * miscellaneous architected definitions
+ */
+#define PMU_FIRST_COUNTER       4       /* first counting monitor (PMC/PMD) */
+#define PMU_MAX_PMCS            256     /* maximum architected number of PMC registers */
+#define PMU_MAX_PMDS            256     /* maximum architected number of PMD registers */
+#endif /* _UAPI_ASM_IA64_PERFMON_H */
diff --git a/arch/ia64/include/asm/perfmon_default_smpl.h b/arch/ia64/include/uapi/asm/perfmon_default_smpl.h
index a2d560c6723..a2d560c6723 100644
--- a/arch/ia64/include/asm/perfmon_default_smpl.h
+++ b/arch/ia64/include/uapi/asm/perfmon_default_smpl.h
diff --git a/arch/ia64/include/asm/poll.h b/arch/ia64/include/uapi/asm/poll.h
index c98509d3149..c98509d3149 100644
--- a/arch/ia64/include/asm/poll.h
+++ b/arch/ia64/include/uapi/asm/poll.h
diff --git a/arch/ia64/include/asm/posix_types.h b/arch/ia64/include/uapi/asm/posix_types.h
index 99ee1d6510c..99ee1d6510c 100644
--- a/arch/ia64/include/asm/posix_types.h
+++ b/arch/ia64/include/uapi/asm/posix_types.h
diff --git a/arch/ia64/include/uapi/asm/ptrace.h b/arch/ia64/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..0a02f634e12
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/ptrace.h
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 1998-2004 Hewlett-Packard Co
+ *      David Mosberger-Tang <davidm@hpl.hp.com>
+ *      Stephane Eranian <eranian@hpl.hp.com>
+ * Copyright (C) 2003 Intel Co
+ *      Suresh Siddha <suresh.b.siddha@intel.com>
+ *      Fenghua Yu <fenghua.yu@intel.com>
+ *      Arun Sharma <arun.sharma@intel.com>
+ *
+ * 12/07/98     S. Eranian      added pt_regs & switch_stack
+ * 12/21/98     D. Mosberger    updated to match latest code
+ *  6/17/99     D. Mosberger    added second unat member to "struct switch_stack"
+ *
+ */
+#ifndef _UAPI_ASM_IA64_PTRACE_H
+#define _UAPI_ASM_IA64_PTRACE_H
+/*
+ * When a user process is blocked, its state looks as follows:
+ *
+ *            +----------------------+  ------- IA64_STK_OFFSET
+ *            |                      |   ^
+ *            | struct pt_regs       |   |
+ *            |                      |   |
+ *            +----------------------+   |
+ *            |                      |   |
+ *            |    memory stack      |   |
+ *            | (growing downwards)  |   |
+ *            //.....................//  |
+ *                                       |
+ *            //.....................//  |
+ *            |                      |   |
+ *            +----------------------+   |
+ *            | struct switch_stack  |   |
+ *            |                      |   |
+ *            +----------------------+   |
+ *            |                      |   |
+ *            //.....................//  |
+ *                                       |
+ *            //.....................//  |
+ *            |                      |   |
+ *            |  register stack      |   |
+ *            | (growing upwards)    |   |
+ *            |                      |   |
+ *            +----------------------+   |  --- IA64_RBS_OFFSET
+ *            |  struct thread_info  |   |  ^
+ *            +----------------------+   |  |
+ *            |                      |   |  |
+ *            |  struct task_struct  |   |  |
+ * current -> |                      |   |  |
+ *            +----------------------+ -------
+ *
+ * Note that ar.ec is not saved explicitly in pt_reg or switch_stack.
+ * This is because ar.ec is saved as part of ar.pfs.
+ */
+#include <asm/fpu.h>
+#ifndef __ASSEMBLY__
+/*
+ * This struct defines the way the registers are saved on system
+ * calls.
+ *
+ * We don't save all floating point register because the kernel
+ * is compiled to use only a very small subset, so the other are
+ * untouched.
+ *
+ * THIS STRUCTURE MUST BE A MULTIPLE 16-BYTE IN SIZE
+ * (because the memory stack pointer MUST ALWAYS be aligned this way)
+ *
+ */
+struct pt_regs {
+        /* The following registers are saved by SAVE_MIN: */
+        unsigned long b6;               /* scratch */
+        unsigned long b7;               /* scratch */
+        unsigned long ar_csd;           /* used by cmp8xchg16 (scratch) */
+        unsigned long ar_ssd;           /* reserved for future use (scratch) */
+        unsigned long r8;               /* scratch (return value register 0) */
+        unsigned long r9;               /* scratch (return value register 1) */
+        unsigned long r10;              /* scratch (return value register 2) */
+        unsigned long r11;              /* scratch (return value register 3) */
+        unsigned long cr_ipsr;          /* interrupted task's psr */
+        unsigned long cr_iip;           /* interrupted task's instruction pointer */
+        /*
+         * interrupted task's function state; if bit 63 is cleared, it
+         * contains syscall's ar.pfs.pfm:
+         */
+        unsigned long cr_ifs;
+        unsigned long ar_unat;          /* interrupted task's NaT register (preserved) */
+        unsigned long ar_pfs;           /* prev function state  */
+        unsigned long ar_rsc;           /* RSE configuration */
+        /* The following two are valid only if cr_ipsr.cpl > 0 || ti->flags & _TIF_MCA_INIT */
+        unsigned long ar_rnat;          /* RSE NaT */
+        unsigned long ar_bspstore;      /* RSE bspstore */
+        unsigned long pr;               /* 64 predicate registers (1 bit each) */
+        unsigned long b0;               /* return pointer (bp) */
+        unsigned long loadrs;           /* size of dirty partition << 16 */
+        unsigned long r1;               /* the gp pointer */
+        unsigned long r12;              /* interrupted task's memory stack pointer */
+        unsigned long r13;              /* thread pointer */
+        unsigned long ar_fpsr;          /* floating point status (preserved) */
+        unsigned long r15;              /* scratch */
+        /* The remaining registers are NOT saved for system calls.  */
+        unsigned long r14;              /* scratch */
+        unsigned long r2;               /* scratch */
+        unsigned long r3;               /* scratch */
+        /* The following registers are saved by SAVE_REST: */
+        unsigned long r16;              /* scratch */
+        unsigned long r17;              /* scratch */
+        unsigned long r18;              /* scratch */
+        unsigned long r19;              /* scratch */
+        unsigned long r20;              /* scratch */
+        unsigned long r21;              /* scratch */
+        unsigned long r22;              /* scratch */
+        unsigned long r23;              /* scratch */
+        unsigned long r24;              /* scratch */
+        unsigned long r25;              /* scratch */
+        unsigned long r26;              /* scratch */
+        unsigned long r27;              /* scratch */
+        unsigned long r28;              /* scratch */
+        unsigned long r29;              /* scratch */
+        unsigned long r30;              /* scratch */
+        unsigned long r31;              /* scratch */
+        unsigned long ar_ccv;           /* compare/exchange value (scratch) */
+        /*
+         * Floating point registers that the kernel considers scratch:
+         */
+        struct ia64_fpreg f6;           /* scratch */
+        struct ia64_fpreg f7;           /* scratch */
+        struct ia64_fpreg f8;           /* scratch */
+        struct ia64_fpreg f9;           /* scratch */
+        struct ia64_fpreg f10;          /* scratch */
+        struct ia64_fpreg f11;          /* scratch */
+};
+/*
+ * This structure contains the addition registers that need to
+ * preserved across a context switch.  This generally consists of
+ * "preserved" registers.
+ */
+struct switch_stack {
+        unsigned long caller_unat;      /* user NaT collection register (preserved) */
+        unsigned long ar_fpsr;          /* floating-point status register */
+        struct ia64_fpreg f2;           /* preserved */
+        struct ia64_fpreg f3;           /* preserved */
+        struct ia64_fpreg f4;           /* preserved */
+        struct ia64_fpreg f5;           /* preserved */
+        struct ia64_fpreg f12;          /* scratch, but untouched by kernel */
+        struct ia64_fpreg f13;          /* scratch, but untouched by kernel */
+        struct ia64_fpreg f14;          /* scratch, but untouched by kernel */
+        struct ia64_fpreg f15;          /* scratch, but untouched by kernel */
+        struct ia64_fpreg f16;          /* preserved */
+        struct ia64_fpreg f17;          /* preserved */
+        struct ia64_fpreg f18;          /* preserved */
+        struct ia64_fpreg f19;          /* preserved */
+        struct ia64_fpreg f20;          /* preserved */
+        struct ia64_fpreg f21;          /* preserved */
+        struct ia64_fpreg f22;          /* preserved */
+        struct ia64_fpreg f23;          /* preserved */
+        struct ia64_fpreg f24;          /* preserved */
+        struct ia64_fpreg f25;          /* preserved */
+        struct ia64_fpreg f26;          /* preserved */
+        struct ia64_fpreg f27;          /* preserved */
+        struct ia64_fpreg f28;          /* preserved */
+        struct ia64_fpreg f29;          /* preserved */
+        struct ia64_fpreg f30;          /* preserved */
+        struct ia64_fpreg f31;          /* preserved */
+        unsigned long r4;               /* preserved */
+        unsigned long r5;               /* preserved */
+        unsigned long r6;               /* preserved */
+        unsigned long r7;               /* preserved */
+        unsigned long b0;               /* so we can force a direct return in copy_thread */
+        unsigned long b1;
+        unsigned long b2;
+        unsigned long b3;
+        unsigned long b4;
+        unsigned long b5;
+        unsigned long ar_pfs;           /* previous function state */
+        unsigned long ar_lc;            /* loop counter (preserved) */
+        unsigned long ar_unat;          /* NaT bits for r4-r7 */
+        unsigned long ar_rnat;          /* RSE NaT collection register */
+        unsigned long ar_bspstore;      /* RSE dirty base (preserved) */
+        unsigned long pr;               /* 64 predicate registers (1 bit each) */
+};
+/* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */
+struct pt_all_user_regs {
+        unsigned long nat;
+        unsigned long cr_iip;
+        unsigned long cfm;
+        unsigned long cr_ipsr;
+        unsigned long pr;
+        unsigned long gr[32];
+        unsigned long br[8];
+        unsigned long ar[128];
+        struct ia64_fpreg fr[128];
+};
+#endif /* !__ASSEMBLY__ */
+/* indices to application-registers array in pt_all_user_regs */
+#define PT_AUR_RSC      16
+#define PT_AUR_BSP      17
+#define PT_AUR_BSPSTORE 18
+#define PT_AUR_RNAT     19
+#define PT_AUR_CCV      32
+#define PT_AUR_UNAT     36
+#define PT_AUR_FPSR     40
+#define PT_AUR_PFS      64
+#define PT_AUR_LC       65
+#define PT_AUR_EC       66
+/*
+ * The numbers chosen here are somewhat arbitrary but absolutely MUST
+ * not overlap with any of the number assigned in <linux/ptrace.h>.
+ */
+#define PTRACE_SINGLEBLOCK      12      /* resume execution until next branch */
+#define PTRACE_OLD_GETSIGINFO   13      /* (replaced by PTRACE_GETSIGINFO in <linux/ptrace.h>)  */
+#define PTRACE_OLD_SETSIGINFO   14      /* (replaced by PTRACE_SETSIGINFO in <linux/ptrace.h>)  */
+#define PTRACE_GETREGS          18      /* get all registers (pt_all_user_regs) in one shot */
+#define PTRACE_SETREGS          19      /* set all registers (pt_all_user_regs) in one shot */
+#define PTRACE_OLDSETOPTIONS    21
+#endif /* _UAPI_ASM_IA64_PTRACE_H */
diff --git a/arch/ia64/include/asm/ptrace_offsets.h b/arch/ia64/include/uapi/asm/ptrace_offsets.h
index b712773c759..b712773c759 100644
--- a/arch/ia64/include/asm/ptrace_offsets.h
+++ b/arch/ia64/include/uapi/asm/ptrace_offsets.h
diff --git a/arch/ia64/include/asm/resource.h b/arch/ia64/include/uapi/asm/resource.h
index ba2272a87fc..ba2272a87fc 100644
--- a/arch/ia64/include/asm/resource.h
+++ b/arch/ia64/include/uapi/asm/resource.h
diff --git a/arch/ia64/include/asm/rse.h b/arch/ia64/include/uapi/asm/rse.h
index 02830a3b019..02830a3b019 100644
--- a/arch/ia64/include/asm/rse.h
+++ b/arch/ia64/include/uapi/asm/rse.h
diff --git a/arch/ia64/include/asm/sembuf.h b/arch/ia64/include/uapi/asm/sembuf.h
index 1340fbc04d3..1340fbc04d3 100644
--- a/arch/ia64/include/asm/sembuf.h
+++ b/arch/ia64/include/uapi/asm/sembuf.h
diff --git a/arch/ia64/include/asm/setup.h b/arch/ia64/include/uapi/asm/setup.h
index 8d56458310b..8d56458310b 100644
--- a/arch/ia64/include/asm/setup.h
+++ b/arch/ia64/include/uapi/asm/setup.h
diff --git a/arch/ia64/include/asm/shmbuf.h b/arch/ia64/include/uapi/asm/shmbuf.h
index 585002a77ac..585002a77ac 100644
--- a/arch/ia64/include/asm/shmbuf.h
+++ b/arch/ia64/include/uapi/asm/shmbuf.h
diff --git a/arch/ia64/include/asm/sigcontext.h b/arch/ia64/include/uapi/asm/sigcontext.h
index 57ff777bcc4..57ff777bcc4 100644
--- a/arch/ia64/include/asm/sigcontext.h
+++ b/arch/ia64/include/uapi/asm/sigcontext.h
diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h
new file mode 100644
index 00000000000..4ea6225196b
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/siginfo.h
@@ -0,0 +1,121 @@
+/*
+ * Based on <asm-i386/siginfo.h>.
+ *
+ * Modified 1998-2002
+ *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
+ */
+#ifndef _UAPI_ASM_IA64_SIGINFO_H
+#define _UAPI_ASM_IA64_SIGINFO_H
+#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
+#define HAVE_ARCH_SIGINFO_T
+#define HAVE_ARCH_COPY_SIGINFO
+#define HAVE_ARCH_COPY_SIGINFO_TO_USER
+#include <asm-generic/siginfo.h>
+typedef struct siginfo {
+        int si_signo;
+        int si_errno;
+        int si_code;
+        int __pad0;
+        union {
+                int _pad[SI_PAD_SIZE];
+                /* kill() */
+                struct {
+                        pid_t _pid;             /* sender's pid */
+                        uid_t _uid;             /* sender's uid */
+                } _kill;
+                /* POSIX.1b timers */
+                struct {
+                        timer_t _tid;           /* timer id */
+                        int _overrun;           /* overrun count */
+                        char _pad[sizeof(__ARCH_SI_UID_T) - sizeof(int)];
+                        sigval_t _sigval;       /* must overlay ._rt._sigval! */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+                /* POSIX.1b signals */
+                struct {
+                        pid_t _pid;             /* sender's pid */
+                        uid_t _uid;             /* sender's uid */
+                        sigval_t _sigval;
+                } _rt;
+                /* SIGCHLD */
+                struct {
+                        pid_t _pid;             /* which child */
+                        uid_t _uid;             /* sender's uid */
+                        int _status;            /* exit code */
+                        clock_t _utime;
+                        clock_t _stime;
+                } _sigchld;
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        void __user *_addr;     /* faulting insn/memory ref. */
+                        int _imm;               /* immediate value for "break" */
+                        unsigned int _flags;    /* see below */
+                        unsigned long _isr;     /* isr */
+                        short _addr_lsb;        /* lsb of faulting address */
+                } _sigfault;
+                /* SIGPOLL */
+                struct {
+                        long _band;     /* POLL_IN, POLL_OUT, POLL_MSG (XPG requires a "long") */
+                        int _fd;
+                } _sigpoll;
+        } _sifields;
+} siginfo_t;
+#define si_imm          _sifields._sigfault._imm        /* as per UNIX SysV ABI spec */
+#define si_flags        _sifields._sigfault._flags
+/*
+ * si_isr is valid for SIGILL, SIGFPE, SIGSEGV, SIGBUS, and SIGTRAP provided that
+ * si_code is non-zero and __ISR_VALID is set in si_flags.
+ */
+#define si_isr          _sifields._sigfault._isr
+/*
+ * Flag values for si_flags:
+ */
+#define __ISR_VALID_BIT 0
+#define __ISR_VALID     (1 << __ISR_VALID_BIT)
+/*
+ * SIGILL si_codes
+ */
+#define ILL_BADIADDR    (__SI_FAULT|9)  /* unimplemented instruction address */
+#define __ILL_BREAK     (__SI_FAULT|10) /* illegal break */
+#define __ILL_BNDMOD    (__SI_FAULT|11) /* bundle-update (modification) in progress */
+#undef NSIGILL
+#define NSIGILL         11
+/*
+ * SIGFPE si_codes
+ */
+#define __FPE_DECOVF    (__SI_FAULT|9)  /* decimal overflow */
+#define __FPE_DECDIV    (__SI_FAULT|10) /* decimal division by zero */
+#define __FPE_DECERR    (__SI_FAULT|11) /* packed decimal error */
+#define __FPE_INVASC    (__SI_FAULT|12) /* invalid ASCII digit */
+#define __FPE_INVDEC    (__SI_FAULT|13) /* invalid decimal digit */
+#undef NSIGFPE
+#define NSIGFPE         13
+/*
+ * SIGSEGV si_codes
+ */
+#define __SEGV_PSTKOVF  (__SI_FAULT|3)  /* paragraph stack overflow */
+#undef NSIGSEGV
+#define NSIGSEGV        3
+#undef NSIGTRAP
+#define NSIGTRAP        4
+#endif /* _UAPI_ASM_IA64_SIGINFO_H */
diff --git a/arch/ia64/include/uapi/asm/signal.h b/arch/ia64/include/uapi/asm/signal.h
new file mode 100644
index 00000000000..e531c424434
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/signal.h
@@ -0,0 +1,127 @@
+/*
+ * Modified 1998-2001, 2003
+ *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
+ *
+ * Unfortunately, this file is being included by bits/signal.h in
+ * glibc-2.x.  Hence the #ifdef __KERNEL__ ugliness.
+ */
+#ifndef _UAPI_ASM_IA64_SIGNAL_H
+#define _UAPI_ASM_IA64_SIGNAL_H
+#define SIGHUP           1
+#define SIGINT           2
+#define SIGQUIT          3
+#define SIGILL           4
+#define SIGTRAP          5
+#define SIGABRT          6
+#define SIGIOT           6
+#define SIGBUS           7
+#define SIGFPE           8
+#define SIGKILL          9
+#define SIGUSR1         10
+#define SIGSEGV         11
+#define SIGUSR2         12
+#define SIGPIPE         13
+#define SIGALRM         14
+#define SIGTERM         15
+#define SIGSTKFLT       16
+#define SIGCHLD         17
+#define SIGCONT         18
+#define SIGSTOP         19
+#define SIGTSTP         20
+#define SIGTTIN         21
+#define SIGTTOU         22
+#define SIGURG          23
+#define SIGXCPU         24
+#define SIGXFSZ         25
+#define SIGVTALRM       26
+#define SIGPROF         27
+#define SIGWINCH        28
+#define SIGIO           29
+#define SIGPOLL         SIGIO
+/*
+#define SIGLOST         29
+*/
+#define SIGPWR          30
+#define SIGSYS          31
+/* signal 31 is no longer "unused", but the SIGUNUSED macro remains for backwards compatibility */
+#define SIGUNUSED       31
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        _NSIG
+/*
+ * SA_FLAGS values:
+ *
+ * SA_ONSTACK indicates that a registered stack_t will be used.
+ * SA_RESTART flag to get restarting signals (which were the default long ago)
+ * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
+ * SA_RESETHAND clears the handler when the signal is delivered.
+ * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
+ * SA_NODEFER prevents the current signal from being masked in the handler.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_NOCLDSTOP    0x00000001
+#define SA_NOCLDWAIT    0x00000002
+#define SA_SIGINFO      0x00000004
+#define SA_ONSTACK      0x08000000
+#define SA_RESTART      0x10000000
+#define SA_NODEFER      0x40000000
+#define SA_RESETHAND    0x80000000
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+#define SA_RESTORER     0x04000000
+/*
+ * sigaltstack controls
+ */
+#define SS_ONSTACK      1
+#define SS_DISABLE      2
+/*
+ * The minimum stack size needs to be fairly large because we want to
+ * be sure that an app compiled for today's CPUs will continue to run
+ * on all future CPU models.  The CPU model matters because the signal
+ * frame needs to have space for the complete machine state, including
+ * all physical stacked registers.  The number of physical stacked
+ * registers is CPU model dependent, but given that the width of
+ * ar.rsc.loadrs is 14 bits, we can assume that they'll never take up
+ * more than 16KB of space.
+ */
+#if 1
+  /*
+   * This is a stupid typo: the value was _meant_ to be 131072 (0x20000), but I typed it
+   * in wrong. ;-(  To preserve backwards compatibility, we leave the kernel at the
+   * incorrect value and fix libc only.
+   */
+# define MINSIGSTKSZ    131027  /* min. stack size for sigaltstack() */
+#else
+# define MINSIGSTKSZ    131072  /* min. stack size for sigaltstack() */
+#endif
+#define SIGSTKSZ        262144  /* default stack size for sigaltstack() */
+#include <asm-generic/signal-defs.h>
+# ifndef __ASSEMBLY__
+#  include <linux/types.h>
+/* Avoid too many header ordering problems.  */
+struct siginfo;
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        int ss_flags;
+        size_t ss_size;
+} stack_t;
+# endif /* !__ASSEMBLY__ */
+#endif /* _UAPI_ASM_IA64_SIGNAL_H */
diff --git a/arch/ia64/include/asm/socket.h b/arch/ia64/include/uapi/asm/socket.h
index 41fc28a4a18..41fc28a4a18 100644
--- a/arch/ia64/include/asm/socket.h
+++ b/arch/ia64/include/uapi/asm/socket.h
diff --git a/arch/ia64/include/asm/sockios.h b/arch/ia64/include/uapi/asm/sockios.h
index 15c92468ad3..15c92468ad3 100644
--- a/arch/ia64/include/asm/sockios.h
+++ b/arch/ia64/include/uapi/asm/sockios.h
diff --git a/arch/ia64/include/asm/stat.h b/arch/ia64/include/uapi/asm/stat.h
index 367bb90cdff..367bb90cdff 100644
--- a/arch/ia64/include/asm/stat.h
+++ b/arch/ia64/include/uapi/asm/stat.h
diff --git a/arch/ia64/include/asm/statfs.h b/arch/ia64/include/uapi/asm/statfs.h
index 1e589669de5..1e589669de5 100644
--- a/arch/ia64/include/asm/statfs.h
+++ b/arch/ia64/include/uapi/asm/statfs.h
diff --git a/arch/ia64/include/asm/swab.h b/arch/ia64/include/uapi/asm/swab.h
index c89a8cb5d8a..c89a8cb5d8a 100644
--- a/arch/ia64/include/asm/swab.h
+++ b/arch/ia64/include/uapi/asm/swab.h
diff --git a/arch/ia64/include/asm/termbits.h b/arch/ia64/include/uapi/asm/termbits.h
index c009b94e58d..c009b94e58d 100644
--- a/arch/ia64/include/asm/termbits.h
+++ b/arch/ia64/include/uapi/asm/termbits.h
diff --git a/arch/ia64/include/uapi/asm/termios.h b/arch/ia64/include/uapi/asm/termios.h
new file mode 100644
index 00000000000..d59b48c307f
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/termios.h
@@ -0,0 +1,50 @@
+/*
+ * Modified 1999
+ *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
+ *
+ * 99/01/28     Added N_IRDA and N_SMSBLOCK
+ */
+#ifndef _UAPI_ASM_IA64_TERMIOS_H
+#define _UAPI_ASM_IA64_TERMIOS_H
+#include <asm/termbits.h>
+#include <asm/ioctls.h>
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+#define NCC 8
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        unsigned char c_line;           /* line discipline */
+        unsigned char c_cc[NCC];        /* control characters */
+};
+/* modem lines */
+#define TIOCM_LE        0x001
+#define TIOCM_DTR       0x002
+#define TIOCM_RTS       0x004
+#define TIOCM_ST        0x008
+#define TIOCM_SR        0x010
+#define TIOCM_CTS       0x020
+#define TIOCM_CAR       0x040
+#define TIOCM_RNG       0x080
+#define TIOCM_DSR       0x100
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+#endif /* _UAPI_ASM_IA64_TERMIOS_H */
diff --git a/arch/ia64/include/uapi/asm/types.h b/arch/ia64/include/uapi/asm/types.h
new file mode 100644
index 00000000000..321193b05ee
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/types.h
@@ -0,0 +1,31 @@
+/*
+ * This file is never included by application software unless explicitly
+ * requested (e.g., via linux/types.h) in which case the application is
+ * Linux specific so (user-) name space pollution is not a major issue.
+ * However, for interoperability, libraries still need to be careful to
+ * avoid naming clashes.
+ *
+ * Based on <asm-alpha/types.h>.
+ *
+ * Modified 1998-2000, 2002
+ *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
+ */
+#ifndef _UAPI_ASM_IA64_TYPES_H
+#define _UAPI_ASM_IA64_TYPES_H
+#ifndef __KERNEL__
+#include <asm-generic/int-l64.h>
+#endif
+#ifdef __ASSEMBLY__
+# define __IA64_UL(x)           (x)
+# define __IA64_UL_CONST(x)     x
+#else
+# define __IA64_UL(x)           ((unsigned long)(x))
+# define __IA64_UL_CONST(x)     x##UL
+#endif /* !__ASSEMBLY__ */
+#endif /* _UAPI_ASM_IA64_TYPES_H */
diff --git a/arch/ia64/include/asm/ucontext.h b/arch/ia64/include/uapi/asm/ucontext.h
index bf573dc8ca6..bf573dc8ca6 100644
--- a/arch/ia64/include/asm/ucontext.h
+++ b/arch/ia64/include/uapi/asm/ucontext.h
diff --git a/arch/ia64/include/uapi/asm/unistd.h b/arch/ia64/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..b706aa54df2
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/unistd.h
@@ -0,0 +1,328 @@
+/*
+ * IA-64 Linux syscall numbers and inline-functions.
+ *
+ * Copyright (C) 1998-2005 Hewlett-Packard Co
+ *      David Mosberger-Tang <davidm@hpl.hp.com>
+ */
+#ifndef _UAPI_ASM_IA64_UNISTD_H
+#define _UAPI_ASM_IA64_UNISTD_H
+#include <asm/break.h>
+#define __BREAK_SYSCALL                 __IA64_BREAK_SYSCALL
+#define __NR_ni_syscall                 1024
+#define __NR_exit                       1025
+#define __NR_read                       1026
+#define __NR_write                      1027
+#define __NR_open                       1028
+#define __NR_close                      1029
+#define __NR_creat                      1030
+#define __NR_link                       1031
+#define __NR_unlink                     1032
+#define __NR_execve                     1033
+#define __NR_chdir                      1034
+#define __NR_fchdir                     1035
+#define __NR_utimes                     1036
+#define __NR_mknod                      1037
+#define __NR_chmod                      1038
+#define __NR_chown                      1039
+#define __NR_lseek                      1040
+#define __NR_getpid                     1041
+#define __NR_getppid                    1042
+#define __NR_mount                      1043
+#define __NR_umount                     1044
+#define __NR_setuid                     1045
+#define __NR_getuid                     1046
+#define __NR_geteuid                    1047
+#define __NR_ptrace                     1048
+#define __NR_access                     1049
+#define __NR_sync                       1050
+#define __NR_fsync                      1051
+#define __NR_fdatasync                  1052
+#define __NR_kill                       1053
+#define __NR_rename                     1054
+#define __NR_mkdir                      1055
+#define __NR_rmdir                      1056
+#define __NR_dup                        1057
+#define __NR_pipe                       1058
+#define __NR_times                      1059
+#define __NR_brk                        1060
+#define __NR_setgid                     1061
+#define __NR_getgid                     1062
+#define __NR_getegid                    1063
+#define __NR_acct                       1064
+#define __NR_ioctl                      1065
+#define __NR_fcntl                      1066
+#define __NR_umask                      1067
+#define __NR_chroot                     1068
+#define __NR_ustat                      1069
+#define __NR_dup2                       1070
+#define __NR_setreuid                   1071
+#define __NR_setregid                   1072
+#define __NR_getresuid                  1073
+#define __NR_setresuid                  1074
+#define __NR_getresgid                  1075
+#define __NR_setresgid                  1076
+#define __NR_getgroups                  1077
+#define __NR_setgroups                  1078
+#define __NR_getpgid                    1079
+#define __NR_setpgid                    1080
+#define __NR_setsid                     1081
+#define __NR_getsid                     1082
+#define __NR_sethostname                1083
+#define __NR_setrlimit                  1084
+#define __NR_getrlimit                  1085
+#define __NR_getrusage                  1086
+#define __NR_gettimeofday               1087
+#define __NR_settimeofday               1088
+#define __NR_select                     1089
+#define __NR_poll                       1090
+#define __NR_symlink                    1091
+#define __NR_readlink                   1092
+#define __NR_uselib                     1093
+#define __NR_swapon                     1094
+#define __NR_swapoff                    1095
+#define __NR_reboot                     1096
+#define __NR_truncate                   1097
+#define __NR_ftruncate                  1098
+#define __NR_fchmod                     1099
+#define __NR_fchown                     1100
+#define __NR_getpriority                1101
+#define __NR_setpriority                1102
+#define __NR_statfs                     1103
+#define __NR_fstatfs                    1104
+#define __NR_gettid                     1105
+#define __NR_semget                     1106
+#define __NR_semop                      1107
+#define __NR_semctl                     1108
+#define __NR_msgget                     1109
+#define __NR_msgsnd                     1110
+#define __NR_msgrcv                     1111
+#define __NR_msgctl                     1112
+#define __NR_shmget                     1113
+#define __NR_shmat                      1114
+#define __NR_shmdt                      1115
+#define __NR_shmctl                     1116
+/* also known as klogctl() in GNU libc: */
+#define __NR_syslog                     1117
+#define __NR_setitimer                  1118
+#define __NR_getitimer                  1119
+/* 1120 was __NR_old_stat */
+/* 1121 was __NR_old_lstat */
+/* 1122 was __NR_old_fstat */
+#define __NR_vhangup                    1123
+#define __NR_lchown                     1124
+#define __NR_remap_file_pages           1125
+#define __NR_wait4                      1126
+#define __NR_sysinfo                    1127
+#define __NR_clone                      1128
+#define __NR_setdomainname              1129
+#define __NR_uname                      1130
+#define __NR_adjtimex                   1131
+/* 1132 was __NR_create_module */
+#define __NR_init_module                1133
+#define __NR_delete_module              1134
+/* 1135 was __NR_get_kernel_syms */
+/* 1136 was __NR_query_module */
+#define __NR_quotactl                   1137
+#define __NR_bdflush                    1138
+#define __NR_sysfs                      1139
+#define __NR_personality                1140
+#define __NR_afs_syscall                1141
+#define __NR_setfsuid                   1142
+#define __NR_setfsgid                   1143
+#define __NR_getdents                   1144
+#define __NR_flock                      1145
+#define __NR_readv                      1146
+#define __NR_writev                     1147
+#define __NR_pread64                    1148
+#define __NR_pwrite64                   1149
+#define __NR__sysctl                    1150
+#define __NR_mmap                       1151
+#define __NR_munmap                     1152
+#define __NR_mlock                      1153
+#define __NR_mlockall                   1154
+#define __NR_mprotect                   1155
+#define __NR_mremap                     1156
+#define __NR_msync                      1157
+#define __NR_munlock                    1158
+#define __NR_munlockall                 1159
+#define __NR_sched_getparam             1160
+#define __NR_sched_setparam             1161
+#define __NR_sched_getscheduler         1162
+#define __NR_sched_setscheduler         1163
+#define __NR_sched_yield                1164
+#define __NR_sched_get_priority_max     1165
+#define __NR_sched_get_priority_min     1166
+#define __NR_sched_rr_get_interval      1167
+#define __NR_nanosleep                  1168
+#define __NR_nfsservctl                 1169
+#define __NR_prctl                      1170
+/* 1171 is reserved for backwards compatibility with old __NR_getpagesize */
+#define __NR_mmap2                      1172
+#define __NR_pciconfig_read             1173
+#define __NR_pciconfig_write            1174
+#define __NR_perfmonctl                 1175
+#define __NR_sigaltstack                1176
+#define __NR_rt_sigaction               1177
+#define __NR_rt_sigpending              1178
+#define __NR_rt_sigprocmask             1179
+#define __NR_rt_sigqueueinfo            1180
+#define __NR_rt_sigreturn               1181
+#define __NR_rt_sigsuspend              1182
+#define __NR_rt_sigtimedwait            1183
+#define __NR_getcwd                     1184
+#define __NR_capget                     1185
+#define __NR_capset                     1186
+#define __NR_sendfile                   1187
+#define __NR_getpmsg                    1188
+#define __NR_putpmsg                    1189
+#define __NR_socket                     1190
+#define __NR_bind                       1191
+#define __NR_connect                    1192
+#define __NR_listen                     1193
+#define __NR_accept                     1194
+#define __NR_getsockname                1195
+#define __NR_getpeername                1196
+#define __NR_socketpair                 1197
+#define __NR_send                       1198
+#define __NR_sendto                     1199
+#define __NR_recv                       1200
+#define __NR_recvfrom                   1201
+#define __NR_shutdown                   1202
+#define __NR_setsockopt                 1203
+#define __NR_getsockopt                 1204
+#define __NR_sendmsg                    1205
+#define __NR_recvmsg                    1206
+#define __NR_pivot_root                 1207
+#define __NR_mincore                    1208
+#define __NR_madvise                    1209
+#define __NR_stat                       1210
+#define __NR_lstat                      1211
+#define __NR_fstat                      1212
+#define __NR_clone2                     1213
+#define __NR_getdents64                 1214
+#define __NR_getunwind                  1215
+#define __NR_readahead                  1216
+#define __NR_setxattr                   1217
+#define __NR_lsetxattr                  1218
+#define __NR_fsetxattr                  1219
+#define __NR_getxattr                   1220
+#define __NR_lgetxattr                  1221
+#define __NR_fgetxattr                  1222
+#define __NR_listxattr                  1223
+#define __NR_llistxattr                 1224
+#define __NR_flistxattr                 1225
+#define __NR_removexattr                1226
+#define __NR_lremovexattr               1227
+#define __NR_fremovexattr               1228
+#define __NR_tkill                      1229
+#define __NR_futex                      1230
+#define __NR_sched_setaffinity          1231
+#define __NR_sched_getaffinity          1232
+#define __NR_set_tid_address            1233
+#define __NR_fadvise64                  1234
+#define __NR_tgkill                     1235
+#define __NR_exit_group                 1236
+#define __NR_lookup_dcookie             1237
+#define __NR_io_setup                   1238
+#define __NR_io_destroy                 1239
+#define __NR_io_getevents               1240
+#define __NR_io_submit                  1241
+#define __NR_io_cancel                  1242
+#define __NR_epoll_create               1243
+#define __NR_epoll_ctl                  1244
+#define __NR_epoll_wait                 1245
+#define __NR_restart_syscall            1246
+#define __NR_semtimedop                 1247
+#define __NR_timer_create               1248
+#define __NR_timer_settime              1249
+#define __NR_timer_gettime              1250
+#define __NR_timer_getoverrun           1251
+#define __NR_timer_delete               1252
+#define __NR_clock_settime              1253
+#define __NR_clock_gettime              1254
+#define __NR_clock_getres               1255
+#define __NR_clock_nanosleep            1256
+#define __NR_fstatfs64                  1257
+#define __NR_statfs64                   1258
+#define __NR_mbind                      1259
+#define __NR_get_mempolicy              1260
+#define __NR_set_mempolicy              1261
+#define __NR_mq_open                    1262
+#define __NR_mq_unlink                  1263
+#define __NR_mq_timedsend               1264
+#define __NR_mq_timedreceive            1265
+#define __NR_mq_notify                  1266
+#define __NR_mq_getsetattr              1267
+#define __NR_kexec_load                 1268
+#define __NR_vserver                    1269
+#define __NR_waitid                     1270
+#define __NR_add_key                    1271
+#define __NR_request_key                1272
+#define __NR_keyctl                     1273
+#define __NR_ioprio_set                 1274
+#define __NR_ioprio_get                 1275
+#define __NR_move_pages                 1276
+#define __NR_inotify_init               1277
+#define __NR_inotify_add_watch          1278
+#define __NR_inotify_rm_watch           1279
+#define __NR_migrate_pages              1280
+#define __NR_openat                     1281
+#define __NR_mkdirat                    1282
+#define __NR_mknodat                    1283
+#define __NR_fchownat                   1284
+#define __NR_futimesat                  1285
+#define __NR_newfstatat                 1286
+#define __NR_unlinkat                   1287
+#define __NR_renameat                   1288
+#define __NR_linkat                     1289
+#define __NR_symlinkat                  1290
+#define __NR_readlinkat                 1291
+#define __NR_fchmodat                   1292
+#define __NR_faccessat                  1293
+#define __NR_pselect6                   1294
+#define __NR_ppoll                      1295
+#define __NR_unshare                    1296
+#define __NR_splice                     1297
+#define __NR_set_robust_list            1298
+#define __NR_get_robust_list            1299
+#define __NR_sync_file_range            1300
+#define __NR_tee                        1301
+#define __NR_vmsplice                   1302
+#define __NR_fallocate                  1303
+#define __NR_getcpu                     1304
+#define __NR_epoll_pwait                1305
+#define __NR_utimensat                  1306
+#define __NR_signalfd                   1307
+#define __NR_timerfd                    1308
+#define __NR_eventfd                    1309
+#define __NR_timerfd_create             1310
+#define __NR_timerfd_settime            1311
+#define __NR_timerfd_gettime            1312
+#define __NR_signalfd4                  1313
+#define __NR_eventfd2                   1314
+#define __NR_epoll_create1              1315
+#define __NR_dup3                       1316
+#define __NR_pipe2                      1317
+#define __NR_inotify_init1              1318
+#define __NR_preadv                     1319
+#define __NR_pwritev                    1320
+#define __NR_rt_tgsigqueueinfo          1321
+#define __NR_recvmmsg                   1322
+#define __NR_fanotify_init              1323
+#define __NR_fanotify_mark              1324
+#define __NR_prlimit64                  1325
+#define __NR_name_to_handle_at          1326
+#define __NR_open_by_handle_at          1327
+#define __NR_clock_adjtime              1328
+#define __NR_syncfs                     1329
+#define __NR_setns                      1330
+#define __NR_sendmmsg                   1331
+#define __NR_process_vm_readv           1332
+#define __NR_process_vm_writev          1333
+#define __NR_accept4                    1334
+#endif /* _UAPI_ASM_IA64_UNISTD_H */
diff --git a/arch/ia64/include/uapi/asm/ustack.h b/arch/ia64/include/uapi/asm/ustack.h
new file mode 100644
index 00000000000..1dfebc62269
--- /dev/null
+++ b/arch/ia64/include/uapi/asm/ustack.h
@@ -0,0 +1,12 @@
+#ifndef _UAPI_ASM_IA64_USTACK_H
+#define _UAPI_ASM_IA64_USTACK_H
+/*
+ * Constants for the user stack size
+ */
+/* Make a default stack size of 2GiB */
+#define DEFAULT_USER_STACK_SIZE (1UL << 31)
+#endif /* _UAPI_ASM_IA64_USTACK_H */
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index ee31fe9b310..35e106f2ed1 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -614,14 +614,14 @@ sys_execve (const char __user *filename,
            const char __user *const __user *envp,
            struct pt_regs *regs)
 {
-        char *fname;
+        struct filename *fname;
        int error;
        fname = getname(filename);
        error = PTR_ERR(fname);
        if (IS_ERR(fname))
                goto out;
-        error = do_execve(fname, argv, envp, regs);
+        error = do_execve(fname->name, argv, envp, regs);
        putname(fname);
 out:
        return error;
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 37dd79511cb..680b73786be 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -438,14 +438,6 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
        long errno = scr->pt.r8;
        /*
-         * In the ia64_leave_kernel code path, we want the common case to go fast, which
-         * is why we may in certain cases get here from kernel mode. Just return without
-         * doing anything if so.
-         */
-        if (!user_mode(&scr->pt))
-                return;
-        /*
         * This only loops in the rare cases of handle_signal() failing, in which case we
         * need to push through a forced SIGSEGV.
         */
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 80ff9acc5ed..f6388216080 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -19,7 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/efi.h>
 #include <linux/timex.h>
-#include <linux/clocksource.h>
+#include <linux/timekeeper_internal.h>
 #include <linux/platform_device.h>
 #include <asm/machvec.h>
@@ -454,7 +454,7 @@ void update_vsyscall_tz(void)
 {
 }
-void update_vsyscall(struct timespec *wall, struct timespec *wtm,
+void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
                        struct clocksource *c, u32 mult)
 {
        write_seqcount_begin(&fsyscall_gtod_data.seq);
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index e875fc3ce9c..f807721e19a 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -14,6 +14,7 @@ config M32R
        select GENERIC_IRQ_SHOW
        select GENERIC_ATOMIC64
        select ARCH_USES_GETTIMEOFFSET
+        select MODULES_USE_ELF_RELA
 config SBUS
        bool
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index fccd81eddff..50bbf387b2f 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -2,3 +2,4 @@ include include/asm-generic/Kbuild.asm
 generic-y += clkdev.h
 generic-y += exec.h
+generic-y += module.h
diff --git a/arch/m32r/include/asm/module.h b/arch/m32r/include/asm/module.h
deleted file mode 100644
index eb73ee01121..00000000000
--- a/arch/m32r/include/asm/module.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_M32R_MODULE_H
-#define _ASM_M32R_MODULE_H
-struct mod_arch_specific { };
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-#endif /* _ASM_M32R_MODULE_H */
diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h
index c083f6073ef..c074f4c2e85 100644
--- a/arch/m32r/include/asm/thread_info.h
+++ b/arch/m32r/include/asm/thread_info.h
@@ -119,25 +119,20 @@ static inline unsigned int get_thread_fault_code(void)
 #define TIF_SIGPENDING          1       /* signal pending */
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
 #define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
-#define TIF_IRET                4       /* return with iret */
 #define TIF_NOTIFY_RESUME       5       /* callback before returning to user */
 #define TIF_RESTORE_SIGMASK     8       /* restore signal mask in do_signal() */
 #define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
-#define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18      /* is terminating due to OOM killer */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
-#define _TIF_IRET               (1<<TIF_IRET)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
-#define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
+#define _TIF_WORK_MASK          (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME)
-#define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
+#define _TIF_ALLWORK_MASK       (_TIF_WORK_MASK | _TIF_SYSCALL_TRACE)
 /*
 * Thread-synchronous status.
diff --git a/arch/m32r/kernel/module.c b/arch/m32r/kernel/module.c
index 3071fe83ffc..38233b6596b 100644
--- a/arch/m32r/kernel/module.c
+++ b/arch/m32r/kernel/module.c
@@ -201,18 +201,3 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
        }
        return 0;
 }
-int apply_relocate(Elf32_Shdr *sechdrs,
-                       const char *strtab,
-                       unsigned int symindex,
-                       unsigned int relsec,
-                       struct module *me)
-{
-#if 0
-        printk(KERN_ERR "module %s: REL RELOCATION unsupported\n",
-               me->name);
-        return -ENOEXEC;
-#endif
-        return 0;
-}
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index 384e63f3a4c..e7366276ef3 100644
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
@@ -296,14 +296,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
                          unsigned long r6, struct pt_regs regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname(ufilename);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, uargv, uenvp, &regs);
+        error = do_execve(filename->name, uargv, uenvp, &regs);
        putname(filename);
 out:
        return error;
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index d0f60b97bbc..6e3c26a1607 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -20,7 +20,6 @@
 #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/personality.h>
-#include <linux/freezer.h>
 #include <linux/tracehook.h>
 #include <asm/cacheflush.h>
 #include <asm/ucontext.h>
@@ -366,6 +365,4 @@ void do_notify_resume(struct pt_regs *regs, __u32 thread_info_flags)
                clear_thread_flag(TIF_NOTIFY_RESUME);
                tracehook_notify_resume(regs);
        }
-        clear_thread_flag(TIF_IRET);
 }
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index dae1e7e16a3..e7c161433ea 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -15,6 +15,10 @@ config M68K
        select FPU if MMU
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
+        select GENERIC_KERNEL_THREAD
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_REL
+        select MODULES_USE_ELF_RELA
 config RWSEM_GENERIC_SPINLOCK
        bool
diff --git a/arch/m68k/include/asm/module.h b/arch/m68k/include/asm/module.h
index edffe66b7f4..8b58fce843d 100644
--- a/arch/m68k/include/asm/module.h
+++ b/arch/m68k/include/asm/module.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_M68K_MODULE_H
 #define _ASM_M68K_MODULE_H
+#include <asm-generic/module.h>
 enum m68k_fixup_type {
        m68k_fixup_memoffset,
        m68k_fixup_vnode_shift,
@@ -36,8 +38,4 @@ struct module;
 extern void module_fixup(struct module *mod, struct m68k_fixup_info *start,
                         struct m68k_fixup_info *end);
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
 #endif /* _ASM_M68K_MODULE_H */
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
index f17c42aff7f..ae700f49e51 100644
--- a/arch/m68k/include/asm/processor.h
+++ b/arch/m68k/include/asm/processor.h
@@ -100,6 +100,16 @@ struct thread_struct {
        .fs     = __KERNEL_DS,                                          \
 }
+/*
+ * ColdFire stack format sbould be 0x4 for an aligned usp (will always be
+ * true on thread creation). We need to set this explicitly.
+ */
+#ifdef CONFIG_COLDFIRE
+#define setframeformat(_regs)   do { (_regs)->format = 0x4; } while(0)
+#else
+#define setframeformat(_regs)   do { } while (0)
+#endif
 #ifdef CONFIG_MMU
 /*
 * Do necessary setup to start up a newly executed thread.
@@ -109,6 +119,7 @@ static inline void start_thread(struct pt_regs * regs, unsigned long pc,
 {
        regs->pc = pc;
        regs->sr &= ~0x2000;
+        setframeformat(regs);
        wrusp(usp);
 }
@@ -116,21 +127,11 @@ extern int handle_kernel_fault(struct pt_regs *regs);
 #else
-/*
- * Coldfire stacks need to be re-aligned on trap exit, conventional
- * 68k can handle this case cleanly.
- */
-#ifdef CONFIG_COLDFIRE
-#define reformat(_regs)         do { (_regs)->format = 0x4; } while(0)
-#else
-#define reformat(_regs)         do { } while (0)
-#endif
 #define start_thread(_regs, _pc, _usp)                  \
 do {                                                    \
        (_regs)->pc = (_pc);                            \
        ((struct switch_stack *)(_regs))[-1].a6 = 0;    \
-        reformat(_regs);                                \
+        setframeformat(_regs);                          \
        if (current->mm)                                \
                (_regs)->d5 = current->mm->start_data;  \
        (_regs)->sr &= ~0x2000;                         \
@@ -153,8 +154,6 @@ static inline void release_thread(struct task_struct *dead_task)
 {
 }
-extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 /*
 * Free current thread data structures etc..
 */
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
index 65322b17b6c..5e08b597f01 100644
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@ -85,6 +85,8 @@ struct switch_stack {
 #define user_mode(regs) (!((regs)->sr & PS_S))
 #define instruction_pointer(regs) ((regs)->pc)
 #define profile_pc(regs) instruction_pointer(regs)
+#define current_pt_regs() \
+        (struct pt_regs *)((char *)current_thread_info() + THREAD_SIZE) - 1
 #define arch_has_single_step()  (1)
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index 045cfd6a9e3..c702ad71679 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -382,6 +382,8 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_SYS_EXECVE
+#define __ARCH_WANT_KERNEL_EXECVE
 /*
 * "Conditional" syscalls
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index 165ee9f9d5c..946cb018775 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -111,6 +111,22 @@ ENTRY(ret_from_fork)
        addql   #4,%sp
        jra     ret_from_exception
+ENTRY(ret_from_kernel_thread)
+        | a3 contains the kernel thread payload, d7 - its argument
+        movel   %d1,%sp@-
+        jsr     schedule_tail
+        GET_CURRENT(%d0)
+        movel   %d7,(%sp)
+        jsr     %a3@
+        addql   #4,%sp
+        movel   %d0,(%sp)
+        jra     sys_exit
+ENTRY(ret_from_kernel_execve)
+        movel   4(%sp), %sp
+        GET_CURRENT(%d0)
+        jra     ret_from_exception
 #if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU)
 #ifdef TRAP_DBG_INTERRUPT
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index ac2892e49c7..c51bb172e14 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -35,6 +35,7 @@
 asmlinkage void ret_from_fork(void);
+asmlinkage void ret_from_kernel_thread(void);
 /*
@@ -123,51 +124,6 @@ void show_regs(struct pt_regs * regs)
                printk("USP: %08lx\n", rdusp());
 }
-/*
- * Create a kernel thread
- */
-int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
-{
-        int pid;
-        mm_segment_t fs;
-        fs = get_fs();
-        set_fs (KERNEL_DS);
-        {
-        register long retval __asm__ ("d0");
-        register long clone_arg __asm__ ("d1") = flags | CLONE_VM | CLONE_UNTRACED;
-        retval = __NR_clone;
-        __asm__ __volatile__
-          ("clrl %%d2\n\t"
-           "trap #0\n\t"                /* Linux/m68k system call */
-           "tstl %0\n\t"                /* child or parent */
-           "jne 1f\n\t"                 /* parent - jump */
-#ifdef CONFIG_MMU
-           "lea %%sp@(%c7),%6\n\t"      /* reload current */
-           "movel %6@,%6\n\t"
-#endif
-           "movel %3,%%sp@-\n\t"        /* push argument */
-           "jsr %4@\n\t"                /* call fn */
-           "movel %0,%%d1\n\t"          /* pass exit value */
-           "movel %2,%%d0\n\t"          /* exit */
-           "trap #0\n"
-           "1:"
-           : "+d" (retval)
-           : "i" (__NR_clone), "i" (__NR_exit),
-             "r" (arg), "a" (fn), "d" (clone_arg), "r" (current),
-             "i" (-THREAD_SIZE)
-           : "d2");
-        pid = retval;
-        }
-        set_fs (fs);
-        return pid;
-}
-EXPORT_SYMBOL(kernel_thread);
 void flush_thread(void)
 {
        current->thread.fs = __USER_DS;
@@ -219,30 +175,18 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
 }
 int copy_thread(unsigned long clone_flags, unsigned long usp,
-                 unsigned long unused,
+                 unsigned long arg,
                 struct task_struct * p, struct pt_regs * regs)
 {
        struct pt_regs * childregs;
-        struct switch_stack * childstack, *stack;
+        struct switch_stack *childstack;
-        unsigned long *retp;
        childregs = (struct pt_regs *) (task_stack_page(p) + THREAD_SIZE) - 1;
-        *childregs = *regs;
-        childregs->d0 = 0;
-        retp = ((unsigned long *) regs);
-        stack = ((struct switch_stack *) retp) - 1;
        childstack = ((struct switch_stack *) childregs) - 1;
-        *childstack = *stack;
-        childstack->retpc = (unsigned long)ret_from_fork;
        p->thread.usp = usp;
        p->thread.ksp = (unsigned long)childstack;
+        p->thread.esp0 = (unsigned long)childregs;
-        if (clone_flags & CLONE_SETTLS)
-                task_thread_info(p)->tp_value = regs->d5;
        /*
         * Must save the current SFC/DFC value, NOT the value when
@@ -250,6 +194,26 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
         */
        p->thread.fs = get_fs().seg;
+        if (unlikely(!regs)) {
+                /* kernel thread */
+                memset(childstack, 0,
+                        sizeof(struct switch_stack) + sizeof(struct pt_regs));
+                childregs->sr = PS_S;
+                childstack->a3 = usp; /* function */
+                childstack->d7 = arg;
+                childstack->retpc = (unsigned long)ret_from_kernel_thread;
+                p->thread.usp = 0;
+                return 0;
+        }
+        *childregs = *regs;
+        childregs->d0 = 0;
+        *childstack = ((struct switch_stack *) regs)[-1];
+        childstack->retpc = (unsigned long)ret_from_fork;
+        if (clone_flags & CLONE_SETTLS)
+                task_thread_info(p)->tp_value = regs->d5;
 #ifdef CONFIG_FPU
        if (!FPU_IS_EMU) {
                /* Copy the current fpu state */
@@ -337,26 +301,6 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu)
 EXPORT_SYMBOL(dump_fpu);
 #endif /* CONFIG_FPU */
-/*
- * sys_execve() executes a new program.
- */
-asmlinkage int sys_execve(const char __user *name,
-                          const char __user *const __user *argv,
-                          const char __user *const __user *envp)
-{
-        int error;
-        char * filename;
-        struct pt_regs *regs = (struct pt_regs *) &name;
-        filename = getname(name);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                return error;
-        error = do_execve(filename, argv, envp, regs);
-        putname(filename);
-        return error;
-}
 unsigned long get_wchan(struct task_struct *p)
 {
        unsigned long fp, pc;
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index 9a5932ec368..3a480b3df0d 100644
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -549,23 +549,6 @@ asmlinkage int sys_getpagesize(void)
        return PAGE_SIZE;
 }
-/*
- * Do a system call from kernel instead of calling sys_execve so we
- * end up with proper pt_regs.
- */
-int kernel_execve(const char *filename,
-                  const char *const argv[],
-                  const char *const envp[])
-{
-        register long __res asm ("%d0") = __NR_execve;
-        register long __a asm ("%d1") = (long)(filename);
-        register long __b asm ("%d2") = (long)(argv);
-        register long __c asm ("%d3") = (long)(envp);
-        asm volatile ("trap  #0" : "+d" (__res)
-                        : "d" (__a), "d" (__b), "d" (__c));
-        return __res;
-}
 asmlinkage unsigned long sys_get_thread_area(void)
 {
        return current_thread_info()->tp_value;
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 53fd94ab60f..4cba7439f9d 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -25,6 +25,7 @@ config MICROBLAZE
        select GENERIC_CPU_DEVICES
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS
+        select MODULES_USE_ELF_RELA
 config SWAP
        def_bool n
diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h
index 6c610234ffa..008f30433d2 100644
--- a/arch/microblaze/include/asm/thread_info.h
+++ b/arch/microblaze/include/asm/thread_info.h
@@ -121,7 +121,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_NEED_RESCHED        3 /* rescheduling necessary */
 /* restore singlestep on return to user mode */
 #define TIF_SINGLESTEP          4
-#define TIF_IRET                5 /* return with iret */
 #define TIF_MEMDIE              6       /* is terminating due to OOM killer */
 #define TIF_SYSCALL_AUDIT       9       /* syscall auditing active */
 #define TIF_SECCOMP             10      /* secure computing */
@@ -134,7 +133,6 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
-#define _TIF_IRET               (1 << TIF_IRET)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_SYSCALL_AUDIT      (1 << TIF_SYSCALL_AUDIT)
 #define _TIF_SECCOMP            (1 << TIF_SECCOMP)
@@ -184,6 +182,7 @@ static inline bool test_and_clear_restore_sigmask(void)
        ti->status &= ~TS_RESTORE_SIGMASK;
        return true;
 }
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif
 #endif /* __KERNEL__ */
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index c1220dbf87c..3847e5b9c60 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -254,10 +254,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        set_fs(USER_DS);
-        /* the tracer may want to single-step inside the handler */
-        if (test_thread_flag(TIF_SINGLESTEP))
-                ptrace_notify(SIGTRAP);
 #ifdef DEBUG_SIG
        printk(KERN_INFO "SIG deliver (%s:%d): sp=%p pc=%08lx\n",
                current->comm, current->pid, frame, regs->pc);
@@ -315,7 +311,8 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
        if (ret)
                return;
-        signal_delivered(sig, info, ka, regs, 0);
+        signal_delivered(sig, info, ka, regs,
+                        test_thread_flag(TIF_SINGLESTEP));
 }
 /*
diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c
index e5b154f24f8..404c0f24bd4 100644
--- a/arch/microblaze/kernel/sys_microblaze.c
+++ b/arch/microblaze/kernel/sys_microblaze.c
@@ -54,13 +54,13 @@ asmlinkage long microblaze_execve(const char __user *filenamei,
                                  struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname(filenamei);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
 out:
        return error;
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3803696e635..dba9390d37c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -37,6 +37,9 @@ config MIPS
        select BUILDTIME_EXTABLE_SORT
        select GENERIC_CLOCKEVENTS
        select GENERIC_CMOS_UPDATE
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_REL
+        select MODULES_USE_ELF_RELA if 64BIT
 menu "Machine selection"
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index dca8bce8c7a..26137da1c71 100644
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -35,11 +35,14 @@ typedef struct {
 } Elf64_Mips_Rela;
 #ifdef CONFIG_32BIT
 #define Elf_Shdr        Elf32_Shdr
 #define Elf_Sym         Elf32_Sym
 #define Elf_Ehdr        Elf32_Ehdr
 #define Elf_Addr        Elf32_Addr
+#define Elf_Rel         Elf32_Rel
+#define Elf_Rela        Elf32_Rela
+#define ELF_R_TYPE(X)   ELF32_R_TYPE(X)
+#define ELF_R_SYM(X)    ELF32_R_SYM(X)
 #define Elf_Mips_Rel    Elf32_Rel
 #define Elf_Mips_Rela   Elf32_Rela
@@ -50,11 +53,14 @@ typedef struct {
 #endif
 #ifdef CONFIG_64BIT
 #define Elf_Shdr        Elf64_Shdr
 #define Elf_Sym         Elf64_Sym
 #define Elf_Ehdr        Elf64_Ehdr
 #define Elf_Addr        Elf64_Addr
+#define Elf_Rel         Elf64_Rel
+#define Elf_Rela        Elf64_Rela
+#define ELF_R_TYPE(X)   ELF64_R_TYPE(X)
+#define ELF_R_SYM(X)    ELF64_R_SYM(X)
 #define Elf_Mips_Rel    Elf64_Mips_Rel
 #define Elf_Mips_Rela   Elf64_Mips_Rela
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
index 946e010f201..8debe9e9175 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@@ -103,7 +103,6 @@ register struct thread_info *__current_thread_info __asm__("$28");
 #define TIF_NOTIFY_RESUME       5       /* callback before returning to user */
 #define TIF_RESTORE_SIGMASK     9       /* restore signal mask in do_signal() */
 #define TIF_USEDFPU             16      /* FPU was used by this task this quantum (SMP) */
-#define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18      /* is terminating due to OOM killer */
 #define TIF_FIXADE              20      /* Fix address errors in software */
 #define TIF_LOGADE              21      /* Log address errors to syslog */
@@ -125,9 +124,7 @@ register struct thread_info *__current_thread_info __asm__("$28");
 #define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
 #define _TIF_SECCOMP            (1<<TIF_SECCOMP)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_FIXADE             (1<<TIF_FIXADE)
 #define _TIF_LOGADE             (1<<TIF_LOGADE)
 #define _TIF_32BIT_REGS         (1<<TIF_32BIT_REGS)
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index e49c4469f73..8b28bc4e14e 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_SYNC_R4K)		+= sync-r4k.o
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o
 obj-$(CONFIG_MODULES)           += mips_ksyms.o module.o
+obj-$(CONFIG_MODULES_USE_ELF_RELA) += module-rela.o
 obj-$(CONFIG_FUNCTION_TRACER)   += mcount.o ftrace.o
diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c
index f4546e97c60..23817a6e32b 100644
--- a/arch/mips/kernel/kgdb.c
+++ b/arch/mips/kernel/kgdb.c
@@ -283,6 +283,15 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd,
        struct pt_regs *regs = args->regs;
        int trap = (regs->cp0_cause & 0x7c) >> 2;
+#ifdef CONFIG_KPROBES
+        /*
+         * Return immediately if the kprobes fault notifier has set
+         * DIE_PAGE_FAULT.
+         */
+        if (cmd == DIE_PAGE_FAULT)
+                return NOTIFY_DONE;
+#endif /* CONFIG_KPROBES */
        /* Userspace events, ignore. */
        if (user_mode(regs))
                return NOTIFY_DONE;
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 922a554cd10..3a21acedf88 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -83,13 +83,13 @@ out:
 asmlinkage int sys32_execve(nabi_no_regargs struct pt_regs regs)
 {
        int error;
-        char * filename;
+        struct filename *filename;
        filename = getname(compat_ptr(regs.regs[4]));
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = compat_do_execve(filename, compat_ptr(regs.regs[5]),
+        error = compat_do_execve(filename->name, compat_ptr(regs.regs[5]),
                                 compat_ptr(regs.regs[6]), &regs);
        putname(filename);
diff --git a/arch/mips/kernel/module-rela.c b/arch/mips/kernel/module-rela.c
new file mode 100644
index 00000000000..61d60028b88
--- /dev/null
+++ b/arch/mips/kernel/module-rela.c
@@ -0,0 +1,145 @@
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  Copyright (C) 2001 Rusty Russell.
+ *  Copyright (C) 2003, 2004 Ralf Baechle (ralf@linux-mips.org)
+ *  Copyright (C) 2005 Thiemo Seufer
+ */
+#include <linux/elf.h>
+#include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/moduleloader.h>
+extern int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v);
+static int apply_r_mips_32_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        *location = v;
+        return 0;
+}
+static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        if (v % 4) {
+                pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
+                       me->name);
+                return -ENOEXEC;
+        }
+        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+                printk(KERN_ERR
+                       "module %s: relocation overflow\n",
+                       me->name);
+                return -ENOEXEC;
+        }
+        *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
+        return 0;
+}
+static int apply_r_mips_hi16_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        *location = (*location & 0xffff0000) |
+                    ((((long long) v + 0x8000LL) >> 16) & 0xffff);
+        return 0;
+}
+static int apply_r_mips_lo16_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        *location = (*location & 0xffff0000) | (v & 0xffff);
+        return 0;
+}
+static int apply_r_mips_64_rela(struct module *me, u32 *location, Elf_Addr v)
+{
+        *(Elf_Addr *)location = v;
+        return 0;
+}
+static int apply_r_mips_higher_rela(struct module *me, u32 *location,
+                                    Elf_Addr v)
+{
+        *location = (*location & 0xffff0000) |
+                    ((((long long) v + 0x80008000LL) >> 32) & 0xffff);
+        return 0;
+}
+static int apply_r_mips_highest_rela(struct module *me, u32 *location,
+                                     Elf_Addr v)
+{
+        *location = (*location & 0xffff0000) |
+                    ((((long long) v + 0x800080008000LL) >> 48) & 0xffff);
+        return 0;
+}
+static int (*reloc_handlers_rela[]) (struct module *me, u32 *location,
+                                Elf_Addr v) = {
+        [R_MIPS_NONE]           = apply_r_mips_none,
+        [R_MIPS_32]             = apply_r_mips_32_rela,
+        [R_MIPS_26]             = apply_r_mips_26_rela,
+        [R_MIPS_HI16]           = apply_r_mips_hi16_rela,
+        [R_MIPS_LO16]           = apply_r_mips_lo16_rela,
+        [R_MIPS_64]             = apply_r_mips_64_rela,
+        [R_MIPS_HIGHER]         = apply_r_mips_higher_rela,
+        [R_MIPS_HIGHEST]        = apply_r_mips_highest_rela
+};
+int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
+                       unsigned int symindex, unsigned int relsec,
+                       struct module *me)
+{
+        Elf_Mips_Rela *rel = (void *) sechdrs[relsec].sh_addr;
+        Elf_Sym *sym;
+        u32 *location;
+        unsigned int i;
+        Elf_Addr v;
+        int res;
+        pr_debug("Applying relocate section %u to %u\n", relsec,
+               sechdrs[relsec].sh_info);
+        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
+                /* This is where to make the change */
+                location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
+                        + rel[i].r_offset;
+                /* This is the symbol it is referring to */
+                sym = (Elf_Sym *)sechdrs[symindex].sh_addr
+                        + ELF_MIPS_R_SYM(rel[i]);
+                if (IS_ERR_VALUE(sym->st_value)) {
+                        /* Ignore unresolved weak symbol */
+                        if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
+                                continue;
+                        printk(KERN_WARNING "%s: Unknown symbol %s\n",
+                               me->name, strtab + sym->st_name);
+                        return -ENOENT;
+                }
+                v = sym->st_value + rel[i].r_addend;
+                res = reloc_handlers_rela[ELF_MIPS_R_TYPE(rel[i])](me, location, v);
+                if (res)
+                        return res;
+        }
+        return 0;
+}
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index 4f8c3cba8c0..07ff5812ffa 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -51,7 +51,7 @@ void *module_alloc(unsigned long size)
 }
 #endif
-static int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
+int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
 {
        return 0;
 }
@@ -63,13 +63,6 @@ static int apply_r_mips_32_rel(struct module *me, u32 *location, Elf_Addr v)
        return 0;
 }
-static int apply_r_mips_32_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        *location = v;
-        return 0;
-}
 static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
 {
        if (v % 4) {
@@ -91,26 +84,6 @@ static int apply_r_mips_26_rel(struct module *me, u32 *location, Elf_Addr v)
        return 0;
 }
-static int apply_r_mips_26_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        if (v % 4) {
-                pr_err("module %s: dangerous R_MIPS_26 RELArelocation\n",
-                       me->name);
-                return -ENOEXEC;
-        }
-        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
-                printk(KERN_ERR
-                       "module %s: relocation overflow\n",
-                       me->name);
-                return -ENOEXEC;
-        }
-        *location = (*location & ~0x03ffffff) | ((v >> 2) & 0x03ffffff);
-        return 0;
-}
 static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
 {
        struct mips_hi16 *n;
@@ -132,14 +105,6 @@ static int apply_r_mips_hi16_rel(struct module *me, u32 *location, Elf_Addr v)
        return 0;
 }
-static int apply_r_mips_hi16_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        *location = (*location & 0xffff0000) |
-                    ((((long long) v + 0x8000LL) >> 16) & 0xffff);
-        return 0;
-}
 static void free_relocation_chain(struct mips_hi16 *l)
 {
        struct mips_hi16 *next;
@@ -217,38 +182,6 @@ out_danger:
        return -ENOEXEC;
 }
-static int apply_r_mips_lo16_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        *location = (*location & 0xffff0000) | (v & 0xffff);
-        return 0;
-}
-static int apply_r_mips_64_rela(struct module *me, u32 *location, Elf_Addr v)
-{
-        *(Elf_Addr *)location = v;
-        return 0;
-}
-static int apply_r_mips_higher_rela(struct module *me, u32 *location,
-                                    Elf_Addr v)
-{
-        *location = (*location & 0xffff0000) |
-                    ((((long long) v + 0x80008000LL) >> 32) & 0xffff);
-        return 0;
-}
-static int apply_r_mips_highest_rela(struct module *me, u32 *location,
-                                     Elf_Addr v)
-{
-        *location = (*location & 0xffff0000) |
-                    ((((long long) v + 0x800080008000LL) >> 48) & 0xffff);
-        return 0;
-}
 static int (*reloc_handlers_rel[]) (struct module *me, u32 *location,
                                Elf_Addr v) = {
        [R_MIPS_NONE]           = apply_r_mips_none,
@@ -258,18 +191,6 @@ static int (*reloc_handlers_rel[]) (struct module *me, u32 *location,
        [R_MIPS_LO16]           = apply_r_mips_lo16_rel
 };
-static int (*reloc_handlers_rela[]) (struct module *me, u32 *location,
-                                Elf_Addr v) = {
-        [R_MIPS_NONE]           = apply_r_mips_none,
-        [R_MIPS_32]             = apply_r_mips_32_rela,
-        [R_MIPS_26]             = apply_r_mips_26_rela,
-        [R_MIPS_HI16]           = apply_r_mips_hi16_rela,
-        [R_MIPS_LO16]           = apply_r_mips_lo16_rela,
-        [R_MIPS_64]             = apply_r_mips_64_rela,
-        [R_MIPS_HIGHER]         = apply_r_mips_higher_rela,
-        [R_MIPS_HIGHEST]        = apply_r_mips_highest_rela
-};
 int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
                   unsigned int symindex, unsigned int relsec,
                   struct module *me)
@@ -324,46 +245,6 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
        return 0;
 }
-int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
-                       unsigned int symindex, unsigned int relsec,
-                       struct module *me)
-{
-        Elf_Mips_Rela *rel = (void *) sechdrs[relsec].sh_addr;
-        Elf_Sym *sym;
-        u32 *location;
-        unsigned int i;
-        Elf_Addr v;
-        int res;
-        pr_debug("Applying relocate section %u to %u\n", relsec,
-               sechdrs[relsec].sh_info);
-        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
-                /* This is where to make the change */
-                location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
-                        + rel[i].r_offset;
-                /* This is the symbol it is referring to */
-                sym = (Elf_Sym *)sechdrs[symindex].sh_addr
-                        + ELF_MIPS_R_SYM(rel[i]);
-                if (IS_ERR_VALUE(sym->st_value)) {
-                        /* Ignore unresolved weak symbol */
-                        if (ELF_ST_BIND(sym->st_info) == STB_WEAK)
-                                continue;
-                        printk(KERN_WARNING "%s: Unknown symbol %s\n",
-                               me->name, strtab + sym->st_name);
-                        return -ENOENT;
-                }
-                v = sym->st_value + rel[i].r_addend;
-                res = reloc_handlers_rela[ELF_MIPS_R_TYPE(rel[i])](me, location, v);
-                if (res)
-                        return res;
-        }
-        return 0;
-}
 /* Given an address, look for it in the module exception tables. */
 const struct exception_table_entry *search_module_dbetables(unsigned long addr)
 {
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index b08220c8211..2bd561bc05a 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -133,13 +133,13 @@ _sys_clone(nabi_no_regargs struct pt_regs regs)
 asmlinkage int sys_execve(nabi_no_regargs struct pt_regs regs)
 {
        int error;
-        char * filename;
+        struct filename *filename;
        filename = getname((const char __user *) (long)regs.regs[4]);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                          (const char __user *const __user *) (long)regs.regs[5],
                          (const char __user *const __user *) (long)regs.regs[6],
                          &regs);
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 5cfb086b390..04669fac117 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -8,6 +8,8 @@ config MN10300
        select HAVE_ARCH_KGDB
        select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
        select GENERIC_CLOCKEVENTS
+        select GENERIC_KERNEL_THREAD
+        select MODULES_USE_ELF_RELA
 config AM33_2
        def_bool n
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild
index fccd81eddff..4a159da2363 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -1,4 +1,3 @@
-include include/asm-generic/Kbuild.asm
 generic-y += clkdev.h
 generic-y += exec.h
diff --git a/arch/mn10300/include/asm/frame.inc b/arch/mn10300/include/asm/frame.inc
index 2ee58e3eb6b..1c3eb4fda95 100644
--- a/arch/mn10300/include/asm/frame.inc
+++ b/arch/mn10300/include/asm/frame.inc
@@ -61,7 +61,7 @@
 ###############################################################################
 .macro RESTORE_ALL
        # peel back the stack to the calling frame
-        # - this permits execve() to discard extra frames due to kernel syscalls
+        # - we need that when returning from interrupts to kernel mode
        GET_THREAD_INFO a0
        mov     (TI_frame,a0),fp
        mov     fp,sp
diff --git a/arch/mn10300/include/asm/module.h b/arch/mn10300/include/asm/module.h
index 5d7057d0149..6571103b051 100644
--- a/arch/mn10300/include/asm/module.h
+++ b/arch/mn10300/include/asm/module.h
@@ -12,12 +12,7 @@
 #ifndef _ASM_MODULE_H
 #define _ASM_MODULE_H
-struct mod_arch_specific {
+#include <asm-generic/module.h>
-};
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
 /*
 * Include the MN10300 architecture version.
diff --git a/arch/mn10300/include/asm/processor.h b/arch/mn10300/include/asm/processor.h
index 247928c9f54..8b80b19d0c8 100644
--- a/arch/mn10300/include/asm/processor.h
+++ b/arch/mn10300/include/asm/processor.h
@@ -119,20 +119,13 @@ struct thread_struct {
 /*
 * do necessary setup to start up a newly executed thread
- * - need to discard the frame stacked by the kernel thread invoking the execve
- *   syscall (see RESTORE_ALL macro)
 */
 static inline void start_thread(struct pt_regs *regs,
                                unsigned long new_pc, unsigned long new_sp)
 {
-        struct thread_info *ti = current_thread_info();
+        regs->epsw = EPSW_nSL | EPSW_IE | EPSW_IM;
-        struct pt_regs *frame0;
+        regs->pc = new_pc;
+        regs->sp = new_sp;
-        frame0 = thread_info_to_uregs(ti);
-        frame0->epsw = EPSW_nSL | EPSW_IE | EPSW_IM;
-        frame0->pc = new_pc;
-        frame0->sp = new_sp;
-        ti->frame = frame0;
 }
@@ -140,11 +133,6 @@ static inline void start_thread(struct pt_regs *regs,
 extern void release_thread(struct task_struct *);
 /*
- * create a kernel thread without removing it from tasklists
- */
-extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
-/*
 * Return saved PC of a blocked thread.
 */
 extern unsigned long thread_saved_pc(struct task_struct *tsk);
diff --git a/arch/mn10300/include/asm/ptrace.h b/arch/mn10300/include/asm/ptrace.h
index 44251b974f1..838a3830010 100644
--- a/arch/mn10300/include/asm/ptrace.h
+++ b/arch/mn10300/include/asm/ptrace.h
@@ -11,85 +11,16 @@
 #ifndef _ASM_PTRACE_H
 #define _ASM_PTRACE_H
-#define PT_A3           0
+#include <uapi/asm/ptrace.h>
-#define PT_A2           1
-#define PT_D3           2
-#define PT_D2           3
-#define PT_MCVF         4
-#define PT_MCRL         5
-#define PT_MCRH         6
-#define PT_MDRQ         7
-#define PT_E1           8
-#define PT_E0           9
-#define PT_E7           10
-#define PT_E6           11
-#define PT_E5           12
-#define PT_E4           13
-#define PT_E3           14
-#define PT_E2           15
-#define PT_SP           16
-#define PT_LAR          17
-#define PT_LIR          18
-#define PT_MDR          19
-#define PT_A1           20
-#define PT_A0           21
-#define PT_D1           22
-#define PT_D0           23
-#define PT_ORIG_D0      24
-#define PT_EPSW         25
-#define PT_PC           26
-#define NR_PTREGS       27
-/*
- * This defines the way registers are stored in the event of an exception
- * - the strange order is due to the MOVM instruction
- */
-struct pt_regs {
-        unsigned long           a3;             /* syscall arg 3 */
-        unsigned long           a2;             /* syscall arg 4 */
-        unsigned long           d3;             /* syscall arg 5 */
-        unsigned long           d2;             /* syscall arg 6 */
-        unsigned long           mcvf;
-        unsigned long           mcrl;
-        unsigned long           mcrh;
-        unsigned long           mdrq;
-        unsigned long           e1;
-        unsigned long           e0;
-        unsigned long           e7;
-        unsigned long           e6;
-        unsigned long           e5;
-        unsigned long           e4;
-        unsigned long           e3;
-        unsigned long           e2;
-        unsigned long           sp;
-        unsigned long           lar;
-        unsigned long           lir;
-        unsigned long           mdr;
-        unsigned long           a1;
-        unsigned long           a0;             /* syscall arg 1 */
-        unsigned long           d1;             /* syscall arg 2 */
-        unsigned long           d0;             /* syscall ret */
-        struct pt_regs          *next;          /* next frame pointer */
-        unsigned long           orig_d0;        /* syscall number */
-        unsigned long           epsw;
-        unsigned long           pc;
-};
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS            12
-#define PTRACE_SETREGS            13
-#define PTRACE_GETFPREGS          14
-#define PTRACE_SETFPREGS          15
-#ifdef __KERNEL__
 #define user_mode(regs)                 (((regs)->epsw & EPSW_nSL) == EPSW_nSL)
 #define instruction_pointer(regs)       ((regs)->pc)
 #define user_stack_pointer(regs)        ((regs)->sp)
+#define current_pt_regs()               current_frame()
 #define arch_has_single_step()  (1)
 #define profile_pc(regs) ((regs)->pc)
-#endif /* __KERNEL__  */
 #endif /* _ASM_PTRACE_H */
diff --git a/arch/mn10300/include/asm/setup.h b/arch/mn10300/include/asm/setup.h
index c229d1e3f99..fb024555d2a 100644
--- a/arch/mn10300/include/asm/setup.h
+++ b/arch/mn10300/include/asm/setup.h
@@ -11,8 +11,8 @@
 #ifndef _ASM_SETUP_H
 #define _ASM_SETUP_H
-#ifdef __KERNEL__
+#include <uapi/asm/setup.h>
 extern void __init unit_setup(void);
 extern void __init unit_init_IRQ(void);
-#endif
 #endif /* _ASM_SETUP_H */
diff --git a/arch/mn10300/include/asm/signal.h b/arch/mn10300/include/asm/signal.h
index 1865d72a86f..f9668ec3040 100644
--- a/arch/mn10300/include/asm/signal.h
+++ b/arch/mn10300/include/asm/signal.h
@@ -11,12 +11,8 @@
 #ifndef _ASM_SIGNAL_H
 #define _ASM_SIGNAL_H
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
-/* Avoid too many header ordering problems.  */
-struct siginfo;
-#ifdef __KERNEL__
 /* Most things should be clean enough to redefine this at will, if care
   is taken to make libc match.  */
@@ -30,94 +26,6 @@ typedef struct {
        unsigned long   sig[_NSIG_WORDS];
 } sigset_t;
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-#define NSIG            32
-typedef unsigned long sigset_t;
-#endif /* __KERNEL__ */
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001U
-#define SA_NOCLDWAIT    0x00000002U
-#define SA_SIGINFO      0x00000004U
-#define SA_ONSTACK      0x08000000U
-#define SA_RESTART      0x10000000U
-#define SA_NODEFER      0x40000000U
-#define SA_RESETHAND    0x80000000U
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-#define SA_RESTORER     0x04000000
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-#include <asm-generic/signal-defs.h>
-#ifdef __KERNEL__
 struct old_sigaction {
        __sighandler_t sa_handler;
        old_sigset_t sa_mask;
@@ -135,37 +43,10 @@ struct sigaction {
 struct k_sigaction {
        struct sigaction sa;
 };
-#else
-/* Here we must cater to libcs that poke about in kernel headers.  */
-struct sigaction {
-        union {
-          __sighandler_t _sa_handler;
-          void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t sa_mask;
-        unsigned long sa_flags;
-        void (*sa_restorer)(void);
-};
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-#endif /* __KERNEL__ */
-typedef struct sigaltstack {
-        void __user     *ss_sp;
-        int             ss_flags;
-        size_t          ss_size;
-} stack_t;
-#ifdef __KERNEL__
 #include <asm/sigcontext.h>
 struct pt_regs;
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif /* __KERNEL__ */
 #endif /* _ASM_SIGNAL_H */
diff --git a/arch/mn10300/include/asm/termios.h b/arch/mn10300/include/asm/termios.h
index dd7cf617e11..c2e29c75dfa 100644
--- a/arch/mn10300/include/asm/termios.h
+++ b/arch/mn10300/include/asm/termios.h
@@ -1,27 +1,8 @@
 #ifndef _ASM_TERMIOS_H
 #define _ASM_TERMIOS_H
-#include <asm/termbits.h>
+#include <uapi/asm/termios.h>
-#include <asm/ioctls.h>
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-#define NCC 8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-#ifdef __KERNEL__
 /*      intr=^C         quit=^|         erase=del       kill=^U
        eof=^D          vtime=\0        vmin=\1         sxtc=\0
        start=^Q        stop=^S         susp=^Z         eol=\0
@@ -29,64 +10,4 @@ struct termio {
        eol2=\0
 */
 #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-#endif
-/* modem lines */
-#define TIOCM_LE        0x001
-#define TIOCM_DTR       0x002
-#define TIOCM_RTS       0x004
-#define TIOCM_ST        0x008
-#define TIOCM_SR        0x010
-#define TIOCM_CTS       0x020
-#define TIOCM_CAR       0x040
-#define TIOCM_RNG       0x080
-#define TIOCM_DSR       0x100
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
-        unsigned short __tmp; \
-        get_user(__tmp, &(termio)->x); \
-        *(unsigned short *) &(termios)->x = __tmp; \
-}
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
-        SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
-        copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
-        put_user((termios)->c_iflag, &(termio)->c_iflag); \
-        put_user((termios)->c_oflag, &(termio)->c_oflag); \
-        put_user((termios)->c_cflag, &(termio)->c_cflag); \
-        put_user((termios)->c_lflag, &(termio)->c_lflag); \
-        put_user((termios)->c_line,  &(termio)->c_line); \
-        copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-#define user_termios_to_kernel_termios(k, u) \
-        copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) \
-        copy_to_user(u, k, sizeof(struct termios2))
-#define user_termios_to_kernel_termios_1(k, u) \
-        copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) \
-        copy_to_user(u, k, sizeof(struct termios))
 #endif  /* _ASM_TERMIOS_H */
diff --git a/arch/mn10300/include/asm/thread_info.h b/arch/mn10300/include/asm/thread_info.h
index ac519bbd42f..f90062b0622 100644
--- a/arch/mn10300/include/asm/thread_info.h
+++ b/arch/mn10300/include/asm/thread_info.h
@@ -160,12 +160,13 @@ void arch_release_thread_info(struct thread_info *ti);
 #define _TIF_SIGPENDING         +(1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       +(1 << TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         +(1 << TIF_SINGLESTEP)
-#define _TIF_RESTORE_SIGMASK    +(1 << TIF_RESTORE_SIGMASK)
 #define _TIF_POLLING_NRFLAG     +(1 << TIF_POLLING_NRFLAG)
 #define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
 #define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif /* __KERNEL__ */
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/mn10300/include/asm/types.h b/arch/mn10300/include/asm/types.h
index 713d4ba108a..3d6e48311be 100644
--- a/arch/mn10300/include/asm/types.h
+++ b/arch/mn10300/include/asm/types.h
@@ -11,15 +11,12 @@
 #ifndef _ASM_TYPES_H
 #define _ASM_TYPES_H
-#include <asm-generic/int-ll64.h>
+#include <uapi/asm/types.h>
 /*
 * These aren't exported outside the kernel to avoid name space clashes
 */
-#ifdef __KERNEL__
 #define BITS_PER_LONG 32
-#endif /* __KERNEL__ */
 #endif /* _ASM_TYPES_H */
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index 866eb14749d..55bbec1887e 100644
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -11,347 +11,8 @@
 #ifndef _ASM_UNISTD_H
 #define _ASM_UNISTD_H
-#define __NR_restart_syscall      0
+#include <uapi/asm/unistd.h>
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lchown              16
-#define __NR_break               17
-#define __NR_oldstat             18
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_ftime               35
-#define __NR_sync                36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_prof                44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_lock                53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_mpx                 56
-#define __NR_setpgid             57
-#define __NR_ulimit              58
-#define __NR_oldolduname         59
-#define __NR_umask               60
-#define __NR_chroot              61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_sigaction           67
-#define __NR_sgetmask            68
-#define __NR_ssetmask            69
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_oldlstat            84
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-#define __NR_readdir             89
-#define __NR_mmap                90
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-#define __NR_profil              98
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-#define __NR_ioperm             101
-#define __NR_socketcall         102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_stat               106
-#define __NR_lstat              107
-#define __NR_fstat              108
-#define __NR_olduname           109
-#define __NR_iopl               110
-#define __NR_vhangup            111
-#define __NR_idle               112
-#define __NR_vm86old            113
-#define __NR_wait4              114
-#define __NR_swapoff            115
-#define __NR_sysinfo            116
-#define __NR_ipc                117
-#define __NR_fsync              118
-#define __NR_sigreturn          119
-#define __NR_clone              120
-#define __NR_setdomainname      121
-#define __NR_uname              122
-#define __NR_modify_ldt         123
-#define __NR_adjtimex           124
-#define __NR_mprotect           125
-#define __NR_sigprocmask        126
-#define __NR_create_module      127
-#define __NR_init_module        128
-#define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
-#define __NR_quotactl           131
-#define __NR_getpgid            132
-#define __NR_fchdir             133
-#define __NR_bdflush            134
-#define __NR_sysfs              135
-#define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
-#define __NR_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#define __NR_flock              143
-#define __NR_msync              144
-#define __NR_readv              145
-#define __NR_writev             146
-#define __NR_getsid             147
-#define __NR_fdatasync          148
-#define __NR__sysctl            149
-#define __NR_mlock              150
-#define __NR_munlock            151
-#define __NR_mlockall           152
-#define __NR_munlockall         153
-#define __NR_sched_setparam             154
-#define __NR_sched_getparam             155
-#define __NR_sched_setscheduler         156
-#define __NR_sched_getscheduler         157
-#define __NR_sched_yield                158
-#define __NR_sched_get_priority_max     159
-#define __NR_sched_get_priority_min     160
-#define __NR_sched_rr_get_interval      161
-#define __NR_nanosleep          162
-#define __NR_mremap             163
-#define __NR_setresuid          164
-#define __NR_getresuid          165
-#define __NR_vm86               166
-#define __NR_query_module       167
-#define __NR_poll               168
-#define __NR_nfsservctl         169
-#define __NR_setresgid          170
-#define __NR_getresgid          171
-#define __NR_prctl              172
-#define __NR_rt_sigreturn       173
-#define __NR_rt_sigaction       174
-#define __NR_rt_sigprocmask     175
-#define __NR_rt_sigpending      176
-#define __NR_rt_sigtimedwait    177
-#define __NR_rt_sigqueueinfo    178
-#define __NR_rt_sigsuspend      179
-#define __NR_pread64            180
-#define __NR_pwrite64           181
-#define __NR_chown              182
-#define __NR_getcwd             183
-#define __NR_capget             184
-#define __NR_capset             185
-#define __NR_sigaltstack        186
-#define __NR_sendfile           187
-#define __NR_getpmsg            188     /* some people actually want streams */
-#define __NR_putpmsg            189     /* some people actually want streams */
-#define __NR_vfork              190
-#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#define __NR_lchown32           198
-#define __NR_getuid32           199
-#define __NR_getgid32           200
-#define __NR_geteuid32          201
-#define __NR_getegid32          202
-#define __NR_setreuid32         203
-#define __NR_setregid32         204
-#define __NR_getgroups32        205
-#define __NR_setgroups32        206
-#define __NR_fchown32           207
-#define __NR_setresuid32        208
-#define __NR_getresuid32        209
-#define __NR_setresgid32        210
-#define __NR_getresgid32        211
-#define __NR_chown32            212
-#define __NR_setuid32           213
-#define __NR_setgid32           214
-#define __NR_setfsuid32         215
-#define __NR_setfsgid32         216
-#define __NR_pivot_root         217
-#define __NR_mincore            218
-#define __NR_madvise            219
-#define __NR_madvise1           219     /* delete when C lib stub is removed */
-#define __NR_getdents64         220
-#define __NR_fcntl64            221
-/* 223 is unused */
-#define __NR_gettid             224
-#define __NR_readahead          225
-#define __NR_setxattr           226
-#define __NR_lsetxattr          227
-#define __NR_fsetxattr          228
-#define __NR_getxattr           229
-#define __NR_lgetxattr          230
-#define __NR_fgetxattr          231
-#define __NR_listxattr          232
-#define __NR_llistxattr         233
-#define __NR_flistxattr         234
-#define __NR_removexattr        235
-#define __NR_lremovexattr       236
-#define __NR_fremovexattr       237
-#define __NR_tkill              238
-#define __NR_sendfile64         239
-#define __NR_futex              240
-#define __NR_sched_setaffinity  241
-#define __NR_sched_getaffinity  242
-#define __NR_set_thread_area    243
-#define __NR_get_thread_area    244
-#define __NR_io_setup           245
-#define __NR_io_destroy         246
-#define __NR_io_getevents       247
-#define __NR_io_submit          248
-#define __NR_io_cancel          249
-#define __NR_fadvise64          250
-#define __NR_exit_group         252
-#define __NR_lookup_dcookie     253
-#define __NR_epoll_create       254
-#define __NR_epoll_ctl          255
-#define __NR_epoll_wait         256
-#define __NR_remap_file_pages   257
-#define __NR_set_tid_address    258
-#define __NR_timer_create       259
-#define __NR_timer_settime      (__NR_timer_create+1)
-#define __NR_timer_gettime      (__NR_timer_create+2)
-#define __NR_timer_getoverrun   (__NR_timer_create+3)
-#define __NR_timer_delete       (__NR_timer_create+4)
-#define __NR_clock_settime      (__NR_timer_create+5)
-#define __NR_clock_gettime      (__NR_timer_create+6)
-#define __NR_clock_getres       (__NR_timer_create+7)
-#define __NR_clock_nanosleep    (__NR_timer_create+8)
-#define __NR_statfs64           268
-#define __NR_fstatfs64          269
-#define __NR_tgkill             270
-#define __NR_utimes             271
-#define __NR_fadvise64_64       272
-#define __NR_vserver            273
-#define __NR_mbind              274
-#define __NR_get_mempolicy      275
-#define __NR_set_mempolicy      276
-#define __NR_mq_open            277
-#define __NR_mq_unlink          (__NR_mq_open+1)
-#define __NR_mq_timedsend       (__NR_mq_open+2)
-#define __NR_mq_timedreceive    (__NR_mq_open+3)
-#define __NR_mq_notify          (__NR_mq_open+4)
-#define __NR_mq_getsetattr      (__NR_mq_open+5)
-#define __NR_kexec_load         283
-#define __NR_waitid             284
-#define __NR_add_key            286
-#define __NR_request_key        287
-#define __NR_keyctl             288
-#define __NR_cacheflush         289
-#define __NR_ioprio_set         290
-#define __NR_ioprio_get         291
-#define __NR_inotify_init       292
-#define __NR_inotify_add_watch  293
-#define __NR_inotify_rm_watch   294
-#define __NR_migrate_pages      295
-#define __NR_openat             296
-#define __NR_mkdirat            297
-#define __NR_mknodat            298
-#define __NR_fchownat           299
-#define __NR_futimesat          300
-#define __NR_fstatat64          301
-#define __NR_unlinkat           302
-#define __NR_renameat           303
-#define __NR_linkat             304
-#define __NR_symlinkat          305
-#define __NR_readlinkat         306
-#define __NR_fchmodat           307
-#define __NR_faccessat          308
-#define __NR_pselect6           309
-#define __NR_ppoll              310
-#define __NR_unshare            311
-#define __NR_set_robust_list    312
-#define __NR_get_robust_list    313
-#define __NR_splice             314
-#define __NR_sync_file_range    315
-#define __NR_tee                316
-#define __NR_vmsplice           317
-#define __NR_move_pages         318
-#define __NR_getcpu             319
-#define __NR_epoll_pwait        320
-#define __NR_utimensat          321
-#define __NR_signalfd           322
-#define __NR_timerfd_create     323
-#define __NR_eventfd            324
-#define __NR_fallocate          325
-#define __NR_timerfd_settime    326
-#define __NR_timerfd_gettime    327
-#define __NR_signalfd4          328
-#define __NR_eventfd2           329
-#define __NR_epoll_create1      330
-#define __NR_dup3               331
-#define __NR_pipe2              332
-#define __NR_inotify_init1      333
-#define __NR_preadv             334
-#define __NR_pwritev            335
-#define __NR_rt_tgsigqueueinfo  336
-#define __NR_perf_event_open    337
-#define __NR_recvmmsg           338
-#define __NR_setns              339
-#ifdef __KERNEL__
 #define NR_syscalls 340
@@ -382,6 +43,8 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_SYS_EXECVE
+#define __ARCH_WANT_KERNEL_EXECVE
 /*
 * "Conditional" syscalls
@@ -393,5 +56,4 @@
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 #endif
-#endif /* __KERNEL__ */
 #endif /* _ASM_UNISTD_H */
diff --git a/arch/mn10300/include/uapi/asm/Kbuild b/arch/mn10300/include/uapi/asm/Kbuild
index baebb3da1d4..040178cdb3e 100644
--- a/arch/mn10300/include/uapi/asm/Kbuild
+++ b/arch/mn10300/include/uapi/asm/Kbuild
@@ -1,3 +1,34 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += param.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += ptrace.h
+header-y += resource.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += shmbuf.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += unistd.h
diff --git a/arch/mn10300/include/asm/auxvec.h b/arch/mn10300/include/uapi/asm/auxvec.h
index 4fdb60b2ae3..4fdb60b2ae3 100644
--- a/arch/mn10300/include/asm/auxvec.h
+++ b/arch/mn10300/include/uapi/asm/auxvec.h
diff --git a/arch/mn10300/include/asm/bitsperlong.h b/arch/mn10300/include/uapi/asm/bitsperlong.h
index 6dc0bb0c13b..6dc0bb0c13b 100644
--- a/arch/mn10300/include/asm/bitsperlong.h
+++ b/arch/mn10300/include/uapi/asm/bitsperlong.h
diff --git a/arch/mn10300/include/asm/byteorder.h b/arch/mn10300/include/uapi/asm/byteorder.h
index 5dd0bdd9fee..5dd0bdd9fee 100644
--- a/arch/mn10300/include/asm/byteorder.h
+++ b/arch/mn10300/include/uapi/asm/byteorder.h
diff --git a/arch/mn10300/include/asm/errno.h b/arch/mn10300/include/uapi/asm/errno.h
index 4c82b503d92..4c82b503d92 100644
--- a/arch/mn10300/include/asm/errno.h
+++ b/arch/mn10300/include/uapi/asm/errno.h
diff --git a/arch/mn10300/include/asm/fcntl.h b/arch/mn10300/include/uapi/asm/fcntl.h
index 46ab12db573..46ab12db573 100644
--- a/arch/mn10300/include/asm/fcntl.h
+++ b/arch/mn10300/include/uapi/asm/fcntl.h
diff --git a/arch/mn10300/include/asm/ioctl.h b/arch/mn10300/include/uapi/asm/ioctl.h
index b279fe06dfe..b279fe06dfe 100644
--- a/arch/mn10300/include/asm/ioctl.h
+++ b/arch/mn10300/include/uapi/asm/ioctl.h
diff --git a/arch/mn10300/include/asm/ioctls.h b/arch/mn10300/include/uapi/asm/ioctls.h
index 0212f4b2255..0212f4b2255 100644
--- a/arch/mn10300/include/asm/ioctls.h
+++ b/arch/mn10300/include/uapi/asm/ioctls.h
diff --git a/arch/mn10300/include/asm/ipcbuf.h b/arch/mn10300/include/uapi/asm/ipcbuf.h
index 84c7e51cb6d..84c7e51cb6d 100644
--- a/arch/mn10300/include/asm/ipcbuf.h
+++ b/arch/mn10300/include/uapi/asm/ipcbuf.h
diff --git a/arch/mn10300/include/asm/kvm_para.h b/arch/mn10300/include/uapi/asm/kvm_para.h
index 14fab8f0b95..14fab8f0b95 100644
--- a/arch/mn10300/include/asm/kvm_para.h
+++ b/arch/mn10300/include/uapi/asm/kvm_para.h
diff --git a/arch/mn10300/include/asm/mman.h b/arch/mn10300/include/uapi/asm/mman.h
index db5c53da73c..db5c53da73c 100644
--- a/arch/mn10300/include/asm/mman.h
+++ b/arch/mn10300/include/uapi/asm/mman.h
diff --git a/arch/mn10300/include/asm/msgbuf.h b/arch/mn10300/include/uapi/asm/msgbuf.h
index 8b602450cc4..8b602450cc4 100644
--- a/arch/mn10300/include/asm/msgbuf.h
+++ b/arch/mn10300/include/uapi/asm/msgbuf.h
diff --git a/arch/mn10300/include/asm/param.h b/arch/mn10300/include/uapi/asm/param.h
index 02a0ca6f13c..02a0ca6f13c 100644
--- a/arch/mn10300/include/asm/param.h
+++ b/arch/mn10300/include/uapi/asm/param.h
diff --git a/arch/mn10300/include/asm/poll.h b/arch/mn10300/include/uapi/asm/poll.h
index c98509d3149..c98509d3149 100644
--- a/arch/mn10300/include/asm/poll.h
+++ b/arch/mn10300/include/uapi/asm/poll.h
diff --git a/arch/mn10300/include/asm/posix_types.h b/arch/mn10300/include/uapi/asm/posix_types.h
index d31eeea480c..d31eeea480c 100644
--- a/arch/mn10300/include/asm/posix_types.h
+++ b/arch/mn10300/include/uapi/asm/posix_types.h
diff --git a/arch/mn10300/include/uapi/asm/ptrace.h b/arch/mn10300/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..71b2251b7bf
--- /dev/null
+++ b/arch/mn10300/include/uapi/asm/ptrace.h
@@ -0,0 +1,84 @@
+/* MN10300 Exception frame layout and ptrace constants
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_PTRACE_H
+#define _UAPI_ASM_PTRACE_H
+#define PT_A3           0
+#define PT_A2           1
+#define PT_D3           2
+#define PT_D2           3
+#define PT_MCVF         4
+#define PT_MCRL         5
+#define PT_MCRH         6
+#define PT_MDRQ         7
+#define PT_E1           8
+#define PT_E0           9
+#define PT_E7           10
+#define PT_E6           11
+#define PT_E5           12
+#define PT_E4           13
+#define PT_E3           14
+#define PT_E2           15
+#define PT_SP           16
+#define PT_LAR          17
+#define PT_LIR          18
+#define PT_MDR          19
+#define PT_A1           20
+#define PT_A0           21
+#define PT_D1           22
+#define PT_D0           23
+#define PT_ORIG_D0      24
+#define PT_EPSW         25
+#define PT_PC           26
+#define NR_PTREGS       27
+/*
+ * This defines the way registers are stored in the event of an exception
+ * - the strange order is due to the MOVM instruction
+ */
+struct pt_regs {
+        unsigned long           a3;             /* syscall arg 3 */
+        unsigned long           a2;             /* syscall arg 4 */
+        unsigned long           d3;             /* syscall arg 5 */
+        unsigned long           d2;             /* syscall arg 6 */
+        unsigned long           mcvf;
+        unsigned long           mcrl;
+        unsigned long           mcrh;
+        unsigned long           mdrq;
+        unsigned long           e1;
+        unsigned long           e0;
+        unsigned long           e7;
+        unsigned long           e6;
+        unsigned long           e5;
+        unsigned long           e4;
+        unsigned long           e3;
+        unsigned long           e2;
+        unsigned long           sp;
+        unsigned long           lar;
+        unsigned long           lir;
+        unsigned long           mdr;
+        unsigned long           a1;
+        unsigned long           a0;             /* syscall arg 1 */
+        unsigned long           d1;             /* syscall arg 2 */
+        unsigned long           d0;             /* syscall ret */
+        struct pt_regs          *next;          /* next frame pointer */
+        unsigned long           orig_d0;        /* syscall number */
+        unsigned long           epsw;
+        unsigned long           pc;
+};
+/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
+#define PTRACE_GETREGS            12
+#define PTRACE_SETREGS            13
+#define PTRACE_GETFPREGS          14
+#define PTRACE_SETFPREGS          15
+#endif /* _UAPI_ASM_PTRACE_H */
diff --git a/arch/mn10300/include/asm/resource.h b/arch/mn10300/include/uapi/asm/resource.h
index 04bc4db8921..04bc4db8921 100644
--- a/arch/mn10300/include/asm/resource.h
+++ b/arch/mn10300/include/uapi/asm/resource.h
diff --git a/arch/mn10300/include/asm/sembuf.h b/arch/mn10300/include/uapi/asm/sembuf.h
index 301f3f9d8aa..301f3f9d8aa 100644
--- a/arch/mn10300/include/asm/sembuf.h
+++ b/arch/mn10300/include/uapi/asm/sembuf.h
diff --git a/arch/mn10300/include/uapi/asm/setup.h b/arch/mn10300/include/uapi/asm/setup.h
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/arch/mn10300/include/uapi/asm/setup.h
diff --git a/arch/mn10300/include/asm/shmbuf.h b/arch/mn10300/include/uapi/asm/shmbuf.h
index 8f300cc35d6..8f300cc35d6 100644
--- a/arch/mn10300/include/asm/shmbuf.h
+++ b/arch/mn10300/include/uapi/asm/shmbuf.h
diff --git a/arch/mn10300/include/asm/sigcontext.h b/arch/mn10300/include/uapi/asm/sigcontext.h
index 4de3afff4ad..4de3afff4ad 100644
--- a/arch/mn10300/include/asm/sigcontext.h
+++ b/arch/mn10300/include/uapi/asm/sigcontext.h
diff --git a/arch/mn10300/include/asm/siginfo.h b/arch/mn10300/include/uapi/asm/siginfo.h
index 0815d29d82e..0815d29d82e 100644
--- a/arch/mn10300/include/asm/siginfo.h
+++ b/arch/mn10300/include/uapi/asm/siginfo.h
diff --git a/arch/mn10300/include/uapi/asm/signal.h b/arch/mn10300/include/uapi/asm/signal.h
new file mode 100644
index 00000000000..08dcd6a8561
--- /dev/null
+++ b/arch/mn10300/include/uapi/asm/signal.h
@@ -0,0 +1,131 @@
+/* MN10300 Signal definitions
+ *
+ * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_SIGNAL_H
+#define _UAPI_ASM_SIGNAL_H
+#include <linux/types.h>
+/* Avoid too many header ordering problems.  */
+struct siginfo;
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+#define NSIG            32
+typedef unsigned long sigset_t;
+#endif /* __KERNEL__ */
+#define SIGHUP           1
+#define SIGINT           2
+#define SIGQUIT          3
+#define SIGILL           4
+#define SIGTRAP          5
+#define SIGABRT          6
+#define SIGIOT           6
+#define SIGBUS           7
+#define SIGFPE           8
+#define SIGKILL          9
+#define SIGUSR1         10
+#define SIGSEGV         11
+#define SIGUSR2         12
+#define SIGPIPE         13
+#define SIGALRM         14
+#define SIGTERM         15
+#define SIGSTKFLT       16
+#define SIGCHLD         17
+#define SIGCONT         18
+#define SIGSTOP         19
+#define SIGTSTP         20
+#define SIGTTIN         21
+#define SIGTTOU         22
+#define SIGURG          23
+#define SIGXCPU         24
+#define SIGXFSZ         25
+#define SIGVTALRM       26
+#define SIGPROF         27
+#define SIGWINCH        28
+#define SIGIO           29
+#define SIGPOLL         SIGIO
+/*
+#define SIGLOST         29
+*/
+#define SIGPWR          30
+#define SIGSYS          31
+#define SIGUNUSED       31
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        _NSIG
+/*
+ * SA_FLAGS values:
+ *
+ * SA_ONSTACK indicates that a registered stack_t will be used.
+ * SA_RESTART flag to get restarting signals (which were the default long ago)
+ * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
+ * SA_RESETHAND clears the handler when the signal is delivered.
+ * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
+ * SA_NODEFER prevents the current signal from being masked in the handler.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_NOCLDSTOP    0x00000001U
+#define SA_NOCLDWAIT    0x00000002U
+#define SA_SIGINFO      0x00000004U
+#define SA_ONSTACK      0x08000000U
+#define SA_RESTART      0x10000000U
+#define SA_NODEFER      0x40000000U
+#define SA_RESETHAND    0x80000000U
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+#define SA_RESTORER     0x04000000
+/*
+ * sigaltstack controls
+ */
+#define SS_ONSTACK      1
+#define SS_DISABLE      2
+#define MINSIGSTKSZ     2048
+#define SIGSTKSZ        8192
+#include <asm-generic/signal-defs.h>
+#ifndef __KERNEL__
+/* Here we must cater to libcs that poke about in kernel headers.  */
+struct sigaction {
+        union {
+          __sighandler_t _sa_handler;
+          void (*_sa_sigaction)(int, struct siginfo *, void *);
+        } _u;
+        sigset_t sa_mask;
+        unsigned long sa_flags;
+        void (*sa_restorer)(void);
+};
+#define sa_handler      _u._sa_handler
+#define sa_sigaction    _u._sa_sigaction
+#endif /* __KERNEL__ */
+typedef struct sigaltstack {
+        void __user     *ss_sp;
+        int             ss_flags;
+        size_t          ss_size;
+} stack_t;
+#endif /* _UAPI_ASM_SIGNAL_H */
diff --git a/arch/mn10300/include/asm/socket.h b/arch/mn10300/include/uapi/asm/socket.h
index 820463a484b..820463a484b 100644
--- a/arch/mn10300/include/asm/socket.h
+++ b/arch/mn10300/include/uapi/asm/socket.h
diff --git a/arch/mn10300/include/asm/sockios.h b/arch/mn10300/include/uapi/asm/sockios.h
index b03043a1c56..b03043a1c56 100644
--- a/arch/mn10300/include/asm/sockios.h
+++ b/arch/mn10300/include/uapi/asm/sockios.h
diff --git a/arch/mn10300/include/asm/stat.h b/arch/mn10300/include/uapi/asm/stat.h
index 63ff8371cf2..63ff8371cf2 100644
--- a/arch/mn10300/include/asm/stat.h
+++ b/arch/mn10300/include/uapi/asm/stat.h
diff --git a/arch/mn10300/include/asm/statfs.h b/arch/mn10300/include/uapi/asm/statfs.h
index 0b91fe198c2..0b91fe198c2 100644
--- a/arch/mn10300/include/asm/statfs.h
+++ b/arch/mn10300/include/uapi/asm/statfs.h
diff --git a/arch/mn10300/include/asm/swab.h b/arch/mn10300/include/uapi/asm/swab.h
index bd818a820ca..bd818a820ca 100644
--- a/arch/mn10300/include/asm/swab.h
+++ b/arch/mn10300/include/uapi/asm/swab.h
diff --git a/arch/mn10300/include/asm/termbits.h b/arch/mn10300/include/uapi/asm/termbits.h
index 130d4249597..130d4249597 100644
--- a/arch/mn10300/include/asm/termbits.h
+++ b/arch/mn10300/include/uapi/asm/termbits.h
diff --git a/arch/mn10300/include/uapi/asm/termios.h b/arch/mn10300/include/uapi/asm/termios.h
new file mode 100644
index 00000000000..11d3cc9d316
--- /dev/null
+++ b/arch/mn10300/include/uapi/asm/termios.h
@@ -0,0 +1,83 @@
+#ifndef _UAPI_ASM_TERMIOS_H
+#define _UAPI_ASM_TERMIOS_H
+#include <asm/termbits.h>
+#include <asm/ioctls.h>
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+#define NCC 8
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        unsigned char c_line;           /* line discipline */
+        unsigned char c_cc[NCC];        /* control characters */
+};
+/* modem lines */
+#define TIOCM_LE        0x001
+#define TIOCM_DTR       0x002
+#define TIOCM_RTS       0x004
+#define TIOCM_ST        0x008
+#define TIOCM_SR        0x010
+#define TIOCM_CTS       0x020
+#define TIOCM_CAR       0x040
+#define TIOCM_RNG       0x080
+#define TIOCM_DSR       0x100
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
+/*
+ * Translate a "termio" structure into a "termios". Ugh.
+ */
+#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
+        unsigned short __tmp; \
+        get_user(__tmp, &(termio)->x); \
+        *(unsigned short *) &(termios)->x = __tmp; \
+}
+#define user_termio_to_kernel_termios(termios, termio) \
+({ \
+        SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
+        SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
+        SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
+        SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
+        copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
+})
+/*
+ * Translate a "termios" structure into a "termio". Ugh.
+ */
+#define kernel_termios_to_user_termio(termio, termios) \
+({ \
+        put_user((termios)->c_iflag, &(termio)->c_iflag); \
+        put_user((termios)->c_oflag, &(termio)->c_oflag); \
+        put_user((termios)->c_cflag, &(termio)->c_cflag); \
+        put_user((termios)->c_lflag, &(termio)->c_lflag); \
+        put_user((termios)->c_line,  &(termio)->c_line); \
+        copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
+})
+#define user_termios_to_kernel_termios(k, u) \
+        copy_from_user(k, u, sizeof(struct termios2))
+#define kernel_termios_to_user_termios(u, k) \
+        copy_to_user(u, k, sizeof(struct termios2))
+#define user_termios_to_kernel_termios_1(k, u) \
+        copy_from_user(k, u, sizeof(struct termios))
+#define kernel_termios_to_user_termios_1(u, k) \
+        copy_to_user(u, k, sizeof(struct termios))
+#endif /* _UAPI_ASM_TERMIOS_H */
diff --git a/arch/mn10300/include/uapi/asm/types.h b/arch/mn10300/include/uapi/asm/types.h
new file mode 100644
index 00000000000..8b3f0501b9b
--- /dev/null
+++ b/arch/mn10300/include/uapi/asm/types.h
@@ -0,0 +1,11 @@
+/* MN10300 Basic type definitions
+ *
+ * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#include <asm-generic/int-ll64.h>
diff --git a/arch/mn10300/include/uapi/asm/unistd.h b/arch/mn10300/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..e28ac3f4247
--- /dev/null
+++ b/arch/mn10300/include/uapi/asm/unistd.h
@@ -0,0 +1,354 @@
+/* MN10300 System call number list
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_UNISTD_H
+#define _UAPI_ASM_UNISTD_H
+#define __NR_restart_syscall      0
+#define __NR_exit                 1
+#define __NR_fork                 2
+#define __NR_read                 3
+#define __NR_write                4
+#define __NR_open                 5
+#define __NR_close                6
+#define __NR_waitpid              7
+#define __NR_creat                8
+#define __NR_link                 9
+#define __NR_unlink              10
+#define __NR_execve              11
+#define __NR_chdir               12
+#define __NR_time                13
+#define __NR_mknod               14
+#define __NR_chmod               15
+#define __NR_lchown              16
+#define __NR_break               17
+#define __NR_oldstat             18
+#define __NR_lseek               19
+#define __NR_getpid              20
+#define __NR_mount               21
+#define __NR_umount              22
+#define __NR_setuid              23
+#define __NR_getuid              24
+#define __NR_stime               25
+#define __NR_ptrace              26
+#define __NR_alarm               27
+#define __NR_oldfstat            28
+#define __NR_pause               29
+#define __NR_utime               30
+#define __NR_stty                31
+#define __NR_gtty                32
+#define __NR_access              33
+#define __NR_nice                34
+#define __NR_ftime               35
+#define __NR_sync                36
+#define __NR_kill                37
+#define __NR_rename              38
+#define __NR_mkdir               39
+#define __NR_rmdir               40
+#define __NR_dup                 41
+#define __NR_pipe                42
+#define __NR_times               43
+#define __NR_prof                44
+#define __NR_brk                 45
+#define __NR_setgid              46
+#define __NR_getgid              47
+#define __NR_signal              48
+#define __NR_geteuid             49
+#define __NR_getegid             50
+#define __NR_acct                51
+#define __NR_umount2             52
+#define __NR_lock                53
+#define __NR_ioctl               54
+#define __NR_fcntl               55
+#define __NR_mpx                 56
+#define __NR_setpgid             57
+#define __NR_ulimit              58
+#define __NR_oldolduname         59
+#define __NR_umask               60
+#define __NR_chroot              61
+#define __NR_ustat               62
+#define __NR_dup2                63
+#define __NR_getppid             64
+#define __NR_getpgrp             65
+#define __NR_setsid              66
+#define __NR_sigaction           67
+#define __NR_sgetmask            68
+#define __NR_ssetmask            69
+#define __NR_setreuid            70
+#define __NR_setregid            71
+#define __NR_sigsuspend          72
+#define __NR_sigpending          73
+#define __NR_sethostname         74
+#define __NR_setrlimit           75
+#define __NR_getrlimit           76     /* Back compatible 2Gig limited rlimit */
+#define __NR_getrusage           77
+#define __NR_gettimeofday        78
+#define __NR_settimeofday        79
+#define __NR_getgroups           80
+#define __NR_setgroups           81
+#define __NR_select              82
+#define __NR_symlink             83
+#define __NR_oldlstat            84
+#define __NR_readlink            85
+#define __NR_uselib              86
+#define __NR_swapon              87
+#define __NR_reboot              88
+#define __NR_readdir             89
+#define __NR_mmap                90
+#define __NR_munmap              91
+#define __NR_truncate            92
+#define __NR_ftruncate           93
+#define __NR_fchmod              94
+#define __NR_fchown              95
+#define __NR_getpriority         96
+#define __NR_setpriority         97
+#define __NR_profil              98
+#define __NR_statfs              99
+#define __NR_fstatfs            100
+#define __NR_ioperm             101
+#define __NR_socketcall         102
+#define __NR_syslog             103
+#define __NR_setitimer          104
+#define __NR_getitimer          105
+#define __NR_stat               106
+#define __NR_lstat              107
+#define __NR_fstat              108
+#define __NR_olduname           109
+#define __NR_iopl               110
+#define __NR_vhangup            111
+#define __NR_idle               112
+#define __NR_vm86old            113
+#define __NR_wait4              114
+#define __NR_swapoff            115
+#define __NR_sysinfo            116
+#define __NR_ipc                117
+#define __NR_fsync              118
+#define __NR_sigreturn          119
+#define __NR_clone              120
+#define __NR_setdomainname      121
+#define __NR_uname              122
+#define __NR_modify_ldt         123
+#define __NR_adjtimex           124
+#define __NR_mprotect           125
+#define __NR_sigprocmask        126
+#define __NR_create_module      127
+#define __NR_init_module        128
+#define __NR_delete_module      129
+#define __NR_get_kernel_syms    130
+#define __NR_quotactl           131
+#define __NR_getpgid            132
+#define __NR_fchdir             133
+#define __NR_bdflush            134
+#define __NR_sysfs              135
+#define __NR_personality        136
+#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
+#define __NR_setfsuid           138
+#define __NR_setfsgid           139
+#define __NR__llseek            140
+#define __NR_getdents           141
+#define __NR__newselect         142
+#define __NR_flock              143
+#define __NR_msync              144
+#define __NR_readv              145
+#define __NR_writev             146
+#define __NR_getsid             147
+#define __NR_fdatasync          148
+#define __NR__sysctl            149
+#define __NR_mlock              150
+#define __NR_munlock            151
+#define __NR_mlockall           152
+#define __NR_munlockall         153
+#define __NR_sched_setparam             154
+#define __NR_sched_getparam             155
+#define __NR_sched_setscheduler         156
+#define __NR_sched_getscheduler         157
+#define __NR_sched_yield                158
+#define __NR_sched_get_priority_max     159
+#define __NR_sched_get_priority_min     160
+#define __NR_sched_rr_get_interval      161
+#define __NR_nanosleep          162
+#define __NR_mremap             163
+#define __NR_setresuid          164
+#define __NR_getresuid          165
+#define __NR_vm86               166
+#define __NR_query_module       167
+#define __NR_poll               168
+#define __NR_nfsservctl         169
+#define __NR_setresgid          170
+#define __NR_getresgid          171
+#define __NR_prctl              172
+#define __NR_rt_sigreturn       173
+#define __NR_rt_sigaction       174
+#define __NR_rt_sigprocmask     175
+#define __NR_rt_sigpending      176
+#define __NR_rt_sigtimedwait    177
+#define __NR_rt_sigqueueinfo    178
+#define __NR_rt_sigsuspend      179
+#define __NR_pread64            180
+#define __NR_pwrite64           181
+#define __NR_chown              182
+#define __NR_getcwd             183
+#define __NR_capget             184
+#define __NR_capset             185
+#define __NR_sigaltstack        186
+#define __NR_sendfile           187
+#define __NR_getpmsg            188     /* some people actually want streams */
+#define __NR_putpmsg            189     /* some people actually want streams */
+#define __NR_vfork              190
+#define __NR_ugetrlimit         191     /* SuS compliant getrlimit */
+#define __NR_mmap2              192
+#define __NR_truncate64         193
+#define __NR_ftruncate64        194
+#define __NR_stat64             195
+#define __NR_lstat64            196
+#define __NR_fstat64            197
+#define __NR_lchown32           198
+#define __NR_getuid32           199
+#define __NR_getgid32           200
+#define __NR_geteuid32          201
+#define __NR_getegid32          202
+#define __NR_setreuid32         203
+#define __NR_setregid32         204
+#define __NR_getgroups32        205
+#define __NR_setgroups32        206
+#define __NR_fchown32           207
+#define __NR_setresuid32        208
+#define __NR_getresuid32        209
+#define __NR_setresgid32        210
+#define __NR_getresgid32        211
+#define __NR_chown32            212
+#define __NR_setuid32           213
+#define __NR_setgid32           214
+#define __NR_setfsuid32         215
+#define __NR_setfsgid32         216
+#define __NR_pivot_root         217
+#define __NR_mincore            218
+#define __NR_madvise            219
+#define __NR_madvise1           219     /* delete when C lib stub is removed */
+#define __NR_getdents64         220
+#define __NR_fcntl64            221
+/* 223 is unused */
+#define __NR_gettid             224
+#define __NR_readahead          225
+#define __NR_setxattr           226
+#define __NR_lsetxattr          227
+#define __NR_fsetxattr          228
+#define __NR_getxattr           229
+#define __NR_lgetxattr          230
+#define __NR_fgetxattr          231
+#define __NR_listxattr          232
+#define __NR_llistxattr         233
+#define __NR_flistxattr         234
+#define __NR_removexattr        235
+#define __NR_lremovexattr       236
+#define __NR_fremovexattr       237
+#define __NR_tkill              238
+#define __NR_sendfile64         239
+#define __NR_futex              240
+#define __NR_sched_setaffinity  241
+#define __NR_sched_getaffinity  242
+#define __NR_set_thread_area    243
+#define __NR_get_thread_area    244
+#define __NR_io_setup           245
+#define __NR_io_destroy         246
+#define __NR_io_getevents       247
+#define __NR_io_submit          248
+#define __NR_io_cancel          249
+#define __NR_fadvise64          250
+#define __NR_exit_group         252
+#define __NR_lookup_dcookie     253
+#define __NR_epoll_create       254
+#define __NR_epoll_ctl          255
+#define __NR_epoll_wait         256
+#define __NR_remap_file_pages   257
+#define __NR_set_tid_address    258
+#define __NR_timer_create       259
+#define __NR_timer_settime      (__NR_timer_create+1)
+#define __NR_timer_gettime      (__NR_timer_create+2)
+#define __NR_timer_getoverrun   (__NR_timer_create+3)
+#define __NR_timer_delete       (__NR_timer_create+4)
+#define __NR_clock_settime      (__NR_timer_create+5)
+#define __NR_clock_gettime      (__NR_timer_create+6)
+#define __NR_clock_getres       (__NR_timer_create+7)
+#define __NR_clock_nanosleep    (__NR_timer_create+8)
+#define __NR_statfs64           268
+#define __NR_fstatfs64          269
+#define __NR_tgkill             270
+#define __NR_utimes             271
+#define __NR_fadvise64_64       272
+#define __NR_vserver            273
+#define __NR_mbind              274
+#define __NR_get_mempolicy      275
+#define __NR_set_mempolicy      276
+#define __NR_mq_open            277
+#define __NR_mq_unlink          (__NR_mq_open+1)
+#define __NR_mq_timedsend       (__NR_mq_open+2)
+#define __NR_mq_timedreceive    (__NR_mq_open+3)
+#define __NR_mq_notify          (__NR_mq_open+4)
+#define __NR_mq_getsetattr      (__NR_mq_open+5)
+#define __NR_kexec_load         283
+#define __NR_waitid             284
+#define __NR_add_key            286
+#define __NR_request_key        287
+#define __NR_keyctl             288
+#define __NR_cacheflush         289
+#define __NR_ioprio_set         290
+#define __NR_ioprio_get         291
+#define __NR_inotify_init       292
+#define __NR_inotify_add_watch  293
+#define __NR_inotify_rm_watch   294
+#define __NR_migrate_pages      295
+#define __NR_openat             296
+#define __NR_mkdirat            297
+#define __NR_mknodat            298
+#define __NR_fchownat           299
+#define __NR_futimesat          300
+#define __NR_fstatat64          301
+#define __NR_unlinkat           302
+#define __NR_renameat           303
+#define __NR_linkat             304
+#define __NR_symlinkat          305
+#define __NR_readlinkat         306
+#define __NR_fchmodat           307
+#define __NR_faccessat          308
+#define __NR_pselect6           309
+#define __NR_ppoll              310
+#define __NR_unshare            311
+#define __NR_set_robust_list    312
+#define __NR_get_robust_list    313
+#define __NR_splice             314
+#define __NR_sync_file_range    315
+#define __NR_tee                316
+#define __NR_vmsplice           317
+#define __NR_move_pages         318
+#define __NR_getcpu             319
+#define __NR_epoll_pwait        320
+#define __NR_utimensat          321
+#define __NR_signalfd           322
+#define __NR_timerfd_create     323
+#define __NR_eventfd            324
+#define __NR_fallocate          325
+#define __NR_timerfd_settime    326
+#define __NR_timerfd_gettime    327
+#define __NR_signalfd4          328
+#define __NR_eventfd2           329
+#define __NR_epoll_create1      330
+#define __NR_dup3               331
+#define __NR_pipe2              332
+#define __NR_inotify_init1      333
+#define __NR_preadv             334
+#define __NR_pwritev            335
+#define __NR_rt_tgsigqueueinfo  336
+#define __NR_perf_event_open    337
+#define __NR_recvmmsg           338
+#define __NR_setns              339
+#endif /* _UAPI_ASM_UNISTD_H */
diff --git a/arch/mn10300/kernel/Makefile b/arch/mn10300/kernel/Makefile
index d06749173d6..561029f7fa4 100644
--- a/arch/mn10300/kernel/Makefile
+++ b/arch/mn10300/kernel/Makefile
@@ -7,8 +7,8 @@ fpu-obj-y := fpu-nofpu.o fpu-nofpu-low.o
 fpu-obj-$(CONFIG_FPU) := fpu.o fpu-low.o
 obj-y   := process.o signal.o entry.o traps.o irq.o \
-           ptrace.o setup.o time.o sys_mn10300.o io.o kthread.o \
+           ptrace.o setup.o time.o sys_mn10300.o io.o \
-           switch_to.o mn10300_ksyms.o kernel_execve.o $(fpu-obj-y) \
+           switch_to.o mn10300_ksyms.o $(fpu-obj-y) \
           csrc-mn10300.o cevt-mn10300.o
 obj-$(CONFIG_SMP) += smp.o smp-low.o
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S
index 8e11f9f4899..0c631d34c8d 100644
--- a/arch/mn10300/kernel/entry.S
+++ b/arch/mn10300/kernel/entry.S
@@ -55,6 +55,20 @@ ENTRY(ret_from_fork)
        mov     d0,(REG_D0,fp)
        jmp     syscall_exit
+ENTRY(ret_from_kernel_thread)
+        call    schedule_tail[],0
+        mov     (REG_D0,fp),d0
+        mov     (REG_A0,fp),a0
+        calls   (a0)
+        jmp     sys_exit
+ENTRY(ret_from_kernel_execve)
+        add     -12,d0  /* pt_regs -> frame */
+        mov     d0,sp
+        GET_THREAD_INFO a2
+        clr     d0
+        jmp     syscall_exit
 ###############################################################################
 #
 # system call handler
@@ -94,6 +108,10 @@ restore_all:
 ###############################################################################
        ALIGN
 syscall_exit_work:
+        mov     (REG_EPSW,fp),d0
+        and     EPSW_nSL,d0
+        beq     resume_kernel           # returning to supervisor mode
        btst    _TIF_SYSCALL_TRACE,d2
        beq     work_pending
        LOCAL_IRQ_ENABLE                # could let syscall_trace_exit() call
diff --git a/arch/mn10300/kernel/internal.h b/arch/mn10300/kernel/internal.h
index 2df440105a8..561785581f6 100644
--- a/arch/mn10300/kernel/internal.h
+++ b/arch/mn10300/kernel/internal.h
@@ -15,14 +15,10 @@ struct clocksource;
 struct clock_event_device;
 /*
- * kthread.S
- */
-extern int kernel_thread_helper(int);
-/*
 * entry.S
 */
 extern void ret_from_fork(struct task_struct *) __attribute__((noreturn));
+extern void ret_from_kernel_thread(struct task_struct *) __attribute__((noreturn));
 /*
 * smp-low.S
diff --git a/arch/mn10300/kernel/kernel_execve.S b/arch/mn10300/kernel/kernel_execve.S
deleted file mode 100644
index 86039f10526..00000000000
--- a/arch/mn10300/kernel/kernel_execve.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/* MN10300 In-kernel program execution
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#include <linux/linkage.h>
-#include <asm/unistd.h>
-###############################################################################
-#
-# Do a system call from kernel instead of calling sys_execve so we end up with
-# proper pt_regs.
-#
-# int kernel_execve(const char *filename, char *const argv[],
-#                   char *const envp[])
-#
-# On entry: D0/D1/8(SP): arguments to function
-# On return: D0: syscall return.
-#
-###############################################################################
-        .globl          kernel_execve
-        .type           kernel_execve,@function
-kernel_execve:
-        mov             a3,a1
-        mov             d0,a0
-        mov             (12,sp),a3
-        mov             +__NR_execve,d0
-        syscall         0
-        mov             a1,a3
-        rets
-        .size           kernel_execve,.-kernel_execve
diff --git a/arch/mn10300/kernel/kthread.S b/arch/mn10300/kernel/kthread.S
deleted file mode 100644
index b5ae467ac5e..00000000000
--- a/arch/mn10300/kernel/kthread.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/* MN10300 Kernel thread trampoline function
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by Mark Salter (msalter@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-        .text
-###############################################################################
-#
-# kernel_thread_helper - trampoline for kernel_thread()
-#
-# On entry:
-#   A2 = address of function to call
-#   D2 = function argument
-#
-###############################################################################
-        .globl  kernel_thread_helper
-        .type   kernel_thread_helper,@function
-kernel_thread_helper:
-        mov     do_exit,d1
-        mov     d1,(sp)
-        mov     d1,mdr
-        mov     d2,d0
-        jmp     (a2)
-        .size   kernel_thread_helper,.-kernel_thread_helper
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c
index e9cceba193b..d0c671b6d9f 100644
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
@@ -165,27 +165,6 @@ void show_regs(struct pt_regs *regs)
 }
 /*
- * create a kernel thread
- */
-int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
-{
-        struct pt_regs regs;
-        memset(&regs, 0, sizeof(regs));
-        regs.a2 = (unsigned long) fn;
-        regs.d2 = (unsigned long) arg;
-        regs.pc = (unsigned long) kernel_thread_helper;
-        local_save_flags(regs.epsw);
-        regs.epsw |= EPSW_IE | EPSW_IM_7;
-        /* Ok, create the new process.. */
-        return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0,
-                       NULL, NULL);
-}
-EXPORT_SYMBOL(kernel_thread);
-/*
 * free current thread data structures etc..
 */
 void exit_thread(void)
@@ -230,50 +209,42 @@ int copy_thread(unsigned long clone_flags,
                struct task_struct *p, struct pt_regs *kregs)
 {
        struct thread_info *ti = task_thread_info(p);
-        struct pt_regs *c_uregs, *c_kregs, *uregs;
+        struct pt_regs *c_regs;
        unsigned long c_ksp;
-        uregs = current->thread.uregs;
        c_ksp = (unsigned long) task_stack_page(p) + THREAD_SIZE;
        /* allocate the userspace exception frame and set it up */
        c_ksp -= sizeof(struct pt_regs);
-        c_uregs = (struct pt_regs *) c_ksp;
+        c_regs = (struct pt_regs *) c_ksp;
+        c_ksp -= 12; /* allocate function call ABI slack */
-        p->thread.uregs = c_uregs;
+        /* set up things up so the scheduler can start the new task */
-        *c_uregs = *uregs;
+        p->thread.uregs = c_regs;
-        c_uregs->sp = c_usp;
+        ti->frame       = c_regs;
-        c_uregs->epsw &= ~EPSW_FE; /* my FPU */
+        p->thread.a3    = (unsigned long) c_regs;
+        p->thread.sp    = c_ksp;
+        p->thread.wchan = p->thread.pc;
+        p->thread.usp   = c_usp;
-        c_ksp -= 12; /* allocate function call ABI slack */
+        if (unlikely(!kregs)) {
+                memset(c_regs, 0, sizeof(struct pt_regs));
+                c_regs->a0 = c_usp; /* function */
+                c_regs->d0 = ustk_size; /* argument */
+                local_save_flags(c_regs->epsw);
+                c_regs->epsw |= EPSW_IE | EPSW_IM_7;
+                p->thread.pc    = (unsigned long) ret_from_kernel_thread;
+                return 0;
+        }
+        *c_regs = *kregs;
+        c_regs->sp = c_usp;
+        c_regs->epsw &= ~EPSW_FE; /* my FPU */
        /* the new TLS pointer is passed in as arg #5 to sys_clone() */
        if (clone_flags & CLONE_SETTLS)
-                c_uregs->e2 = current_frame()->d3;
+                c_regs->e2 = current_frame()->d3;
-        /* set up the return kernel frame if called from kernel_thread() */
-        c_kregs = c_uregs;
-        if (kregs != uregs) {
-                c_ksp -= sizeof(struct pt_regs);
-                c_kregs = (struct pt_regs *) c_ksp;
-                *c_kregs = *kregs;
-                c_kregs->sp = c_usp;
-                c_kregs->next = c_uregs;
-#ifdef CONFIG_MN10300_CURRENT_IN_E2
-                c_kregs->e2 = (unsigned long) p; /* current */
-#endif
-                c_ksp -= 12; /* allocate function call ABI slack */
-        }
-        /* set up things up so the scheduler can start the new task */
-        ti->frame       = c_kregs;
-        p->thread.a3    = (unsigned long) c_kregs;
-        p->thread.sp    = c_ksp;
        p->thread.pc    = (unsigned long) ret_from_fork;
-        p->thread.wchan = (unsigned long) ret_from_fork;
-        p->thread.usp   = c_usp;
        return 0;
 }
@@ -302,22 +273,6 @@ asmlinkage long sys_vfork(void)
                       current_frame(), 0, NULL, NULL);
 }
-asmlinkage long sys_execve(const char __user *name,
-                           const char __user *const __user *argv,
-                           const char __user *const __user *envp)
-{
-        char *filename;
-        int error;
-        filename = getname(name);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                return error;
-        error = do_execve(filename, argv, envp, current_frame());
-        putname(filename);
-        return error;
-}
 unsigned long get_wchan(struct task_struct *p)
 {
        return p->thread.wchan;
diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c
index 4d584ae29ae..f570b3085ef 100644
--- a/arch/mn10300/kernel/signal.c
+++ b/arch/mn10300/kernel/signal.c
@@ -317,10 +317,6 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
        regs->d0 = sig;
        regs->d1 = (unsigned long) &frame->sc;
-        /* the tracer may want to single-step inside the handler */
-        if (test_thread_flag(TIF_SINGLESTEP))
-                ptrace_notify(SIGTRAP);
 #if DEBUG_SIG
        printk(KERN_DEBUG "SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
               sig, current->comm, current->pid, frame, regs->pc,
@@ -398,10 +394,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        regs->d0 = sig;
        regs->d1 = (long) &frame->info;
-        /* the tracer may want to single-step inside the handler */
-        if (test_thread_flag(TIF_SINGLESTEP))
-                ptrace_notify(SIGTRAP);
 #if DEBUG_SIG
        printk(KERN_DEBUG "SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
               sig, current->comm, current->pid, frame, regs->pc,
@@ -475,11 +467,6 @@ static void do_signal(struct pt_regs *regs)
        siginfo_t info;
        int signr;
-        /* we want the common case to go fast, which is why we may in certain
-         * cases get here from kernel mode */
-        if (!user_mode(regs))
-                return;
        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
        if (signr > 0) {
                if (handle_signal(signr, &info, &ka, regs) == 0) {
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 49765b53f63..05f2ba41ff1 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -21,6 +21,7 @@ config OPENRISC
        select GENERIC_CLOCKEVENTS
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
+        select MODULES_USE_ELF_RELA
 config MMU
        def_bool y
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index 7140b6b2644..78de6805268 100644
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@ -1,6 +1,4 @@
-include include/asm-generic/Kbuild.asm
-header-y += elf.h
 header-y += ucontext.h
 generic-y += atomic.h
diff --git a/arch/openrisc/include/asm/elf.h b/arch/openrisc/include/asm/elf.h
index 225a7ff320a..f4aa8a542a2 100644
--- a/arch/openrisc/include/asm/elf.h
+++ b/arch/openrisc/include/asm/elf.h
@@ -15,60 +15,12 @@
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 */
 #ifndef __ASM_OPENRISC_ELF_H
 #define __ASM_OPENRISC_ELF_H
-/*
- * This files is partially exported to userspace.  This allows us to keep
- * the ELF bits in one place which should assist in keeping the kernel and
- * userspace in sync.
- */
-/*
- * ELF register definitions..
- */
-/* for struct user_regs_struct definition */
-#include <asm/ptrace.h>
-/* The OR1K relocation types... not all relevant for module loader */
-#define R_OR32_NONE     0
-#define R_OR32_32       1
-#define R_OR32_16       2
-#define R_OR32_8        3
-#define R_OR32_CONST    4
-#define R_OR32_CONSTH   5
-#define R_OR32_JUMPTARG 6
-#define R_OR32_VTINHERIT 7
-#define R_OR32_VTENTRY  8
-typedef unsigned long elf_greg_t;
-/*
- * Note that NGREG is defined to ELF_NGREG in include/linux/elfcore.h, and is
- * thus exposed to user-space.
- */
-#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-/* A placeholder; OR32 does not have fp support yes, so no fp regs for now.  */
-typedef unsigned long elf_fpregset_t;
-/* This should be moved to include/linux/elf.h */
-#define EM_OR32         0x8472
-#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_ARCH        EM_OR32
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2MSB
-#ifdef __KERNEL__
 #include <linux/types.h>
+#include <uapi/asm/elf.h>
 /*
 * This is used to ensure we don't load something for the wrong architecture.
@@ -113,5 +65,4 @@ extern void dump_elf_thread(elf_greg_t *dest, struct pt_regs *pt);
 #define SET_PERSONALITY(ex) \
        set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
-#endif /* __KERNEL__ */
 #endif
diff --git a/arch/openrisc/include/asm/processor.h b/arch/openrisc/include/asm/processor.h
index 30462f1fe95..43decdbdb2e 100644
--- a/arch/openrisc/include/asm/processor.h
+++ b/arch/openrisc/include/asm/processor.h
@@ -103,7 +103,7 @@ extern unsigned long thread_saved_pc(struct task_struct *t);
 #define init_stack      (init_thread_union.stack)
-#define cpu_relax()     do { } while (0)
+#define cpu_relax()     barrier()
 #endif /* __ASSEMBLY__ */
 #endif /* __ASM_OPENRISC_PROCESSOR_H */
diff --git a/arch/openrisc/include/asm/ptrace.h b/arch/openrisc/include/asm/ptrace.h
index 8555c0c3d4d..6ca17264c39 100644
--- a/arch/openrisc/include/asm/ptrace.h
+++ b/arch/openrisc/include/asm/ptrace.h
@@ -15,25 +15,12 @@
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 */
 #ifndef __ASM_OPENRISC_PTRACE_H
 #define __ASM_OPENRISC_PTRACE_H
-#ifndef __ASSEMBLY__
-/*
- * This is the layout of the regset returned by the GETREGSET ptrace call
- */
-struct user_regs_struct {
-        /* GPR R0-R31... */
-        unsigned long gpr[32];
-        unsigned long pc;
-        unsigned long sr;
-};
-#endif
-#ifdef __KERNEL__
 #include <asm/spr_defs.h>
+#include <uapi/asm/ptrace.h>
 /*
 * Make kernel PTrace/register structures opaque to userspace... userspace can
@@ -134,6 +121,4 @@ static inline long regs_return_value(struct pt_regs *regs)
 #define PT_ORIG_GPR11 132
 #define PT_SYSCALLNO  136
-#endif /* __KERNEL__ */
 #endif /* __ASM_OPENRISC_PTRACE_H */
diff --git a/arch/openrisc/include/asm/thread_info.h b/arch/openrisc/include/asm/thread_info.h
index 07a8bc080ef..07f3212422a 100644
--- a/arch/openrisc/include/asm/thread_info.h
+++ b/arch/openrisc/include/asm/thread_info.h
@@ -121,7 +121,6 @@ register struct thread_info *current_thread_info_reg asm("r10");
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
-#define _TIF_RESTORE_SIGMASK     (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
@@ -129,6 +128,8 @@ register struct thread_info *current_thread_info_reg asm("r10");
 /* For OpenRISC, this is anything in the LSW other than syscall trace */
 #define _TIF_WORK_MASK (0xff & ~(_TIF_SYSCALL_TRACE|_TIF_SINGLESTEP))
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif /* __KERNEL__ */
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild
index baebb3da1d4..80761eb82b5 100644
--- a/arch/openrisc/include/uapi/asm/Kbuild
+++ b/arch/openrisc/include/uapi/asm/Kbuild
@@ -1,3 +1,10 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += byteorder.h
+header-y += elf.h
+header-y += kvm_para.h
+header-y += param.h
+header-y += ptrace.h
+header-y += sigcontext.h
+header-y += unistd.h
diff --git a/arch/openrisc/include/asm/byteorder.h b/arch/openrisc/include/uapi/asm/byteorder.h
index 60d14f7e14e..60d14f7e14e 100644
--- a/arch/openrisc/include/asm/byteorder.h
+++ b/arch/openrisc/include/uapi/asm/byteorder.h
diff --git a/arch/openrisc/include/uapi/asm/elf.h b/arch/openrisc/include/uapi/asm/elf.h
new file mode 100644
index 00000000000..f02ea583042
--- /dev/null
+++ b/arch/openrisc/include/uapi/asm/elf.h
@@ -0,0 +1,69 @@
+/*
+ * OpenRISC Linux
+ *
+ * Linux architectural port borrowing liberally from similar works of
+ * others.  All original copyrights apply as per the original source
+ * declaration.
+ *
+ * OpenRISC implementation:
+ * Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>
+ * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
+ * et al.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef _UAPI__ASM_OPENRISC_ELF_H
+#define _UAPI__ASM_OPENRISC_ELF_H
+/*
+ * This files is partially exported to userspace.  This allows us to keep
+ * the ELF bits in one place which should assist in keeping the kernel and
+ * userspace in sync.
+ */
+/*
+ * ELF register definitions..
+ */
+/* for struct user_regs_struct definition */
+#include <asm/ptrace.h>
+/* The OR1K relocation types... not all relevant for module loader */
+#define R_OR32_NONE     0
+#define R_OR32_32       1
+#define R_OR32_16       2
+#define R_OR32_8        3
+#define R_OR32_CONST    4
+#define R_OR32_CONSTH   5
+#define R_OR32_JUMPTARG 6
+#define R_OR32_VTINHERIT 7
+#define R_OR32_VTENTRY  8
+typedef unsigned long elf_greg_t;
+/*
+ * Note that NGREG is defined to ELF_NGREG in include/linux/elfcore.h, and is
+ * thus exposed to user-space.
+ */
+#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+/* A placeholder; OR32 does not have fp support yes, so no fp regs for now.  */
+typedef unsigned long elf_fpregset_t;
+/* This should be moved to include/linux/elf.h */
+#define EM_OR32         0x8472
+#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
+/*
+ * These are used to set parameters in the core dumps.
+ */
+#define ELF_ARCH        EM_OR32
+#define ELF_CLASS       ELFCLASS32
+#define ELF_DATA        ELFDATA2MSB
+#endif /* _UAPI__ASM_OPENRISC_ELF_H */
diff --git a/arch/openrisc/include/asm/kvm_para.h b/arch/openrisc/include/uapi/asm/kvm_para.h
index 14fab8f0b95..14fab8f0b95 100644
--- a/arch/openrisc/include/asm/kvm_para.h
+++ b/arch/openrisc/include/uapi/asm/kvm_para.h
diff --git a/arch/openrisc/include/asm/param.h b/arch/openrisc/include/uapi/asm/param.h
index c39a336610e..c39a336610e 100644
--- a/arch/openrisc/include/asm/param.h
+++ b/arch/openrisc/include/uapi/asm/param.h
diff --git a/arch/openrisc/include/uapi/asm/ptrace.h b/arch/openrisc/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..9760bd17fbc
--- /dev/null
+++ b/arch/openrisc/include/uapi/asm/ptrace.h
@@ -0,0 +1,35 @@
+/*
+ * OpenRISC Linux
+ *
+ * Linux architectural port borrowing liberally from similar works of
+ * others.  All original copyrights apply as per the original source
+ * declaration.
+ *
+ * OpenRISC implementation:
+ * Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>
+ * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
+ * et al.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef _UAPI__ASM_OPENRISC_PTRACE_H
+#define _UAPI__ASM_OPENRISC_PTRACE_H
+#ifndef __ASSEMBLY__
+/*
+ * This is the layout of the regset returned by the GETREGSET ptrace call
+ */
+struct user_regs_struct {
+        /* GPR R0-R31... */
+        unsigned long gpr[32];
+        unsigned long pc;
+        unsigned long sr;
+};
+#endif
+#endif /* _UAPI__ASM_OPENRISC_PTRACE_H */
diff --git a/arch/openrisc/include/asm/sigcontext.h b/arch/openrisc/include/uapi/asm/sigcontext.h
index b79c2b19afb..b79c2b19afb 100644
--- a/arch/openrisc/include/asm/sigcontext.h
+++ b/arch/openrisc/include/uapi/asm/sigcontext.h
diff --git a/arch/openrisc/include/asm/unistd.h b/arch/openrisc/include/uapi/asm/unistd.h
index 437bdbb61b1..437bdbb61b1 100644
--- a/arch/openrisc/include/asm/unistd.h
+++ b/arch/openrisc/include/uapi/asm/unistd.h
diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c
index e935b9d8eee..8ec77bc9f1e 100644
--- a/arch/openrisc/kernel/irq.c
+++ b/arch/openrisc/kernel/irq.c
@@ -46,19 +46,19 @@ EXPORT_SYMBOL(arch_local_irq_restore);
 static void or1k_pic_mask(struct irq_data *data)
 {
-        mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->irq));
+        mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq));
 }
 static void or1k_pic_unmask(struct irq_data *data)
 {
-        mtspr(SPR_PICMR, mfspr(SPR_PICMR) | (1UL << data->irq));
+        mtspr(SPR_PICMR, mfspr(SPR_PICMR) | (1UL << data->hwirq));
 }
 static void or1k_pic_ack(struct irq_data *data)
 {
        /* EDGE-triggered interrupts need to be ack'ed in order to clear
         * the latch.
-         * LEVER-triggered interrupts do not need to be ack'ed; however,
+         * LEVEL-triggered interrupts do not need to be ack'ed; however,
         * ack'ing the interrupt has no ill-effect and is quicker than
         * trying to figure out what type it is...
         */
@@ -75,10 +75,10 @@ static void or1k_pic_ack(struct irq_data *data)
         *     as opposed to a 1 as mandated by the spec
         */
-        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->irq));
+        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq));
 #else
-        WARN(1, "Interrupt handling possibily broken\n");
+        WARN(1, "Interrupt handling possibly broken\n");
-        mtspr(SPR_PICSR, (1UL << irq));
+        mtspr(SPR_PICSR, (1UL << data->hwirq));
 #endif
 }
@@ -87,10 +87,12 @@ static void or1k_pic_mask_ack(struct irq_data *data)
        /* Comments for pic_ack apply here, too */
 #ifdef CONFIG_OR1K_1200
-        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->irq));
+        mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq));
+        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq));
 #else
-        WARN(1, "Interrupt handling possibily broken\n");
+        WARN(1, "Interrupt handling possibly broken\n");
-        mtspr(SPR_PICSR, (1UL << irq));
+        mtspr(SPR_PICMR, (1UL << data->hwirq));
+        mtspr(SPR_PICSR, (1UL << data->hwirq));
 #endif
 }
diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c
index 55210f37d1a..c35f3ab1a8d 100644
--- a/arch/openrisc/kernel/process.c
+++ b/arch/openrisc/kernel/process.c
@@ -271,7 +271,7 @@ asmlinkage long _sys_execve(const char __user *name,
                            struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname(name);
        error = PTR_ERR(filename);
@@ -279,7 +279,7 @@ asmlinkage long _sys_execve(const char __user *name,
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
 out:
diff --git a/arch/openrisc/kernel/ptrace.c b/arch/openrisc/kernel/ptrace.c
index e71781d24b0..71a2a0c34c6 100644
--- a/arch/openrisc/kernel/ptrace.c
+++ b/arch/openrisc/kernel/ptrace.c
@@ -187,7 +187,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
                 */
                ret = -1L;
-        audit_syscall_entry(audit_arch(), regs->gpr[11],
+        audit_syscall_entry(AUDIT_ARCH_OPENRISC, regs->gpr[11],
                            regs->gpr[3], regs->gpr[4],
                            regs->gpr[5], regs->gpr[6]);
diff --git a/arch/openrisc/lib/delay.c b/arch/openrisc/lib/delay.c
index 01d9740ae6f..c330767c921 100644
--- a/arch/openrisc/lib/delay.c
+++ b/arch/openrisc/lib/delay.c
@@ -30,9 +30,9 @@ int __devinit read_current_timer(unsigned long *timer_value)
 void __delay(unsigned long cycles)
 {
-        cycles_t target = get_cycles() + cycles;
+        cycles_t start = get_cycles();
-        while (get_cycles() < target)
+        while ((get_cycles() - start) < cycles)
                cpu_relax();
 }
 EXPORT_SYMBOL(__delay);
@@ -41,7 +41,7 @@ inline void __const_udelay(unsigned long xloops)
 {
        unsigned long long loops;
-        loops = xloops * loops_per_jiffy * HZ;
+        loops = (unsigned long long)xloops * loops_per_jiffy * HZ;
        __delay(loops >> 32);
 }
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index b87438bb338..11def45b98c 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -20,6 +20,8 @@ config PARISC
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_STRNCPY_FROM_USER
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index 6785de7bd2a..a0760b87fd4 100644
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -34,14 +34,14 @@
 int hpux_execve(struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname((const char __user *) regs->gr[26]);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                          (const char __user *const __user *) regs->gr[25],
                          (const char __user *const __user *) regs->gr[24],
                          regs);
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S
index 38a1c1b8d4e..011468857e9 100644
--- a/arch/parisc/hpux/gate.S
+++ b/arch/parisc/hpux/gate.S
@@ -71,7 +71,7 @@ ENTRY(hpux_gateway_page)
        STREG   %r26, TASK_PT_GR26(%r1)         /* 1st argument */
        STREG   %r27, TASK_PT_GR27(%r1)         /* user dp */
        STREG   %r28, TASK_PT_GR28(%r1)         /* return value 0 */
-        STREG   %r28, TASK_PT_ORIG_R28(%r1)     /* return value 0 (saved for signals) */
+        STREG   %r0, TASK_PT_ORIG_R28(%r1)     /* don't prohibit restarts */
        STREG   %r29, TASK_PT_GR29(%r1)         /* 8th argument */
        STREG   %r31, TASK_PT_GR31(%r1)         /* preserve syscall return ptr */
        
diff --git a/arch/parisc/include/asm/module.h b/arch/parisc/include/asm/module.h
index 1f4123427ea..bab37e99168 100644
--- a/arch/parisc/include/asm/module.h
+++ b/arch/parisc/include/asm/module.h
@@ -1,21 +1,11 @@
 #ifndef _ASM_PARISC_MODULE_H
 #define _ASM_PARISC_MODULE_H
+#include <asm-generic/module.h>
 /*
 * This file contains the parisc architecture specific module code.
 */
-#ifdef CONFIG_64BIT
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Sym Elf64_Sym
-#define Elf_Ehdr Elf64_Ehdr
-#define Elf_Addr Elf64_Addr
-#define Elf_Rela Elf64_Rela
-#else
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-#define Elf_Addr Elf32_Addr
-#define Elf_Rela Elf32_Rela
-#endif
 struct unwind_table;
diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h
index 22b4726dee4..d1fb79a36f3 100644
--- a/arch/parisc/include/asm/thread_info.h
+++ b/arch/parisc/include/asm/thread_info.h
@@ -68,13 +68,16 @@ struct thread_info {
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_32BIT              (1 << TIF_32BIT)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
 #define _TIF_BLOCKSTEP          (1 << TIF_BLOCKSTEP)
 #define _TIF_USER_WORK_MASK     (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | \
                                 _TIF_NEED_RESCHED)
+#define _TIF_SYSCALL_TRACE_MASK (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | \
+                                 _TIF_BLOCKSTEP)
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif /* __KERNEL__ */
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 8c6b6b6561f..cbc37216bf9 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -342,13 +342,13 @@ unsigned long thread_saved_pc(struct task_struct *t)
 asmlinkage int sys_execve(struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname((const char __user *) regs->gr[26]);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                          (const char __user *const __user *) regs->gr[25],
                          (const char __user *const __user *) regs->gr[24],
                          regs);
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 594459bde14..53799695599 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -113,6 +113,8 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall)
                (usp - sigframe_size);
        DBG(2,"sys_rt_sigreturn: frame is %p\n", frame);
+        regs->orig_r28 = 1; /* no restarts for sigreturn */
 #ifdef CONFIG_64BIT
        compat_frame = (struct compat_rt_sigframe __user *)frame;
        
@@ -437,7 +439,7 @@ give_sigsegv:
 * OK, we're invoking a handler.
 */     
-static long
+static void
 handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
                struct pt_regs *regs, int in_syscall)
 {
@@ -447,7 +449,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
        
        /* Set up the stack frame */
        if (!setup_rt_frame(sig, ka, info, oldset, regs, in_syscall))
-                return 0;
+                return;
        signal_delivered(sig, info, ka, regs, 
                test_thread_flag(TIF_SINGLESTEP) ||
@@ -455,13 +457,14 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
        DBG(1,KERN_DEBUG "do_signal: Exit (success), regs->gr[28] = %ld\n",
                regs->gr[28]);
-        return 1;
 }
 static inline void
 syscall_restart(struct pt_regs *regs, struct k_sigaction *ka)
 {
+        if (regs->orig_r28)
+                return;
+        regs->orig_r28 = 1; /* no more restarts */
        /* Check the return code */
        switch (regs->gr[28]) {
        case -ERESTART_RESTARTBLOCK:
@@ -482,8 +485,6 @@ syscall_restart(struct pt_regs *regs, struct k_sigaction *ka)
                 * we have to do is fiddle the return pointer.
                 */
                regs->gr[31] -= 8; /* delayed branching */
-                /* Preserve original r28. */
-                regs->gr[28] = regs->orig_r28;
                break;
        }
 }
@@ -491,6 +492,9 @@ syscall_restart(struct pt_regs *regs, struct k_sigaction *ka)
 static inline void
 insert_restart_trampoline(struct pt_regs *regs)
 {
+        if (regs->orig_r28)
+                return;
+        regs->orig_r28 = 1; /* no more restarts */
        switch(regs->gr[28]) {
        case -ERESTART_RESTARTBLOCK: {
                /* Restart the system call - no handlers present */
@@ -525,9 +529,6 @@ insert_restart_trampoline(struct pt_regs *regs)
                flush_user_icache_range(regs->gr[30], regs->gr[30] + 4);
                regs->gr[31] = regs->gr[30] + 8;
-                /* Preserve original r28. */
-                regs->gr[28] = regs->orig_r28;
                return;
        }
        case -ERESTARTNOHAND:
@@ -539,9 +540,6 @@ insert_restart_trampoline(struct pt_regs *regs)
                 * slot of the branch external instruction.
                 */
                regs->gr[31] -= 8;
-                /* Preserve original r28. */
-                regs->gr[28] = regs->orig_r28;
                return;
        }
        default:
@@ -570,30 +568,17 @@ do_signal(struct pt_regs *regs, long in_syscall)
        DBG(1,"\ndo_signal: regs=0x%p, sr7 %#lx, in_syscall=%d\n",
               regs, regs->sr[7], in_syscall);
-        /* Everyone else checks to see if they are in kernel mode at
+        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-           this point and exits if that's the case.  I'm not sure why
+        DBG(3,"do_signal: signr = %d, regs->gr[28] = %ld\n", signr, regs->gr[28]); 
-           we would be called in that case, but for some reason we
-           are. */
-        /* May need to force signal if handle_signal failed to deliver */
-        while (1) {
-                signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-                DBG(3,"do_signal: signr = %d, regs->gr[28] = %ld\n", signr, regs->gr[28]); 
        
-                if (signr <= 0)
+        if (signr > 0) {
-                  break;
-                
                /* Restart a system call if necessary. */
                if (in_syscall)
                        syscall_restart(regs, &ka);
-                /* Whee!  Actually deliver the signal.  If the
+                handle_signal(signr, &info, &ka, regs, in_syscall);
-                   delivery failed, we need to continue to iterate in
+                return;
-                   this loop so we can deliver the SIGSEGV... */
-                if (handle_signal(signr, &info, &ka, regs, in_syscall))
-                        return;
        }
-        /* end of while(1) looping forever if we can't force a signal */
        /* Did we come from a system call? */
        if (in_syscall)
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index dc9a6246232..bf5b93a885d 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -60,14 +60,14 @@
 asmlinkage int sys32_execve(struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        DBG(("sys32_execve(%p) r26 = 0x%lx\n", regs, regs->gr[26]));
        filename = getname((const char __user *) regs->gr[26]);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = compat_do_execve(filename, compat_ptr(regs->gr[25]),
+        error = compat_do_execve(filename->name, compat_ptr(regs->gr[25]),
                                 compat_ptr(regs->gr[24]), regs);
        putname(filename);
 out:
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 82a52b2fb13..86742df0b19 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -156,7 +156,7 @@ linux_gateway_entry:
        STREG   %r26, TASK_PT_GR26(%r1)         /* 1st argument */
        STREG   %r27, TASK_PT_GR27(%r1)         /* user dp */
        STREG   %r28, TASK_PT_GR28(%r1)         /* return value 0 */
-        STREG   %r28, TASK_PT_ORIG_R28(%r1)     /* return value 0 (saved for signals) */
+        STREG   %r0, TASK_PT_ORIG_R28(%r1)      /* don't prohibit restarts */
        STREG   %r29, TASK_PT_GR29(%r1)         /* return value 1 */
        STREG   %r31, TASK_PT_GR31(%r1)         /* preserve syscall return ptr */
        
@@ -180,9 +180,10 @@ linux_gateway_entry:
        /* Are we being ptraced? */
        mfctl   %cr30, %r1
-        LDREG   TI_TASK(%r1),%r1
+        LDREG   TI_FLAGS(%r1),%r1
-        ldw     TASK_PTRACE(%r1), %r1
+        ldi     _TIF_SYSCALL_TRACE_MASK, %r19
-        bb,<,n  %r1,31,.Ltracesys
+        and,COND(=) %r1, %r19, %r0
+        b,n     .Ltracesys
        
        /* Note!  We cannot use the syscall table that is mapped
        nearby since the gateway page is mapped execute-only. */
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index df7edb887a0..a902a5c1c76 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -137,10 +137,13 @@ config PPC
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_CMOS_UPDATE
-        select GENERIC_TIME_VSYSCALL
+        select GENERIC_TIME_VSYSCALL_OLD
        select GENERIC_CLOCKEVENTS
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
+        select GENERIC_KERNEL_THREAD
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
 config EARLY_PRINTK
        bool
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild
index ace53dbde2c..a4fe15e33c6 100644
--- a/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@ -1,39 +1,4 @@
-include include/asm-generic/Kbuild.asm
-header-y += auxvec.h
-header-y += bootx.h
-header-y += byteorder.h
-header-y += cputable.h
-header-y += elf.h
-header-y += errno.h
-header-y += fcntl.h
-header-y += ioctl.h
-header-y += ioctls.h
-header-y += ipcbuf.h
-header-y += linkage.h
-header-y += msgbuf.h
-header-y += nvram.h
-header-y += param.h
-header-y += poll.h
-header-y += posix_types.h
-header-y += ps3fb.h
-header-y += resource.h
-header-y += seccomp.h
-header-y += sembuf.h
-header-y += shmbuf.h
-header-y += sigcontext.h
-header-y += siginfo.h
-header-y += signal.h
-header-y += socket.h
-header-y += sockios.h
-header-y += spu_info.h
-header-y += stat.h
-header-y += statfs.h
-header-y += termbits.h
-header-y += termios.h
-header-y += types.h
-header-y += ucontext.h
-header-y += unistd.h
 generic-y += clkdev.h
 generic-y += rwsem.h
diff --git a/arch/powerpc/include/asm/bootx.h b/arch/powerpc/include/asm/bootx.h
index 60a3c9ef301..dd9461003df 100644
--- a/arch/powerpc/include/asm/bootx.h
+++ b/arch/powerpc/include/asm/bootx.h
@@ -5,126 +5,11 @@
 * Written by Benjamin Herrenschmidt.
 */
 #ifndef __ASM_BOOTX_H__
 #define __ASM_BOOTX_H__
-#include <linux/types.h>
+#include <uapi/asm/bootx.h>
-#ifdef macintosh
-#include <Types.h>
-#include "linux_type_defs.h"
-#endif
-#ifdef macintosh
-/* All this requires PowerPC alignment */
-#pragma options align=power
-#endif
-/* On kernel entry:
- *
- * r3 = 0x426f6f58    ('BooX')
- * r4 = pointer to boot_infos
- * r5 = NULL
- *
- * Data and instruction translation disabled, interrupts
- * disabled, kernel loaded at physical 0x00000000 on PCI
- * machines (will be different on NuBus).
- */
-#define BOOT_INFO_VERSION               5
-#define BOOT_INFO_COMPATIBLE_VERSION    1
-/* Bit in the architecture flag mask. More to be defined in
-   future versions. Note that either BOOT_ARCH_PCI or
-   BOOT_ARCH_NUBUS is set. The other BOOT_ARCH_NUBUS_xxx are
-   set additionally when BOOT_ARCH_NUBUS is set.
- */
-#define BOOT_ARCH_PCI                   0x00000001UL
-#define BOOT_ARCH_NUBUS                 0x00000002UL
-#define BOOT_ARCH_NUBUS_PDM             0x00000010UL
-#define BOOT_ARCH_NUBUS_PERFORMA        0x00000020UL
-#define BOOT_ARCH_NUBUS_POWERBOOK       0x00000040UL
-/*  Maximum number of ranges in phys memory map */
-#define MAX_MEM_MAP_SIZE                                26
-/* This is the format of an element in the physical memory map. Note that
-   the map is optional and current BootX will only build it for pre-PCI
-   machines */
-typedef struct boot_info_map_entry
-{
-    __u32       physAddr;                /* Physical starting address */
-    __u32       size;                    /* Size in bytes */
-} boot_info_map_entry_t;
-/* Here are the boot informations that are passed to the bootstrap
- * Note that the kernel arguments and the device tree are appended
- * at the end of this structure. */
-typedef struct boot_infos
-{
-    /* Version of this structure */
-    __u32       version;
-    /* backward compatible down to version: */
-    __u32       compatible_version;
-    /* NEW (vers. 2) this holds the current _logical_ base addr of
-       the frame buffer (for use by early boot message) */
-    __u8*       logicalDisplayBase;
-    /* NEW (vers. 4) Apple's machine identification */
-    __u32       machineID;
-    /* NEW (vers. 4) Detected hw architecture */
-    __u32       architecture;
-    /* The device tree (internal addresses relative to the beginning of the tree,
-     * device tree offset relative to the beginning of this structure).
-     * On pre-PCI macintosh (BOOT_ARCH_PCI bit set to 0 in architecture), this
-     * field is 0.
-     */
-    __u32       deviceTreeOffset;        /* Device tree offset */
-    __u32       deviceTreeSize;          /* Size of the device tree */
-    /* Some infos about the current MacOS display */
-    __u32       dispDeviceRect[4];       /* left,top,right,bottom */
-    __u32       dispDeviceDepth;         /* (8, 16 or 32) */
-    __u8*       dispDeviceBase;          /* base address (physical) */
-    __u32       dispDeviceRowBytes;      /* rowbytes (in bytes) */
-    __u32       dispDeviceColorsOffset;  /* Colormap (8 bits only) or 0 (*) */
-    /* Optional offset in the registry to the current
-     * MacOS display. (Can be 0 when not detected) */
-     __u32      dispDeviceRegEntryOffset;
-    /* Optional pointer to boot ramdisk (offset from this structure) */
-    __u32       ramDisk;
-    __u32       ramDiskSize;             /* size of ramdisk image */
-    /* Kernel command line arguments (offset from this structure) */
-    __u32       kernelParamsOffset;
-    /* ALL BELOW NEW (vers. 4) */
-    /* This defines the physical memory. Valid with BOOT_ARCH_NUBUS flag
-       (non-PCI) only. On PCI, memory is contiguous and it's size is in the
-       device-tree. */
-    boot_info_map_entry_t
-                physMemoryMap[MAX_MEM_MAP_SIZE]; /* Where the phys memory is */
-    __u32       physMemoryMapSize;               /* How many entries in map */
-    /* The framebuffer size (optional, currently 0) */
-    __u32       frameBufferSize;         /* Represents a max size, can be 0. */
-    /* NEW (vers. 5) */
-    /* Total params size (args + colormap + device tree + ramdisk) */
-    __u32       totalParamsSize;
-} boot_infos_t;
-#ifdef __KERNEL__
 /* (*) The format of the colormap is 256 * 3 * 2 bytes. Each color index
 * is represented by 3 short words containing a 16 bits (unsigned) color
 * component. Later versions may contain the gamma table for direct-color
@@ -162,10 +47,4 @@ struct bootx_dt_node {
 extern void bootx_init(unsigned long r4, unsigned long phys);
-#endif /* __KERNEL__ */
-#ifdef macintosh
-#pragma options align=reset
-#endif
 #endif
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index b3c083de17a..21a0687b8c4 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -1,42 +1,10 @@
 #ifndef __ASM_POWERPC_CPUTABLE_H
 #define __ASM_POWERPC_CPUTABLE_H
-#define PPC_FEATURE_32                  0x80000000
-#define PPC_FEATURE_64                  0x40000000
-#define PPC_FEATURE_601_INSTR           0x20000000
-#define PPC_FEATURE_HAS_ALTIVEC         0x10000000
-#define PPC_FEATURE_HAS_FPU             0x08000000
-#define PPC_FEATURE_HAS_MMU             0x04000000
-#define PPC_FEATURE_HAS_4xxMAC          0x02000000
-#define PPC_FEATURE_UNIFIED_CACHE       0x01000000
-#define PPC_FEATURE_HAS_SPE             0x00800000
-#define PPC_FEATURE_HAS_EFP_SINGLE      0x00400000
-#define PPC_FEATURE_HAS_EFP_DOUBLE      0x00200000
-#define PPC_FEATURE_NO_TB               0x00100000
-#define PPC_FEATURE_POWER4              0x00080000
-#define PPC_FEATURE_POWER5              0x00040000
-#define PPC_FEATURE_POWER5_PLUS         0x00020000
-#define PPC_FEATURE_CELL                0x00010000
-#define PPC_FEATURE_BOOKE               0x00008000
-#define PPC_FEATURE_SMT                 0x00004000
-#define PPC_FEATURE_ICACHE_SNOOP        0x00002000
-#define PPC_FEATURE_ARCH_2_05           0x00001000
-#define PPC_FEATURE_PA6T                0x00000800
-#define PPC_FEATURE_HAS_DFP             0x00000400
-#define PPC_FEATURE_POWER6_EXT          0x00000200
-#define PPC_FEATURE_ARCH_2_06           0x00000100
-#define PPC_FEATURE_HAS_VSX             0x00000080
-#define PPC_FEATURE_PSERIES_PERFMON_COMPAT \
-                                        0x00000040
-#define PPC_FEATURE_TRUE_LE             0x00000002
-#define PPC_FEATURE_PPC_LE              0x00000001
-#ifdef __KERNEL__
 #include <asm/asm-compat.h>
 #include <asm/feature-fixups.h>
+#include <uapi/asm/cputable.h>
 #ifndef __ASSEMBLY__
@@ -557,5 +525,4 @@ static inline int cpu_has_feature(unsigned long feature)
 #endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #endif /* __ASM_POWERPC_CPUTABLE_H */
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
index 3bf9cca3514..6abf0a16323 100644
--- a/arch/powerpc/include/asm/elf.h
+++ b/arch/powerpc/include/asm/elf.h
@@ -1,90 +1,3 @@
-#ifndef _ASM_POWERPC_ELF_H
-#define _ASM_POWERPC_ELF_H
-#ifdef __KERNEL__
-#include <linux/sched.h>        /* for task_struct */
-#include <asm/page.h>
-#include <asm/string.h>
-#endif
-#include <linux/types.h>
-#include <asm/ptrace.h>
-#include <asm/cputable.h>
-#include <asm/auxvec.h>
-/* PowerPC relocations defined by the ABIs */
-#define R_PPC_NONE              0
-#define R_PPC_ADDR32            1       /* 32bit absolute address */
-#define R_PPC_ADDR24            2       /* 26bit address, 2 bits ignored.  */
-#define R_PPC_ADDR16            3       /* 16bit absolute address */
-#define R_PPC_ADDR16_LO         4       /* lower 16bit of absolute address */
-#define R_PPC_ADDR16_HI         5       /* high 16bit of absolute address */
-#define R_PPC_ADDR16_HA         6       /* adjusted high 16bit */
-#define R_PPC_ADDR14            7       /* 16bit address, 2 bits ignored */
-#define R_PPC_ADDR14_BRTAKEN    8
-#define R_PPC_ADDR14_BRNTAKEN   9
-#define R_PPC_REL24             10      /* PC relative 26 bit */
-#define R_PPC_REL14             11      /* PC relative 16 bit */
-#define R_PPC_REL14_BRTAKEN     12
-#define R_PPC_REL14_BRNTAKEN    13
-#define R_PPC_GOT16             14
-#define R_PPC_GOT16_LO          15
-#define R_PPC_GOT16_HI          16
-#define R_PPC_GOT16_HA          17
-#define R_PPC_PLTREL24          18
-#define R_PPC_COPY              19
-#define R_PPC_GLOB_DAT          20
-#define R_PPC_JMP_SLOT          21
-#define R_PPC_RELATIVE          22
-#define R_PPC_LOCAL24PC         23
-#define R_PPC_UADDR32           24
-#define R_PPC_UADDR16           25
-#define R_PPC_REL32             26
-#define R_PPC_PLT32             27
-#define R_PPC_PLTREL32          28
-#define R_PPC_PLT16_LO          29
-#define R_PPC_PLT16_HI          30
-#define R_PPC_PLT16_HA          31
-#define R_PPC_SDAREL16          32
-#define R_PPC_SECTOFF           33
-#define R_PPC_SECTOFF_LO        34
-#define R_PPC_SECTOFF_HI        35
-#define R_PPC_SECTOFF_HA        36
-/* PowerPC relocations defined for the TLS access ABI.  */
-#define R_PPC_TLS               67 /* none      (sym+add)@tls */
-#define R_PPC_DTPMOD32          68 /* word32    (sym+add)@dtpmod */
-#define R_PPC_TPREL16           69 /* half16*   (sym+add)@tprel */
-#define R_PPC_TPREL16_LO        70 /* half16    (sym+add)@tprel@l */
-#define R_PPC_TPREL16_HI        71 /* half16    (sym+add)@tprel@h */
-#define R_PPC_TPREL16_HA        72 /* half16    (sym+add)@tprel@ha */
-#define R_PPC_TPREL32           73 /* word32    (sym+add)@tprel */
-#define R_PPC_DTPREL16          74 /* half16*   (sym+add)@dtprel */
-#define R_PPC_DTPREL16_LO       75 /* half16    (sym+add)@dtprel@l */
-#define R_PPC_DTPREL16_HI       76 /* half16    (sym+add)@dtprel@h */
-#define R_PPC_DTPREL16_HA       77 /* half16    (sym+add)@dtprel@ha */
-#define R_PPC_DTPREL32          78 /* word32    (sym+add)@dtprel */
-#define R_PPC_GOT_TLSGD16       79 /* half16*   (sym+add)@got@tlsgd */
-#define R_PPC_GOT_TLSGD16_LO    80 /* half16    (sym+add)@got@tlsgd@l */
-#define R_PPC_GOT_TLSGD16_HI    81 /* half16    (sym+add)@got@tlsgd@h */
-#define R_PPC_GOT_TLSGD16_HA    82 /* half16    (sym+add)@got@tlsgd@ha */
-#define R_PPC_GOT_TLSLD16       83 /* half16*   (sym+add)@got@tlsld */
-#define R_PPC_GOT_TLSLD16_LO    84 /* half16    (sym+add)@got@tlsld@l */
-#define R_PPC_GOT_TLSLD16_HI    85 /* half16    (sym+add)@got@tlsld@h */
-#define R_PPC_GOT_TLSLD16_HA    86 /* half16    (sym+add)@got@tlsld@ha */
-#define R_PPC_GOT_TPREL16       87 /* half16*   (sym+add)@got@tprel */
-#define R_PPC_GOT_TPREL16_LO    88 /* half16    (sym+add)@got@tprel@l */
-#define R_PPC_GOT_TPREL16_HI    89 /* half16    (sym+add)@got@tprel@h */
-#define R_PPC_GOT_TPREL16_HA    90 /* half16    (sym+add)@got@tprel@ha */
-#define R_PPC_GOT_DTPREL16      91 /* half16*   (sym+add)@got@dtprel */
-#define R_PPC_GOT_DTPREL16_LO   92 /* half16*   (sym+add)@got@dtprel@l */
-#define R_PPC_GOT_DTPREL16_HI   93 /* half16*   (sym+add)@got@dtprel@h */
-#define R_PPC_GOT_DTPREL16_HA   94 /* half16*   (sym+add)@got@dtprel@ha */
-/* keep this the last entry. */
-#define R_PPC_NUM               95
 /*
 * ELF register definitions..
 *
@@ -93,77 +6,14 @@
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
+#ifndef _ASM_POWERPC_ELF_H
+#define _ASM_POWERPC_ELF_H
-#define ELF_NGREG       48      /* includes nip, msr, lr, etc. */
+#include <linux/sched.h>        /* for task_struct */
-#define ELF_NFPREG      33      /* includes fpscr */
+#include <asm/page.h>
+#include <asm/string.h>
-typedef unsigned long elf_greg_t64;
+#include <uapi/asm/elf.h>
-typedef elf_greg_t64 elf_gregset_t64[ELF_NGREG];
-typedef unsigned int elf_greg_t32;
-typedef elf_greg_t32 elf_gregset_t32[ELF_NGREG];
-typedef elf_gregset_t32 compat_elf_gregset_t;
-/*
- * ELF_ARCH, CLASS, and DATA are used to set parameters in the core dumps.
- */
-#ifdef __powerpc64__
-# define ELF_NVRREG32   33      /* includes vscr & vrsave stuffed together */
-# define ELF_NVRREG     34      /* includes vscr & vrsave in split vectors */
-# define ELF_NVSRHALFREG 32     /* Half the vsx registers */
-# define ELF_GREG_TYPE  elf_greg_t64
-#else
-# define ELF_NEVRREG    34      /* includes acc (as 2) */
-# define ELF_NVRREG     33      /* includes vscr */
-# define ELF_GREG_TYPE  elf_greg_t32
-# define ELF_ARCH       EM_PPC
-# define ELF_CLASS      ELFCLASS32
-# define ELF_DATA       ELFDATA2MSB
-#endif /* __powerpc64__ */
-#ifndef ELF_ARCH
-# define ELF_ARCH       EM_PPC64
-# define ELF_CLASS      ELFCLASS64
-# define ELF_DATA       ELFDATA2MSB
-  typedef elf_greg_t64 elf_greg_t;
-  typedef elf_gregset_t64 elf_gregset_t;
-#else
-  /* Assumption: ELF_ARCH == EM_PPC and ELF_CLASS == ELFCLASS32 */
-  typedef elf_greg_t32 elf_greg_t;
-  typedef elf_gregset_t32 elf_gregset_t;
-#endif /* ELF_ARCH */
-/* Floating point registers */
-typedef double elf_fpreg_t;
-typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
-/* Altivec registers */
-/*
- * The entries with indexes 0-31 contain the corresponding vector registers. 
- * The entry with index 32 contains the vscr as the last word (offset 12) 
- * within the quadword.  This allows the vscr to be stored as either a 
- * quadword (since it must be copied via a vector register to/from storage) 
- * or as a word.  
- *
- * 64-bit kernel notes: The entry at index 33 contains the vrsave as the first  
- * word (offset 0) within the quadword.
- *
- * This definition of the VMX state is compatible with the current PPC32 
- * ptrace interface.  This allows signal handling and ptrace to use the same 
- * structures.  This also simplifies the implementation of a bi-arch 
- * (combined (32- and 64-bit) gdb.
- *
- * Note that it's _not_ compatible with 32 bits ucontext which stuffs the
- * vrsave along with vscr and so only uses 33 vectors for the register set
- */
-typedef __vector128 elf_vrreg_t;
-typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG];
-#ifdef __powerpc64__
-typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32];
-typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
-#endif
-#ifdef __KERNEL__
 /*
 * This is used to ensure we don't load something for the wrong architecture.
 */
@@ -277,153 +127,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
 extern unsigned long arch_randomize_brk(struct mm_struct *mm);
 #define arch_randomize_brk arch_randomize_brk
-#endif /* __KERNEL__ */
-/*
- * The requirements here are:
- * - keep the final alignment of sp (sp & 0xf)
- * - make sure the 32-bit value at the first 16 byte aligned position of
- *   AUXV is greater than 16 for glibc compatibility.
- *   AT_IGNOREPPC is used for that.
- * - for compatibility with glibc ARCH_DLINFO must always be defined on PPC,
- *   even if DLINFO_ARCH_ITEMS goes to zero or is undefined.
- * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes
- */
-#define ARCH_DLINFO                                                     \
-do {                                                                    \
-        /* Handle glibc compatibility. */                               \
-        NEW_AUX_ENT(AT_IGNOREPPC, AT_IGNOREPPC);                        \
-        NEW_AUX_ENT(AT_IGNOREPPC, AT_IGNOREPPC);                        \
-        /* Cache size items */                                          \
-        NEW_AUX_ENT(AT_DCACHEBSIZE, dcache_bsize);                      \
-        NEW_AUX_ENT(AT_ICACHEBSIZE, icache_bsize);                      \
-        NEW_AUX_ENT(AT_UCACHEBSIZE, ucache_bsize);                      \
-        VDSO_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso_base);  \
-} while (0)
-/* PowerPC64 relocations defined by the ABIs */
-#define R_PPC64_NONE    R_PPC_NONE
-#define R_PPC64_ADDR32  R_PPC_ADDR32  /* 32bit absolute address.  */
-#define R_PPC64_ADDR24  R_PPC_ADDR24  /* 26bit address, word aligned.  */
-#define R_PPC64_ADDR16  R_PPC_ADDR16  /* 16bit absolute address. */
-#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address.  */
-#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
-#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits.  */
-#define R_PPC64_ADDR14 R_PPC_ADDR14   /* 16bit address, word aligned.  */
-#define R_PPC64_ADDR14_BRTAKEN  R_PPC_ADDR14_BRTAKEN
-#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
-#define R_PPC64_REL24   R_PPC_REL24 /* PC relative 26 bit, word aligned.  */
-#define R_PPC64_REL14   R_PPC_REL14 /* PC relative 16 bit. */
-#define R_PPC64_REL14_BRTAKEN   R_PPC_REL14_BRTAKEN
-#define R_PPC64_REL14_BRNTAKEN  R_PPC_REL14_BRNTAKEN
-#define R_PPC64_GOT16     R_PPC_GOT16
-#define R_PPC64_GOT16_LO  R_PPC_GOT16_LO
-#define R_PPC64_GOT16_HI  R_PPC_GOT16_HI
-#define R_PPC64_GOT16_HA  R_PPC_GOT16_HA
-#define R_PPC64_COPY      R_PPC_COPY
-#define R_PPC64_GLOB_DAT  R_PPC_GLOB_DAT
-#define R_PPC64_JMP_SLOT  R_PPC_JMP_SLOT
-#define R_PPC64_RELATIVE  R_PPC_RELATIVE
-#define R_PPC64_UADDR32   R_PPC_UADDR32
-#define R_PPC64_UADDR16   R_PPC_UADDR16
-#define R_PPC64_REL32     R_PPC_REL32
-#define R_PPC64_PLT32     R_PPC_PLT32
-#define R_PPC64_PLTREL32  R_PPC_PLTREL32
-#define R_PPC64_PLT16_LO  R_PPC_PLT16_LO
-#define R_PPC64_PLT16_HI  R_PPC_PLT16_HI
-#define R_PPC64_PLT16_HA  R_PPC_PLT16_HA
-#define R_PPC64_SECTOFF     R_PPC_SECTOFF
-#define R_PPC64_SECTOFF_LO  R_PPC_SECTOFF_LO
-#define R_PPC64_SECTOFF_HI  R_PPC_SECTOFF_HI
-#define R_PPC64_SECTOFF_HA  R_PPC_SECTOFF_HA
-#define R_PPC64_ADDR30          37  /* word30 (S + A - P) >> 2.  */
-#define R_PPC64_ADDR64          38  /* doubleword64 S + A.  */
-#define R_PPC64_ADDR16_HIGHER   39  /* half16 #higher(S + A).  */
-#define R_PPC64_ADDR16_HIGHERA  40  /* half16 #highera(S + A).  */
-#define R_PPC64_ADDR16_HIGHEST  41  /* half16 #highest(S + A).  */
-#define R_PPC64_ADDR16_HIGHESTA 42  /* half16 #highesta(S + A). */
-#define R_PPC64_UADDR64     43  /* doubleword64 S + A.  */
-#define R_PPC64_REL64       44  /* doubleword64 S + A - P.  */
-#define R_PPC64_PLT64       45  /* doubleword64 L + A.  */
-#define R_PPC64_PLTREL64    46  /* doubleword64 L + A - P.  */
-#define R_PPC64_TOC16       47  /* half16* S + A - .TOC.  */
-#define R_PPC64_TOC16_LO    48  /* half16 #lo(S + A - .TOC.).  */
-#define R_PPC64_TOC16_HI    49  /* half16 #hi(S + A - .TOC.).  */
-#define R_PPC64_TOC16_HA    50  /* half16 #ha(S + A - .TOC.).  */
-#define R_PPC64_TOC         51  /* doubleword64 .TOC. */
-#define R_PPC64_PLTGOT16    52  /* half16* M + A.  */
-#define R_PPC64_PLTGOT16_LO 53  /* half16 #lo(M + A).  */
-#define R_PPC64_PLTGOT16_HI 54  /* half16 #hi(M + A).  */
-#define R_PPC64_PLTGOT16_HA 55  /* half16 #ha(M + A).  */
-#define R_PPC64_ADDR16_DS      56 /* half16ds* (S + A) >> 2.  */
-#define R_PPC64_ADDR16_LO_DS   57 /* half16ds  #lo(S + A) >> 2.  */
-#define R_PPC64_GOT16_DS       58 /* half16ds* (G + A) >> 2.  */
-#define R_PPC64_GOT16_LO_DS    59 /* half16ds  #lo(G + A) >> 2.  */
-#define R_PPC64_PLT16_LO_DS    60 /* half16ds  #lo(L + A) >> 2.  */
-#define R_PPC64_SECTOFF_DS     61 /* half16ds* (R + A) >> 2.  */
-#define R_PPC64_SECTOFF_LO_DS  62 /* half16ds  #lo(R + A) >> 2.  */
-#define R_PPC64_TOC16_DS       63 /* half16ds* (S + A - .TOC.) >> 2.  */
-#define R_PPC64_TOC16_LO_DS    64 /* half16ds  #lo(S + A - .TOC.) >> 2.  */
-#define R_PPC64_PLTGOT16_DS    65 /* half16ds* (M + A) >> 2.  */
-#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds  #lo(M + A) >> 2.  */
-/* PowerPC64 relocations defined for the TLS access ABI.  */
-#define R_PPC64_TLS             67 /* none      (sym+add)@tls */
-#define R_PPC64_DTPMOD64        68 /* doubleword64 (sym+add)@dtpmod */
-#define R_PPC64_TPREL16         69 /* half16*   (sym+add)@tprel */
-#define R_PPC64_TPREL16_LO      70 /* half16    (sym+add)@tprel@l */
-#define R_PPC64_TPREL16_HI      71 /* half16    (sym+add)@tprel@h */
-#define R_PPC64_TPREL16_HA      72 /* half16    (sym+add)@tprel@ha */
-#define R_PPC64_TPREL64         73 /* doubleword64 (sym+add)@tprel */
-#define R_PPC64_DTPREL16        74 /* half16*   (sym+add)@dtprel */
-#define R_PPC64_DTPREL16_LO     75 /* half16    (sym+add)@dtprel@l */
-#define R_PPC64_DTPREL16_HI     76 /* half16    (sym+add)@dtprel@h */
-#define R_PPC64_DTPREL16_HA     77 /* half16    (sym+add)@dtprel@ha */
-#define R_PPC64_DTPREL64        78 /* doubleword64 (sym+add)@dtprel */
-#define R_PPC64_GOT_TLSGD16     79 /* half16*   (sym+add)@got@tlsgd */
-#define R_PPC64_GOT_TLSGD16_LO  80 /* half16    (sym+add)@got@tlsgd@l */
-#define R_PPC64_GOT_TLSGD16_HI  81 /* half16    (sym+add)@got@tlsgd@h */
-#define R_PPC64_GOT_TLSGD16_HA  82 /* half16    (sym+add)@got@tlsgd@ha */
-#define R_PPC64_GOT_TLSLD16     83 /* half16*   (sym+add)@got@tlsld */
-#define R_PPC64_GOT_TLSLD16_LO  84 /* half16    (sym+add)@got@tlsld@l */
-#define R_PPC64_GOT_TLSLD16_HI  85 /* half16    (sym+add)@got@tlsld@h */
-#define R_PPC64_GOT_TLSLD16_HA  86 /* half16    (sym+add)@got@tlsld@ha */
-#define R_PPC64_GOT_TPREL16_DS  87 /* half16ds* (sym+add)@got@tprel */
-#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
-#define R_PPC64_GOT_TPREL16_HI  89 /* half16    (sym+add)@got@tprel@h */
-#define R_PPC64_GOT_TPREL16_HA  90 /* half16    (sym+add)@got@tprel@ha */
-#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
-#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
-#define R_PPC64_GOT_DTPREL16_HI 93 /* half16    (sym+add)@got@dtprel@h */
-#define R_PPC64_GOT_DTPREL16_HA 94 /* half16    (sym+add)@got@dtprel@ha */
-#define R_PPC64_TPREL16_DS      95 /* half16ds* (sym+add)@tprel */
-#define R_PPC64_TPREL16_LO_DS   96 /* half16ds  (sym+add)@tprel@l */
-#define R_PPC64_TPREL16_HIGHER  97 /* half16    (sym+add)@tprel@higher */
-#define R_PPC64_TPREL16_HIGHERA 98 /* half16    (sym+add)@tprel@highera */
-#define R_PPC64_TPREL16_HIGHEST 99 /* half16    (sym+add)@tprel@highest */
-#define R_PPC64_TPREL16_HIGHESTA 100 /* half16  (sym+add)@tprel@highesta */
-#define R_PPC64_DTPREL16_DS     101 /* half16ds* (sym+add)@dtprel */
-#define R_PPC64_DTPREL16_LO_DS  102 /* half16ds (sym+add)@dtprel@l */
-#define R_PPC64_DTPREL16_HIGHER 103 /* half16   (sym+add)@dtprel@higher */
-#define R_PPC64_DTPREL16_HIGHERA 104 /* half16  (sym+add)@dtprel@highera */
-#define R_PPC64_DTPREL16_HIGHEST 105 /* half16  (sym+add)@dtprel@highest */
-#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
-/* Keep this the last entry.  */
-#define R_PPC64_NUM             107
-/* There's actually a third entry here, but it's unused */
-struct ppc64_opd_entry
-{
-        unsigned long funcaddr;
-        unsigned long r2;
-};
-#ifdef  __KERNEL__
 #ifdef CONFIG_SPU_BASE
 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
@@ -433,6 +136,4 @@ struct ppc64_opd_entry
 #endif /* CONFIG_SPU_BASE */
-#endif /* __KERNEL */
 #endif /* _ASM_POWERPC_ELF_H */
diff --git a/arch/powerpc/include/asm/kvm_para.h b/arch/powerpc/include/asm/kvm_para.h
index c18916bff68..9365860fb7f 100644
--- a/arch/powerpc/include/asm/kvm_para.h
+++ b/arch/powerpc/include/asm/kvm_para.h
@@ -16,77 +16,11 @@
 *
 * Authors: Hollis Blanchard <hollisb@us.ibm.com>
 */
 #ifndef __POWERPC_KVM_PARA_H__
 #define __POWERPC_KVM_PARA_H__
-#include <linux/types.h>
+#include <uapi/asm/kvm_para.h>
-/*
- * Additions to this struct must only occur at the end, and should be
- * accompanied by a KVM_MAGIC_FEAT flag to advertise that they are present
- * (albeit not necessarily relevant to the current target hardware platform).
- *
- * Struct fields are always 32 or 64 bit aligned, depending on them being 32
- * or 64 bit wide respectively.
- *
- * See Documentation/virtual/kvm/ppc-pv.txt
- */
-struct kvm_vcpu_arch_shared {
-        __u64 scratch1;
-        __u64 scratch2;
-        __u64 scratch3;
-        __u64 critical;         /* Guest may not get interrupts if == r1 */
-        __u64 sprg0;
-        __u64 sprg1;
-        __u64 sprg2;
-        __u64 sprg3;
-        __u64 srr0;
-        __u64 srr1;
-        __u64 dar;              /* dear on BookE */
-        __u64 msr;
-        __u32 dsisr;
-        __u32 int_pending;      /* Tells the guest if we have an interrupt */
-        __u32 sr[16];
-        __u32 mas0;
-        __u32 mas1;
-        __u64 mas7_3;
-        __u64 mas2;
-        __u32 mas4;
-        __u32 mas6;
-        __u32 esr;
-        __u32 pir;
-        /*
-         * SPRG4-7 are user-readable, so we can only keep these consistent
-         * between the shared area and the real registers when there's an
-         * intervening exit to KVM.  This also applies to SPRG3 on some
-         * chips.
-         *
-         * This suffices for access by guest userspace, since in PR-mode
-         * KVM, an exit must occur when changing the guest's MSR[PR].
-         * If the guest kernel writes to SPRG3-7 via the shared area, it
-         * must also use the shared area for reading while in kernel space.
-         */
-        __u64 sprg4;
-        __u64 sprg5;
-        __u64 sprg6;
-        __u64 sprg7;
-};
-#define KVM_SC_MAGIC_R0         0x4b564d21 /* "KVM!" */
-#define HC_VENDOR_KVM           (42 << 16)
-#define HC_EV_SUCCESS           0
-#define HC_EV_UNIMPLEMENTED     12
-#define KVM_FEATURE_MAGIC_PAGE  1
-#define KVM_MAGIC_FEAT_SR               (1 << 0)
-/* MASn, ESR, PIR, and high SPRGs */
-#define KVM_MAGIC_FEAT_MAS0_TO_SPRG7    (1 << 1)
-#ifdef __KERNEL__
 #ifdef CONFIG_KVM_GUEST
@@ -211,6 +145,4 @@ static inline bool kvm_check_and_clear_guest_paused(void)
        return false;
 }
-#endif /* __KERNEL__ */
 #endif /* __POWERPC_KVM_PARA_H__ */
diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
index d4a7f645c5d..8565c254151 100644
--- a/arch/powerpc/include/asm/mman.h
+++ b/arch/powerpc/include/asm/mman.h
@@ -1,34 +1,14 @@
-#ifndef _ASM_POWERPC_MMAN_H
-#define _ASM_POWERPC_MMAN_H
-#include <asm-generic/mman-common.h>
 /*
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
+#ifndef _ASM_POWERPC_MMAN_H
+#define _ASM_POWERPC_MMAN_H
-#define PROT_SAO        0x10            /* Strong Access Ordering */
+#include <uapi/asm/mman.h>
-#define MAP_RENAME      MAP_ANONYMOUS   /* In SunOS terminology */
-#define MAP_NORESERVE   0x40            /* don't reserve swap pages */
-#define MAP_LOCKED      0x80
-#define MAP_GROWSDOWN   0x0100          /* stack-like segment */
-#define MAP_DENYWRITE   0x0800          /* ETXTBSY */
-#define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
-#define MCL_CURRENT     0x2000          /* lock all currently mapped pages */
-#define MCL_FUTURE      0x4000          /* lock all additions to address space */
-#define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
-#define MAP_NONBLOCK    0x10000         /* do not block on IO */
-#define MAP_STACK       0x20000         /* give out an address that is best suited for process/thread stacks */
-#define MAP_HUGETLB     0x40000         /* create a huge page mapping */
-#ifdef __KERNEL__
 #ifdef CONFIG_PPC64
 #include <asm/cputable.h>
@@ -61,5 +41,4 @@ static inline int arch_validate_prot(unsigned long prot)
 #define arch_validate_prot(prot) arch_validate_prot(prot)
 #endif /* CONFIG_PPC64 */
-#endif /* __KERNEL__ */
 #endif  /* _ASM_POWERPC_MMAN_H */
diff --git a/arch/powerpc/include/asm/module.h b/arch/powerpc/include/asm/module.h
index 0192a4ee2bc..c1df590ec44 100644
--- a/arch/powerpc/include/asm/module.h
+++ b/arch/powerpc/include/asm/module.h
@@ -11,6 +11,7 @@
 #include <linux/list.h>
 #include <asm/bug.h>
+#include <asm-generic/module.h>
 #ifndef __powerpc64__
@@ -60,16 +61,10 @@ struct mod_arch_specific {
 */
 #ifdef __powerpc64__
-#    define Elf_Shdr    Elf64_Shdr
-#    define Elf_Sym     Elf64_Sym
-#    define Elf_Ehdr    Elf64_Ehdr
 #    ifdef MODULE
        asm(".section .stubs,\"ax\",@nobits; .align 3; .previous");
 #    endif
 #else
-#    define Elf_Shdr    Elf32_Shdr
-#    define Elf_Sym     Elf32_Sym
-#    define Elf_Ehdr    Elf32_Ehdr
 #    ifdef MODULE
        asm(".section .plt,\"ax\",@nobits; .align 3; .previous");
        asm(".section .init.plt,\"ax\",@nobits; .align 3; .previous");
diff --git a/arch/powerpc/include/asm/nvram.h b/arch/powerpc/include/asm/nvram.h
index 9d1aafe607c..b0fe0fe4e62 100644
--- a/arch/powerpc/include/asm/nvram.h
+++ b/arch/powerpc/include/asm/nvram.h
@@ -6,29 +6,13 @@
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
 #ifndef _ASM_POWERPC_NVRAM_H
 #define _ASM_POWERPC_NVRAM_H
-/* Signatures for nvram partitions */
-#define NVRAM_SIG_SP    0x02    /* support processor */
-#define NVRAM_SIG_OF    0x50    /* open firmware config */
-#define NVRAM_SIG_FW    0x51    /* general firmware */
-#define NVRAM_SIG_HW    0x52    /* hardware (VPD) */
-#define NVRAM_SIG_FLIP  0x5a    /* Apple flip/flop header */
-#define NVRAM_SIG_APPL  0x5f    /* Apple "system" (???) */
-#define NVRAM_SIG_SYS   0x70    /* system env vars */
-#define NVRAM_SIG_CFG   0x71    /* config data */
-#define NVRAM_SIG_ELOG  0x72    /* error log */
-#define NVRAM_SIG_VEND  0x7e    /* vendor defined */
-#define NVRAM_SIG_FREE  0x7f    /* Free space */
-#define NVRAM_SIG_OS    0xa0    /* OS defined */
-#define NVRAM_SIG_PANIC 0xa1    /* Apple OSX "panic" */
-#ifdef __KERNEL__
 #include <linux/errno.h>
 #include <linux/list.h>
+#include <uapi/asm/nvram.h>
 #ifdef CONFIG_PPC_PSERIES
 extern int nvram_write_error_log(char * buff, int length,
@@ -56,17 +40,6 @@ extern int nvram_remove_partition(const char *name, int sig,
 extern int nvram_get_partition_size(loff_t data_index);
 extern loff_t nvram_find_partition(const char *name, int sig, int *out_size);
-#endif /* __KERNEL__ */
-/* PowerMac specific nvram stuffs */
-enum {
-        pmac_nvram_OF,          /* Open Firmware partition */
-        pmac_nvram_XPRAM,       /* MacOS XPRAM partition */
-        pmac_nvram_NR           /* MacOS Name Registry partition */
-};
-#ifdef __KERNEL__
 /* Return partition offset in nvram */
 extern int      pmac_get_partition(int partition);
@@ -83,30 +56,4 @@ extern ssize_t nvram_get_size(void);
 /* Normal access to NVRAM */
 extern unsigned char nvram_read_byte(int i);
 extern void nvram_write_byte(unsigned char c, int i);
-#endif
-/* Some offsets in XPRAM */
-#define PMAC_XPRAM_MACHINE_LOC  0xe4
-#define PMAC_XPRAM_SOUND_VOLUME 0x08
-/* Machine location structure in PowerMac XPRAM */
-struct pmac_machine_location {
-        unsigned int    latitude;       /* 2+30 bit Fractional number */
-        unsigned int    longitude;      /* 2+30 bit Fractional number */
-        unsigned int    delta;          /* mix of GMT delta and DLS */
-};
-/*
- * /dev/nvram ioctls
- *
- * Note that PMAC_NVRAM_GET_OFFSET is still supported, but is
- * definitely obsolete. Do not use it if you can avoid it
- */
-#define OBSOLETE_PMAC_NVRAM_GET_OFFSET \
-                                _IOWR('p', 0x40, int)
-#define IOC_NVRAM_GET_OFFSET    _IOWR('p', 0x42, int)   /* Get NVRAM partition offset */
-#define IOC_NVRAM_SYNC          _IO('p', 0x43)          /* Sync NVRAM image */
 #endif /* _ASM_POWERPC_NVRAM_H */
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 9dc5cd1fde1..8734b385527 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -74,9 +74,6 @@ struct task_struct;
 void start_thread(struct pt_regs *regs, unsigned long fdptr, unsigned long sp);
 void release_thread(struct task_struct *);
-/* Create a new kernel thread. */
-extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
 /* Lazy FPU handling on uni-processor */
 extern struct task_struct *last_task_used_math;
 extern struct task_struct *last_task_used_altivec;
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 9c21ed42aba..5f995681bc1 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -1,6 +1,3 @@
-#ifndef _ASM_POWERPC_PTRACE_H
-#define _ASM_POWERPC_PTRACE_H
 /*
 * Copyright (C) 2001 PPC64 Team, IBM Corp
 *
@@ -23,37 +20,11 @@
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
+#ifndef _ASM_POWERPC_PTRACE_H
+#define _ASM_POWERPC_PTRACE_H
-#include <linux/types.h>
+#include <uapi/asm/ptrace.h>
-#ifndef __ASSEMBLY__
-struct pt_regs {
-        unsigned long gpr[32];
-        unsigned long nip;
-        unsigned long msr;
-        unsigned long orig_gpr3;        /* Used for restarting system calls */
-        unsigned long ctr;
-        unsigned long link;
-        unsigned long xer;
-        unsigned long ccr;
-#ifdef __powerpc64__
-        unsigned long softe;            /* Soft enabled/disabled */
-#else
-        unsigned long mq;               /* 601 only (not used at present) */
-                                        /* Used on APUS to hold IPL value. */
-#endif
-        unsigned long trap;             /* Reason for being here */
-        /* N.B. for critical exceptions on 4xx, the dar and dsisr
-           fields are overloaded to hold srr0 and srr1. */
-        unsigned long dar;              /* Fault registers */
-        unsigned long dsisr;            /* on 4xx/Book-E used for ESR */
-        unsigned long result;           /* Result of a system call */
-};
-#endif /* __ASSEMBLY__ */
-#ifdef __KERNEL__
 #ifdef __powerpc64__
@@ -125,6 +96,8 @@ extern unsigned long ptrace_get_reg(struct task_struct *task, int regno);
 extern int ptrace_put_reg(struct task_struct *task, int regno,
                          unsigned long data);
+#define current_pt_regs() \
+        ((struct pt_regs *)((unsigned long)current_thread_info() + THREAD_SIZE) - 1)
 /*
 * We use the least-significant bit of the trap field to indicate
 * whether we have saved the full set of registers, or only a
@@ -220,219 +193,12 @@ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs,
 #endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-/*
- * Offsets used by 'ptrace' system call interface.
- * These can't be changed without breaking binary compatibility
- * with MkLinux, etc.
- */
-#define PT_R0   0
-#define PT_R1   1
-#define PT_R2   2
-#define PT_R3   3
-#define PT_R4   4
-#define PT_R5   5
-#define PT_R6   6
-#define PT_R7   7
-#define PT_R8   8
-#define PT_R9   9
-#define PT_R10  10
-#define PT_R11  11
-#define PT_R12  12
-#define PT_R13  13
-#define PT_R14  14
-#define PT_R15  15
-#define PT_R16  16
-#define PT_R17  17
-#define PT_R18  18
-#define PT_R19  19
-#define PT_R20  20
-#define PT_R21  21
-#define PT_R22  22
-#define PT_R23  23
-#define PT_R24  24
-#define PT_R25  25
-#define PT_R26  26
-#define PT_R27  27
-#define PT_R28  28
-#define PT_R29  29
-#define PT_R30  30
-#define PT_R31  31
-#define PT_NIP  32
-#define PT_MSR  33
-#define PT_ORIG_R3 34
-#define PT_CTR  35
-#define PT_LNK  36
-#define PT_XER  37
-#define PT_CCR  38
-#ifndef __powerpc64__
-#define PT_MQ   39
-#else
-#define PT_SOFTE 39
-#endif
-#define PT_TRAP 40
-#define PT_DAR  41
-#define PT_DSISR 42
-#define PT_RESULT 43
-#define PT_REGS_COUNT 44
-#define PT_FPR0 48      /* each FP reg occupies 2 slots in this space */
 #ifndef __powerpc64__
-#define PT_FPR31 (PT_FPR0 + 2*31)
-#define PT_FPSCR (PT_FPR0 + 2*32 + 1)
 #else /* __powerpc64__ */
-#define PT_FPSCR (PT_FPR0 + 32) /* each FP reg occupies 1 slot in 64-bit space */
-#ifdef __KERNEL__
 #define PT_FPSCR32 (PT_FPR0 + 2*32 + 1) /* each FP reg occupies 2 32-bit userspace slots */
-#endif
-#define PT_VR0 82       /* each Vector reg occupies 2 slots in 64-bit */
-#define PT_VSCR (PT_VR0 + 32*2 + 1)
-#define PT_VRSAVE (PT_VR0 + 33*2)
-#ifdef __KERNEL__
 #define PT_VR0_32 164   /* each Vector reg occupies 4 slots in 32-bit */
 #define PT_VSCR_32 (PT_VR0 + 32*4 + 3)
 #define PT_VRSAVE_32 (PT_VR0 + 33*4)
-#endif
-/*
- * Only store first 32 VSRs here. The second 32 VSRs in VR0-31
- */
-#define PT_VSR0 150     /* each VSR reg occupies 2 slots in 64-bit */
-#define PT_VSR31 (PT_VSR0 + 2*31)
-#ifdef __KERNEL__
 #define PT_VSR0_32 300  /* each VSR reg occupies 4 slots in 32-bit */
-#endif
 #endif /* __powerpc64__ */
-/*
- * Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
- * The transfer totals 34 quadword.  Quadwords 0-31 contain the
- * corresponding vector registers.  Quadword 32 contains the vscr as the
- * last word (offset 12) within that quadword.  Quadword 33 contains the
- * vrsave as the first word (offset 0) within the quadword.
- *
- * This definition of the VMX state is compatible with the current PPC32
- * ptrace interface.  This allows signal handling and ptrace to use the same
- * structures.  This also simplifies the implementation of a bi-arch
- * (combined (32- and 64-bit) gdb.
- */
-#define PTRACE_GETVRREGS        18
-#define PTRACE_SETVRREGS        19
-/* Get/set all the upper 32-bits of the SPE registers, accumulator, and
- * spefscr, in one go */
-#define PTRACE_GETEVRREGS       20
-#define PTRACE_SETEVRREGS       21
-/* Get the first 32 128bit VSX registers */
-#define PTRACE_GETVSRREGS       27
-#define PTRACE_SETVSRREGS       28
-/*
- * Get or set a debug register. The first 16 are DABR registers and the
- * second 16 are IABR registers.
- */
-#define PTRACE_GET_DEBUGREG     25
-#define PTRACE_SET_DEBUGREG     26
-/* (new) PTRACE requests using the same numbers as x86 and the same
- * argument ordering. Additionally, they support more registers too
- */
-#define PTRACE_GETREGS            12
-#define PTRACE_SETREGS            13
-#define PTRACE_GETFPREGS          14
-#define PTRACE_SETFPREGS          15
-#define PTRACE_GETREGS64          22
-#define PTRACE_SETREGS64          23
-/* Calls to trace a 64bit program from a 32bit program */
-#define PPC_PTRACE_PEEKTEXT_3264 0x95
-#define PPC_PTRACE_PEEKDATA_3264 0x94
-#define PPC_PTRACE_POKETEXT_3264 0x93
-#define PPC_PTRACE_POKEDATA_3264 0x92
-#define PPC_PTRACE_PEEKUSR_3264  0x91
-#define PPC_PTRACE_POKEUSR_3264  0x90
-#define PTRACE_SINGLEBLOCK      0x100   /* resume execution until next branch */
-#define PPC_PTRACE_GETHWDBGINFO 0x89
-#define PPC_PTRACE_SETHWDEBUG   0x88
-#define PPC_PTRACE_DELHWDEBUG   0x87
-#ifndef __ASSEMBLY__
-struct ppc_debug_info {
-        __u32 version;                  /* Only version 1 exists to date */
-        __u32 num_instruction_bps;
-        __u32 num_data_bps;
-        __u32 num_condition_regs;
-        __u32 data_bp_alignment;
-        __u32 sizeof_condition;         /* size of the DVC register */
-        __u64 features;
-};
-#endif /* __ASSEMBLY__ */
-/*
- * features will have bits indication whether there is support for:
- */
-#define PPC_DEBUG_FEATURE_INSN_BP_RANGE         0x0000000000000001
-#define PPC_DEBUG_FEATURE_INSN_BP_MASK          0x0000000000000002
-#define PPC_DEBUG_FEATURE_DATA_BP_RANGE         0x0000000000000004
-#define PPC_DEBUG_FEATURE_DATA_BP_MASK          0x0000000000000008
-#ifndef __ASSEMBLY__
-struct ppc_hw_breakpoint {
-        __u32 version;          /* currently, version must be 1 */
-        __u32 trigger_type;     /* only some combinations allowed */
-        __u32 addr_mode;        /* address match mode */
-        __u32 condition_mode;   /* break/watchpoint condition flags */
-        __u64 addr;             /* break/watchpoint address */
-        __u64 addr2;            /* range end or mask */
-        __u64 condition_value;  /* contents of the DVC register */
-};
-#endif /* __ASSEMBLY__ */
-/*
- * Trigger Type
- */
-#define PPC_BREAKPOINT_TRIGGER_EXECUTE  0x00000001
-#define PPC_BREAKPOINT_TRIGGER_READ     0x00000002
-#define PPC_BREAKPOINT_TRIGGER_WRITE    0x00000004
-#define PPC_BREAKPOINT_TRIGGER_RW       \
-        (PPC_BREAKPOINT_TRIGGER_READ | PPC_BREAKPOINT_TRIGGER_WRITE)
-/*
- * Address Mode
- */
-#define PPC_BREAKPOINT_MODE_EXACT               0x00000000
-#define PPC_BREAKPOINT_MODE_RANGE_INCLUSIVE     0x00000001
-#define PPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE     0x00000002
-#define PPC_BREAKPOINT_MODE_MASK                0x00000003
-/*
- * Condition Mode
- */
-#define PPC_BREAKPOINT_CONDITION_MODE   0x00000003
-#define PPC_BREAKPOINT_CONDITION_NONE   0x00000000
-#define PPC_BREAKPOINT_CONDITION_AND    0x00000001
-#define PPC_BREAKPOINT_CONDITION_EXACT  PPC_BREAKPOINT_CONDITION_AND
-#define PPC_BREAKPOINT_CONDITION_OR     0x00000002
-#define PPC_BREAKPOINT_CONDITION_AND_OR 0x00000003
-#define PPC_BREAKPOINT_CONDITION_BE_ALL 0x00ff0000
-#define PPC_BREAKPOINT_CONDITION_BE_SHIFT       16
-#define PPC_BREAKPOINT_CONDITION_BE(n)  \
-        (1<<((n)+PPC_BREAKPOINT_CONDITION_BE_SHIFT))
 #endif /* _ASM_POWERPC_PTRACE_H */
diff --git a/arch/powerpc/include/asm/signal.h b/arch/powerpc/include/asm/signal.h
index 3eb13be11d8..189998bb61c 100644
--- a/arch/powerpc/include/asm/signal.h
+++ b/arch/powerpc/include/asm/signal.h
@@ -1,149 +1,8 @@
 #ifndef _ASM_POWERPC_SIGNAL_H
 #define _ASM_POWERPC_SIGNAL_H
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
-#define _NSIG           64
-#ifdef __powerpc64__
-#define _NSIG_BPW       64
-#else
-#define _NSIG_BPW       32
-#endif
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-#define SIGHUP           1
-#define SIGINT           2
-#define SIGQUIT          3
-#define SIGILL           4
-#define SIGTRAP          5
-#define SIGABRT          6
-#define SIGIOT           6
-#define SIGBUS           7
-#define SIGFPE           8
-#define SIGKILL          9
-#define SIGUSR1         10
-#define SIGSEGV         11
-#define SIGUSR2         12
-#define SIGPIPE         13
-#define SIGALRM         14
-#define SIGTERM         15
-#define SIGSTKFLT       16
-#define SIGCHLD         17
-#define SIGCONT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGURG          23
-#define SIGXCPU         24
-#define SIGXFSZ         25
-#define SIGVTALRM       26
-#define SIGPROF         27
-#define SIGWINCH        28
-#define SIGIO           29
-#define SIGPOLL         SIGIO
-/*
-#define SIGLOST         29
-*/
-#define SIGPWR          30
-#define SIGSYS          31
-#define SIGUNUSED       31
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK is not currently supported, but will allow sigaltstack(2).
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_NOCLDSTOP    0x00000001U
-#define SA_NOCLDWAIT    0x00000002U
-#define SA_SIGINFO      0x00000004U
-#define SA_ONSTACK      0x08000000U
-#define SA_RESTART      0x10000000U
-#define SA_NODEFER      0x40000000U
-#define SA_RESETHAND    0x80000000U
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-#define SA_RESTORER     0x04000000U
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK      1
-#define SS_DISABLE      2
-#define MINSIGSTKSZ     2048
-#define SIGSTKSZ        8192
-#include <asm-generic/signal-defs.h>
-struct old_sigaction {
-        __sighandler_t sa_handler;
-        old_sigset_t sa_mask;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-};
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        __sigrestore_t sa_restorer;
-        sigset_t sa_mask;               /* mask last for extensibility */
-};
-struct k_sigaction {
-        struct sigaction sa;
-};
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        int ss_flags;
-        size_t ss_size;
-} stack_t;
-#ifdef __KERNEL__
 struct pt_regs;
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif /* __KERNEL__ */
-#ifndef __powerpc64__
-/*
- * These are parameters to dbg_sigreturn syscall.  They enable or
- * disable certain debugging things that can be done from signal
- * handlers.  The dbg_sigreturn syscall *must* be called from a
- * SA_SIGINFO signal so the ucontext can be passed to it.  It takes an
- * array of struct sig_dbg_op, which has the debug operations to
- * perform before returning from the signal.
- */
-struct sig_dbg_op {
-        int dbg_type;
-        unsigned long dbg_value;
-};
-/* Enable or disable single-stepping.  The value sets the state. */
-#define SIG_DBG_SINGLE_STEPPING         1
-/* Enable or disable branch tracing.  The value sets the state. */
-#define SIG_DBG_BRANCH_TRACING          2
-#endif /* ! __powerpc64__ */
 #endif /* _ASM_POWERPC_SIGNAL_H */
diff --git a/arch/powerpc/include/asm/spu_info.h b/arch/powerpc/include/asm/spu_info.h
index 1286c823f0d..7146b78e40f 100644
--- a/arch/powerpc/include/asm/spu_info.h
+++ b/arch/powerpc/include/asm/spu_info.h
@@ -19,37 +19,10 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #ifndef _SPU_INFO_H
 #define _SPU_INFO_H
-#include <linux/types.h>
-#ifdef __KERNEL__
 #include <asm/spu.h>
-#else
+#include <uapi/asm/spu_info.h>
-struct mfc_cq_sr {
-        __u64 mfc_cq_data0_RW;
-        __u64 mfc_cq_data1_RW;
-        __u64 mfc_cq_data2_RW;
-        __u64 mfc_cq_data3_RW;
-};
-#endif /* __KERNEL__ */
-struct spu_dma_info {
-        __u64 dma_info_type;
-        __u64 dma_info_mask;
-        __u64 dma_info_status;
-        __u64 dma_info_stall_and_notify;
-        __u64 dma_info_atomic_command_status;
-        struct mfc_cq_sr dma_info_command_data[16];
-};
-struct spu_proxydma_info {
-        __u64 proxydma_info_type;
-        __u64 proxydma_info_mask;
-        __u64 proxydma_info_status;
-        struct mfc_cq_sr proxydma_info_command_data[8];
-};
 #endif
diff --git a/arch/powerpc/include/asm/swab.h b/arch/powerpc/include/asm/swab.h
index c581e3ef73e..b9bd1ca944d 100644
--- a/arch/powerpc/include/asm/swab.h
+++ b/arch/powerpc/include/asm/swab.h
@@ -1,24 +1,18 @@
-#ifndef _ASM_POWERPC_SWAB_H
-#define _ASM_POWERPC_SWAB_H
 /*
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
+#ifndef _ASM_POWERPC_SWAB_H
+#define _ASM_POWERPC_SWAB_H
-#include <linux/types.h>
+#include <uapi/asm/swab.h>
-#include <linux/compiler.h>
 #ifdef __GNUC__
 #ifndef __powerpc64__
-#define __SWAB_64_THRU_32__
 #endif /* __powerpc64__ */
-#ifdef __KERNEL__
 static __inline__ __u16 ld_le16(const volatile __u16 *addr)
 {
        __u16 val;
@@ -83,8 +77,5 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 value)
 }
 #define __arch_swab32 __arch_swab32
-#endif /* __KERNEL__ */
 #endif /* __GNUC__ */
 #endif /* _ASM_POWERPC_SWAB_H */
diff --git a/arch/powerpc/include/asm/syscalls.h b/arch/powerpc/include/asm/syscalls.h
index 4084e567d28..329db4ec12c 100644
--- a/arch/powerpc/include/asm/syscalls.h
+++ b/arch/powerpc/include/asm/syscalls.h
@@ -17,9 +17,6 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len,
 asmlinkage unsigned long sys_mmap2(unsigned long addr, size_t len,
                unsigned long prot, unsigned long flags,
                unsigned long fd, unsigned long pgoff);
-asmlinkage int sys_execve(unsigned long a0, unsigned long a1,
-                unsigned long a2, unsigned long a3, unsigned long a4,
-                unsigned long a5, struct pt_regs *regs);
 asmlinkage int sys_clone(unsigned long clone_flags, unsigned long usp,
                int __user *parent_tidp, void __user *child_threadptr,
                int __user *child_tidp, int p6, struct pt_regs *regs);
diff --git a/arch/powerpc/include/asm/termios.h b/arch/powerpc/include/asm/termios.h
index a24f48704a3..b8353e2032d 100644
--- a/arch/powerpc/include/asm/termios.h
+++ b/arch/powerpc/include/asm/termios.h
@@ -1,6 +1,3 @@
-#ifndef _ASM_POWERPC_TERMIOS_H
-#define _ASM_POWERPC_TERMIOS_H
 /*
 * Liberally adapted from alpha/termios.h.  In particular, the c_cc[]
 * fields have been reordered so that termio & termios share the
@@ -12,74 +9,14 @@
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
+#ifndef _ASM_POWERPC_TERMIOS_H
+#define _ASM_POWERPC_TERMIOS_H
-#include <asm/ioctls.h>
+#include <uapi/asm/termios.h>
-#include <asm/termbits.h>
-struct sgttyb {
-        char    sg_ispeed;
-        char    sg_ospeed;
-        char    sg_erase;
-        char    sg_kill;
-        short   sg_flags;
-};
-struct tchars {
-        char    t_intrc;
-        char    t_quitc;
-        char    t_startc;
-        char    t_stopc;
-        char    t_eofc;
-        char    t_brkc;
-};
-struct ltchars {
-        char    t_suspc;
-        char    t_dsuspc;
-        char    t_rprntc;
-        char    t_flushc;
-        char    t_werasc;
-        char    t_lnextc;
-};
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-#define NCC 10
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        unsigned char c_line;           /* line discipline */
-        unsigned char c_cc[NCC];        /* control characters */
-};
-/* c_cc characters */
-#define _VINTR  0
-#define _VQUIT  1
-#define _VERASE 2
-#define _VKILL  3
-#define _VEOF   4
-#define _VMIN   5
-#define _VEOL   6
-#define _VTIME  7
-#define _VEOL2  8
-#define _VSWTC  9
-#ifdef __KERNEL__
 /*                   ^C  ^\ del  ^U  ^D   1   0   0   0   0  ^W  ^R  ^Z  ^Q  ^S  ^V  ^U  */
 #define INIT_C_CC "\003\034\177\025\004\001\000\000\000\000\027\022\032\021\023\026\025" 
-#endif
-#ifdef __KERNEL__
 #include <asm-generic/termios-base.h>
-#endif  /* __KERNEL__ */
 #endif  /* _ASM_POWERPC_TERMIOS_H */
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index 8ceea14d6fe..406b7b9a134 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -182,6 +182,8 @@ static inline bool test_thread_local_flags(unsigned int flags)
 #define is_32bit_task() (1)
 #endif
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif  /* !__ASSEMBLY__ */
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index 0abf7f2c6df..bfb6ded38ff 100644
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@ -1,22 +1,3 @@
-#ifndef _ASM_POWERPC_TYPES_H
-#define _ASM_POWERPC_TYPES_H
-/*
- * This is here because we used to use l64 for 64bit powerpc
- * and we don't want to impact user mode with our change to ll64
- * in the kernel.
- *
- * However, some user programs are fine with this.  They can
- * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here.
- */
-#if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__) && !defined(__KERNEL__)
-# include <asm-generic/int-l64.h>
-#else
-# include <asm-generic/int-ll64.h>
-#endif
-#ifndef __ASSEMBLY__
 /*
 * This file is never included by application software unless
 * explicitly requested (e.g., via linux/types.h) in which case the
@@ -29,14 +10,11 @@
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
+#ifndef _ASM_POWERPC_TYPES_H
+#define _ASM_POWERPC_TYPES_H
-typedef struct {
+#include <uapi/asm/types.h>
-        __u32 u[4];
-} __attribute__((aligned(16))) __vector128;
-#endif /* __ASSEMBLY__ */
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 typedef __vector128 vector128;
@@ -49,6 +27,4 @@ typedef struct {
 #endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_TYPES_H */
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index c683fa350ad..921dce6d844 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -1,6 +1,3 @@
-#ifndef _ASM_POWERPC_UNISTD_H_
-#define _ASM_POWERPC_UNISTD_H_
 /*
 * This file contains the system call numbers.
 *
@@ -9,374 +6,11 @@
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
 */
+#ifndef _ASM_POWERPC_UNISTD_H_
+#define _ASM_POWERPC_UNISTD_H_
-#define __NR_restart_syscall      0
+#include <uapi/asm/unistd.h>
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_waitpid              7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_lchown              16
-#define __NR_break               17
-#define __NR_oldstat             18
-#define __NR_lseek               19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount              22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_oldfstat            28
-#define __NR_pause               29
-#define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
-#define __NR_access              33
-#define __NR_nice                34
-#define __NR_ftime               35
-#define __NR_sync                36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_prof                44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_signal              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_umount2             52
-#define __NR_lock                53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_mpx                 56
-#define __NR_setpgid             57
-#define __NR_ulimit              58
-#define __NR_oldolduname         59
-#define __NR_umask               60
-#define __NR_chroot              61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_sigaction           67
-#define __NR_sgetmask            68
-#define __NR_ssetmask            69
-#define __NR_setreuid            70
-#define __NR_setregid            71
-#define __NR_sigsuspend          72
-#define __NR_sigpending          73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_oldlstat            84
-#define __NR_readlink            85
-#define __NR_uselib              86
-#define __NR_swapon              87
-#define __NR_reboot              88
-#define __NR_readdir             89
-#define __NR_mmap                90
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-#define __NR_profil              98
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-#define __NR_ioperm             101
-#define __NR_socketcall         102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_stat               106
-#define __NR_lstat              107
-#define __NR_fstat              108
-#define __NR_olduname           109
-#define __NR_iopl               110
-#define __NR_vhangup            111
-#define __NR_idle               112
-#define __NR_vm86               113
-#define __NR_wait4              114
-#define __NR_swapoff            115
-#define __NR_sysinfo            116
-#define __NR_ipc                117
-#define __NR_fsync              118
-#define __NR_sigreturn          119
-#define __NR_clone              120
-#define __NR_setdomainname      121
-#define __NR_uname              122
-#define __NR_modify_ldt         123
-#define __NR_adjtimex           124
-#define __NR_mprotect           125
-#define __NR_sigprocmask        126
-#define __NR_create_module      127
-#define __NR_init_module        128
-#define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
-#define __NR_quotactl           131
-#define __NR_getpgid            132
-#define __NR_fchdir             133
-#define __NR_bdflush            134
-#define __NR_sysfs              135
-#define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
-#define __NR_setfsuid           138
-#define __NR_setfsgid           139
-#define __NR__llseek            140
-#define __NR_getdents           141
-#define __NR__newselect         142
-#define __NR_flock              143
-#define __NR_msync              144
-#define __NR_readv              145
-#define __NR_writev             146
-#define __NR_getsid             147
-#define __NR_fdatasync          148
-#define __NR__sysctl            149
-#define __NR_mlock              150
-#define __NR_munlock            151
-#define __NR_mlockall           152
-#define __NR_munlockall         153
-#define __NR_sched_setparam             154
-#define __NR_sched_getparam             155
-#define __NR_sched_setscheduler         156
-#define __NR_sched_getscheduler         157
-#define __NR_sched_yield                158
-#define __NR_sched_get_priority_max     159
-#define __NR_sched_get_priority_min     160
-#define __NR_sched_rr_get_interval      161
-#define __NR_nanosleep          162
-#define __NR_mremap             163
-#define __NR_setresuid          164
-#define __NR_getresuid          165
-#define __NR_query_module       166
-#define __NR_poll               167
-#define __NR_nfsservctl         168
-#define __NR_setresgid          169
-#define __NR_getresgid          170
-#define __NR_prctl              171
-#define __NR_rt_sigreturn       172
-#define __NR_rt_sigaction       173
-#define __NR_rt_sigprocmask     174
-#define __NR_rt_sigpending      175
-#define __NR_rt_sigtimedwait    176
-#define __NR_rt_sigqueueinfo    177
-#define __NR_rt_sigsuspend      178
-#define __NR_pread64            179
-#define __NR_pwrite64           180
-#define __NR_chown              181
-#define __NR_getcwd             182
-#define __NR_capget             183
-#define __NR_capset             184
-#define __NR_sigaltstack        185
-#define __NR_sendfile           186
-#define __NR_getpmsg            187     /* some people actually want streams */
-#define __NR_putpmsg            188     /* some people actually want streams */
-#define __NR_vfork              189
-#define __NR_ugetrlimit         190     /* SuS compliant getrlimit */
-#define __NR_readahead          191
-#ifndef __powerpc64__                   /* these are 32-bit only */
-#define __NR_mmap2              192
-#define __NR_truncate64         193
-#define __NR_ftruncate64        194
-#define __NR_stat64             195
-#define __NR_lstat64            196
-#define __NR_fstat64            197
-#endif
-#define __NR_pciconfig_read     198
-#define __NR_pciconfig_write    199
-#define __NR_pciconfig_iobase   200
-#define __NR_multiplexer        201
-#define __NR_getdents64         202
-#define __NR_pivot_root         203
-#ifndef __powerpc64__
-#define __NR_fcntl64            204
-#endif
-#define __NR_madvise            205
-#define __NR_mincore            206
-#define __NR_gettid             207
-#define __NR_tkill              208
-#define __NR_setxattr           209
-#define __NR_lsetxattr          210
-#define __NR_fsetxattr          211
-#define __NR_getxattr           212
-#define __NR_lgetxattr          213
-#define __NR_fgetxattr          214
-#define __NR_listxattr          215
-#define __NR_llistxattr         216
-#define __NR_flistxattr         217
-#define __NR_removexattr        218
-#define __NR_lremovexattr       219
-#define __NR_fremovexattr       220
-#define __NR_futex              221
-#define __NR_sched_setaffinity  222
-#define __NR_sched_getaffinity  223
-/* 224 currently unused */
-#define __NR_tuxcall            225
-#ifndef __powerpc64__
-#define __NR_sendfile64         226
-#endif
-#define __NR_io_setup           227
-#define __NR_io_destroy         228
-#define __NR_io_getevents       229
-#define __NR_io_submit          230
-#define __NR_io_cancel          231
-#define __NR_set_tid_address    232
-#define __NR_fadvise64          233
-#define __NR_exit_group         234
-#define __NR_lookup_dcookie     235
-#define __NR_epoll_create       236
-#define __NR_epoll_ctl          237
-#define __NR_epoll_wait         238
-#define __NR_remap_file_pages   239
-#define __NR_timer_create       240
-#define __NR_timer_settime      241
-#define __NR_timer_gettime      242
-#define __NR_timer_getoverrun   243
-#define __NR_timer_delete       244
-#define __NR_clock_settime      245
-#define __NR_clock_gettime      246
-#define __NR_clock_getres       247
-#define __NR_clock_nanosleep    248
-#define __NR_swapcontext        249
-#define __NR_tgkill             250
-#define __NR_utimes             251
-#define __NR_statfs64           252
-#define __NR_fstatfs64          253
-#ifndef __powerpc64__
-#define __NR_fadvise64_64       254
-#endif
-#define __NR_rtas               255
-#define __NR_sys_debug_setcontext 256
-/* Number 257 is reserved for vserver */
-#define __NR_migrate_pages      258
-#define __NR_mbind              259
-#define __NR_get_mempolicy      260
-#define __NR_set_mempolicy      261
-#define __NR_mq_open            262
-#define __NR_mq_unlink          263
-#define __NR_mq_timedsend       264
-#define __NR_mq_timedreceive    265
-#define __NR_mq_notify          266
-#define __NR_mq_getsetattr      267
-#define __NR_kexec_load         268
-#define __NR_add_key            269
-#define __NR_request_key        270
-#define __NR_keyctl             271
-#define __NR_waitid             272
-#define __NR_ioprio_set         273
-#define __NR_ioprio_get         274
-#define __NR_inotify_init       275
-#define __NR_inotify_add_watch  276
-#define __NR_inotify_rm_watch   277
-#define __NR_spu_run            278
-#define __NR_spu_create         279
-#define __NR_pselect6           280
-#define __NR_ppoll              281
-#define __NR_unshare            282
-#define __NR_splice             283
-#define __NR_tee                284
-#define __NR_vmsplice           285
-#define __NR_openat             286
-#define __NR_mkdirat            287
-#define __NR_mknodat            288
-#define __NR_fchownat           289
-#define __NR_futimesat          290
-#ifdef __powerpc64__
-#define __NR_newfstatat         291
-#else
-#define __NR_fstatat64          291
-#endif
-#define __NR_unlinkat           292
-#define __NR_renameat           293
-#define __NR_linkat             294
-#define __NR_symlinkat          295
-#define __NR_readlinkat         296
-#define __NR_fchmodat           297
-#define __NR_faccessat          298
-#define __NR_get_robust_list    299
-#define __NR_set_robust_list    300
-#define __NR_move_pages         301
-#define __NR_getcpu             302
-#define __NR_epoll_pwait        303
-#define __NR_utimensat          304
-#define __NR_signalfd           305
-#define __NR_timerfd_create     306
-#define __NR_eventfd            307
-#define __NR_sync_file_range2   308
-#define __NR_fallocate          309
-#define __NR_subpage_prot       310
-#define __NR_timerfd_settime    311
-#define __NR_timerfd_gettime    312
-#define __NR_signalfd4          313
-#define __NR_eventfd2           314
-#define __NR_epoll_create1      315
-#define __NR_dup3               316
-#define __NR_pipe2              317
-#define __NR_inotify_init1      318
-#define __NR_perf_event_open    319
-#define __NR_preadv             320
-#define __NR_pwritev            321
-#define __NR_rt_tgsigqueueinfo  322
-#define __NR_fanotify_init      323
-#define __NR_fanotify_mark      324
-#define __NR_prlimit64          325
-#define __NR_socket             326
-#define __NR_bind               327
-#define __NR_connect            328
-#define __NR_listen             329
-#define __NR_accept             330
-#define __NR_getsockname        331
-#define __NR_getpeername        332
-#define __NR_socketpair         333
-#define __NR_send               334
-#define __NR_sendto             335
-#define __NR_recv               336
-#define __NR_recvfrom           337
-#define __NR_shutdown           338
-#define __NR_setsockopt         339
-#define __NR_getsockopt         340
-#define __NR_sendmsg            341
-#define __NR_recvmsg            342
-#define __NR_recvmmsg           343
-#define __NR_accept4            344
-#define __NR_name_to_handle_at  345
-#define __NR_open_by_handle_at  346
-#define __NR_clock_adjtime      347
-#define __NR_syncfs             348
-#define __NR_sendmmsg           349
-#define __NR_setns              350
-#define __NR_process_vm_readv   351
-#define __NR_process_vm_writev  352
-#ifdef __KERNEL__
 #define __NR_syscalls           353
@@ -421,6 +55,8 @@
 #define __ARCH_WANT_SYS_NEWFSTATAT
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif
+#define __ARCH_WANT_SYS_EXECVE
+#define __ARCH_WANT_KERNEL_EXECVE
 /*
 * "Conditional" syscalls
@@ -429,6 +65,4 @@
        asmlinkage long x (void) __attribute__((weak,alias("sys_ni_syscall")))
 #endif          /* __ASSEMBLY__ */
-#endif          /* __KERNEL__ */
 #endif /* _ASM_POWERPC_UNISTD_H_ */
diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild
index baebb3da1d4..a33c3c03bb2 100644
--- a/arch/powerpc/include/uapi/asm/Kbuild
+++ b/arch/powerpc/include/uapi/asm/Kbuild
@@ -1,3 +1,44 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += bootx.h
+header-y += byteorder.h
+header-y += cputable.h
+header-y += elf.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += kvm.h
+header-y += kvm_para.h
+header-y += linkage.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += nvram.h
+header-y += param.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += ps3fb.h
+header-y += ptrace.h
+header-y += resource.h
+header-y += seccomp.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += shmbuf.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += spu_info.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += ucontext.h
+header-y += unistd.h
diff --git a/arch/powerpc/include/asm/auxvec.h b/arch/powerpc/include/uapi/asm/auxvec.h
index ce17d2c9eb4..ce17d2c9eb4 100644
--- a/arch/powerpc/include/asm/auxvec.h
+++ b/arch/powerpc/include/uapi/asm/auxvec.h
diff --git a/arch/powerpc/include/asm/bitsperlong.h b/arch/powerpc/include/uapi/asm/bitsperlong.h
index 5f1659032c4..5f1659032c4 100644
--- a/arch/powerpc/include/asm/bitsperlong.h
+++ b/arch/powerpc/include/uapi/asm/bitsperlong.h
diff --git a/arch/powerpc/include/uapi/asm/bootx.h b/arch/powerpc/include/uapi/asm/bootx.h
new file mode 100644
index 00000000000..6e51cf0708a
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/bootx.h
@@ -0,0 +1,132 @@
+/*
+ * This file describes the structure passed from the BootX application
+ * (for MacOS) when it is used to boot Linux.
+ *
+ * Written by Benjamin Herrenschmidt.
+ */
+#ifndef _UAPI__ASM_BOOTX_H__
+#define _UAPI__ASM_BOOTX_H__
+#include <linux/types.h>
+#ifdef macintosh
+#include <Types.h>
+#include "linux_type_defs.h"
+#endif
+#ifdef macintosh
+/* All this requires PowerPC alignment */
+#pragma options align=power
+#endif
+/* On kernel entry:
+ *
+ * r3 = 0x426f6f58    ('BooX')
+ * r4 = pointer to boot_infos
+ * r5 = NULL
+ *
+ * Data and instruction translation disabled, interrupts
+ * disabled, kernel loaded at physical 0x00000000 on PCI
+ * machines (will be different on NuBus).
+ */
+#define BOOT_INFO_VERSION               5
+#define BOOT_INFO_COMPATIBLE_VERSION    1
+/* Bit in the architecture flag mask. More to be defined in
+   future versions. Note that either BOOT_ARCH_PCI or
+   BOOT_ARCH_NUBUS is set. The other BOOT_ARCH_NUBUS_xxx are
+   set additionally when BOOT_ARCH_NUBUS is set.
+ */
+#define BOOT_ARCH_PCI                   0x00000001UL
+#define BOOT_ARCH_NUBUS                 0x00000002UL
+#define BOOT_ARCH_NUBUS_PDM             0x00000010UL
+#define BOOT_ARCH_NUBUS_PERFORMA        0x00000020UL
+#define BOOT_ARCH_NUBUS_POWERBOOK       0x00000040UL
+/*  Maximum number of ranges in phys memory map */
+#define MAX_MEM_MAP_SIZE                                26
+/* This is the format of an element in the physical memory map. Note that
+   the map is optional and current BootX will only build it for pre-PCI
+   machines */
+typedef struct boot_info_map_entry
+{
+    __u32       physAddr;                /* Physical starting address */
+    __u32       size;                    /* Size in bytes */
+} boot_info_map_entry_t;
+/* Here are the boot informations that are passed to the bootstrap
+ * Note that the kernel arguments and the device tree are appended
+ * at the end of this structure. */
+typedef struct boot_infos
+{
+    /* Version of this structure */
+    __u32       version;
+    /* backward compatible down to version: */
+    __u32       compatible_version;
+    /* NEW (vers. 2) this holds the current _logical_ base addr of
+       the frame buffer (for use by early boot message) */
+    __u8*       logicalDisplayBase;
+    /* NEW (vers. 4) Apple's machine identification */
+    __u32       machineID;
+    /* NEW (vers. 4) Detected hw architecture */
+    __u32       architecture;
+    /* The device tree (internal addresses relative to the beginning of the tree,
+     * device tree offset relative to the beginning of this structure).
+     * On pre-PCI macintosh (BOOT_ARCH_PCI bit set to 0 in architecture), this
+     * field is 0.
+     */
+    __u32       deviceTreeOffset;        /* Device tree offset */
+    __u32       deviceTreeSize;          /* Size of the device tree */
+    /* Some infos about the current MacOS display */
+    __u32       dispDeviceRect[4];       /* left,top,right,bottom */
+    __u32       dispDeviceDepth;         /* (8, 16 or 32) */
+    __u8*       dispDeviceBase;          /* base address (physical) */
+    __u32       dispDeviceRowBytes;      /* rowbytes (in bytes) */
+    __u32       dispDeviceColorsOffset;  /* Colormap (8 bits only) or 0 (*) */
+    /* Optional offset in the registry to the current
+     * MacOS display. (Can be 0 when not detected) */
+     __u32      dispDeviceRegEntryOffset;
+    /* Optional pointer to boot ramdisk (offset from this structure) */
+    __u32       ramDisk;
+    __u32       ramDiskSize;             /* size of ramdisk image */
+    /* Kernel command line arguments (offset from this structure) */
+    __u32       kernelParamsOffset;
+    /* ALL BELOW NEW (vers. 4) */
+    /* This defines the physical memory. Valid with BOOT_ARCH_NUBUS flag
+       (non-PCI) only. On PCI, memory is contiguous and it's size is in the
+       device-tree. */
+    boot_info_map_entry_t
+                physMemoryMap[MAX_MEM_MAP_SIZE]; /* Where the phys memory is */
+    __u32       physMemoryMapSize;               /* How many entries in map */
+    /* The framebuffer size (optional, currently 0) */
+    __u32       frameBufferSize;         /* Represents a max size, can be 0. */
+    /* NEW (vers. 5) */
+    /* Total params size (args + colormap + device tree + ramdisk) */
+    __u32       totalParamsSize;
+} boot_infos_t;
+#ifdef macintosh
+#pragma options align=reset
+#endif
+#endif /* _UAPI__ASM_BOOTX_H__ */
diff --git a/arch/powerpc/include/asm/byteorder.h b/arch/powerpc/include/uapi/asm/byteorder.h
index aa6cc4fac96..aa6cc4fac96 100644
--- a/arch/powerpc/include/asm/byteorder.h
+++ b/arch/powerpc/include/uapi/asm/byteorder.h
diff --git a/arch/powerpc/include/uapi/asm/cputable.h b/arch/powerpc/include/uapi/asm/cputable.h
new file mode 100644
index 00000000000..ed9dd815696
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/cputable.h
@@ -0,0 +1,36 @@
+#ifndef _UAPI__ASM_POWERPC_CPUTABLE_H
+#define _UAPI__ASM_POWERPC_CPUTABLE_H
+#define PPC_FEATURE_32                  0x80000000
+#define PPC_FEATURE_64                  0x40000000
+#define PPC_FEATURE_601_INSTR           0x20000000
+#define PPC_FEATURE_HAS_ALTIVEC         0x10000000
+#define PPC_FEATURE_HAS_FPU             0x08000000
+#define PPC_FEATURE_HAS_MMU             0x04000000
+#define PPC_FEATURE_HAS_4xxMAC          0x02000000
+#define PPC_FEATURE_UNIFIED_CACHE       0x01000000
+#define PPC_FEATURE_HAS_SPE             0x00800000
+#define PPC_FEATURE_HAS_EFP_SINGLE      0x00400000
+#define PPC_FEATURE_HAS_EFP_DOUBLE      0x00200000
+#define PPC_FEATURE_NO_TB               0x00100000
+#define PPC_FEATURE_POWER4              0x00080000
+#define PPC_FEATURE_POWER5              0x00040000
+#define PPC_FEATURE_POWER5_PLUS         0x00020000
+#define PPC_FEATURE_CELL                0x00010000
+#define PPC_FEATURE_BOOKE               0x00008000
+#define PPC_FEATURE_SMT                 0x00004000
+#define PPC_FEATURE_ICACHE_SNOOP        0x00002000
+#define PPC_FEATURE_ARCH_2_05           0x00001000
+#define PPC_FEATURE_PA6T                0x00000800
+#define PPC_FEATURE_HAS_DFP             0x00000400
+#define PPC_FEATURE_POWER6_EXT          0x00000200
+#define PPC_FEATURE_ARCH_2_06           0x00000100
+#define PPC_FEATURE_HAS_VSX             0x00000080
+#define PPC_FEATURE_PSERIES_PERFMON_COMPAT \
+                                        0x00000040
+#define PPC_FEATURE_TRUE_LE             0x00000002
+#define PPC_FEATURE_PPC_LE              0x00000001
+#endif /* _UAPI__ASM_POWERPC_CPUTABLE_H */
diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
new file mode 100644
index 00000000000..05b8d560cfb
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/elf.h
@@ -0,0 +1,307 @@
+/*
+ * ELF register definitions..
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_POWERPC_ELF_H
+#define _UAPI_ASM_POWERPC_ELF_H
+#include <linux/types.h>
+#include <asm/ptrace.h>
+#include <asm/cputable.h>
+#include <asm/auxvec.h>
+/* PowerPC relocations defined by the ABIs */
+#define R_PPC_NONE              0
+#define R_PPC_ADDR32            1       /* 32bit absolute address */
+#define R_PPC_ADDR24            2       /* 26bit address, 2 bits ignored.  */
+#define R_PPC_ADDR16            3       /* 16bit absolute address */
+#define R_PPC_ADDR16_LO         4       /* lower 16bit of absolute address */
+#define R_PPC_ADDR16_HI         5       /* high 16bit of absolute address */
+#define R_PPC_ADDR16_HA         6       /* adjusted high 16bit */
+#define R_PPC_ADDR14            7       /* 16bit address, 2 bits ignored */
+#define R_PPC_ADDR14_BRTAKEN    8
+#define R_PPC_ADDR14_BRNTAKEN   9
+#define R_PPC_REL24             10      /* PC relative 26 bit */
+#define R_PPC_REL14             11      /* PC relative 16 bit */
+#define R_PPC_REL14_BRTAKEN     12
+#define R_PPC_REL14_BRNTAKEN    13
+#define R_PPC_GOT16             14
+#define R_PPC_GOT16_LO          15
+#define R_PPC_GOT16_HI          16
+#define R_PPC_GOT16_HA          17
+#define R_PPC_PLTREL24          18
+#define R_PPC_COPY              19
+#define R_PPC_GLOB_DAT          20
+#define R_PPC_JMP_SLOT          21
+#define R_PPC_RELATIVE          22
+#define R_PPC_LOCAL24PC         23
+#define R_PPC_UADDR32           24
+#define R_PPC_UADDR16           25
+#define R_PPC_REL32             26
+#define R_PPC_PLT32             27
+#define R_PPC_PLTREL32          28
+#define R_PPC_PLT16_LO          29
+#define R_PPC_PLT16_HI          30
+#define R_PPC_PLT16_HA          31
+#define R_PPC_SDAREL16          32
+#define R_PPC_SECTOFF           33
+#define R_PPC_SECTOFF_LO        34
+#define R_PPC_SECTOFF_HI        35
+#define R_PPC_SECTOFF_HA        36
+/* PowerPC relocations defined for the TLS access ABI.  */
+#define R_PPC_TLS               67 /* none      (sym+add)@tls */
+#define R_PPC_DTPMOD32          68 /* word32    (sym+add)@dtpmod */
+#define R_PPC_TPREL16           69 /* half16*   (sym+add)@tprel */
+#define R_PPC_TPREL16_LO        70 /* half16    (sym+add)@tprel@l */
+#define R_PPC_TPREL16_HI        71 /* half16    (sym+add)@tprel@h */
+#define R_PPC_TPREL16_HA        72 /* half16    (sym+add)@tprel@ha */
+#define R_PPC_TPREL32           73 /* word32    (sym+add)@tprel */
+#define R_PPC_DTPREL16          74 /* half16*   (sym+add)@dtprel */
+#define R_PPC_DTPREL16_LO       75 /* half16    (sym+add)@dtprel@l */
+#define R_PPC_DTPREL16_HI       76 /* half16    (sym+add)@dtprel@h */
+#define R_PPC_DTPREL16_HA       77 /* half16    (sym+add)@dtprel@ha */
+#define R_PPC_DTPREL32          78 /* word32    (sym+add)@dtprel */
+#define R_PPC_GOT_TLSGD16       79 /* half16*   (sym+add)@got@tlsgd */
+#define R_PPC_GOT_TLSGD16_LO    80 /* half16    (sym+add)@got@tlsgd@l */
+#define R_PPC_GOT_TLSGD16_HI    81 /* half16    (sym+add)@got@tlsgd@h */
+#define R_PPC_GOT_TLSGD16_HA    82 /* half16    (sym+add)@got@tlsgd@ha */
+#define R_PPC_GOT_TLSLD16       83 /* half16*   (sym+add)@got@tlsld */
+#define R_PPC_GOT_TLSLD16_LO    84 /* half16    (sym+add)@got@tlsld@l */
+#define R_PPC_GOT_TLSLD16_HI    85 /* half16    (sym+add)@got@tlsld@h */
+#define R_PPC_GOT_TLSLD16_HA    86 /* half16    (sym+add)@got@tlsld@ha */
+#define R_PPC_GOT_TPREL16       87 /* half16*   (sym+add)@got@tprel */
+#define R_PPC_GOT_TPREL16_LO    88 /* half16    (sym+add)@got@tprel@l */
+#define R_PPC_GOT_TPREL16_HI    89 /* half16    (sym+add)@got@tprel@h */
+#define R_PPC_GOT_TPREL16_HA    90 /* half16    (sym+add)@got@tprel@ha */
+#define R_PPC_GOT_DTPREL16      91 /* half16*   (sym+add)@got@dtprel */
+#define R_PPC_GOT_DTPREL16_LO   92 /* half16*   (sym+add)@got@dtprel@l */
+#define R_PPC_GOT_DTPREL16_HI   93 /* half16*   (sym+add)@got@dtprel@h */
+#define R_PPC_GOT_DTPREL16_HA   94 /* half16*   (sym+add)@got@dtprel@ha */
+/* keep this the last entry. */
+#define R_PPC_NUM               95
+#define ELF_NGREG       48      /* includes nip, msr, lr, etc. */
+#define ELF_NFPREG      33      /* includes fpscr */
+typedef unsigned long elf_greg_t64;
+typedef elf_greg_t64 elf_gregset_t64[ELF_NGREG];
+typedef unsigned int elf_greg_t32;
+typedef elf_greg_t32 elf_gregset_t32[ELF_NGREG];
+typedef elf_gregset_t32 compat_elf_gregset_t;
+/*
+ * ELF_ARCH, CLASS, and DATA are used to set parameters in the core dumps.
+ */
+#ifdef __powerpc64__
+# define ELF_NVRREG32   33      /* includes vscr & vrsave stuffed together */
+# define ELF_NVRREG     34      /* includes vscr & vrsave in split vectors */
+# define ELF_NVSRHALFREG 32     /* Half the vsx registers */
+# define ELF_GREG_TYPE  elf_greg_t64
+#else
+# define ELF_NEVRREG    34      /* includes acc (as 2) */
+# define ELF_NVRREG     33      /* includes vscr */
+# define ELF_GREG_TYPE  elf_greg_t32
+# define ELF_ARCH       EM_PPC
+# define ELF_CLASS      ELFCLASS32
+# define ELF_DATA       ELFDATA2MSB
+#endif /* __powerpc64__ */
+#ifndef ELF_ARCH
+# define ELF_ARCH       EM_PPC64
+# define ELF_CLASS      ELFCLASS64
+# define ELF_DATA       ELFDATA2MSB
+  typedef elf_greg_t64 elf_greg_t;
+  typedef elf_gregset_t64 elf_gregset_t;
+#else
+  /* Assumption: ELF_ARCH == EM_PPC and ELF_CLASS == ELFCLASS32 */
+  typedef elf_greg_t32 elf_greg_t;
+  typedef elf_gregset_t32 elf_gregset_t;
+#endif /* ELF_ARCH */
+/* Floating point registers */
+typedef double elf_fpreg_t;
+typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
+/* Altivec registers */
+/*
+ * The entries with indexes 0-31 contain the corresponding vector registers. 
+ * The entry with index 32 contains the vscr as the last word (offset 12) 
+ * within the quadword.  This allows the vscr to be stored as either a 
+ * quadword (since it must be copied via a vector register to/from storage) 
+ * or as a word.  
+ *
+ * 64-bit kernel notes: The entry at index 33 contains the vrsave as the first  
+ * word (offset 0) within the quadword.
+ *
+ * This definition of the VMX state is compatible with the current PPC32 
+ * ptrace interface.  This allows signal handling and ptrace to use the same 
+ * structures.  This also simplifies the implementation of a bi-arch 
+ * (combined (32- and 64-bit) gdb.
+ *
+ * Note that it's _not_ compatible with 32 bits ucontext which stuffs the
+ * vrsave along with vscr and so only uses 33 vectors for the register set
+ */
+typedef __vector128 elf_vrreg_t;
+typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG];
+#ifdef __powerpc64__
+typedef elf_vrreg_t elf_vrregset_t32[ELF_NVRREG32];
+typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
+#endif
+/*
+ * The requirements here are:
+ * - keep the final alignment of sp (sp & 0xf)
+ * - make sure the 32-bit value at the first 16 byte aligned position of
+ *   AUXV is greater than 16 for glibc compatibility.
+ *   AT_IGNOREPPC is used for that.
+ * - for compatibility with glibc ARCH_DLINFO must always be defined on PPC,
+ *   even if DLINFO_ARCH_ITEMS goes to zero or is undefined.
+ * update AT_VECTOR_SIZE_ARCH if the number of NEW_AUX_ENT entries changes
+ */
+#define ARCH_DLINFO                                                     \
+do {                                                                    \
+        /* Handle glibc compatibility. */                               \
+        NEW_AUX_ENT(AT_IGNOREPPC, AT_IGNOREPPC);                        \
+        NEW_AUX_ENT(AT_IGNOREPPC, AT_IGNOREPPC);                        \
+        /* Cache size items */                                          \
+        NEW_AUX_ENT(AT_DCACHEBSIZE, dcache_bsize);                      \
+        NEW_AUX_ENT(AT_ICACHEBSIZE, icache_bsize);                      \
+        NEW_AUX_ENT(AT_UCACHEBSIZE, ucache_bsize);                      \
+        VDSO_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso_base);  \
+} while (0)
+/* PowerPC64 relocations defined by the ABIs */
+#define R_PPC64_NONE    R_PPC_NONE
+#define R_PPC64_ADDR32  R_PPC_ADDR32  /* 32bit absolute address.  */
+#define R_PPC64_ADDR24  R_PPC_ADDR24  /* 26bit address, word aligned.  */
+#define R_PPC64_ADDR16  R_PPC_ADDR16  /* 16bit absolute address. */
+#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of abs. address.  */
+#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of abs. address. */
+#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits.  */
+#define R_PPC64_ADDR14 R_PPC_ADDR14   /* 16bit address, word aligned.  */
+#define R_PPC64_ADDR14_BRTAKEN  R_PPC_ADDR14_BRTAKEN
+#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
+#define R_PPC64_REL24   R_PPC_REL24 /* PC relative 26 bit, word aligned.  */
+#define R_PPC64_REL14   R_PPC_REL14 /* PC relative 16 bit. */
+#define R_PPC64_REL14_BRTAKEN   R_PPC_REL14_BRTAKEN
+#define R_PPC64_REL14_BRNTAKEN  R_PPC_REL14_BRNTAKEN
+#define R_PPC64_GOT16     R_PPC_GOT16
+#define R_PPC64_GOT16_LO  R_PPC_GOT16_LO
+#define R_PPC64_GOT16_HI  R_PPC_GOT16_HI
+#define R_PPC64_GOT16_HA  R_PPC_GOT16_HA
+#define R_PPC64_COPY      R_PPC_COPY
+#define R_PPC64_GLOB_DAT  R_PPC_GLOB_DAT
+#define R_PPC64_JMP_SLOT  R_PPC_JMP_SLOT
+#define R_PPC64_RELATIVE  R_PPC_RELATIVE
+#define R_PPC64_UADDR32   R_PPC_UADDR32
+#define R_PPC64_UADDR16   R_PPC_UADDR16
+#define R_PPC64_REL32     R_PPC_REL32
+#define R_PPC64_PLT32     R_PPC_PLT32
+#define R_PPC64_PLTREL32  R_PPC_PLTREL32
+#define R_PPC64_PLT16_LO  R_PPC_PLT16_LO
+#define R_PPC64_PLT16_HI  R_PPC_PLT16_HI
+#define R_PPC64_PLT16_HA  R_PPC_PLT16_HA
+#define R_PPC64_SECTOFF     R_PPC_SECTOFF
+#define R_PPC64_SECTOFF_LO  R_PPC_SECTOFF_LO
+#define R_PPC64_SECTOFF_HI  R_PPC_SECTOFF_HI
+#define R_PPC64_SECTOFF_HA  R_PPC_SECTOFF_HA
+#define R_PPC64_ADDR30          37  /* word30 (S + A - P) >> 2.  */
+#define R_PPC64_ADDR64          38  /* doubleword64 S + A.  */
+#define R_PPC64_ADDR16_HIGHER   39  /* half16 #higher(S + A).  */
+#define R_PPC64_ADDR16_HIGHERA  40  /* half16 #highera(S + A).  */
+#define R_PPC64_ADDR16_HIGHEST  41  /* half16 #highest(S + A).  */
+#define R_PPC64_ADDR16_HIGHESTA 42  /* half16 #highesta(S + A). */
+#define R_PPC64_UADDR64     43  /* doubleword64 S + A.  */
+#define R_PPC64_REL64       44  /* doubleword64 S + A - P.  */
+#define R_PPC64_PLT64       45  /* doubleword64 L + A.  */
+#define R_PPC64_PLTREL64    46  /* doubleword64 L + A - P.  */
+#define R_PPC64_TOC16       47  /* half16* S + A - .TOC.  */
+#define R_PPC64_TOC16_LO    48  /* half16 #lo(S + A - .TOC.).  */
+#define R_PPC64_TOC16_HI    49  /* half16 #hi(S + A - .TOC.).  */
+#define R_PPC64_TOC16_HA    50  /* half16 #ha(S + A - .TOC.).  */
+#define R_PPC64_TOC         51  /* doubleword64 .TOC. */
+#define R_PPC64_PLTGOT16    52  /* half16* M + A.  */
+#define R_PPC64_PLTGOT16_LO 53  /* half16 #lo(M + A).  */
+#define R_PPC64_PLTGOT16_HI 54  /* half16 #hi(M + A).  */
+#define R_PPC64_PLTGOT16_HA 55  /* half16 #ha(M + A).  */
+#define R_PPC64_ADDR16_DS      56 /* half16ds* (S + A) >> 2.  */
+#define R_PPC64_ADDR16_LO_DS   57 /* half16ds  #lo(S + A) >> 2.  */
+#define R_PPC64_GOT16_DS       58 /* half16ds* (G + A) >> 2.  */
+#define R_PPC64_GOT16_LO_DS    59 /* half16ds  #lo(G + A) >> 2.  */
+#define R_PPC64_PLT16_LO_DS    60 /* half16ds  #lo(L + A) >> 2.  */
+#define R_PPC64_SECTOFF_DS     61 /* half16ds* (R + A) >> 2.  */
+#define R_PPC64_SECTOFF_LO_DS  62 /* half16ds  #lo(R + A) >> 2.  */
+#define R_PPC64_TOC16_DS       63 /* half16ds* (S + A - .TOC.) >> 2.  */
+#define R_PPC64_TOC16_LO_DS    64 /* half16ds  #lo(S + A - .TOC.) >> 2.  */
+#define R_PPC64_PLTGOT16_DS    65 /* half16ds* (M + A) >> 2.  */
+#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds  #lo(M + A) >> 2.  */
+/* PowerPC64 relocations defined for the TLS access ABI.  */
+#define R_PPC64_TLS             67 /* none      (sym+add)@tls */
+#define R_PPC64_DTPMOD64        68 /* doubleword64 (sym+add)@dtpmod */
+#define R_PPC64_TPREL16         69 /* half16*   (sym+add)@tprel */
+#define R_PPC64_TPREL16_LO      70 /* half16    (sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HI      71 /* half16    (sym+add)@tprel@h */
+#define R_PPC64_TPREL16_HA      72 /* half16    (sym+add)@tprel@ha */
+#define R_PPC64_TPREL64         73 /* doubleword64 (sym+add)@tprel */
+#define R_PPC64_DTPREL16        74 /* half16*   (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO     75 /* half16    (sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HI     76 /* half16    (sym+add)@dtprel@h */
+#define R_PPC64_DTPREL16_HA     77 /* half16    (sym+add)@dtprel@ha */
+#define R_PPC64_DTPREL64        78 /* doubleword64 (sym+add)@dtprel */
+#define R_PPC64_GOT_TLSGD16     79 /* half16*   (sym+add)@got@tlsgd */
+#define R_PPC64_GOT_TLSGD16_LO  80 /* half16    (sym+add)@got@tlsgd@l */
+#define R_PPC64_GOT_TLSGD16_HI  81 /* half16    (sym+add)@got@tlsgd@h */
+#define R_PPC64_GOT_TLSGD16_HA  82 /* half16    (sym+add)@got@tlsgd@ha */
+#define R_PPC64_GOT_TLSLD16     83 /* half16*   (sym+add)@got@tlsld */
+#define R_PPC64_GOT_TLSLD16_LO  84 /* half16    (sym+add)@got@tlsld@l */
+#define R_PPC64_GOT_TLSLD16_HI  85 /* half16    (sym+add)@got@tlsld@h */
+#define R_PPC64_GOT_TLSLD16_HA  86 /* half16    (sym+add)@got@tlsld@ha */
+#define R_PPC64_GOT_TPREL16_DS  87 /* half16ds* (sym+add)@got@tprel */
+#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
+#define R_PPC64_GOT_TPREL16_HI  89 /* half16    (sym+add)@got@tprel@h */
+#define R_PPC64_GOT_TPREL16_HA  90 /* half16    (sym+add)@got@tprel@ha */
+#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
+#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
+#define R_PPC64_GOT_DTPREL16_HI 93 /* half16    (sym+add)@got@dtprel@h */
+#define R_PPC64_GOT_DTPREL16_HA 94 /* half16    (sym+add)@got@dtprel@ha */
+#define R_PPC64_TPREL16_DS      95 /* half16ds* (sym+add)@tprel */
+#define R_PPC64_TPREL16_LO_DS   96 /* half16ds  (sym+add)@tprel@l */
+#define R_PPC64_TPREL16_HIGHER  97 /* half16    (sym+add)@tprel@higher */
+#define R_PPC64_TPREL16_HIGHERA 98 /* half16    (sym+add)@tprel@highera */
+#define R_PPC64_TPREL16_HIGHEST 99 /* half16    (sym+add)@tprel@highest */
+#define R_PPC64_TPREL16_HIGHESTA 100 /* half16  (sym+add)@tprel@highesta */
+#define R_PPC64_DTPREL16_DS     101 /* half16ds* (sym+add)@dtprel */
+#define R_PPC64_DTPREL16_LO_DS  102 /* half16ds (sym+add)@dtprel@l */
+#define R_PPC64_DTPREL16_HIGHER 103 /* half16   (sym+add)@dtprel@higher */
+#define R_PPC64_DTPREL16_HIGHERA 104 /* half16  (sym+add)@dtprel@highera */
+#define R_PPC64_DTPREL16_HIGHEST 105 /* half16  (sym+add)@dtprel@highest */
+#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
+/* Keep this the last entry.  */
+#define R_PPC64_NUM             107
+/* There's actually a third entry here, but it's unused */
+struct ppc64_opd_entry
+{
+        unsigned long funcaddr;
+        unsigned long r2;
+};
+#endif /* _UAPI_ASM_POWERPC_ELF_H */
diff --git a/arch/powerpc/include/asm/errno.h b/arch/powerpc/include/uapi/asm/errno.h
index 8c145fd17d8..8c145fd17d8 100644
--- a/arch/powerpc/include/asm/errno.h
+++ b/arch/powerpc/include/uapi/asm/errno.h
diff --git a/arch/powerpc/include/asm/fcntl.h b/arch/powerpc/include/uapi/asm/fcntl.h
index ce5c4516d40..ce5c4516d40 100644
--- a/arch/powerpc/include/asm/fcntl.h
+++ b/arch/powerpc/include/uapi/asm/fcntl.h
diff --git a/arch/powerpc/include/asm/ioctl.h b/arch/powerpc/include/uapi/asm/ioctl.h
index 57d68304218..57d68304218 100644
--- a/arch/powerpc/include/asm/ioctl.h
+++ b/arch/powerpc/include/uapi/asm/ioctl.h
diff --git a/arch/powerpc/include/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h
index e9b78870aaa..e9b78870aaa 100644
--- a/arch/powerpc/include/asm/ioctls.h
+++ b/arch/powerpc/include/uapi/asm/ioctls.h
diff --git a/arch/powerpc/include/asm/ipcbuf.h b/arch/powerpc/include/uapi/asm/ipcbuf.h
index 2c3e1d94db1..2c3e1d94db1 100644
--- a/arch/powerpc/include/asm/ipcbuf.h
+++ b/arch/powerpc/include/uapi/asm/ipcbuf.h
diff --git a/arch/powerpc/include/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h
index 1bea4d8ea6f..1bea4d8ea6f 100644
--- a/arch/powerpc/include/asm/kvm.h
+++ b/arch/powerpc/include/uapi/asm/kvm.h
diff --git a/arch/powerpc/include/uapi/asm/kvm_para.h b/arch/powerpc/include/uapi/asm/kvm_para.h
new file mode 100644
index 00000000000..5e04383a1db
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/kvm_para.h
@@ -0,0 +1,90 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright IBM Corp. 2008
+ *
+ * Authors: Hollis Blanchard <hollisb@us.ibm.com>
+ */
+#ifndef _UAPI__POWERPC_KVM_PARA_H__
+#define _UAPI__POWERPC_KVM_PARA_H__
+#include <linux/types.h>
+/*
+ * Additions to this struct must only occur at the end, and should be
+ * accompanied by a KVM_MAGIC_FEAT flag to advertise that they are present
+ * (albeit not necessarily relevant to the current target hardware platform).
+ *
+ * Struct fields are always 32 or 64 bit aligned, depending on them being 32
+ * or 64 bit wide respectively.
+ *
+ * See Documentation/virtual/kvm/ppc-pv.txt
+ */
+struct kvm_vcpu_arch_shared {
+        __u64 scratch1;
+        __u64 scratch2;
+        __u64 scratch3;
+        __u64 critical;         /* Guest may not get interrupts if == r1 */
+        __u64 sprg0;
+        __u64 sprg1;
+        __u64 sprg2;
+        __u64 sprg3;
+        __u64 srr0;
+        __u64 srr1;
+        __u64 dar;              /* dear on BookE */
+        __u64 msr;
+        __u32 dsisr;
+        __u32 int_pending;      /* Tells the guest if we have an interrupt */
+        __u32 sr[16];
+        __u32 mas0;
+        __u32 mas1;
+        __u64 mas7_3;
+        __u64 mas2;
+        __u32 mas4;
+        __u32 mas6;
+        __u32 esr;
+        __u32 pir;
+        /*
+         * SPRG4-7 are user-readable, so we can only keep these consistent
+         * between the shared area and the real registers when there's an
+         * intervening exit to KVM.  This also applies to SPRG3 on some
+         * chips.
+         *
+         * This suffices for access by guest userspace, since in PR-mode
+         * KVM, an exit must occur when changing the guest's MSR[PR].
+         * If the guest kernel writes to SPRG3-7 via the shared area, it
+         * must also use the shared area for reading while in kernel space.
+         */
+        __u64 sprg4;
+        __u64 sprg5;
+        __u64 sprg6;
+        __u64 sprg7;
+};
+#define KVM_SC_MAGIC_R0         0x4b564d21 /* "KVM!" */
+#define HC_VENDOR_KVM           (42 << 16)
+#define HC_EV_SUCCESS           0
+#define HC_EV_UNIMPLEMENTED     12
+#define KVM_FEATURE_MAGIC_PAGE  1
+#define KVM_MAGIC_FEAT_SR               (1 << 0)
+/* MASn, ESR, PIR, and high SPRGs */
+#define KVM_MAGIC_FEAT_MAS0_TO_SPRG7    (1 << 1)
+#endif /* _UAPI__POWERPC_KVM_PARA_H__ */
diff --git a/arch/powerpc/include/asm/linkage.h b/arch/powerpc/include/uapi/asm/linkage.h
index e1c4ac1cc4b..e1c4ac1cc4b 100644
--- a/arch/powerpc/include/asm/linkage.h
+++ b/arch/powerpc/include/uapi/asm/linkage.h
diff --git a/arch/powerpc/include/uapi/asm/mman.h b/arch/powerpc/include/uapi/asm/mman.h
new file mode 100644
index 00000000000..6ea26df0a73
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/mman.h
@@ -0,0 +1,31 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_POWERPC_MMAN_H
+#define _UAPI_ASM_POWERPC_MMAN_H
+#include <asm-generic/mman-common.h>
+#define PROT_SAO        0x10            /* Strong Access Ordering */
+#define MAP_RENAME      MAP_ANONYMOUS   /* In SunOS terminology */
+#define MAP_NORESERVE   0x40            /* don't reserve swap pages */
+#define MAP_LOCKED      0x80
+#define MAP_GROWSDOWN   0x0100          /* stack-like segment */
+#define MAP_DENYWRITE   0x0800          /* ETXTBSY */
+#define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
+#define MCL_CURRENT     0x2000          /* lock all currently mapped pages */
+#define MCL_FUTURE      0x4000          /* lock all additions to address space */
+#define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
+#define MAP_NONBLOCK    0x10000         /* do not block on IO */
+#define MAP_STACK       0x20000         /* give out an address that is best suited for process/thread stacks */
+#define MAP_HUGETLB     0x40000         /* create a huge page mapping */
+#endif /* _UAPI_ASM_POWERPC_MMAN_H */
diff --git a/arch/powerpc/include/asm/msgbuf.h b/arch/powerpc/include/uapi/asm/msgbuf.h
index dd76743c753..dd76743c753 100644
--- a/arch/powerpc/include/asm/msgbuf.h
+++ b/arch/powerpc/include/uapi/asm/msgbuf.h
diff --git a/arch/powerpc/include/uapi/asm/nvram.h b/arch/powerpc/include/uapi/asm/nvram.h
new file mode 100644
index 00000000000..608bdc8aedd
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/nvram.h
@@ -0,0 +1,62 @@
+/*
+ * NVRAM definitions and access functions.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_POWERPC_NVRAM_H
+#define _UAPI_ASM_POWERPC_NVRAM_H
+/* Signatures for nvram partitions */
+#define NVRAM_SIG_SP    0x02    /* support processor */
+#define NVRAM_SIG_OF    0x50    /* open firmware config */
+#define NVRAM_SIG_FW    0x51    /* general firmware */
+#define NVRAM_SIG_HW    0x52    /* hardware (VPD) */
+#define NVRAM_SIG_FLIP  0x5a    /* Apple flip/flop header */
+#define NVRAM_SIG_APPL  0x5f    /* Apple "system" (???) */
+#define NVRAM_SIG_SYS   0x70    /* system env vars */
+#define NVRAM_SIG_CFG   0x71    /* config data */
+#define NVRAM_SIG_ELOG  0x72    /* error log */
+#define NVRAM_SIG_VEND  0x7e    /* vendor defined */
+#define NVRAM_SIG_FREE  0x7f    /* Free space */
+#define NVRAM_SIG_OS    0xa0    /* OS defined */
+#define NVRAM_SIG_PANIC 0xa1    /* Apple OSX "panic" */
+/* PowerMac specific nvram stuffs */
+enum {
+        pmac_nvram_OF,          /* Open Firmware partition */
+        pmac_nvram_XPRAM,       /* MacOS XPRAM partition */
+        pmac_nvram_NR           /* MacOS Name Registry partition */
+};
+/* Some offsets in XPRAM */
+#define PMAC_XPRAM_MACHINE_LOC  0xe4
+#define PMAC_XPRAM_SOUND_VOLUME 0x08
+/* Machine location structure in PowerMac XPRAM */
+struct pmac_machine_location {
+        unsigned int    latitude;       /* 2+30 bit Fractional number */
+        unsigned int    longitude;      /* 2+30 bit Fractional number */
+        unsigned int    delta;          /* mix of GMT delta and DLS */
+};
+/*
+ * /dev/nvram ioctls
+ *
+ * Note that PMAC_NVRAM_GET_OFFSET is still supported, but is
+ * definitely obsolete. Do not use it if you can avoid it
+ */
+#define OBSOLETE_PMAC_NVRAM_GET_OFFSET \
+                                _IOWR('p', 0x40, int)
+#define IOC_NVRAM_GET_OFFSET    _IOWR('p', 0x42, int)   /* Get NVRAM partition offset */
+#define IOC_NVRAM_SYNC          _IO('p', 0x43)          /* Sync NVRAM image */
+#endif /* _UAPI_ASM_POWERPC_NVRAM_H */
diff --git a/arch/powerpc/include/asm/param.h b/arch/powerpc/include/uapi/asm/param.h
index 965d4542797..965d4542797 100644
--- a/arch/powerpc/include/asm/param.h
+++ b/arch/powerpc/include/uapi/asm/param.h
diff --git a/arch/powerpc/include/asm/poll.h b/arch/powerpc/include/uapi/asm/poll.h
index c98509d3149..c98509d3149 100644
--- a/arch/powerpc/include/asm/poll.h
+++ b/arch/powerpc/include/uapi/asm/poll.h
diff --git a/arch/powerpc/include/asm/posix_types.h b/arch/powerpc/include/uapi/asm/posix_types.h
index 2958c5b97b2..2958c5b97b2 100644
--- a/arch/powerpc/include/asm/posix_types.h
+++ b/arch/powerpc/include/uapi/asm/posix_types.h
diff --git a/arch/powerpc/include/asm/ps3fb.h b/arch/powerpc/include/uapi/asm/ps3fb.h
index e7233a84968..e7233a84968 100644
--- a/arch/powerpc/include/asm/ps3fb.h
+++ b/arch/powerpc/include/uapi/asm/ps3fb.h
diff --git a/arch/powerpc/include/uapi/asm/ptrace.h b/arch/powerpc/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..ee67a2bc91b
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/ptrace.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2001 PPC64 Team, IBM Corp
+ *
+ * This struct defines the way the registers are stored on the
+ * kernel stack during a system call or other kernel entry.
+ *
+ * this should only contain volatile regs
+ * since we can keep non-volatile in the thread_struct
+ * should set this up when only volatiles are saved
+ * by intr code.
+ *
+ * Since this is going on the stack, *CARE MUST BE TAKEN* to insure
+ * that the overall structure is a multiple of 16 bytes in length.
+ *
+ * Note that the offsets of the fields in this struct correspond with
+ * the PT_* values below.  This simplifies arch/powerpc/kernel/ptrace.c.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_POWERPC_PTRACE_H
+#define _UAPI_ASM_POWERPC_PTRACE_H
+#include <linux/types.h>
+#ifndef __ASSEMBLY__
+struct pt_regs {
+        unsigned long gpr[32];
+        unsigned long nip;
+        unsigned long msr;
+        unsigned long orig_gpr3;        /* Used for restarting system calls */
+        unsigned long ctr;
+        unsigned long link;
+        unsigned long xer;
+        unsigned long ccr;
+#ifdef __powerpc64__
+        unsigned long softe;            /* Soft enabled/disabled */
+#else
+        unsigned long mq;               /* 601 only (not used at present) */
+                                        /* Used on APUS to hold IPL value. */
+#endif
+        unsigned long trap;             /* Reason for being here */
+        /* N.B. for critical exceptions on 4xx, the dar and dsisr
+           fields are overloaded to hold srr0 and srr1. */
+        unsigned long dar;              /* Fault registers */
+        unsigned long dsisr;            /* on 4xx/Book-E used for ESR */
+        unsigned long result;           /* Result of a system call */
+};
+#endif /* __ASSEMBLY__ */
+/*
+ * Offsets used by 'ptrace' system call interface.
+ * These can't be changed without breaking binary compatibility
+ * with MkLinux, etc.
+ */
+#define PT_R0   0
+#define PT_R1   1
+#define PT_R2   2
+#define PT_R3   3
+#define PT_R4   4
+#define PT_R5   5
+#define PT_R6   6
+#define PT_R7   7
+#define PT_R8   8
+#define PT_R9   9
+#define PT_R10  10
+#define PT_R11  11
+#define PT_R12  12
+#define PT_R13  13
+#define PT_R14  14
+#define PT_R15  15
+#define PT_R16  16
+#define PT_R17  17
+#define PT_R18  18
+#define PT_R19  19
+#define PT_R20  20
+#define PT_R21  21
+#define PT_R22  22
+#define PT_R23  23
+#define PT_R24  24
+#define PT_R25  25
+#define PT_R26  26
+#define PT_R27  27
+#define PT_R28  28
+#define PT_R29  29
+#define PT_R30  30
+#define PT_R31  31
+#define PT_NIP  32
+#define PT_MSR  33
+#define PT_ORIG_R3 34
+#define PT_CTR  35
+#define PT_LNK  36
+#define PT_XER  37
+#define PT_CCR  38
+#ifndef __powerpc64__
+#define PT_MQ   39
+#else
+#define PT_SOFTE 39
+#endif
+#define PT_TRAP 40
+#define PT_DAR  41
+#define PT_DSISR 42
+#define PT_RESULT 43
+#define PT_REGS_COUNT 44
+#define PT_FPR0 48      /* each FP reg occupies 2 slots in this space */
+#ifndef __powerpc64__
+#define PT_FPR31 (PT_FPR0 + 2*31)
+#define PT_FPSCR (PT_FPR0 + 2*32 + 1)
+#else /* __powerpc64__ */
+#define PT_FPSCR (PT_FPR0 + 32) /* each FP reg occupies 1 slot in 64-bit space */
+#define PT_VR0 82       /* each Vector reg occupies 2 slots in 64-bit */
+#define PT_VSCR (PT_VR0 + 32*2 + 1)
+#define PT_VRSAVE (PT_VR0 + 33*2)
+/*
+ * Only store first 32 VSRs here. The second 32 VSRs in VR0-31
+ */
+#define PT_VSR0 150     /* each VSR reg occupies 2 slots in 64-bit */
+#define PT_VSR31 (PT_VSR0 + 2*31)
+#endif /* __powerpc64__ */
+/*
+ * Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
+ * The transfer totals 34 quadword.  Quadwords 0-31 contain the
+ * corresponding vector registers.  Quadword 32 contains the vscr as the
+ * last word (offset 12) within that quadword.  Quadword 33 contains the
+ * vrsave as the first word (offset 0) within the quadword.
+ *
+ * This definition of the VMX state is compatible with the current PPC32
+ * ptrace interface.  This allows signal handling and ptrace to use the same
+ * structures.  This also simplifies the implementation of a bi-arch
+ * (combined (32- and 64-bit) gdb.
+ */
+#define PTRACE_GETVRREGS        18
+#define PTRACE_SETVRREGS        19
+/* Get/set all the upper 32-bits of the SPE registers, accumulator, and
+ * spefscr, in one go */
+#define PTRACE_GETEVRREGS       20
+#define PTRACE_SETEVRREGS       21
+/* Get the first 32 128bit VSX registers */
+#define PTRACE_GETVSRREGS       27
+#define PTRACE_SETVSRREGS       28
+/*
+ * Get or set a debug register. The first 16 are DABR registers and the
+ * second 16 are IABR registers.
+ */
+#define PTRACE_GET_DEBUGREG     25
+#define PTRACE_SET_DEBUGREG     26
+/* (new) PTRACE requests using the same numbers as x86 and the same
+ * argument ordering. Additionally, they support more registers too
+ */
+#define PTRACE_GETREGS            12
+#define PTRACE_SETREGS            13
+#define PTRACE_GETFPREGS          14
+#define PTRACE_SETFPREGS          15
+#define PTRACE_GETREGS64          22
+#define PTRACE_SETREGS64          23
+/* Calls to trace a 64bit program from a 32bit program */
+#define PPC_PTRACE_PEEKTEXT_3264 0x95
+#define PPC_PTRACE_PEEKDATA_3264 0x94
+#define PPC_PTRACE_POKETEXT_3264 0x93
+#define PPC_PTRACE_POKEDATA_3264 0x92
+#define PPC_PTRACE_PEEKUSR_3264  0x91
+#define PPC_PTRACE_POKEUSR_3264  0x90
+#define PTRACE_SINGLEBLOCK      0x100   /* resume execution until next branch */
+#define PPC_PTRACE_GETHWDBGINFO 0x89
+#define PPC_PTRACE_SETHWDEBUG   0x88
+#define PPC_PTRACE_DELHWDEBUG   0x87
+#ifndef __ASSEMBLY__
+struct ppc_debug_info {
+        __u32 version;                  /* Only version 1 exists to date */
+        __u32 num_instruction_bps;
+        __u32 num_data_bps;
+        __u32 num_condition_regs;
+        __u32 data_bp_alignment;
+        __u32 sizeof_condition;         /* size of the DVC register */
+        __u64 features;
+};
+#endif /* __ASSEMBLY__ */
+/*
+ * features will have bits indication whether there is support for:
+ */
+#define PPC_DEBUG_FEATURE_INSN_BP_RANGE         0x0000000000000001
+#define PPC_DEBUG_FEATURE_INSN_BP_MASK          0x0000000000000002
+#define PPC_DEBUG_FEATURE_DATA_BP_RANGE         0x0000000000000004
+#define PPC_DEBUG_FEATURE_DATA_BP_MASK          0x0000000000000008
+#ifndef __ASSEMBLY__
+struct ppc_hw_breakpoint {
+        __u32 version;          /* currently, version must be 1 */
+        __u32 trigger_type;     /* only some combinations allowed */
+        __u32 addr_mode;        /* address match mode */
+        __u32 condition_mode;   /* break/watchpoint condition flags */
+        __u64 addr;             /* break/watchpoint address */
+        __u64 addr2;            /* range end or mask */
+        __u64 condition_value;  /* contents of the DVC register */
+};
+#endif /* __ASSEMBLY__ */
+/*
+ * Trigger Type
+ */
+#define PPC_BREAKPOINT_TRIGGER_EXECUTE  0x00000001
+#define PPC_BREAKPOINT_TRIGGER_READ     0x00000002
+#define PPC_BREAKPOINT_TRIGGER_WRITE    0x00000004
+#define PPC_BREAKPOINT_TRIGGER_RW       \
+        (PPC_BREAKPOINT_TRIGGER_READ | PPC_BREAKPOINT_TRIGGER_WRITE)
+/*
+ * Address Mode
+ */
+#define PPC_BREAKPOINT_MODE_EXACT               0x00000000
+#define PPC_BREAKPOINT_MODE_RANGE_INCLUSIVE     0x00000001
+#define PPC_BREAKPOINT_MODE_RANGE_EXCLUSIVE     0x00000002
+#define PPC_BREAKPOINT_MODE_MASK                0x00000003
+/*
+ * Condition Mode
+ */
+#define PPC_BREAKPOINT_CONDITION_MODE   0x00000003
+#define PPC_BREAKPOINT_CONDITION_NONE   0x00000000
+#define PPC_BREAKPOINT_CONDITION_AND    0x00000001
+#define PPC_BREAKPOINT_CONDITION_EXACT  PPC_BREAKPOINT_CONDITION_AND
+#define PPC_BREAKPOINT_CONDITION_OR     0x00000002
+#define PPC_BREAKPOINT_CONDITION_AND_OR 0x00000003
+#define PPC_BREAKPOINT_CONDITION_BE_ALL 0x00ff0000
+#define PPC_BREAKPOINT_CONDITION_BE_SHIFT       16
+#define PPC_BREAKPOINT_CONDITION_BE(n)  \
+        (1<<((n)+PPC_BREAKPOINT_CONDITION_BE_SHIFT))
+#endif /* _UAPI_ASM_POWERPC_PTRACE_H */
diff --git a/arch/powerpc/include/asm/resource.h b/arch/powerpc/include/uapi/asm/resource.h
index 04bc4db8921..04bc4db8921 100644
--- a/arch/powerpc/include/asm/resource.h
+++ b/arch/powerpc/include/uapi/asm/resource.h
diff --git a/arch/powerpc/include/asm/seccomp.h b/arch/powerpc/include/uapi/asm/seccomp.h
index 00c1d9133cf..00c1d9133cf 100644
--- a/arch/powerpc/include/asm/seccomp.h
+++ b/arch/powerpc/include/uapi/asm/seccomp.h
diff --git a/arch/powerpc/include/asm/sembuf.h b/arch/powerpc/include/uapi/asm/sembuf.h
index 99a41938ae3..99a41938ae3 100644
--- a/arch/powerpc/include/asm/sembuf.h
+++ b/arch/powerpc/include/uapi/asm/sembuf.h
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/uapi/asm/setup.h
index 8b9a306260b..8b9a306260b 100644
--- a/arch/powerpc/include/asm/setup.h
+++ b/arch/powerpc/include/uapi/asm/setup.h
diff --git a/arch/powerpc/include/asm/shmbuf.h b/arch/powerpc/include/uapi/asm/shmbuf.h
index 8efa39698b6..8efa39698b6 100644
--- a/arch/powerpc/include/asm/shmbuf.h
+++ b/arch/powerpc/include/uapi/asm/shmbuf.h
diff --git a/arch/powerpc/include/asm/sigcontext.h b/arch/powerpc/include/uapi/asm/sigcontext.h
index 9c1f24fd5d1..9c1f24fd5d1 100644
--- a/arch/powerpc/include/asm/sigcontext.h
+++ b/arch/powerpc/include/uapi/asm/sigcontext.h
diff --git a/arch/powerpc/include/asm/siginfo.h b/arch/powerpc/include/uapi/asm/siginfo.h
index ccce3ef5cd8..ccce3ef5cd8 100644
--- a/arch/powerpc/include/asm/siginfo.h
+++ b/arch/powerpc/include/uapi/asm/siginfo.h
diff --git a/arch/powerpc/include/uapi/asm/signal.h b/arch/powerpc/include/uapi/asm/signal.h
new file mode 100644
index 00000000000..48fa8d3f2f9
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/signal.h
@@ -0,0 +1,145 @@
+#ifndef _UAPI_ASM_POWERPC_SIGNAL_H
+#define _UAPI_ASM_POWERPC_SIGNAL_H
+#include <linux/types.h>
+#define _NSIG           64
+#ifdef __powerpc64__
+#define _NSIG_BPW       64
+#else
+#define _NSIG_BPW       32
+#endif
+#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
+typedef unsigned long old_sigset_t;             /* at least 32 bits */
+typedef struct {
+        unsigned long sig[_NSIG_WORDS];
+} sigset_t;
+#define SIGHUP           1
+#define SIGINT           2
+#define SIGQUIT          3
+#define SIGILL           4
+#define SIGTRAP          5
+#define SIGABRT          6
+#define SIGIOT           6
+#define SIGBUS           7
+#define SIGFPE           8
+#define SIGKILL          9
+#define SIGUSR1         10
+#define SIGSEGV         11
+#define SIGUSR2         12
+#define SIGPIPE         13
+#define SIGALRM         14
+#define SIGTERM         15
+#define SIGSTKFLT       16
+#define SIGCHLD         17
+#define SIGCONT         18
+#define SIGSTOP         19
+#define SIGTSTP         20
+#define SIGTTIN         21
+#define SIGTTOU         22
+#define SIGURG          23
+#define SIGXCPU         24
+#define SIGXFSZ         25
+#define SIGVTALRM       26
+#define SIGPROF         27
+#define SIGWINCH        28
+#define SIGIO           29
+#define SIGPOLL         SIGIO
+/*
+#define SIGLOST         29
+*/
+#define SIGPWR          30
+#define SIGSYS          31
+#define SIGUNUSED       31
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        _NSIG
+/*
+ * SA_FLAGS values:
+ *
+ * SA_ONSTACK is not currently supported, but will allow sigaltstack(2).
+ * SA_RESTART flag to get restarting signals (which were the default long ago)
+ * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
+ * SA_RESETHAND clears the handler when the signal is delivered.
+ * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
+ * SA_NODEFER prevents the current signal from being masked in the handler.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_NOCLDSTOP    0x00000001U
+#define SA_NOCLDWAIT    0x00000002U
+#define SA_SIGINFO      0x00000004U
+#define SA_ONSTACK      0x08000000U
+#define SA_RESTART      0x10000000U
+#define SA_NODEFER      0x40000000U
+#define SA_RESETHAND    0x80000000U
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+#define SA_RESTORER     0x04000000U
+/*
+ * sigaltstack controls
+ */
+#define SS_ONSTACK      1
+#define SS_DISABLE      2
+#define MINSIGSTKSZ     2048
+#define SIGSTKSZ        8192
+#include <asm-generic/signal-defs.h>
+struct old_sigaction {
+        __sighandler_t sa_handler;
+        old_sigset_t sa_mask;
+        unsigned long sa_flags;
+        __sigrestore_t sa_restorer;
+};
+struct sigaction {
+        __sighandler_t sa_handler;
+        unsigned long sa_flags;
+        __sigrestore_t sa_restorer;
+        sigset_t sa_mask;               /* mask last for extensibility */
+};
+struct k_sigaction {
+        struct sigaction sa;
+};
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        int ss_flags;
+        size_t ss_size;
+} stack_t;
+#ifndef __powerpc64__
+/*
+ * These are parameters to dbg_sigreturn syscall.  They enable or
+ * disable certain debugging things that can be done from signal
+ * handlers.  The dbg_sigreturn syscall *must* be called from a
+ * SA_SIGINFO signal so the ucontext can be passed to it.  It takes an
+ * array of struct sig_dbg_op, which has the debug operations to
+ * perform before returning from the signal.
+ */
+struct sig_dbg_op {
+        int dbg_type;
+        unsigned long dbg_value;
+};
+/* Enable or disable single-stepping.  The value sets the state. */
+#define SIG_DBG_SINGLE_STEPPING         1
+/* Enable or disable branch tracing.  The value sets the state. */
+#define SIG_DBG_BRANCH_TRACING          2
+#endif /* ! __powerpc64__ */
+#endif /* _UAPI_ASM_POWERPC_SIGNAL_H */
diff --git a/arch/powerpc/include/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h
index 3d5179bb122..3d5179bb122 100644
--- a/arch/powerpc/include/asm/socket.h
+++ b/arch/powerpc/include/uapi/asm/socket.h
diff --git a/arch/powerpc/include/asm/sockios.h b/arch/powerpc/include/uapi/asm/sockios.h
index 55cef7675a3..55cef7675a3 100644
--- a/arch/powerpc/include/asm/sockios.h
+++ b/arch/powerpc/include/uapi/asm/sockios.h
diff --git a/arch/powerpc/include/uapi/asm/spu_info.h b/arch/powerpc/include/uapi/asm/spu_info.h
new file mode 100644
index 00000000000..ed071bf9770
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/spu_info.h
@@ -0,0 +1,53 @@
+/*
+ * SPU info structures
+ *
+ * (C) Copyright 2006 IBM Corp.
+ *
+ * Author: Dwayne Grant McConnell <decimal@us.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef _UAPI_SPU_INFO_H
+#define _UAPI_SPU_INFO_H
+#include <linux/types.h>
+#ifndef __KERNEL__
+struct mfc_cq_sr {
+        __u64 mfc_cq_data0_RW;
+        __u64 mfc_cq_data1_RW;
+        __u64 mfc_cq_data2_RW;
+        __u64 mfc_cq_data3_RW;
+};
+#endif /* __KERNEL__ */
+struct spu_dma_info {
+        __u64 dma_info_type;
+        __u64 dma_info_mask;
+        __u64 dma_info_status;
+        __u64 dma_info_stall_and_notify;
+        __u64 dma_info_atomic_command_status;
+        struct mfc_cq_sr dma_info_command_data[16];
+};
+struct spu_proxydma_info {
+        __u64 proxydma_info_type;
+        __u64 proxydma_info_mask;
+        __u64 proxydma_info_status;
+        struct mfc_cq_sr proxydma_info_command_data[8];
+};
+#endif /* _UAPI_SPU_INFO_H */
diff --git a/arch/powerpc/include/asm/stat.h b/arch/powerpc/include/uapi/asm/stat.h
index 84880b80cc1..84880b80cc1 100644
--- a/arch/powerpc/include/asm/stat.h
+++ b/arch/powerpc/include/uapi/asm/stat.h
diff --git a/arch/powerpc/include/asm/statfs.h b/arch/powerpc/include/uapi/asm/statfs.h
index 5244834583a..5244834583a 100644
--- a/arch/powerpc/include/asm/statfs.h
+++ b/arch/powerpc/include/uapi/asm/statfs.h
diff --git a/arch/powerpc/include/uapi/asm/swab.h b/arch/powerpc/include/uapi/asm/swab.h
new file mode 100644
index 00000000000..b6c368aa5c0
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/swab.h
@@ -0,0 +1,23 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_POWERPC_SWAB_H
+#define _UAPI_ASM_POWERPC_SWAB_H
+#include <linux/types.h>
+#include <linux/compiler.h>
+#ifdef __GNUC__
+#ifndef __powerpc64__
+#define __SWAB_64_THRU_32__
+#endif /* __powerpc64__ */
+#endif /* __GNUC__ */
+#endif /* _UAPI_ASM_POWERPC_SWAB_H */
diff --git a/arch/powerpc/include/asm/termbits.h b/arch/powerpc/include/uapi/asm/termbits.h
index 549d700e18f..549d700e18f 100644
--- a/arch/powerpc/include/asm/termbits.h
+++ b/arch/powerpc/include/uapi/asm/termbits.h
diff --git a/arch/powerpc/include/uapi/asm/termios.h b/arch/powerpc/include/uapi/asm/termios.h
new file mode 100644
index 00000000000..6cca5cdfec0
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/termios.h
@@ -0,0 +1,76 @@
+/*
+ * Liberally adapted from alpha/termios.h.  In particular, the c_cc[]
+ * fields have been reordered so that termio & termios share the
+ * common subset in the same order (for brain dead programs that don't
+ * know or care about the differences).
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_POWERPC_TERMIOS_H
+#define _UAPI_ASM_POWERPC_TERMIOS_H
+#include <asm/ioctls.h>
+#include <asm/termbits.h>
+struct sgttyb {
+        char    sg_ispeed;
+        char    sg_ospeed;
+        char    sg_erase;
+        char    sg_kill;
+        short   sg_flags;
+};
+struct tchars {
+        char    t_intrc;
+        char    t_quitc;
+        char    t_startc;
+        char    t_stopc;
+        char    t_eofc;
+        char    t_brkc;
+};
+struct ltchars {
+        char    t_suspc;
+        char    t_dsuspc;
+        char    t_rprntc;
+        char    t_flushc;
+        char    t_werasc;
+        char    t_lnextc;
+};
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+#define NCC 10
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        unsigned char c_line;           /* line discipline */
+        unsigned char c_cc[NCC];        /* control characters */
+};
+/* c_cc characters */
+#define _VINTR  0
+#define _VQUIT  1
+#define _VERASE 2
+#define _VKILL  3
+#define _VEOF   4
+#define _VMIN   5
+#define _VEOL   6
+#define _VTIME  7
+#define _VEOL2  8
+#define _VSWTC  9
+#endif /* _UAPI_ASM_POWERPC_TERMIOS_H */
diff --git a/arch/powerpc/include/uapi/asm/types.h b/arch/powerpc/include/uapi/asm/types.h
new file mode 100644
index 00000000000..4b8ab990a3c
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/types.h
@@ -0,0 +1,40 @@
+/*
+ * This file is never included by application software unless
+ * explicitly requested (e.g., via linux/types.h) in which case the
+ * application is Linux specific so (user-) name space pollution is
+ * not a major issue.  However, for interoperability, libraries still
+ * need to be careful to avoid a name clashes.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_POWERPC_TYPES_H
+#define _UAPI_ASM_POWERPC_TYPES_H
+/*
+ * This is here because we used to use l64 for 64bit powerpc
+ * and we don't want to impact user mode with our change to ll64
+ * in the kernel.
+ *
+ * However, some user programs are fine with this.  They can
+ * flag __SANE_USERSPACE_TYPES__ to get int-ll64.h here.
+ */
+#if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__) && !defined(__KERNEL__)
+# include <asm-generic/int-l64.h>
+#else
+# include <asm-generic/int-ll64.h>
+#endif
+#ifndef __ASSEMBLY__
+typedef struct {
+        __u32 u[4];
+} __attribute__((aligned(16))) __vector128;
+#endif /* __ASSEMBLY__ */
+#endif /* _UAPI_ASM_POWERPC_TYPES_H */
diff --git a/arch/powerpc/include/asm/ucontext.h b/arch/powerpc/include/uapi/asm/ucontext.h
index d9a4ddf0cc8..d9a4ddf0cc8 100644
--- a/arch/powerpc/include/asm/ucontext.h
+++ b/arch/powerpc/include/uapi/asm/ucontext.h
diff --git a/arch/powerpc/include/uapi/asm/unistd.h b/arch/powerpc/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..380b5d37a90
--- /dev/null
+++ b/arch/powerpc/include/uapi/asm/unistd.h
@@ -0,0 +1,380 @@
+/*
+ * This file contains the system call numbers.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _UAPI_ASM_POWERPC_UNISTD_H_
+#define _UAPI_ASM_POWERPC_UNISTD_H_
+#define __NR_restart_syscall      0
+#define __NR_exit                 1
+#define __NR_fork                 2
+#define __NR_read                 3
+#define __NR_write                4
+#define __NR_open                 5
+#define __NR_close                6
+#define __NR_waitpid              7
+#define __NR_creat                8
+#define __NR_link                 9
+#define __NR_unlink              10
+#define __NR_execve              11
+#define __NR_chdir               12
+#define __NR_time                13
+#define __NR_mknod               14
+#define __NR_chmod               15
+#define __NR_lchown              16
+#define __NR_break               17
+#define __NR_oldstat             18
+#define __NR_lseek               19
+#define __NR_getpid              20
+#define __NR_mount               21
+#define __NR_umount              22
+#define __NR_setuid              23
+#define __NR_getuid              24
+#define __NR_stime               25
+#define __NR_ptrace              26
+#define __NR_alarm               27
+#define __NR_oldfstat            28
+#define __NR_pause               29
+#define __NR_utime               30
+#define __NR_stty                31
+#define __NR_gtty                32
+#define __NR_access              33
+#define __NR_nice                34
+#define __NR_ftime               35
+#define __NR_sync                36
+#define __NR_kill                37
+#define __NR_rename              38
+#define __NR_mkdir               39
+#define __NR_rmdir               40
+#define __NR_dup                 41
+#define __NR_pipe                42
+#define __NR_times               43
+#define __NR_prof                44
+#define __NR_brk                 45
+#define __NR_setgid              46
+#define __NR_getgid              47
+#define __NR_signal              48
+#define __NR_geteuid             49
+#define __NR_getegid             50
+#define __NR_acct                51
+#define __NR_umount2             52
+#define __NR_lock                53
+#define __NR_ioctl               54
+#define __NR_fcntl               55
+#define __NR_mpx                 56
+#define __NR_setpgid             57
+#define __NR_ulimit              58
+#define __NR_oldolduname         59
+#define __NR_umask               60
+#define __NR_chroot              61
+#define __NR_ustat               62
+#define __NR_dup2                63
+#define __NR_getppid             64
+#define __NR_getpgrp             65
+#define __NR_setsid              66
+#define __NR_sigaction           67
+#define __NR_sgetmask            68
+#define __NR_ssetmask            69
+#define __NR_setreuid            70
+#define __NR_setregid            71
+#define __NR_sigsuspend          72
+#define __NR_sigpending          73
+#define __NR_sethostname         74
+#define __NR_setrlimit           75
+#define __NR_getrlimit           76
+#define __NR_getrusage           77
+#define __NR_gettimeofday        78
+#define __NR_settimeofday        79
+#define __NR_getgroups           80
+#define __NR_setgroups           81
+#define __NR_select              82
+#define __NR_symlink             83
+#define __NR_oldlstat            84
+#define __NR_readlink            85
+#define __NR_uselib              86
+#define __NR_swapon              87
+#define __NR_reboot              88
+#define __NR_readdir             89
+#define __NR_mmap                90
+#define __NR_munmap              91
+#define __NR_truncate            92
+#define __NR_ftruncate           93
+#define __NR_fchmod              94
+#define __NR_fchown              95
+#define __NR_getpriority         96
+#define __NR_setpriority         97
+#define __NR_profil              98
+#define __NR_statfs              99
+#define __NR_fstatfs            100
+#define __NR_ioperm             101
+#define __NR_socketcall         102
+#define __NR_syslog             103
+#define __NR_setitimer          104
+#define __NR_getitimer          105
+#define __NR_stat               106
+#define __NR_lstat              107
+#define __NR_fstat              108
+#define __NR_olduname           109
+#define __NR_iopl               110
+#define __NR_vhangup            111
+#define __NR_idle               112
+#define __NR_vm86               113
+#define __NR_wait4              114
+#define __NR_swapoff            115
+#define __NR_sysinfo            116
+#define __NR_ipc                117
+#define __NR_fsync              118
+#define __NR_sigreturn          119
+#define __NR_clone              120
+#define __NR_setdomainname      121
+#define __NR_uname              122
+#define __NR_modify_ldt         123
+#define __NR_adjtimex           124
+#define __NR_mprotect           125
+#define __NR_sigprocmask        126
+#define __NR_create_module      127
+#define __NR_init_module        128
+#define __NR_delete_module      129
+#define __NR_get_kernel_syms    130
+#define __NR_quotactl           131
+#define __NR_getpgid            132
+#define __NR_fchdir             133
+#define __NR_bdflush            134
+#define __NR_sysfs              135
+#define __NR_personality        136
+#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
+#define __NR_setfsuid           138
+#define __NR_setfsgid           139
+#define __NR__llseek            140
+#define __NR_getdents           141
+#define __NR__newselect         142
+#define __NR_flock              143
+#define __NR_msync              144
+#define __NR_readv              145
+#define __NR_writev             146
+#define __NR_getsid             147
+#define __NR_fdatasync          148
+#define __NR__sysctl            149
+#define __NR_mlock              150
+#define __NR_munlock            151
+#define __NR_mlockall           152
+#define __NR_munlockall         153
+#define __NR_sched_setparam             154
+#define __NR_sched_getparam             155
+#define __NR_sched_setscheduler         156
+#define __NR_sched_getscheduler         157
+#define __NR_sched_yield                158
+#define __NR_sched_get_priority_max     159
+#define __NR_sched_get_priority_min     160
+#define __NR_sched_rr_get_interval      161
+#define __NR_nanosleep          162
+#define __NR_mremap             163
+#define __NR_setresuid          164
+#define __NR_getresuid          165
+#define __NR_query_module       166
+#define __NR_poll               167
+#define __NR_nfsservctl         168
+#define __NR_setresgid          169
+#define __NR_getresgid          170
+#define __NR_prctl              171
+#define __NR_rt_sigreturn       172
+#define __NR_rt_sigaction       173
+#define __NR_rt_sigprocmask     174
+#define __NR_rt_sigpending      175
+#define __NR_rt_sigtimedwait    176
+#define __NR_rt_sigqueueinfo    177
+#define __NR_rt_sigsuspend      178
+#define __NR_pread64            179
+#define __NR_pwrite64           180
+#define __NR_chown              181
+#define __NR_getcwd             182
+#define __NR_capget             183
+#define __NR_capset             184
+#define __NR_sigaltstack        185
+#define __NR_sendfile           186
+#define __NR_getpmsg            187     /* some people actually want streams */
+#define __NR_putpmsg            188     /* some people actually want streams */
+#define __NR_vfork              189
+#define __NR_ugetrlimit         190     /* SuS compliant getrlimit */
+#define __NR_readahead          191
+#ifndef __powerpc64__                   /* these are 32-bit only */
+#define __NR_mmap2              192
+#define __NR_truncate64         193
+#define __NR_ftruncate64        194
+#define __NR_stat64             195
+#define __NR_lstat64            196
+#define __NR_fstat64            197
+#endif
+#define __NR_pciconfig_read     198
+#define __NR_pciconfig_write    199
+#define __NR_pciconfig_iobase   200
+#define __NR_multiplexer        201
+#define __NR_getdents64         202
+#define __NR_pivot_root         203
+#ifndef __powerpc64__
+#define __NR_fcntl64            204
+#endif
+#define __NR_madvise            205
+#define __NR_mincore            206
+#define __NR_gettid             207
+#define __NR_tkill              208
+#define __NR_setxattr           209
+#define __NR_lsetxattr          210
+#define __NR_fsetxattr          211
+#define __NR_getxattr           212
+#define __NR_lgetxattr          213
+#define __NR_fgetxattr          214
+#define __NR_listxattr          215
+#define __NR_llistxattr         216
+#define __NR_flistxattr         217
+#define __NR_removexattr        218
+#define __NR_lremovexattr       219
+#define __NR_fremovexattr       220
+#define __NR_futex              221
+#define __NR_sched_setaffinity  222
+#define __NR_sched_getaffinity  223
+/* 224 currently unused */
+#define __NR_tuxcall            225
+#ifndef __powerpc64__
+#define __NR_sendfile64         226
+#endif
+#define __NR_io_setup           227
+#define __NR_io_destroy         228
+#define __NR_io_getevents       229
+#define __NR_io_submit          230
+#define __NR_io_cancel          231
+#define __NR_set_tid_address    232
+#define __NR_fadvise64          233
+#define __NR_exit_group         234
+#define __NR_lookup_dcookie     235
+#define __NR_epoll_create       236
+#define __NR_epoll_ctl          237
+#define __NR_epoll_wait         238
+#define __NR_remap_file_pages   239
+#define __NR_timer_create       240
+#define __NR_timer_settime      241
+#define __NR_timer_gettime      242
+#define __NR_timer_getoverrun   243
+#define __NR_timer_delete       244
+#define __NR_clock_settime      245
+#define __NR_clock_gettime      246
+#define __NR_clock_getres       247
+#define __NR_clock_nanosleep    248
+#define __NR_swapcontext        249
+#define __NR_tgkill             250
+#define __NR_utimes             251
+#define __NR_statfs64           252
+#define __NR_fstatfs64          253
+#ifndef __powerpc64__
+#define __NR_fadvise64_64       254
+#endif
+#define __NR_rtas               255
+#define __NR_sys_debug_setcontext 256
+/* Number 257 is reserved for vserver */
+#define __NR_migrate_pages      258
+#define __NR_mbind              259
+#define __NR_get_mempolicy      260
+#define __NR_set_mempolicy      261
+#define __NR_mq_open            262
+#define __NR_mq_unlink          263
+#define __NR_mq_timedsend       264
+#define __NR_mq_timedreceive    265
+#define __NR_mq_notify          266
+#define __NR_mq_getsetattr      267
+#define __NR_kexec_load         268
+#define __NR_add_key            269
+#define __NR_request_key        270
+#define __NR_keyctl             271
+#define __NR_waitid             272
+#define __NR_ioprio_set         273
+#define __NR_ioprio_get         274
+#define __NR_inotify_init       275
+#define __NR_inotify_add_watch  276
+#define __NR_inotify_rm_watch   277
+#define __NR_spu_run            278
+#define __NR_spu_create         279
+#define __NR_pselect6           280
+#define __NR_ppoll              281
+#define __NR_unshare            282
+#define __NR_splice             283
+#define __NR_tee                284
+#define __NR_vmsplice           285
+#define __NR_openat             286
+#define __NR_mkdirat            287
+#define __NR_mknodat            288
+#define __NR_fchownat           289
+#define __NR_futimesat          290
+#ifdef __powerpc64__
+#define __NR_newfstatat         291
+#else
+#define __NR_fstatat64          291
+#endif
+#define __NR_unlinkat           292
+#define __NR_renameat           293
+#define __NR_linkat             294
+#define __NR_symlinkat          295
+#define __NR_readlinkat         296
+#define __NR_fchmodat           297
+#define __NR_faccessat          298
+#define __NR_get_robust_list    299
+#define __NR_set_robust_list    300
+#define __NR_move_pages         301
+#define __NR_getcpu             302
+#define __NR_epoll_pwait        303
+#define __NR_utimensat          304
+#define __NR_signalfd           305
+#define __NR_timerfd_create     306
+#define __NR_eventfd            307
+#define __NR_sync_file_range2   308
+#define __NR_fallocate          309
+#define __NR_subpage_prot       310
+#define __NR_timerfd_settime    311
+#define __NR_timerfd_gettime    312
+#define __NR_signalfd4          313
+#define __NR_eventfd2           314
+#define __NR_epoll_create1      315
+#define __NR_dup3               316
+#define __NR_pipe2              317
+#define __NR_inotify_init1      318
+#define __NR_perf_event_open    319
+#define __NR_preadv             320
+#define __NR_pwritev            321
+#define __NR_rt_tgsigqueueinfo  322
+#define __NR_fanotify_init      323
+#define __NR_fanotify_mark      324
+#define __NR_prlimit64          325
+#define __NR_socket             326
+#define __NR_bind               327
+#define __NR_connect            328
+#define __NR_listen             329
+#define __NR_accept             330
+#define __NR_getsockname        331
+#define __NR_getpeername        332
+#define __NR_socketpair         333
+#define __NR_send               334
+#define __NR_sendto             335
+#define __NR_recv               336
+#define __NR_recvfrom           337
+#define __NR_shutdown           338
+#define __NR_setsockopt         339
+#define __NR_getsockopt         340
+#define __NR_sendmsg            341
+#define __NR_recvmsg            342
+#define __NR_recvmmsg           343
+#define __NR_accept4            344
+#define __NR_name_to_handle_at  345
+#define __NR_open_by_handle_at  346
+#define __NR_clock_adjtime      347
+#define __NR_syncfs             348
+#define __NR_sendmmsg           349
+#define __NR_setns              350
+#define __NR_process_vm_readv   351
+#define __NR_process_vm_writev  352
+#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index af37528da49..9499385676e 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -435,6 +435,22 @@ ret_from_fork:
        li      r3,0
        b       ret_from_syscall
+        .globl  ret_from_kernel_thread
+ret_from_kernel_thread:
+        REST_NVGPRS(r1)
+        bl      schedule_tail
+        mtlr    r14
+        mr      r3,r15
+        PPC440EP_ERR42
+        blrl
+        li      r3,0
+        b       do_exit         # no return
+        .globl  __ret_from_kernel_execve
+__ret_from_kernel_execve:
+        addi    r1,r3,-STACK_FRAME_OVERHEAD
+        b       ret_from_syscall
 /* Traced system call support */
 syscall_dotrace:
        SAVE_NVGPRS(r1)
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 0e931aaffca..56e0ff0878b 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -370,6 +370,22 @@ _GLOBAL(ret_from_fork)
        li      r3,0
        b       syscall_exit
+_GLOBAL(ret_from_kernel_thread)
+        bl      .schedule_tail
+        REST_NVGPRS(r1)
+        REST_GPR(2,r1)
+        mtlr    r14
+        mr      r3,r15
+        blrl
+        li      r3,0
+        b       .do_exit        # no return
+_GLOBAL(__ret_from_kernel_execve)
+        addi    r1,r3,-STACK_FRAME_OVERHEAD
+        li      r10,1
+        std     r10,SOFTE(r1)
+        b       syscall_exit
        .section        ".toc","aw"
 DSCR_DEFAULT:
        .tc dscr_default[TC],dscr_default
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index ba16874fe29..7ce26d45777 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -54,13 +54,6 @@ _GLOBAL(add_reloc_offset)
        .align  3
 2:      PPC_LONG 1b
-_GLOBAL(kernel_execve)
-        li      r0,__NR_execve
-        sc
-        bnslr
-        neg     r3,r3
-        blr
 _GLOBAL(setjmp)
        mflr    r0
        PPC_STL r0,0(r3)
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 407e293aad2..19e096bd0e7 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -663,39 +663,6 @@ _GLOBAL(abs)
        sub     r3,r3,r4
        blr
-/*
- * Create a kernel thread
- *   kernel_thread(fn, arg, flags)
- */
-_GLOBAL(kernel_thread)
-        stwu    r1,-16(r1)
-        stw     r30,8(r1)
-        stw     r31,12(r1)
-        mr      r30,r3          /* function */
-        mr      r31,r4          /* argument */
-        ori     r3,r5,CLONE_VM  /* flags */
-        oris    r3,r3,CLONE_UNTRACED>>16
-        li      r4,0            /* new sp (unused) */
-        li      r0,__NR_clone
-        sc
-        bns+    1f              /* did system call indicate error? */
-        neg     r3,r3           /* if so, make return code negative */
-1:      cmpwi   0,r3,0          /* parent or child? */
-        bne     2f              /* return if parent */
-        li      r0,0            /* make top-level stack frame */
-        stwu    r0,-16(r1)
-        mtlr    r30             /* fn addr in lr */
-        mr      r3,r31          /* load arg and call fn */
-        PPC440EP_ERR42
-        blrl
-        li      r0,__NR_exit    /* exit if function returns */
-        li      r3,0
-        sc
-2:      lwz     r30,8(r1)
-        lwz     r31,12(r1)
-        addi    r1,r1,16
-        blr
 #ifdef CONFIG_SMP
 _GLOBAL(start_secondary_resume)
        /* Reset stack */
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 565b78625a3..5cfa8008693 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -407,40 +407,6 @@ _GLOBAL(scom970_write)
 /*
- * Create a kernel thread
- *   kernel_thread(fn, arg, flags)
- */
-_GLOBAL(kernel_thread)
-        std     r29,-24(r1)
-        std     r30,-16(r1)
-        stdu    r1,-STACK_FRAME_OVERHEAD(r1)
-        mr      r29,r3
-        mr      r30,r4
-        ori     r3,r5,CLONE_VM  /* flags */
-        oris    r3,r3,(CLONE_UNTRACED>>16)
-        li      r4,0            /* new sp (unused) */
-        li      r0,__NR_clone
-        sc
-        bns+    1f              /* did system call indicate error? */
-        neg     r3,r3           /* if so, make return code negative */
-1:      cmpdi   0,r3,0          /* parent or child? */
-        bne     2f              /* return if parent */
-        li      r0,0
-        stdu    r0,-STACK_FRAME_OVERHEAD(r1)
-        ld      r2,8(r29)
-        ld      r29,0(r29)
-        mtlr    r29              /* fn addr in lr */
-        mr      r3,r30          /* load arg and call fn */
-        blrl
-        li      r0,__NR_exit    /* exit after child exits */
-        li      r3,0
-        sc
-2:      addi    r1,r1,STACK_FRAME_OVERHEAD
-        ld      r29,-24(r1)
-        ld      r30,-16(r1)
-        blr
-/*
 * disable_kernel_fp()
 * Disable the FPU.
 */
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 3e4031581c6..19e4288d848 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -94,7 +94,6 @@ EXPORT_SYMBOL(pci_dram_offset);
 #endif /* CONFIG_PCI */
 EXPORT_SYMBOL(start_thread);
-EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(giveup_fpu);
 #ifdef CONFIG_ALTIVEC
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index d5ad666efd8..ba48233500f 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -733,30 +733,39 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
 extern unsigned long dscr_default; /* defined in arch/powerpc/kernel/sysfs.c */
 int copy_thread(unsigned long clone_flags, unsigned long usp,
-                unsigned long unused, struct task_struct *p,
+                unsigned long arg, struct task_struct *p,
                struct pt_regs *regs)
 {
        struct pt_regs *childregs, *kregs;
        extern void ret_from_fork(void);
+        extern void ret_from_kernel_thread(void);
+        void (*f)(void);
        unsigned long sp = (unsigned long)task_stack_page(p) + THREAD_SIZE;
-        CHECK_FULL_REGS(regs);
        /* Copy registers */
        sp -= sizeof(struct pt_regs);
        childregs = (struct pt_regs *) sp;
-        *childregs = *regs;
+        if (!regs) {
-        if ((childregs->msr & MSR_PR) == 0) {
                /* for kernel thread, set `current' and stackptr in new task */
+                memset(childregs, 0, sizeof(struct pt_regs));
                childregs->gpr[1] = sp + sizeof(struct pt_regs);
-#ifdef CONFIG_PPC32
+#ifdef CONFIG_PPC64
-                childregs->gpr[2] = (unsigned long) p;
+                childregs->gpr[14] = *(unsigned long *)usp;
-#else
+                childregs->gpr[2] = ((unsigned long *)usp)[1],
                clear_tsk_thread_flag(p, TIF_32BIT);
+#else
+                childregs->gpr[14] = usp;       /* function */
+                childregs->gpr[2] = (unsigned long) p;
 #endif
+                childregs->gpr[15] = arg;
                p->thread.regs = NULL;  /* no user register state */
+                f = ret_from_kernel_thread;
        } else {
+                CHECK_FULL_REGS(regs);
+                *childregs = *regs;
                childregs->gpr[1] = usp;
                p->thread.regs = childregs;
+                childregs->gpr[3] = 0;  /* Result from fork() */
                if (clone_flags & CLONE_SETTLS) {
 #ifdef CONFIG_PPC64
                        if (!is_32bit_task())
@@ -765,8 +774,9 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 #endif
                                childregs->gpr[2] = childregs->gpr[6];
                }
+                f = ret_from_fork;
        }
-        childregs->gpr[3] = 0;  /* Result from fork() */
        sp -= STACK_FRAME_OVERHEAD;
        /*
@@ -805,19 +815,17 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
                p->thread.dscr = current->thread.dscr;
        }
 #endif
        /*
         * The PPC64 ABI makes use of a TOC to contain function 
         * pointers.  The function (ret_from_except) is actually a pointer
         * to the TOC entry.  The first entry is a pointer to the actual
         * function.
-         */
+         */
 #ifdef CONFIG_PPC64
-        kregs->nip = *((unsigned long *)ret_from_fork);
+        kregs->nip = *((unsigned long *)f);
 #else
-        kregs->nip = (unsigned long)ret_from_fork;
+        kregs->nip = (unsigned long)f;
 #endif
        return 0;
 }
@@ -1055,26 +1063,13 @@ int sys_vfork(unsigned long p1, unsigned long p2, unsigned long p3,
                        regs, 0, NULL, NULL);
 }
-int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
+void __ret_from_kernel_execve(struct pt_regs *normal)
-               unsigned long a3, unsigned long a4, unsigned long a5,
+__noreturn;
-               struct pt_regs *regs)
+void ret_from_kernel_execve(struct pt_regs *normal)
 {
-        int error;
+        set_thread_flag(TIF_RESTOREALL);
-        char *filename;
+        __ret_from_kernel_execve(normal);
-        filename = getname((const char __user *) a0);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                goto out;
-        flush_fp_to_thread(current);
-        flush_altivec_to_thread(current);
-        flush_spe_to_thread(current);
-        error = do_execve(filename,
-                          (const char __user *const __user *) a1,
-                          (const char __user *const __user *) a2, regs);
-        putname(filename);
-out:
-        return error;
 }
 static inline int valid_irq_stack(unsigned long sp, struct task_struct *p,
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 8b4c049aee2..804e323c139 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -35,7 +35,6 @@
 #include <linux/stddef.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
-#include <linux/freezer.h>
 #endif
 #include <asm/uaccess.h>
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index abd1112da54..9c2ed90ece8 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -156,28 +156,6 @@ asmlinkage long compat_sys_sendfile64_wrapper(u32 out_fd, u32 in_fd,
                            (off_t __user *)offset, count);
 }
-long compat_sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
-                  unsigned long a3, unsigned long a4, unsigned long a5,
-                  struct pt_regs *regs)
-{
-        int error;
-        char * filename;
-        
-        filename = getname((char __user *) a0);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                goto out;
-        flush_fp_to_thread(current);
-        flush_altivec_to_thread(current);
-        error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
-        putname(filename);
-out:
-        return error;
-}
 /* Note: it is necessary to treat option as an unsigned int, 
 * with the corresponding cast to a signed int to insure that the 
 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index c9986fd400d..ce4cb772dc7 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -73,7 +73,7 @@
 /* powerpc clocksource/clockevent code */
 #include <linux/clockchips.h>
-#include <linux/clocksource.h>
+#include <linux/timekeeper_internal.h>
 static cycle_t rtc_read(struct clocksource *);
 static struct clocksource clocksource_rtc = {
@@ -727,7 +727,7 @@ static cycle_t timebase_read(struct clocksource *cs)
        return (cycle_t)get_tb();
 }
-void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
+void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
                        struct clocksource *clock, u32 mult)
 {
        u64 new_tb_to_xs, new_stamp_xsec;
diff --git a/arch/powerpc/platforms/pseries/eeh_event.c b/arch/powerpc/platforms/pseries/eeh_event.c
index 51faaac8abe..185bedd926d 100644
--- a/arch/powerpc/platforms/pseries/eeh_event.c
+++ b/arch/powerpc/platforms/pseries/eeh_event.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
+#include <linux/kthread.h>
 #include <asm/eeh_event.h>
 #include <asm/ppc-pci.h>
@@ -59,8 +60,6 @@ static int eeh_event_handler(void * dummy)
        struct eeh_event *event;
        struct eeh_pe *pe;
-        set_task_comm(current, "eehd");
        spin_lock_irqsave(&eeh_eventlist_lock, flags);
        event = NULL;
@@ -108,7 +107,7 @@ static int eeh_event_handler(void * dummy)
 */
 static void eeh_thread_launcher(struct work_struct *dummy)
 {
-        if (kernel_thread(eeh_event_handler, NULL, CLONE_KERNEL) < 0)
+        if (IS_ERR(kthread_run(eeh_event_handler, NULL, "eehd")))
                printk(KERN_ERR "Failed to start EEH daemon\n");
 }
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 99d2d790d15..3f3d9ca7a5b 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -131,11 +131,13 @@ config S390
        select HAVE_UID16 if 32BIT
        select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_SMP_IDLE_THREAD
-        select GENERIC_TIME_VSYSCALL
+        select GENERIC_TIME_VSYSCALL_OLD
        select GENERIC_CLOCKEVENTS
        select KTIME_SCALAR if 32BIT
        select HAVE_ARCH_SECCOMP_FILTER
        select GENERIC_KERNEL_THREAD
+        select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_RELA
 config SCHED_OMIT_FRAME_POINTER
        def_bool y
diff --git a/arch/s390/include/asm/module.h b/arch/s390/include/asm/module.h
index f0b6b26b6e5..df1f861a848 100644
--- a/arch/s390/include/asm/module.h
+++ b/arch/s390/include/asm/module.h
@@ -1,5 +1,8 @@
 #ifndef _ASM_S390_MODULE_H
 #define _ASM_S390_MODULE_H
+#include <asm-generic/module.h>
 /*
 * This file contains the s390 architecture specific module code.
 */
@@ -28,19 +31,4 @@ struct mod_arch_specific
        struct mod_arch_syminfo *syminfo;
 };
-#ifdef CONFIG_64BIT
-#define ElfW(x) Elf64_ ## x
-#define ELFW(x) ELF64_ ## x
-#else
-#define ElfW(x) Elf32_ ## x
-#define ELFW(x) ELF32_ ## x
-#endif
-#define Elf_Addr ElfW(Addr)
-#define Elf_Rela ElfW(Rela)
-#define Elf_Shdr ElfW(Shdr)
-#define Elf_Sym ElfW(Sym)
-#define Elf_Ehdr ElfW(Ehdr)
-#define ELF_R_SYM ELFW(R_SYM)
-#define ELF_R_TYPE ELFW(R_TYPE)
 #endif /* _ASM_S390_MODULE_H */
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index bb08e2afc5d..9e2cfe0349c 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -91,8 +91,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_SYSCALL_AUDIT       9       /* syscall auditing active */
 #define TIF_SECCOMP             10      /* secure computing */
 #define TIF_SYSCALL_TRACEPOINT  11      /* syscall tracepoint instrumentation */
-#define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling
-                                           TIF_NEED_RESCHED */
 #define TIF_31BIT               17      /* 32bit process */
 #define TIF_MEMDIE              18      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     19      /* restore signal mask in do_signal() */
@@ -100,7 +98,6 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SYSCALL            (1<<TIF_SYSCALL)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_PER_TRAP           (1<<TIF_PER_TRAP)
@@ -109,7 +106,6 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
 #define _TIF_SECCOMP            (1<<TIF_SECCOMP)
 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_31BIT              (1<<TIF_31BIT)
 #define _TIF_SINGLE_STEP        (1<<TIF_SINGLE_STEP)
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 2db1011b8b1..7fcd690d42c 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -34,7 +34,7 @@
 #include <linux/profile.h>
 #include <linux/timex.h>
 #include <linux/notifier.h>
-#include <linux/clocksource.h>
+#include <linux/timekeeper_internal.h>
 #include <linux/clockchips.h>
 #include <linux/gfp.h>
 #include <linux/kprobes.h>
@@ -219,7 +219,7 @@ struct clocksource * __init clocksource_default_clock(void)
        return &clocksource_tod;
 }
-void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
+void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
                        struct clocksource *clock, u32 mult)
 {
        if (clock != &clocksource_tod)
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 461c2374749..4f93a431a45 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -11,6 +11,8 @@ config SCORE
       select ARCH_DISCARD_MEMBLOCK
       select GENERIC_CPU_DEVICES
       select GENERIC_CLOCKEVENTS
+       select HAVE_MOD_ARCH_SPECIFIC
+        select MODULES_USE_ELF_REL
 choice
        prompt "System type"
diff --git a/arch/score/include/asm/module.h b/arch/score/include/asm/module.h
index f0b5dc0bd02..abf395bbfab 100644
--- a/arch/score/include/asm/module.h
+++ b/arch/score/include/asm/module.h
@@ -3,6 +3,7 @@
 #include <linux/list.h>
 #include <asm/uaccess.h>
+#include <asm-generic/module.h>
 struct mod_arch_specific {
        /* Data Bus Error exception tables */
@@ -13,11 +14,6 @@ struct mod_arch_specific {
 typedef uint8_t Elf64_Byte;             /* Type for a 8-bit quantity. */
-#define Elf_Shdr        Elf32_Shdr
-#define Elf_Sym         Elf32_Sym
-#define Elf_Ehdr        Elf32_Ehdr
-#define Elf_Addr        Elf32_Addr
 /* Given an address, look for it in the exception tables. */
 #ifdef CONFIG_MODULES
 const struct exception_table_entry *search_module_dbetables(unsigned long addr);
diff --git a/arch/score/include/asm/thread_info.h b/arch/score/include/asm/thread_info.h
index a18006e97f1..1425cc03487 100644
--- a/arch/score/include/asm/thread_info.h
+++ b/arch/score/include/asm/thread_info.h
@@ -86,16 +86,12 @@ register struct thread_info *__current_thread_info __asm__("r28");
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
 #define TIF_NOTIFY_RESUME       5       /* callback before returning to user */
 #define TIF_RESTORE_SIGMASK     9       /* restore signal mask in do_signal() */
-#define TIF_POLLING_NRFLAG      17      /* true if poll_idle() is polling
-                                                 TIF_NEED_RESCHED */
 #define TIF_MEMDIE              18      /* is terminating due to OOM killer */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_WORK_MASK          (0x0000ffff)
diff --git a/arch/score/kernel/module.c b/arch/score/kernel/module.c
index 469e3b64e2f..1378d99baa3 100644
--- a/arch/score/kernel/module.c
+++ b/arch/score/kernel/module.c
@@ -125,16 +125,6 @@ int apply_relocate(Elf_Shdr *sechdrs, const char *strtab,
        return 0;
 }
-int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
-                unsigned int symindex, unsigned int relsec,
-                struct module *me)
-{
-        /* Non-standard return value... most other arch's return -ENOEXEC
-         * for an unsupported relocation variant
-         */
-        return 0;
-}
 /* Given an address, look for it in the module exception tables. */
 const struct exception_table_entry *search_module_dbetables(unsigned long addr)
 {
diff --git a/arch/score/kernel/signal.c b/arch/score/kernel/signal.c
index e382c52ca0d..c268bbf8b41 100644
--- a/arch/score/kernel/signal.c
+++ b/arch/score/kernel/signal.c
@@ -174,6 +174,7 @@ score_rt_sigreturn(struct pt_regs *regs)
        /* It is more difficult to avoid calling this function than to
           call it and ignore errors.  */
        do_sigaltstack((stack_t __user *)&st, NULL, regs->regs[0]);
+        regs->is_syscall = 0;
        __asm__ __volatile__(
                "mv\tr0, %0\n\t"
diff --git a/arch/score/kernel/sys_score.c b/arch/score/kernel/sys_score.c
index 21e86797406..d45cf00a335 100644
--- a/arch/score/kernel/sys_score.c
+++ b/arch/score/kernel/sys_score.c
@@ -92,14 +92,14 @@ asmlinkage long
 score_execve(struct pt_regs *regs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname((char __user*)regs->regs[4]);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                return error;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                          (const char __user *const __user *)regs->regs[5],
                          (const char __user *const __user *)regs->regs[6],
                          regs);
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3b3e27a3ff2..babc2b826c5 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -38,6 +38,8 @@ config SUPERH
        select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
+        select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
+        select MODULES_USE_ELF_RELA
        help
          The SuperH is a RISC processor targeted for use in embedded systems
          and consumer electronics; it was also used in the Sega Dreamcast
diff --git a/arch/sh/include/asm/module.h b/arch/sh/include/asm/module.h
index b7927de86f9..81300d8b544 100644
--- a/arch/sh/include/asm/module.h
+++ b/arch/sh/include/asm/module.h
@@ -1,21 +1,13 @@
 #ifndef _ASM_SH_MODULE_H
 #define _ASM_SH_MODULE_H
-struct mod_arch_specific {
+#include <asm-generic/module.h>
 #ifdef CONFIG_DWARF_UNWINDER
+struct mod_arch_specific {
        struct list_head fde_list;
        struct list_head cie_list;
-#endif
 };
-#ifdef CONFIG_64BIT
-#define Elf_Shdr Elf64_Shdr
-#define Elf_Sym Elf64_Sym
-#define Elf_Ehdr Elf64_Ehdr
-#else
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
 #endif
 #ifdef CONFIG_CPU_LITTLE_ENDIAN
diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h
index bc13b57cdc8..7d5ac4e4848 100644
--- a/arch/sh/include/asm/thread_info.h
+++ b/arch/sh/include/asm/thread_info.h
@@ -206,6 +206,9 @@ static inline bool test_and_clear_restore_sigmask(void)
        ti->status &= ~TS_RESTORE_SIGMASK;
        return true;
 }
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif  /* !__ASSEMBLY__ */
 #endif /* __KERNEL__ */
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index 59521e8a164..ba7345f37bc 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -298,14 +298,14 @@ asmlinkage int sys_execve(const char __user *ufilename,
 {
        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname(ufilename);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, uargv, uenvp, regs);
+        error = do_execve(filename->name, uargv, uenvp, regs);
        putname(filename);
 out:
        return error;
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index 602545b12a8..98a709f0c3c 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -491,14 +491,14 @@ asmlinkage int sys_execve(const char *ufilename, char **uargv,
                          struct pt_regs *pregs)
 {
        int error;
-        char *filename;
+        struct filename *filename;
        filename = getname((char __user *)ufilename);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                          (const char __user *const __user *)uargv,
                          (const char __user *const __user *)uenvp,
                          pregs);
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index d6b7b6154f8..2f1f65356c0 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -22,7 +22,6 @@
 #include <linux/elf.h>
 #include <linux/personality.h>
 #include <linux/binfmts.h>
-#include <linux/freezer.h>
 #include <linux/io.h>
 #include <linux/tracehook.h>
 #include <asm/ucontext.h>
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
index 6b5b3dfe886..23853814bd1 100644
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@ -18,7 +18,6 @@
 #include <linux/errno.h>
 #include <linux/wait.h>
 #include <linux/personality.h>
-#include <linux/freezer.h>
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 91c780c973b..b6b442b0d79 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -39,6 +39,7 @@ config SPARC
        select GENERIC_CLOCKEVENTS
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
+        select MODULES_USE_ELF_RELA
 config SPARC32
        def_bool !64BIT
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
index 10d54e5e37f..645a58da0e8 100644
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -7,4 +7,5 @@ generic-y += exec.h
 generic-y += local64.h
 generic-y += irq_regs.h
 generic-y += local.h
+generic-y += module.h
 generic-y += word-at-a-time.h
diff --git a/arch/sparc/include/asm/module.h b/arch/sparc/include/asm/module.h
deleted file mode 100644
index ff8e02d8033..00000000000
--- a/arch/sparc/include/asm/module.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef __SPARC_MODULE_H
-#define __SPARC_MODULE_H
-struct mod_arch_specific { };
-/*
- * Use some preprocessor magic to define the correct symbol
- * for sparc32 and sparc64.
- * Elf_Addr becomes Elf32_Addr for sparc32 and Elf64_Addr for sparc64
- */
-#define ___ELF(a, b, c) a##b##c
-#define __ELF(a, b, c)  ___ELF(a, b, c)
-#define  _Elf(t)        __ELF(Elf, CONFIG_BITS, t)
-#define  _ELF(t)        __ELF(ELF, CONFIG_BITS, t)
-#define Elf_Shdr     _Elf(_Shdr)
-#define Elf_Sym      _Elf(_Sym)
-#define Elf_Ehdr     _Elf(_Ehdr)
-#define Elf_Rela     _Elf(_Rela)
-#define Elf_Addr     _Elf(_Addr)
-#define ELF_R_SYM    _ELF(_R_SYM)
-#define ELF_R_TYPE   _ELF(_R_TYPE)
-#endif /* __SPARC_MODULE_H */
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index e6cd224506a..25849ae3e90 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -126,13 +126,14 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_DO_NOTIFY_RESUME_MASK      (_TIF_NOTIFY_RESUME | \
                                         _TIF_SIGPENDING)
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif /* __KERNEL__ */
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index cfa8c38fb9c..4e227663108 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -256,6 +256,9 @@ static inline bool test_and_clear_restore_sigmask(void)
        ti->status &= ~TS_RESTORE_SIGMASK;
        return true;
 }
+#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif  /* !__ASSEMBLY__ */
 #endif /* __KERNEL__ */
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
index 7c831d848b4..73083e1d38d 100644
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@ -265,6 +265,11 @@ extern __must_check long strnlen_user(const char __user *str, long n);
 #define __copy_to_user_inatomic ___copy_to_user
 #define __copy_from_user_inatomic ___copy_from_user
+struct pt_regs;
+extern unsigned long compute_effective_address(struct pt_regs *,
+                                               unsigned int insn,
+                                               unsigned int rd);
 #endif  /* __ASSEMBLY__ */
 #endif /* _ASM_UACCESS_H */
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index 14006d8aca2..487bffb36f5 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -482,7 +482,7 @@ int dump_fpu (struct pt_regs * regs, elf_fpregset_t * fpregs)
 asmlinkage int sparc_execve(struct pt_regs *regs)
 {
        int error, base = 0;
-        char *filename;
+        struct filename *filename;
        /* Check for indirect call. */
        if(regs->u_regs[UREG_G1] == 0)
@@ -492,7 +492,7 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
        error = PTR_ERR(filename);
        if(IS_ERR(filename))
                goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                          (const char __user *const  __user *)
                          regs->u_regs[base + UREG_I1],
                          (const char __user *const  __user *)
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index aff0c72fac0..fcaa5942112 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -722,7 +722,7 @@ EXPORT_SYMBOL(dump_fpu);
 asmlinkage int sparc_execve(struct pt_regs *regs)
 {
        int error, base = 0;
-        char *filename;
+        struct filename *filename;
        /* User register window flush is done by entry.S */
@@ -734,7 +734,7 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename,
+        error = do_execve(filename->name,
                          (const char __user *const __user *)
                          regs->u_regs[base + UREG_I1],
                          (const char __user *const __user *)
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index d862499eb01..c3239811a1b 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -403,7 +403,7 @@ asmlinkage long compat_sys_rt_sigaction(int sig,
 asmlinkage long sparc32_execve(struct pt_regs *regs)
 {
        int error, base = 0;
-        char *filename;
+        struct filename *filename;
        /* User register window flush is done by entry.S */
@@ -416,7 +416,7 @@ asmlinkage long sparc32_execve(struct pt_regs *regs)
        if (IS_ERR(filename))
                goto out;
-        error = compat_do_execve(filename,
+        error = compat_do_execve(filename->name,
                                 compat_ptr(regs->u_regs[base + UREG_I1]),
                                 compat_ptr(regs->u_regs[base + UREG_I2]), regs);
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
index 1d7e274f3f2..7f5f65d0b3f 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -212,24 +212,20 @@ linux_sparc_syscall:
 3:      stx     %o0, [%sp + PTREGS_OFF + PT_V9_I0]
 ret_sys_call:
        ldx     [%sp + PTREGS_OFF + PT_V9_TSTATE], %g3
-        ldx     [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
        sra     %o0, 0, %o0
        mov     %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2
        sllx    %g2, 32, %g2
-        /* Check if force_successful_syscall_return()
-         * was invoked.
-         */
-        ldub    [%g6 + TI_SYS_NOERROR], %l2
-        brnz,a,pn %l2, 80f
-         stb    %g0, [%g6 + TI_SYS_NOERROR]
        cmp     %o0, -ERESTART_RESTARTBLOCK
        bgeu,pn %xcc, 1f
-         andcc  %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6
+         andcc  %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
-80:
+        ldx     [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
+2:
+        stb     %g0, [%g6 + TI_SYS_NOERROR]
        /* System call success, clear Carry condition code. */
        andn    %g3, %g2, %g3
+3:
        stx     %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]  
        bne,pn  %icc, linux_syscall_trace2
         add    %l1, 0x4, %l2                   ! npc = npc+4
@@ -238,20 +234,20 @@ ret_sys_call:
         stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
 1:
+        /* Check if force_successful_syscall_return()
+         * was invoked.
+         */
+        ldub    [%g6 + TI_SYS_NOERROR], %l2
+        brnz,pn %l2, 2b
+         ldx    [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
        /* System call failure, set Carry condition code.
         * Also, get abs(errno) to return to the process.
         */
-        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6  
        sub     %g0, %o0, %o0
-        or      %g3, %g2, %g3
        stx     %o0, [%sp + PTREGS_OFF + PT_V9_I0]
-        stx     %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]
+        ba,pt   %xcc, 3b
-        bne,pn  %icc, linux_syscall_trace2
+         or     %g3, %g2, %g3
-         add    %l1, 0x4, %l2                   ! npc = npc+4
-        stx     %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
-        b,pt    %xcc, rtrap
-         stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
 linux_syscall_trace2:
        call    syscall_trace_leave
         add    %sp, PTREGS_OFF, %o0
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index fa1f1d375ff..b66a77968f3 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -1,6 +1,6 @@
 /* arch/sparc64/kernel/traps.c
 *
- * Copyright (C) 1995,1997,2008,2009 David S. Miller (davem@davemloft.net)
+ * Copyright (C) 1995,1997,2008,2009,2012 David S. Miller (davem@davemloft.net)
 * Copyright (C) 1997,1999,2000 Jakub Jelinek (jakub@redhat.com)
 */
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/kdebug.h>
 #include <linux/ftrace.h>
+#include <linux/reboot.h>
 #include <linux/gfp.h>
 #include <asm/smp.h>
@@ -1760,85 +1761,223 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
 }
 struct sun4v_error_entry {
-        u64             err_handle;
+        /* Unique error handle */
-        u64             err_stick;
+/*0x00*/u64             err_handle;
-        u32             err_type;
+        /* %stick value at the time of the error */
+/*0x08*/u64             err_stick;
+/*0x10*/u8              reserved_1[3];
+        /* Error type */
+/*0x13*/u8              err_type;
 #define SUN4V_ERR_TYPE_UNDEFINED        0
 #define SUN4V_ERR_TYPE_UNCORRECTED_RES  1
 #define SUN4V_ERR_TYPE_PRECISE_NONRES   2
 #define SUN4V_ERR_TYPE_DEFERRED_NONRES  3
-#define SUN4V_ERR_TYPE_WARNING_RES      4
+#define SUN4V_ERR_TYPE_SHUTDOWN_RQST    4
+#define SUN4V_ERR_TYPE_DUMP_CORE        5
+#define SUN4V_ERR_TYPE_SP_STATE_CHANGE  6
+#define SUN4V_ERR_TYPE_NUM              7
-        u32             err_attrs;
+        /* Error attributes */
+/*0x14*/u32             err_attrs;
 #define SUN4V_ERR_ATTRS_PROCESSOR       0x00000001
 #define SUN4V_ERR_ATTRS_MEMORY          0x00000002
 #define SUN4V_ERR_ATTRS_PIO             0x00000004
 #define SUN4V_ERR_ATTRS_INT_REGISTERS   0x00000008
 #define SUN4V_ERR_ATTRS_FPU_REGISTERS   0x00000010
-#define SUN4V_ERR_ATTRS_USER_MODE       0x01000000
+#define SUN4V_ERR_ATTRS_SHUTDOWN_RQST   0x00000020
-#define SUN4V_ERR_ATTRS_PRIV_MODE       0x02000000
+#define SUN4V_ERR_ATTRS_ASR             0x00000040
+#define SUN4V_ERR_ATTRS_ASI             0x00000080
+#define SUN4V_ERR_ATTRS_PRIV_REG        0x00000100
+#define SUN4V_ERR_ATTRS_SPSTATE_MSK     0x00000600
+#define SUN4V_ERR_ATTRS_SPSTATE_SHFT    9
+#define SUN4V_ERR_ATTRS_MODE_MSK        0x03000000
+#define SUN4V_ERR_ATTRS_MODE_SHFT       24
 #define SUN4V_ERR_ATTRS_RES_QUEUE_FULL  0x80000000
-        u64             err_raddr;
+#define SUN4V_ERR_SPSTATE_FAULTED       0
-        u32             err_size;
+#define SUN4V_ERR_SPSTATE_AVAILABLE     1
-        u16             err_cpu;
+#define SUN4V_ERR_SPSTATE_NOT_PRESENT   2
-        u16             err_pad;
+#define SUN4V_ERR_MODE_USER             1
+#define SUN4V_ERR_MODE_PRIV             2
+        /* Real address of the memory region or PIO transaction */
+/*0x18*/u64             err_raddr;
+        /* Size of the operation triggering the error, in bytes */
+/*0x20*/u32             err_size;
+        /* ID of the CPU */
+/*0x24*/u16             err_cpu;
+        /* Grace periof for shutdown, in seconds */
+/*0x26*/u16             err_secs;
+        /* Value of the %asi register */
+/*0x28*/u8              err_asi;
+/*0x29*/u8              reserved_2;
+        /* Value of the ASR register number */
+/*0x2a*/u16             err_asr;
+#define SUN4V_ERR_ASR_VALID             0x8000
+/*0x2c*/u32             reserved_3;
+/*0x30*/u64             reserved_4;
+/*0x38*/u64             reserved_5;
 };
 static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
 static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
-static const char *sun4v_err_type_to_str(u32 type)
+static const char *sun4v_err_type_to_str(u8 type)
-{
+{
-        switch (type) {
+        static const char *types[SUN4V_ERR_TYPE_NUM] = {
-        case SUN4V_ERR_TYPE_UNDEFINED:
+                "undefined",
-                return "undefined";
+                "uncorrected resumable",
-        case SUN4V_ERR_TYPE_UNCORRECTED_RES:
+                "precise nonresumable",
-                return "uncorrected resumable";
+                "deferred nonresumable",
-        case SUN4V_ERR_TYPE_PRECISE_NONRES:
+                "shutdown request",
-                return "precise nonresumable";
+                "dump core",
-        case SUN4V_ERR_TYPE_DEFERRED_NONRES:
+                "SP state change",
-                return "deferred nonresumable";
+        };
-        case SUN4V_ERR_TYPE_WARNING_RES:
-                return "warning resumable";
+        if (type < SUN4V_ERR_TYPE_NUM)
-        default:
+                return types[type];
-                return "unknown";
+        return "unknown";
+}
+static void sun4v_emit_err_attr_strings(u32 attrs)
+{
+        static const char *attr_names[] = {
+                "processor",
+                "memory",
+                "PIO",
+                "int-registers",
+                "fpu-registers",
+                "shutdown-request",
+                "ASR",
+                "ASI",
+                "priv-reg",
+        };
+        static const char *sp_states[] = {
+                "sp-faulted",
+                "sp-available",
+                "sp-not-present",
+                "sp-state-reserved",
+        };
+        static const char *modes[] = {
+                "mode-reserved0",
+                "user",
+                "priv",
+                "mode-reserved1",
+        };
+        u32 sp_state, mode;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(attr_names); i++) {
+                if (attrs & (1U << i)) {
+                        const char *s = attr_names[i];
+                        pr_cont("%s ", s);
+                }
        }
+        sp_state = ((attrs & SUN4V_ERR_ATTRS_SPSTATE_MSK) >>
+                    SUN4V_ERR_ATTRS_SPSTATE_SHFT);
+        pr_cont("%s ", sp_states[sp_state]);
+        mode = ((attrs & SUN4V_ERR_ATTRS_MODE_MSK) >>
+                SUN4V_ERR_ATTRS_MODE_SHFT);
+        pr_cont("%s ", modes[mode]);
+        if (attrs & SUN4V_ERR_ATTRS_RES_QUEUE_FULL)
+                pr_cont("res-queue-full ");
 }
-static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent, int cpu, const char *pfx, atomic_t *ocnt)
+/* When the report contains a real-address of "-1" it means that the
+ * hardware did not provide the address.  So we compute the effective
+ * address of the load or store instruction at regs->tpc and report
+ * that.  Usually when this happens it's a PIO and in such a case we
+ * are using physical addresses with bypass ASIs anyways, so what we
+ * report here is exactly what we want.
+ */
+static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
 {
+        unsigned int insn;
+        u64 addr;
+        if (!(regs->tstate & TSTATE_PRIV))
+                return;
+        insn = *(unsigned int *) regs->tpc;
+        addr = compute_effective_address(regs, insn, 0);
+        printk("%s: insn effective address [0x%016llx]\n",
+               pfx, addr);
+}
+static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
+                            int cpu, const char *pfx, atomic_t *ocnt)
+{
+        u64 *raw_ptr = (u64 *) ent;
+        u32 attrs;
        int cnt;
        printk("%s: Reporting on cpu %d\n", pfx, cpu);
-        printk("%s: err_handle[%llx] err_stick[%llx] err_type[%08x:%s]\n",
+        printk("%s: TPC [0x%016lx] <%pS>\n",
-               pfx,
+               pfx, regs->tpc, (void *) regs->tpc);
-               ent->err_handle, ent->err_stick,
-               ent->err_type,
+        printk("%s: RAW [%016llx:%016llx:%016llx:%016llx\n",
-               sun4v_err_type_to_str(ent->err_type));
+               pfx, raw_ptr[0], raw_ptr[1], raw_ptr[2], raw_ptr[3]);
-        printk("%s: err_attrs[%08x:%s %s %s %s %s %s %s %s]\n",
+        printk("%s:      %016llx:%016llx:%016llx:%016llx]\n",
-               pfx,
+               pfx, raw_ptr[4], raw_ptr[5], raw_ptr[6], raw_ptr[7]);
-               ent->err_attrs,
-               ((ent->err_attrs & SUN4V_ERR_ATTRS_PROCESSOR) ?
+        printk("%s: handle [0x%016llx] stick [0x%016llx]\n",
-                "processor" : ""),
+               pfx, ent->err_handle, ent->err_stick);
-               ((ent->err_attrs & SUN4V_ERR_ATTRS_MEMORY) ?
-                "memory" : ""),
+        printk("%s: type [%s]\n", pfx, sun4v_err_type_to_str(ent->err_type));
-               ((ent->err_attrs & SUN4V_ERR_ATTRS_PIO) ?
-                "pio" : ""),
+        attrs = ent->err_attrs;
-               ((ent->err_attrs & SUN4V_ERR_ATTRS_INT_REGISTERS) ?
+        printk("%s: attrs [0x%08x] < ", pfx, attrs);
-                "integer-regs" : ""),
+        sun4v_emit_err_attr_strings(attrs);
-               ((ent->err_attrs & SUN4V_ERR_ATTRS_FPU_REGISTERS) ?
+        pr_cont(">\n");
-                "fpu-regs" : ""),
-               ((ent->err_attrs & SUN4V_ERR_ATTRS_USER_MODE) ?
+        /* Various fields in the error report are only valid if
-                "user" : ""),
+         * certain attribute bits are set.
-               ((ent->err_attrs & SUN4V_ERR_ATTRS_PRIV_MODE) ?
+         */
-                "privileged" : ""),
+        if (attrs & (SUN4V_ERR_ATTRS_MEMORY |
-               ((ent->err_attrs & SUN4V_ERR_ATTRS_RES_QUEUE_FULL) ?
+                     SUN4V_ERR_ATTRS_PIO |
-                "queue-full" : ""));
+                     SUN4V_ERR_ATTRS_ASI)) {
-        printk("%s: err_raddr[%016llx] err_size[%u] err_cpu[%u]\n",
+                printk("%s: raddr [0x%016llx]\n", pfx, ent->err_raddr);
-               pfx,
-               ent->err_raddr, ent->err_size, ent->err_cpu);
+                if (ent->err_raddr == ~(u64)0)
+                        sun4v_report_real_raddr(pfx, regs);
+        }
+        if (attrs & (SUN4V_ERR_ATTRS_MEMORY | SUN4V_ERR_ATTRS_ASI))
+                printk("%s: size [0x%x]\n", pfx, ent->err_size);
+        if (attrs & (SUN4V_ERR_ATTRS_PROCESSOR |
+                     SUN4V_ERR_ATTRS_INT_REGISTERS |
+                     SUN4V_ERR_ATTRS_FPU_REGISTERS |
+                     SUN4V_ERR_ATTRS_PRIV_REG))
+                printk("%s: cpu[%u]\n", pfx, ent->err_cpu);
+        if (attrs & SUN4V_ERR_ATTRS_ASI)
+                printk("%s: asi [0x%02x]\n", pfx, ent->err_asi);
+        if ((attrs & (SUN4V_ERR_ATTRS_INT_REGISTERS |
+                      SUN4V_ERR_ATTRS_FPU_REGISTERS |
+                      SUN4V_ERR_ATTRS_PRIV_REG)) &&
+            (ent->err_asr & SUN4V_ERR_ASR_VALID) != 0)
+                printk("%s: reg [0x%04x]\n",
+                       pfx, ent->err_asr & ~SUN4V_ERR_ASR_VALID);
        show_regs(regs);
@@ -1874,13 +2013,15 @@ void sun4v_resum_error(struct pt_regs *regs, unsigned long offset)
        put_cpu();
-        if (ent->err_type == SUN4V_ERR_TYPE_WARNING_RES) {
+        if (local_copy.err_type == SUN4V_ERR_TYPE_SHUTDOWN_RQST) {
-                /* If err_type is 0x4, it's a powerdown request.  Do
+                /* We should really take the seconds field of
-                 * not do the usual resumable error log because that
+                 * the error report and use it for the shutdown
-                 * makes it look like some abnormal error.
+                 * invocation, but for now do the same thing we
+                 * do for a DS shutdown request.
                 */
-                printk(KERN_INFO "Power down request...\n");
+                pr_info("Shutdown request, %u seconds...\n",
-                kill_cad_pid(SIGINT, 1);
+                        local_copy.err_secs);
+                orderly_poweroff(true);
                return;
        }
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 2976dba1eba..097aee763af 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -151,8 +151,6 @@ show_signal_msg(struct pt_regs *regs, int sig, int code,
        printk(KERN_CONT "\n");
 }
-extern unsigned long compute_effective_address(struct pt_regs *, unsigned int, unsigned int);
 static void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
                             unsigned int insn, int fault_code)
 {
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index dc46490adca..875d008828b 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -20,6 +20,7 @@ config TILE
        select SYS_HYPERVISOR
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_CLOCKEVENTS
+        select MODULES_USE_ELF_RELA
 # FIXME: investigate whether we need/want these options.
 #       select HAVE_IOREMAP_PROT
diff --git a/arch/tile/include/arch/Kbuild b/arch/tile/include/arch/Kbuild
index 9c0ea24cc94..e69de29bb2d 100644
--- a/arch/tile/include/arch/Kbuild
+++ b/arch/tile/include/arch/Kbuild
@@ -1,17 +0,0 @@
-header-y += abi.h
-header-y += chip.h
-header-y += chip_tile64.h
-header-y += chip_tilegx.h
-header-y += chip_tilepro.h
-header-y += icache.h
-header-y += interrupts.h
-header-y += interrupts_32.h
-header-y += interrupts_64.h
-header-y += opcode.h
-header-y += opcode_tilegx.h
-header-y += opcode_tilepro.h
-header-y += sim.h
-header-y += sim_def.h
-header-y += spr_def.h
-header-y += spr_def_32.h
-header-y += spr_def_64.h
diff --git a/arch/tile/include/arch/spr_def.h b/arch/tile/include/arch/spr_def.h
index d6ba449b536..2de83e7aff3 100644
--- a/arch/tile/include/arch/spr_def.h
+++ b/arch/tile/include/arch/spr_def.h
@@ -11,15 +11,11 @@
 *   NON INFRINGEMENT.  See the GNU General Public License for
 *   more details.
 */
+#ifndef __ARCH_SPR_DEF_H__
+#define __ARCH_SPR_DEF_H__
-/* Include the proper base SPR definition file. */
+#include <uapi/arch/spr_def.h>
-#ifdef __tilegx__
-#include <arch/spr_def_64.h>
-#else
-#include <arch/spr_def_32.h>
-#endif
-#ifdef __KERNEL__
 /*
 * In addition to including the proper base SPR definition file, depending
@@ -110,4 +106,4 @@
 #define INT_INTCTRL_K \
        _concat4(INT_INTCTRL_, CONFIG_KERNEL_PL,,)
-#endif /* __KERNEL__ */
+#endif /* __ARCH_SPR_DEF_H__ */
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index 5cd98fac989..c68808a09da 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -1,10 +1,7 @@
-include include/asm-generic/Kbuild.asm
 header-y += ../arch/
-header-y += cachectl.h
 header-y += ucontext.h
-header-y += hardwall.h
 generic-y += bug.h
 generic-y += bugs.h
diff --git a/arch/tile/include/asm/hardwall.h b/arch/tile/include/asm/hardwall.h
index 47514a58d68..2f572b6b7bc 100644
--- a/arch/tile/include/asm/hardwall.h
+++ b/arch/tile/include/asm/hardwall.h
@@ -14,40 +14,11 @@
 * Provide methods for access control of per-cpu resources like
 * UDN, IDN, or IPI.
 */
 #ifndef _ASM_TILE_HARDWALL_H
 #define _ASM_TILE_HARDWALL_H
-#include <arch/chip.h>
+#include <uapi/asm/hardwall.h>
-#include <linux/ioctl.h>
-#define HARDWALL_IOCTL_BASE 0xa2
-/*
- * The HARDWALL_CREATE() ioctl is a macro with a "size" argument.
- * The resulting ioctl value is passed to the kernel in conjunction
- * with a pointer to a standard kernel bitmask of cpus.
- * For network resources (UDN or IDN) the bitmask must physically
- * represent a rectangular configuration on the chip.
- * The "size" is the number of bytes of cpu mask data.
- */
-#define _HARDWALL_CREATE 1
-#define HARDWALL_CREATE(size) \
-  _IOC(_IOC_READ, HARDWALL_IOCTL_BASE, _HARDWALL_CREATE, (size))
-#define _HARDWALL_ACTIVATE 2
-#define HARDWALL_ACTIVATE \
-  _IO(HARDWALL_IOCTL_BASE, _HARDWALL_ACTIVATE)
-#define _HARDWALL_DEACTIVATE 3
-#define HARDWALL_DEACTIVATE \
- _IO(HARDWALL_IOCTL_BASE, _HARDWALL_DEACTIVATE)
-#define _HARDWALL_GET_ID 4
-#define HARDWALL_GET_ID \
- _IO(HARDWALL_IOCTL_BASE, _HARDWALL_GET_ID)
-#ifdef __KERNEL__
 /* /proc hooks for hardwall. */
 struct proc_dir_entry;
 #ifdef CONFIG_HARDWALL
@@ -56,6 +27,4 @@ int proc_pid_hardwall(struct task_struct *task, char *buffer);
 #else
 static inline void proc_tile_hardwall_init(struct proc_dir_entry *root) {}
 #endif
-#endif
 #endif /* _ASM_TILE_HARDWALL_H */
diff --git a/arch/tile/include/asm/ptrace.h b/arch/tile/include/asm/ptrace.h
index c6cddd7e8d5..1a4fd9ab0ee 100644
--- a/arch/tile/include/asm/ptrace.h
+++ b/arch/tile/include/asm/ptrace.h
@@ -11,87 +11,21 @@
 *   NON INFRINGEMENT.  See the GNU General Public License for
 *   more details.
 */
 #ifndef _ASM_TILE_PTRACE_H
 #define _ASM_TILE_PTRACE_H
-#include <arch/chip.h>
+#include <linux/compiler.h>
-#include <arch/abi.h>
-/* These must match struct pt_regs, below. */
-#if CHIP_WORD_SIZE() == 32
-#define PTREGS_OFFSET_REG(n)    ((n)*4)
-#else
-#define PTREGS_OFFSET_REG(n)    ((n)*8)
-#endif
-#define PTREGS_OFFSET_BASE      0
-#define PTREGS_OFFSET_TP        PTREGS_OFFSET_REG(53)
-#define PTREGS_OFFSET_SP        PTREGS_OFFSET_REG(54)
-#define PTREGS_OFFSET_LR        PTREGS_OFFSET_REG(55)
-#define PTREGS_NR_GPRS          56
-#define PTREGS_OFFSET_PC        PTREGS_OFFSET_REG(56)
-#define PTREGS_OFFSET_EX1       PTREGS_OFFSET_REG(57)
-#define PTREGS_OFFSET_FAULTNUM  PTREGS_OFFSET_REG(58)
-#define PTREGS_OFFSET_ORIG_R0   PTREGS_OFFSET_REG(59)
-#define PTREGS_OFFSET_FLAGS     PTREGS_OFFSET_REG(60)
-#if CHIP_HAS_CMPEXCH()
-#define PTREGS_OFFSET_CMPEXCH   PTREGS_OFFSET_REG(61)
-#endif
-#define PTREGS_SIZE             PTREGS_OFFSET_REG(64)
 #ifndef __ASSEMBLY__
-#ifdef __KERNEL__
 /* Benefit from consistent use of "long" on all chips. */
 typedef unsigned long pt_reg_t;
-#else
-/* Provide appropriate length type to userspace regardless of -m32/-m64. */
-typedef uint_reg_t pt_reg_t;
-#endif
-/*
- * This struct defines the way the registers are stored on the stack during a
- * system call or exception.  "struct sigcontext" has the same shape.
- */
-struct pt_regs {
-        /* Saved main processor registers; 56..63 are special. */
-        /* tp, sp, and lr must immediately follow regs[] for aliasing. */
-        pt_reg_t regs[53];
-        pt_reg_t tp;            /* aliases regs[TREG_TP] */
-        pt_reg_t sp;            /* aliases regs[TREG_SP] */
-        pt_reg_t lr;            /* aliases regs[TREG_LR] */
-        /* Saved special registers. */
-        pt_reg_t pc;            /* stored in EX_CONTEXT_K_0 */
-        pt_reg_t ex1;           /* stored in EX_CONTEXT_K_1 (PL and ICS bit) */
-        pt_reg_t faultnum;      /* fault number (INT_SWINT_1 for syscall) */
-        pt_reg_t orig_r0;       /* r0 at syscall entry, else zero */
-        pt_reg_t flags;         /* flags (see below) */
-#if !CHIP_HAS_CMPEXCH()
-        pt_reg_t pad[3];
-#else
-        pt_reg_t cmpexch;       /* value of CMPEXCH_VALUE SPR at interrupt */
-        pt_reg_t pad[2];
 #endif
-};
-#endif /* __ASSEMBLY__ */
-#define PTRACE_GETREGS          12
+#include <uapi/asm/ptrace.h>
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS        14
-#define PTRACE_SETFPREGS        15
-/* Support TILE-specific ptrace options, with events starting at 16. */
-#define PTRACE_O_TRACEMIGRATE   0x00010000
-#define PTRACE_EVENT_MIGRATE    16
-#ifdef __KERNEL__
 #define PTRACE_O_MASK_TILE      (PTRACE_O_TRACEMIGRATE)
 #define PT_TRACE_MIGRATE        0x00080000
 #define PT_TRACE_MASK_TILE      (PT_TRACE_MIGRATE)
-#endif
-#ifdef __KERNEL__
 /* Flag bits in pt_regs.flags */
 #define PT_FLAGS_DISABLE_IRQ    1  /* on return to kernel, disable irqs */
@@ -159,6 +93,4 @@ extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
 #define SINGLESTEP_STATE_TARGET_LB              2
 #define SINGLESTEP_STATE_TARGET_UB              7
-#endif /* !__KERNEL__ */
 #endif /* _ASM_TILE_PTRACE_H */
diff --git a/arch/tile/include/asm/setup.h b/arch/tile/include/asm/setup.h
index c67eb70ea78..d048888c5d9 100644
--- a/arch/tile/include/asm/setup.h
+++ b/arch/tile/include/asm/setup.h
@@ -11,16 +11,13 @@
 *   NON INFRINGEMENT.  See the GNU General Public License for
 *   more details.
 */
 #ifndef _ASM_TILE_SETUP_H
 #define _ASM_TILE_SETUP_H
-#define COMMAND_LINE_SIZE       2048
-#ifdef __KERNEL__
 #include <linux/pfn.h>
 #include <linux/init.h>
+#include <uapi/asm/setup.h>
 /*
 * Reserved space for vmalloc and iomap - defined in asm/page.h
@@ -53,6 +50,4 @@ int hardwall_ipi_valid(int cpu);
 } while (0)
 #endif
-#endif /* __KERNEL__ */
 #endif /* _ASM_TILE_SETUP_H */
diff --git a/arch/tile/include/asm/signal.h b/arch/tile/include/asm/signal.h
index 1e5e49aad54..10e183de96d 100644
--- a/arch/tile/include/asm/signal.h
+++ b/arch/tile/include/asm/signal.h
@@ -11,19 +11,11 @@
 *   NON INFRINGEMENT.  See the GNU General Public License for
 *   more details.
 */
 #ifndef _ASM_TILE_SIGNAL_H
 #define _ASM_TILE_SIGNAL_H
-/* Do not notify a ptracer when this signal is handled. */
+#include <uapi/asm/signal.h>
-#define SA_NOPTRACE 0x02000000u
-/* Used in earlier Tilera releases, so keeping for binary compatibility. */
-#define SA_RESTORER 0x04000000u
-#include <asm-generic/signal.h>
-#if defined(__KERNEL__)
 #if !defined(__ASSEMBLY__)
 struct pt_regs;
 int restore_sigcontext(struct pt_regs *, struct sigcontext __user *);
@@ -34,6 +26,4 @@ void signal_fault(const char *type, struct pt_regs *,
 void trace_unhandled_signal(const char *type, struct pt_regs *regs,
                            unsigned long address, int signo);
 #endif
-#endif
 #endif /* _ASM_TILE_SIGNAL_H */
diff --git a/arch/tile/include/asm/unistd.h b/arch/tile/include/asm/unistd.h
index 0e1f3e66e49..6e032a0a268 100644
--- a/arch/tile/include/asm/unistd.h
+++ b/arch/tile/include/asm/unistd.h
@@ -11,32 +11,9 @@
 *   NON INFRINGEMENT.  See the GNU General Public License for
 *   more details.
 */
-#if !defined(__LP64__) || defined(__SYSCALL_COMPAT)
-/* Use the flavor of this syscall that matches the 32-bit API better. */
-#define __ARCH_WANT_SYNC_FILE_RANGE2
-#endif
-/* Use the standard ABI for syscalls. */
-#include <asm-generic/unistd.h>
-/* Additional Tilera-specific syscalls. */
-#define __NR_cacheflush (__NR_arch_specific_syscall + 1)
-__SYSCALL(__NR_cacheflush, sys_cacheflush)
-#ifndef __tilegx__
-/* "Fast" syscalls provide atomic support for 32-bit chips. */
-#define __NR_FAST_cmpxchg       -1
-#define __NR_FAST_atomic_update -2
-#define __NR_FAST_cmpxchg64     -3
-#define __NR_cmpxchg_badaddr    (__NR_arch_specific_syscall + 0)
-__SYSCALL(__NR_cmpxchg_badaddr, sys_cmpxchg_badaddr)
-#endif
-#ifdef __KERNEL__
 /* In compat mode, we use sys_llseek() for compat_sys_llseek(). */
 #ifdef CONFIG_COMPAT
 #define __ARCH_WANT_SYS_LLSEEK
 #endif
 #define __ARCH_WANT_SYS_NEWFSTATAT
-#endif
+#include <uapi/asm/unistd.h>
diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild
index aafaa5aa54d..4ebc34f4768 100644
--- a/arch/tile/include/uapi/arch/Kbuild
+++ b/arch/tile/include/uapi/arch/Kbuild
@@ -1 +1,18 @@
 # UAPI Header export list
+header-y += abi.h
+header-y += chip.h
+header-y += chip_tile64.h
+header-y += chip_tilegx.h
+header-y += chip_tilepro.h
+header-y += icache.h
+header-y += interrupts.h
+header-y += interrupts_32.h
+header-y += interrupts_64.h
+header-y += opcode.h
+header-y += opcode_tilegx.h
+header-y += opcode_tilepro.h
+header-y += sim.h
+header-y += sim_def.h
+header-y += spr_def.h
+header-y += spr_def_32.h
+header-y += spr_def_64.h
diff --git a/arch/tile/include/arch/abi.h b/arch/tile/include/uapi/arch/abi.h
index c55a3d43264..c55a3d43264 100644
--- a/arch/tile/include/arch/abi.h
+++ b/arch/tile/include/uapi/arch/abi.h
diff --git a/arch/tile/include/arch/chip.h b/arch/tile/include/uapi/arch/chip.h
index 926d3db0e91..926d3db0e91 100644
--- a/arch/tile/include/arch/chip.h
+++ b/arch/tile/include/uapi/arch/chip.h
diff --git a/arch/tile/include/arch/chip_tile64.h b/arch/tile/include/uapi/arch/chip_tile64.h
index 261aaba092d..261aaba092d 100644
--- a/arch/tile/include/arch/chip_tile64.h
+++ b/arch/tile/include/uapi/arch/chip_tile64.h
diff --git a/arch/tile/include/arch/chip_tilegx.h b/arch/tile/include/uapi/arch/chip_tilegx.h
index ea8e4f2c948..ea8e4f2c948 100644
--- a/arch/tile/include/arch/chip_tilegx.h
+++ b/arch/tile/include/uapi/arch/chip_tilegx.h
diff --git a/arch/tile/include/arch/chip_tilepro.h b/arch/tile/include/uapi/arch/chip_tilepro.h
index 70017699a74..70017699a74 100644
--- a/arch/tile/include/arch/chip_tilepro.h
+++ b/arch/tile/include/uapi/arch/chip_tilepro.h
diff --git a/arch/tile/include/arch/icache.h b/arch/tile/include/uapi/arch/icache.h
index 762eafa8a11..762eafa8a11 100644
--- a/arch/tile/include/arch/icache.h
+++ b/arch/tile/include/uapi/arch/icache.h
diff --git a/arch/tile/include/arch/interrupts.h b/arch/tile/include/uapi/arch/interrupts.h
index 20f8f07d2de..20f8f07d2de 100644
--- a/arch/tile/include/arch/interrupts.h
+++ b/arch/tile/include/uapi/arch/interrupts.h
diff --git a/arch/tile/include/arch/interrupts_32.h b/arch/tile/include/uapi/arch/interrupts_32.h
index 96b5710505b..96b5710505b 100644
--- a/arch/tile/include/arch/interrupts_32.h
+++ b/arch/tile/include/uapi/arch/interrupts_32.h
diff --git a/arch/tile/include/arch/interrupts_64.h b/arch/tile/include/uapi/arch/interrupts_64.h
index 5bb58b2e4e6..5bb58b2e4e6 100644
--- a/arch/tile/include/arch/interrupts_64.h
+++ b/arch/tile/include/uapi/arch/interrupts_64.h
diff --git a/arch/tile/include/arch/opcode.h b/arch/tile/include/uapi/arch/opcode.h
index 92d15229ece..92d15229ece 100644
--- a/arch/tile/include/arch/opcode.h
+++ b/arch/tile/include/uapi/arch/opcode.h
diff --git a/arch/tile/include/arch/opcode_tilegx.h b/arch/tile/include/uapi/arch/opcode_tilegx.h
index c14d02c8160..c14d02c8160 100644
--- a/arch/tile/include/arch/opcode_tilegx.h
+++ b/arch/tile/include/uapi/arch/opcode_tilegx.h
diff --git a/arch/tile/include/arch/opcode_tilepro.h b/arch/tile/include/uapi/arch/opcode_tilepro.h
index 71b763b8ce8..71b763b8ce8 100644
--- a/arch/tile/include/arch/opcode_tilepro.h
+++ b/arch/tile/include/uapi/arch/opcode_tilepro.h
diff --git a/arch/tile/include/arch/sim.h b/arch/tile/include/uapi/arch/sim.h
index e54b7b0527f..e54b7b0527f 100644
--- a/arch/tile/include/arch/sim.h
+++ b/arch/tile/include/uapi/arch/sim.h
diff --git a/arch/tile/include/arch/sim_def.h b/arch/tile/include/uapi/arch/sim_def.h
index 4b44a2b6a09..4b44a2b6a09 100644
--- a/arch/tile/include/arch/sim_def.h
+++ b/arch/tile/include/uapi/arch/sim_def.h
diff --git a/arch/tile/include/uapi/arch/spr_def.h b/arch/tile/include/uapi/arch/spr_def.h
new file mode 100644
index 00000000000..c250c5adb1a
--- /dev/null
+++ b/arch/tile/include/uapi/arch/spr_def.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+#ifndef _UAPI__ARCH_SPR_DEF_H__
+#define _UAPI__ARCH_SPR_DEF_H__
+/* Include the proper base SPR definition file. */
+#ifdef __tilegx__
+#include <arch/spr_def_64.h>
+#else
+#include <arch/spr_def_32.h>
+#endif
+#endif /* _UAPI__ARCH_SPR_DEF_H__ */
diff --git a/arch/tile/include/arch/spr_def_32.h b/arch/tile/include/uapi/arch/spr_def_32.h
index 78bbce2fb19..c689446e628 100644
--- a/arch/tile/include/arch/spr_def_32.h
+++ b/arch/tile/include/uapi/arch/spr_def_32.h
@@ -14,8 +14,8 @@
 #ifndef __DOXYGEN__
-#ifndef __ARCH_SPR_DEF_H__
+#ifndef __ARCH_SPR_DEF_32_H__
-#define __ARCH_SPR_DEF_H__
+#define __ARCH_SPR_DEF_32_H__
 #define SPR_AUX_PERF_COUNT_0 0x6005
 #define SPR_AUX_PERF_COUNT_1 0x6006
@@ -252,6 +252,6 @@
 #define SPR_WATCH_MASK 0x420a
 #define SPR_WATCH_VAL 0x420b
-#endif /* !defined(__ARCH_SPR_DEF_H__) */
+#endif /* !defined(__ARCH_SPR_DEF_32_H__) */
 #endif /* !defined(__DOXYGEN__) */
diff --git a/arch/tile/include/arch/spr_def_64.h b/arch/tile/include/uapi/arch/spr_def_64.h
index 0da86faa337..67a6c1751e3 100644
--- a/arch/tile/include/arch/spr_def_64.h
+++ b/arch/tile/include/uapi/arch/spr_def_64.h
@@ -14,8 +14,8 @@
 #ifndef __DOXYGEN__
-#ifndef __ARCH_SPR_DEF_H__
+#ifndef __ARCH_SPR_DEF_64_H__
-#define __ARCH_SPR_DEF_H__
+#define __ARCH_SPR_DEF_64_H__
 #define SPR_AUX_PERF_COUNT_0 0x2105
 #define SPR_AUX_PERF_COUNT_1 0x2106
@@ -211,6 +211,6 @@
 #define SPR_WATCH_MASK 0x200a
 #define SPR_WATCH_VAL 0x200b
-#endif /* !defined(__ARCH_SPR_DEF_H__) */
+#endif /* !defined(__ARCH_SPR_DEF_64_H__) */
 #endif /* !defined(__DOXYGEN__) */
diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild
index baebb3da1d4..5c6915fd30b 100644
--- a/arch/tile/include/uapi/asm/Kbuild
+++ b/arch/tile/include/uapi/asm/Kbuild
@@ -1,3 +1,18 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += cachectl.h
+header-y += hardwall.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += ptrace.h
+header-y += setup.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += stat.h
+header-y += swab.h
+header-y += unistd.h
diff --git a/arch/tile/include/asm/auxvec.h b/arch/tile/include/uapi/asm/auxvec.h
index 1d393edb064..1d393edb064 100644
--- a/arch/tile/include/asm/auxvec.h
+++ b/arch/tile/include/uapi/asm/auxvec.h
diff --git a/arch/tile/include/asm/bitsperlong.h b/arch/tile/include/uapi/asm/bitsperlong.h
index 58c771f2af2..58c771f2af2 100644
--- a/arch/tile/include/asm/bitsperlong.h
+++ b/arch/tile/include/uapi/asm/bitsperlong.h
diff --git a/arch/tile/include/asm/byteorder.h b/arch/tile/include/uapi/asm/byteorder.h
index fb72ecf4921..fb72ecf4921 100644
--- a/arch/tile/include/asm/byteorder.h
+++ b/arch/tile/include/uapi/asm/byteorder.h
diff --git a/arch/tile/include/asm/cachectl.h b/arch/tile/include/uapi/asm/cachectl.h
index af4c9f9154d..af4c9f9154d 100644
--- a/arch/tile/include/asm/cachectl.h
+++ b/arch/tile/include/uapi/asm/cachectl.h
diff --git a/arch/tile/include/uapi/asm/hardwall.h b/arch/tile/include/uapi/asm/hardwall.h
new file mode 100644
index 00000000000..c2169d4f401
--- /dev/null
+++ b/arch/tile/include/uapi/asm/hardwall.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * Provide methods for access control of per-cpu resources like
+ * UDN, IDN, or IPI.
+ */
+#ifndef _UAPI_ASM_TILE_HARDWALL_H
+#define _UAPI_ASM_TILE_HARDWALL_H
+#include <arch/chip.h>
+#include <linux/ioctl.h>
+#define HARDWALL_IOCTL_BASE 0xa2
+/*
+ * The HARDWALL_CREATE() ioctl is a macro with a "size" argument.
+ * The resulting ioctl value is passed to the kernel in conjunction
+ * with a pointer to a standard kernel bitmask of cpus.
+ * For network resources (UDN or IDN) the bitmask must physically
+ * represent a rectangular configuration on the chip.
+ * The "size" is the number of bytes of cpu mask data.
+ */
+#define _HARDWALL_CREATE 1
+#define HARDWALL_CREATE(size) \
+  _IOC(_IOC_READ, HARDWALL_IOCTL_BASE, _HARDWALL_CREATE, (size))
+#define _HARDWALL_ACTIVATE 2
+#define HARDWALL_ACTIVATE \
+  _IO(HARDWALL_IOCTL_BASE, _HARDWALL_ACTIVATE)
+#define _HARDWALL_DEACTIVATE 3
+#define HARDWALL_DEACTIVATE \
+ _IO(HARDWALL_IOCTL_BASE, _HARDWALL_DEACTIVATE)
+#define _HARDWALL_GET_ID 4
+#define HARDWALL_GET_ID \
+ _IO(HARDWALL_IOCTL_BASE, _HARDWALL_GET_ID)
+#endif /* _UAPI_ASM_TILE_HARDWALL_H */
diff --git a/arch/tile/include/asm/kvm_para.h b/arch/tile/include/uapi/asm/kvm_para.h
index 14fab8f0b95..14fab8f0b95 100644
--- a/arch/tile/include/asm/kvm_para.h
+++ b/arch/tile/include/uapi/asm/kvm_para.h
diff --git a/arch/tile/include/asm/mman.h b/arch/tile/include/uapi/asm/mman.h
index 81b8fc348d6..81b8fc348d6 100644
--- a/arch/tile/include/asm/mman.h
+++ b/arch/tile/include/uapi/asm/mman.h
diff --git a/arch/tile/include/uapi/asm/ptrace.h b/arch/tile/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..c717d0fec72
--- /dev/null
+++ b/arch/tile/include/uapi/asm/ptrace.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+#ifndef _UAPI_ASM_TILE_PTRACE_H
+#define _UAPI_ASM_TILE_PTRACE_H
+#include <arch/chip.h>
+#include <arch/abi.h>
+/* These must match struct pt_regs, below. */
+#if CHIP_WORD_SIZE() == 32
+#define PTREGS_OFFSET_REG(n)    ((n)*4)
+#else
+#define PTREGS_OFFSET_REG(n)    ((n)*8)
+#endif
+#define PTREGS_OFFSET_BASE      0
+#define PTREGS_OFFSET_TP        PTREGS_OFFSET_REG(53)
+#define PTREGS_OFFSET_SP        PTREGS_OFFSET_REG(54)
+#define PTREGS_OFFSET_LR        PTREGS_OFFSET_REG(55)
+#define PTREGS_NR_GPRS          56
+#define PTREGS_OFFSET_PC        PTREGS_OFFSET_REG(56)
+#define PTREGS_OFFSET_EX1       PTREGS_OFFSET_REG(57)
+#define PTREGS_OFFSET_FAULTNUM  PTREGS_OFFSET_REG(58)
+#define PTREGS_OFFSET_ORIG_R0   PTREGS_OFFSET_REG(59)
+#define PTREGS_OFFSET_FLAGS     PTREGS_OFFSET_REG(60)
+#if CHIP_HAS_CMPEXCH()
+#define PTREGS_OFFSET_CMPEXCH   PTREGS_OFFSET_REG(61)
+#endif
+#define PTREGS_SIZE             PTREGS_OFFSET_REG(64)
+#ifndef __ASSEMBLY__
+#ifndef __KERNEL__
+/* Provide appropriate length type to userspace regardless of -m32/-m64. */
+typedef uint_reg_t pt_reg_t;
+#endif
+/*
+ * This struct defines the way the registers are stored on the stack during a
+ * system call or exception.  "struct sigcontext" has the same shape.
+ */
+struct pt_regs {
+        /* Saved main processor registers; 56..63 are special. */
+        /* tp, sp, and lr must immediately follow regs[] for aliasing. */
+        pt_reg_t regs[53];
+        pt_reg_t tp;            /* aliases regs[TREG_TP] */
+        pt_reg_t sp;            /* aliases regs[TREG_SP] */
+        pt_reg_t lr;            /* aliases regs[TREG_LR] */
+        /* Saved special registers. */
+        pt_reg_t pc;            /* stored in EX_CONTEXT_K_0 */
+        pt_reg_t ex1;           /* stored in EX_CONTEXT_K_1 (PL and ICS bit) */
+        pt_reg_t faultnum;      /* fault number (INT_SWINT_1 for syscall) */
+        pt_reg_t orig_r0;       /* r0 at syscall entry, else zero */
+        pt_reg_t flags;         /* flags (see below) */
+#if !CHIP_HAS_CMPEXCH()
+        pt_reg_t pad[3];
+#else
+        pt_reg_t cmpexch;       /* value of CMPEXCH_VALUE SPR at interrupt */
+        pt_reg_t pad[2];
+#endif
+};
+#endif /* __ASSEMBLY__ */
+#define PTRACE_GETREGS          12
+#define PTRACE_SETREGS          13
+#define PTRACE_GETFPREGS        14
+#define PTRACE_SETFPREGS        15
+/* Support TILE-specific ptrace options, with events starting at 16. */
+#define PTRACE_O_TRACEMIGRATE   0x00010000
+#define PTRACE_EVENT_MIGRATE    16
+#endif /* _UAPI_ASM_TILE_PTRACE_H */
diff --git a/arch/tile/include/uapi/asm/setup.h b/arch/tile/include/uapi/asm/setup.h
new file mode 100644
index 00000000000..e6f7da265ac
--- /dev/null
+++ b/arch/tile/include/uapi/asm/setup.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+#ifndef _UAPI_ASM_TILE_SETUP_H
+#define _UAPI_ASM_TILE_SETUP_H
+#define COMMAND_LINE_SIZE       2048
+#endif /* _UAPI_ASM_TILE_SETUP_H */
diff --git a/arch/tile/include/asm/sigcontext.h b/arch/tile/include/uapi/asm/sigcontext.h
index 6348e59d372..6348e59d372 100644
--- a/arch/tile/include/asm/sigcontext.h
+++ b/arch/tile/include/uapi/asm/sigcontext.h
diff --git a/arch/tile/include/asm/siginfo.h b/arch/tile/include/uapi/asm/siginfo.h
index 56d661bb010..56d661bb010 100644
--- a/arch/tile/include/asm/siginfo.h
+++ b/arch/tile/include/uapi/asm/siginfo.h
diff --git a/arch/tile/include/uapi/asm/signal.h b/arch/tile/include/uapi/asm/signal.h
new file mode 100644
index 00000000000..ef0d32d84a4
--- /dev/null
+++ b/arch/tile/include/uapi/asm/signal.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+#ifndef _UAPI_ASM_TILE_SIGNAL_H
+#define _UAPI_ASM_TILE_SIGNAL_H
+/* Do not notify a ptracer when this signal is handled. */
+#define SA_NOPTRACE 0x02000000u
+/* Used in earlier Tilera releases, so keeping for binary compatibility. */
+#define SA_RESTORER 0x04000000u
+#include <asm-generic/signal.h>
+#endif /* _UAPI_ASM_TILE_SIGNAL_H */
diff --git a/arch/tile/include/asm/stat.h b/arch/tile/include/uapi/asm/stat.h
index c0db34d56be..c0db34d56be 100644
--- a/arch/tile/include/asm/stat.h
+++ b/arch/tile/include/uapi/asm/stat.h
diff --git a/arch/tile/include/asm/swab.h b/arch/tile/include/uapi/asm/swab.h
index 7c37b38f6c8..7c37b38f6c8 100644
--- a/arch/tile/include/asm/swab.h
+++ b/arch/tile/include/uapi/asm/swab.h
diff --git a/arch/tile/include/uapi/asm/unistd.h b/arch/tile/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..cd7b6dd9d47
--- /dev/null
+++ b/arch/tile/include/uapi/asm/unistd.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   This program is distributed in the hope that it will be useful, but
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+#if !defined(__LP64__) || defined(__SYSCALL_COMPAT)
+/* Use the flavor of this syscall that matches the 32-bit API better. */
+#define __ARCH_WANT_SYNC_FILE_RANGE2
+#endif
+/* Use the standard ABI for syscalls. */
+#include <asm-generic/unistd.h>
+/* Additional Tilera-specific syscalls. */
+#define __NR_cacheflush (__NR_arch_specific_syscall + 1)
+__SYSCALL(__NR_cacheflush, sys_cacheflush)
+#ifndef __tilegx__
+/* "Fast" syscalls provide atomic support for 32-bit chips. */
+#define __NR_FAST_cmpxchg       -1
+#define __NR_FAST_atomic_update -2
+#define __NR_FAST_cmpxchg64     -3
+#define __NR_cmpxchg_badaddr    (__NR_arch_specific_syscall + 0)
+__SYSCALL(__NR_cmpxchg_badaddr, sys_cmpxchg_badaddr)
+#endif
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index 7bc0859a9f5..08b4fe1717b 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -354,15 +354,6 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        regs->regs[1] = ptr_to_compat_reg(&frame->info);
        regs->regs[2] = ptr_to_compat_reg(&frame->uc);
        regs->flags |= PT_FLAGS_CALLER_SAVES;
-        /*
-         * Notify any tracer that was single-stepping it.
-         * The tracer may want to single-step inside the
-         * handler too.
-         */
-        if (test_thread_flag(TIF_SINGLESTEP))
-                ptrace_notify(SIGTRAP);
        return 0;
 give_sigsegv:
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 6be79915050..307d010696c 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -548,6 +548,9 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags)
        if (!user_mode(regs))
                return 0;
+        /* Enable interrupts; they are disabled again on return to caller. */
+        local_irq_enable();
        if (thread_info_flags & _TIF_NEED_RESCHED) {
                schedule();
                return 1;
@@ -594,13 +597,13 @@ SYSCALL_DEFINE4(execve, const char __user *, path,
                struct pt_regs *, regs)
 {
        long error;
-        char *filename;
+        struct filename *filename;
        filename = getname(path);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
        if (error == 0)
                single_step_execve();
@@ -615,13 +618,13 @@ long compat_sys_execve(const char __user *path,
                       struct pt_regs *regs)
 {
        long error;
-        char *filename;
+        struct filename *filename;
        filename = getname(path);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = compat_do_execve(filename, argv, envp, regs);
+        error = compat_do_execve(filename->name, argv, envp, regs);
        putname(filename);
        if (error == 0)
                single_step_execve();
diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index e29b0553211..67efb656d10 100644
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -219,15 +219,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        regs->regs[1] = (unsigned long) &frame->info;
        regs->regs[2] = (unsigned long) &frame->uc;
        regs->flags |= PT_FLAGS_CALLER_SAVES;
-        /*
-         * Notify any tracer that was single-stepping it.
-         * The tracer may want to single-step inside the
-         * handler too.
-         */
-        if (test_thread_flag(TIF_SINGLESTEP))
-                ptrace_notify(SIGTRAP);
        return 0;
 give_sigsegv:
@@ -278,7 +269,8 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
                ret = setup_rt_frame(sig, ka, info, oldset, regs);
        if (ret)
                return;
-        signal_delivered(sig, info, ka, regs, 0);
+        signal_delivered(sig, info, ka, regs,
+                        test_thread_flag(TIF_SINGLESTEP));
 }
 /*
diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h
index 1e82e954e97..c03cd5a0236 100644
--- a/arch/um/include/asm/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
@@ -26,7 +26,6 @@ struct thread_struct {
        jmp_buf *fault_catcher;
        struct task_struct *prev_sched;
        unsigned long temp_stack;
-        jmp_buf *exec_buf;
        struct arch_thread arch;
        jmp_buf switch_buf;
        int mm_count;
@@ -54,7 +53,6 @@ struct thread_struct {
        .fault_addr             = NULL, \
        .prev_sched             = NULL, \
        .temp_stack             = 0, \
-        .exec_buf               = NULL, \
        .arch                   = INIT_ARCH_THREAD, \
        .request                = { 0 } \
 }
diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h
index c04e5ab68f5..2c8eeb2df8b 100644
--- a/arch/um/include/asm/thread_info.h
+++ b/arch/um/include/asm/thread_info.h
@@ -65,8 +65,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
 #define TIF_SIGPENDING          1       /* signal pending */
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling
-                                         * TIF_NEED_RESCHED */
 #define TIF_RESTART_BLOCK       4
 #define TIF_MEMDIE              5       /* is terminating due to OOM killer */
 #define TIF_SYSCALL_AUDIT       6
@@ -76,7 +74,6 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
-#define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_MEMDIE             (1 << TIF_MEMDIE)
 #define _TIF_SYSCALL_AUDIT      (1 << TIF_SYSCALL_AUDIT)
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index 44883049c11..95feaa47a2f 100644
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -191,7 +191,6 @@ extern int os_getpid(void);
 extern int os_getpgrp(void);
 extern void init_new_thread_signals(void);
-extern int run_kernel_thread(int (*fn)(void *), void *arg, jmp_buf **jmp_ptr);
 extern int os_map_memory(void *virt, int fd, unsigned long long off,
                         unsigned long len, int r, int w, int x);
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index ab019c7f0b5..3a8ece7d09c 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -47,8 +47,3 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
 #endif
 }
 EXPORT_SYMBOL(start_thread);
-void __noreturn ret_from_kernel_execve(struct pt_regs *unused)
-{
-        UML_LONGJMP(current->thread.exec_buf, 1);
-}
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 30629783b3e..b6d699cdd55 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -135,14 +135,10 @@ void new_thread_handler(void)
        arg = current->thread.request.u.thread.arg;
        /*
-         * The return value is 1 if the kernel thread execs a process,
+         * callback returns only if the kernel thread execs a process
-         * 0 if it just exits
         */
-        n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
+        n = fn(arg);
-        if (n == 1)
+        userspace(&current->thread.regs.regs);
-                userspace(&current->thread.regs.regs);
-        else
-                do_exit(0);
 }
 /* Called magically, see new_thread_handler above */
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index 162bea3d91b..b8f34c9e53a 100644
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -244,16 +244,3 @@ void init_new_thread_signals(void)
        signal(SIGWINCH, SIG_IGN);
        signal(SIGTERM, SIG_DFL);
 }
-int run_kernel_thread(int (*fn)(void *), void *arg, jmp_buf **jmp_ptr)
-{
-        jmp_buf buf;
-        int n;
-        *jmp_ptr = &buf;
-        n = UML_SETJMP(&buf);
-        if (n != 0)
-                return n;
-        (*fn)(arg);
-        return 0;
-}
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 35ee2bf6635..e5c5473e69c 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -15,6 +15,7 @@ config UNICORE32
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_FRAME_POINTERS
        select GENERIC_IOMAP
+        select MODULES_USE_ELF_REL
        help
          UniCore-32 is 32-bit Instruction Set Architecture,
          including a series of low-power-consumption RISC chip
diff --git a/arch/unicore32/include/asm/thread_info.h b/arch/unicore32/include/asm/thread_info.h
index 89f7557583b..818b4a1edb5 100644
--- a/arch/unicore32/include/asm/thread_info.h
+++ b/arch/unicore32/include/asm/thread_info.h
@@ -141,12 +141,12 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
 /*
 * Change these and you break ASM code in entry-common.S
 */
-#define _TIF_WORK_MASK          0x000000ff
+#define _TIF_WORK_MASK \
+        (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME)
 #endif /* __KERNEL__ */
 #endif /* __UNICORE_THREAD_INFO_H__ */
diff --git a/arch/unicore32/kernel/entry.S b/arch/unicore32/kernel/entry.S
index 00a259f9819..dcb87ab19dd 100644
--- a/arch/unicore32/kernel/entry.S
+++ b/arch/unicore32/kernel/entry.S
@@ -544,8 +544,6 @@ fast_work_pending:
 work_pending:
        cand.a  r1, #_TIF_NEED_RESCHED
        bne     work_resched
-        cand.a  r1, #_TIF_SIGPENDING|_TIF_NOTIFY_RESUME
-        beq     no_work_pending
        mov     r0, sp                          @ 'regs'
        mov     r2, why                         @ 'syscall'
        cand.a  r1, #_TIF_SIGPENDING            @ delivering a signal?
diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c
index 8adedb37720..b8b2ffd774d 100644
--- a/arch/unicore32/kernel/signal.c
+++ b/arch/unicore32/kernel/signal.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/personality.h>
-#include <linux/freezer.h>
 #include <linux/uaccess.h>
 #include <linux/tracehook.h>
 #include <linux/elf.h>
diff --git a/arch/unicore32/kernel/sys.c b/arch/unicore32/kernel/sys.c
index 5fd9af773e1..fabdee96110 100644
--- a/arch/unicore32/kernel/sys.c
+++ b/arch/unicore32/kernel/sys.c
@@ -51,13 +51,13 @@ asmlinkage long __sys_execve(const char __user *filename,
                          struct pt_regs *regs)
 {
        int error;
-        char *fn;
+        struct filename *fn;
        fn = getname(filename);
        error = PTR_ERR(fn);
        if (IS_ERR(fn))
                goto out;
-        error = do_execve(fn, argv, envp, regs);
+        error = do_execve(fn->name, argv, envp, regs);
        putname(fn);
 out:
        return error;
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 42d2c35a5bb..46c3bff3ced 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -109,6 +109,9 @@ config X86
        select HAVE_RCU_USER_QS if X86_64
        select HAVE_IRQ_TIME_ACCOUNTING
        select GENERIC_KERNEL_THREAD
+        select GENERIC_KERNEL_EXECVE
+        select MODULES_USE_ELF_REL if X86_32
+        select MODULES_USE_ELF_RELA if X86_64
 config INSTRUCTION_DECODER
        def_bool y
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index ce03476d8c8..ccce0ed67dd 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -37,7 +37,8 @@ setup-y		+= video-bios.o
 targets         += $(setup-y)
 hostprogs-y     := mkcpustr tools/build
-HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include \
+                    -include include/generated/autoconf.h \
                    -D__EXPORTED_HEADERS__
 $(obj)/cpu.o: $(obj)/cpustr.h
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index fbee9714d9a..7f0edceb756 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -121,6 +121,11 @@
 #define MSR_P6_EVNTSEL0                 0x00000186
 #define MSR_P6_EVNTSEL1                 0x00000187
+#define MSR_KNC_PERFCTR0               0x00000020
+#define MSR_KNC_PERFCTR1               0x00000021
+#define MSR_KNC_EVNTSEL0               0x00000028
+#define MSR_KNC_EVNTSEL1               0x00000029
 /* AMD64 MSRs. Not complete. See the architecture manual for a more
   complete list. */
diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h
index 55d155560fd..16f3fc6ebf2 100644
--- a/arch/x86/include/asm/unistd.h
+++ b/arch/x86/include/asm/unistd.h
@@ -51,7 +51,6 @@
 # define __ARCH_WANT_SYS_UTIME
 # define __ARCH_WANT_SYS_WAITPID
 # define __ARCH_WANT_SYS_EXECVE
-# define __ARCH_WANT_KERNEL_EXECVE
 /*
 * "Conditional" syscalls
diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
index 8b38be2de9e..46e24d36b7d 100644
--- a/arch/x86/include/asm/vgtod.h
+++ b/arch/x86/include/asm/vgtod.h
@@ -17,8 +17,8 @@ struct vsyscall_gtod_data {
        /* open coded 'struct timespec' */
        time_t          wall_time_sec;
-        u32             wall_time_nsec;
+        u64             wall_time_snsec;
-        u32             monotonic_time_nsec;
+        u64             monotonic_time_snsec;
        time_t          monotonic_time_sec;
        struct timezone sys_tz;
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index d30a6a9a012..a0e067d3d96 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -32,7 +32,7 @@ obj-$(CONFIG_PERF_EVENTS)		+= perf_event.o
 ifdef CONFIG_PERF_EVENTS
 obj-$(CONFIG_CPU_SUP_AMD)               += perf_event_amd.o
-obj-$(CONFIG_CPU_SUP_INTEL)             += perf_event_p6.o perf_event_p4.o
+obj-$(CONFIG_CPU_SUP_INTEL)             += perf_event_p6.o perf_event_knc.o perf_event_p4.o
 obj-$(CONFIG_CPU_SUP_INTEL)             += perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o
 obj-$(CONFIG_CPU_SUP_INTEL)             += perf_event_intel_uncore.o
 endif
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
index 8b6defe7eef..271d2570029 100644
--- a/arch/x86/kernel/cpu/perf_event.h
+++ b/arch/x86/kernel/cpu/perf_event.h
@@ -626,6 +626,8 @@ int p4_pmu_init(void);
 int p6_pmu_init(void);
+int knc_pmu_init(void);
 #else /* CONFIG_CPU_SUP_INTEL */
 static inline void reserve_ds_buffers(void)
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c
index eebd5ffe1bb..6336bcbd061 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c
@@ -41,17 +41,22 @@ struct cpu_perf_ibs {
 };
 struct perf_ibs {
-        struct pmu      pmu;
+        struct pmu                      pmu;
-        unsigned int    msr;
+        unsigned int                    msr;
-        u64             config_mask;
+        u64                             config_mask;
-        u64             cnt_mask;
+        u64                             cnt_mask;
-        u64             enable_mask;
+        u64                             enable_mask;
-        u64             valid_mask;
+        u64                             valid_mask;
-        u64             max_period;
+        u64                             max_period;
-        unsigned long   offset_mask[1];
+        unsigned long                   offset_mask[1];
-        int             offset_max;
+        int                             offset_max;
-        struct cpu_perf_ibs __percpu *pcpu;
+        struct cpu_perf_ibs __percpu    *pcpu;
-        u64             (*get_count)(u64 config);
+        struct attribute                **format_attrs;
+        struct attribute_group          format_group;
+        const struct attribute_group    *attr_groups[2];
+        u64                             (*get_count)(u64 config);
 };
 struct perf_ibs_data {
@@ -446,6 +451,19 @@ static void perf_ibs_del(struct perf_event *event, int flags)
 static void perf_ibs_read(struct perf_event *event) { }
+PMU_FORMAT_ATTR(rand_en,        "config:57");
+PMU_FORMAT_ATTR(cnt_ctl,        "config:19");
+static struct attribute *ibs_fetch_format_attrs[] = {
+        &format_attr_rand_en.attr,
+        NULL,
+};
+static struct attribute *ibs_op_format_attrs[] = {
+        NULL,   /* &format_attr_cnt_ctl.attr if IBS_CAPS_OPCNT */
+        NULL,
+};
 static struct perf_ibs perf_ibs_fetch = {
        .pmu = {
                .task_ctx_nr    = perf_invalid_context,
@@ -465,6 +483,7 @@ static struct perf_ibs perf_ibs_fetch = {
        .max_period             = IBS_FETCH_MAX_CNT << 4,
        .offset_mask            = { MSR_AMD64_IBSFETCH_REG_MASK },
        .offset_max             = MSR_AMD64_IBSFETCH_REG_COUNT,
+        .format_attrs           = ibs_fetch_format_attrs,
        .get_count              = get_ibs_fetch_count,
 };
@@ -488,6 +507,7 @@ static struct perf_ibs perf_ibs_op = {
        .max_period             = IBS_OP_MAX_CNT << 4,
        .offset_mask            = { MSR_AMD64_IBSOP_REG_MASK },
        .offset_max             = MSR_AMD64_IBSOP_REG_COUNT,
+        .format_attrs           = ibs_op_format_attrs,
        .get_count              = get_ibs_op_count,
 };
@@ -597,6 +617,17 @@ static __init int perf_ibs_pmu_init(struct perf_ibs *perf_ibs, char *name)
        perf_ibs->pcpu = pcpu;
+        /* register attributes */
+        if (perf_ibs->format_attrs[0]) {
+                memset(&perf_ibs->format_group, 0, sizeof(perf_ibs->format_group));
+                perf_ibs->format_group.name     = "format";
+                perf_ibs->format_group.attrs    = perf_ibs->format_attrs;
+                memset(&perf_ibs->attr_groups, 0, sizeof(perf_ibs->attr_groups));
+                perf_ibs->attr_groups[0]        = &perf_ibs->format_group;
+                perf_ibs->pmu.attr_groups       = perf_ibs->attr_groups;
+        }
        ret = perf_pmu_register(&perf_ibs->pmu, name, -1);
        if (ret) {
                perf_ibs->pcpu = NULL;
@@ -608,13 +639,19 @@ static __init int perf_ibs_pmu_init(struct perf_ibs *perf_ibs, char *name)
 static __init int perf_event_ibs_init(void)
 {
+        struct attribute **attr = ibs_op_format_attrs;
        if (!ibs_caps)
                return -ENODEV; /* ibs not supported by the cpu */
        perf_ibs_pmu_init(&perf_ibs_fetch, "ibs_fetch");
-        if (ibs_caps & IBS_CAPS_OPCNT)
+        if (ibs_caps & IBS_CAPS_OPCNT) {
                perf_ibs_op.config_mask |= IBS_OP_CNT_CTL;
+                *attr++ = &format_attr_cnt_ctl.attr;
+        }
        perf_ibs_pmu_init(&perf_ibs_op, "ibs_op");
        register_nmi_handler(NMI_LOCAL, perf_ibs_nmi_handler, 0, "perf_ibs");
        printk(KERN_INFO "perf: AMD IBS detected (0x%08x)\n", ibs_caps);
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 6bca492b854..324bb523d9d 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -1906,6 +1906,8 @@ __init int intel_pmu_init(void)
                switch (boot_cpu_data.x86) {
                case 0x6:
                        return p6_pmu_init();
+                case 0xb:
+                        return knc_pmu_init();
                case 0xf:
                        return p4_pmu_init();
                }
diff --git a/arch/x86/kernel/cpu/perf_event_knc.c b/arch/x86/kernel/cpu/perf_event_knc.c
new file mode 100644
index 00000000000..7c46bfdbc37
--- /dev/null
+++ b/arch/x86/kernel/cpu/perf_event_knc.c
@@ -0,0 +1,248 @@
+/* Driver for Intel Xeon Phi "Knights Corner" PMU */
+#include <linux/perf_event.h>
+#include <linux/types.h>
+#include "perf_event.h"
+static const u64 knc_perfmon_event_map[] =
+{
+  [PERF_COUNT_HW_CPU_CYCLES]            = 0x002a,
+  [PERF_COUNT_HW_INSTRUCTIONS]          = 0x0016,
+  [PERF_COUNT_HW_CACHE_REFERENCES]      = 0x0028,
+  [PERF_COUNT_HW_CACHE_MISSES]          = 0x0029,
+  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]   = 0x0012,
+  [PERF_COUNT_HW_BRANCH_MISSES]         = 0x002b,
+};
+static __initconst u64 knc_hw_cache_event_ids
+                                [PERF_COUNT_HW_CACHE_MAX]
+                                [PERF_COUNT_HW_CACHE_OP_MAX]
+                                [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+ [ C(L1D) ] = {
+        [ C(OP_READ) ] = {
+                /* On Xeon Phi event "0" is a valid DATA_READ          */
+                /*   (L1 Data Cache Reads) Instruction.                */
+                /* We code this as ARCH_PERFMON_EVENTSEL_INT as this   */
+                /* bit will always be set in x86_pmu_hw_config().      */
+                [ C(RESULT_ACCESS) ] = ARCH_PERFMON_EVENTSEL_INT,
+                                                /* DATA_READ           */
+                [ C(RESULT_MISS)   ] = 0x0003,  /* DATA_READ_MISS      */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = 0x0001,  /* DATA_WRITE          */
+                [ C(RESULT_MISS)   ] = 0x0004,  /* DATA_WRITE_MISS     */
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = 0x0011,  /* L1_DATA_PF1         */
+                [ C(RESULT_MISS)   ] = 0x001c,  /* L1_DATA_PF1_MISS    */
+        },
+ },
+ [ C(L1I ) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0x000c,  /* CODE_READ          */
+                [ C(RESULT_MISS)   ] = 0x000e,  /* CODE_CACHE_MISS    */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = 0x0,
+                [ C(RESULT_MISS)   ] = 0x0,
+        },
+ },
+ [ C(LL  ) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0,
+                [ C(RESULT_MISS)   ] = 0x10cb,  /* L2_READ_MISS */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = 0x10cc,  /* L2_WRITE_HIT */
+                [ C(RESULT_MISS)   ] = 0,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = 0x10fc,  /* L2_DATA_PF2      */
+                [ C(RESULT_MISS)   ] = 0x10fe,  /* L2_DATA_PF2_MISS */
+        },
+ },
+ [ C(DTLB) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = ARCH_PERFMON_EVENTSEL_INT,
+                                                /* DATA_READ */
+                                                /* see note on L1 OP_READ */
+                [ C(RESULT_MISS)   ] = 0x0002,  /* DATA_PAGE_WALK */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = 0x0001,  /* DATA_WRITE */
+                [ C(RESULT_MISS)   ] = 0x0002,  /* DATA_PAGE_WALK */
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = 0x0,
+                [ C(RESULT_MISS)   ] = 0x0,
+        },
+ },
+ [ C(ITLB) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0x000c,  /* CODE_READ */
+                [ C(RESULT_MISS)   ] = 0x000d,  /* CODE_PAGE_WALK */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+ },
+ [ C(BPU ) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0x0012,  /* BRANCHES */
+                [ C(RESULT_MISS)   ] = 0x002b,  /* BRANCHES_MISPREDICTED */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+ },
+};
+static u64 knc_pmu_event_map(int hw_event)
+{
+        return knc_perfmon_event_map[hw_event];
+}
+static struct event_constraint knc_event_constraints[] =
+{
+        INTEL_EVENT_CONSTRAINT(0xc3, 0x1),      /* HWP_L2HIT */
+        INTEL_EVENT_CONSTRAINT(0xc4, 0x1),      /* HWP_L2MISS */
+        INTEL_EVENT_CONSTRAINT(0xc8, 0x1),      /* L2_READ_HIT_E */
+        INTEL_EVENT_CONSTRAINT(0xc9, 0x1),      /* L2_READ_HIT_M */
+        INTEL_EVENT_CONSTRAINT(0xca, 0x1),      /* L2_READ_HIT_S */
+        INTEL_EVENT_CONSTRAINT(0xcb, 0x1),      /* L2_READ_MISS */
+        INTEL_EVENT_CONSTRAINT(0xcc, 0x1),      /* L2_WRITE_HIT */
+        INTEL_EVENT_CONSTRAINT(0xce, 0x1),      /* L2_STRONGLY_ORDERED_STREAMING_VSTORES_MISS */
+        INTEL_EVENT_CONSTRAINT(0xcf, 0x1),      /* L2_WEAKLY_ORDERED_STREAMING_VSTORE_MISS */
+        INTEL_EVENT_CONSTRAINT(0xd7, 0x1),      /* L2_VICTIM_REQ_WITH_DATA */
+        INTEL_EVENT_CONSTRAINT(0xe3, 0x1),      /* SNP_HITM_BUNIT */
+        INTEL_EVENT_CONSTRAINT(0xe6, 0x1),      /* SNP_HIT_L2 */
+        INTEL_EVENT_CONSTRAINT(0xe7, 0x1),      /* SNP_HITM_L2 */
+        INTEL_EVENT_CONSTRAINT(0xf1, 0x1),      /* L2_DATA_READ_MISS_CACHE_FILL */
+        INTEL_EVENT_CONSTRAINT(0xf2, 0x1),      /* L2_DATA_WRITE_MISS_CACHE_FILL */
+        INTEL_EVENT_CONSTRAINT(0xf6, 0x1),      /* L2_DATA_READ_MISS_MEM_FILL */
+        INTEL_EVENT_CONSTRAINT(0xf7, 0x1),      /* L2_DATA_WRITE_MISS_MEM_FILL */
+        INTEL_EVENT_CONSTRAINT(0xfc, 0x1),      /* L2_DATA_PF2 */
+        INTEL_EVENT_CONSTRAINT(0xfd, 0x1),      /* L2_DATA_PF2_DROP */
+        INTEL_EVENT_CONSTRAINT(0xfe, 0x1),      /* L2_DATA_PF2_MISS */
+        INTEL_EVENT_CONSTRAINT(0xff, 0x1),      /* L2_DATA_HIT_INFLIGHT_PF2 */
+        EVENT_CONSTRAINT_END
+};
+#define MSR_KNC_IA32_PERF_GLOBAL_STATUS         0x0000002d
+#define MSR_KNC_IA32_PERF_GLOBAL_OVF_CONTROL    0x0000002e
+#define MSR_KNC_IA32_PERF_GLOBAL_CTRL           0x0000002f
+#define KNC_ENABLE_COUNTER0                     0x00000001
+#define KNC_ENABLE_COUNTER1                     0x00000002
+static void knc_pmu_disable_all(void)
+{
+        u64 val;
+        rdmsrl(MSR_KNC_IA32_PERF_GLOBAL_CTRL, val);
+        val &= ~(KNC_ENABLE_COUNTER0|KNC_ENABLE_COUNTER1);
+        wrmsrl(MSR_KNC_IA32_PERF_GLOBAL_CTRL, val);
+}
+static void knc_pmu_enable_all(int added)
+{
+        u64 val;
+        rdmsrl(MSR_KNC_IA32_PERF_GLOBAL_CTRL, val);
+        val |= (KNC_ENABLE_COUNTER0|KNC_ENABLE_COUNTER1);
+        wrmsrl(MSR_KNC_IA32_PERF_GLOBAL_CTRL, val);
+}
+static inline void
+knc_pmu_disable_event(struct perf_event *event)
+{
+        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct hw_perf_event *hwc = &event->hw;
+        u64 val;
+        val = hwc->config;
+        if (cpuc->enabled)
+                val &= ~ARCH_PERFMON_EVENTSEL_ENABLE;
+        (void)wrmsrl_safe(hwc->config_base + hwc->idx, val);
+}
+static void knc_pmu_enable_event(struct perf_event *event)
+{
+        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct hw_perf_event *hwc = &event->hw;
+        u64 val;
+        val = hwc->config;
+        if (cpuc->enabled)
+                val |= ARCH_PERFMON_EVENTSEL_ENABLE;
+        (void)wrmsrl_safe(hwc->config_base + hwc->idx, val);
+}
+PMU_FORMAT_ATTR(event,  "config:0-7"    );
+PMU_FORMAT_ATTR(umask,  "config:8-15"   );
+PMU_FORMAT_ATTR(edge,   "config:18"     );
+PMU_FORMAT_ATTR(inv,    "config:23"     );
+PMU_FORMAT_ATTR(cmask,  "config:24-31"  );
+static struct attribute *intel_knc_formats_attr[] = {
+        &format_attr_event.attr,
+        &format_attr_umask.attr,
+        &format_attr_edge.attr,
+        &format_attr_inv.attr,
+        &format_attr_cmask.attr,
+        NULL,
+};
+static __initconst struct x86_pmu knc_pmu = {
+        .name                   = "knc",
+        .handle_irq             = x86_pmu_handle_irq,
+        .disable_all            = knc_pmu_disable_all,
+        .enable_all             = knc_pmu_enable_all,
+        .enable                 = knc_pmu_enable_event,
+        .disable                = knc_pmu_disable_event,
+        .hw_config              = x86_pmu_hw_config,
+        .schedule_events        = x86_schedule_events,
+        .eventsel               = MSR_KNC_EVNTSEL0,
+        .perfctr                = MSR_KNC_PERFCTR0,
+        .event_map              = knc_pmu_event_map,
+        .max_events             = ARRAY_SIZE(knc_perfmon_event_map),
+        .apic                   = 1,
+        .max_period             = (1ULL << 31) - 1,
+        .version                = 0,
+        .num_counters           = 2,
+        /* in theory 40 bits, early silicon is buggy though */
+        .cntval_bits            = 32,
+        .cntval_mask            = (1ULL << 32) - 1,
+        .get_event_constraints  = x86_get_event_constraints,
+        .event_constraints      = knc_event_constraints,
+        .format_attrs           = intel_knc_formats_attr,
+};
+__init int knc_pmu_init(void)
+{
+        x86_pmu = knc_pmu;
+        memcpy(hw_cache_event_ids, knc_hw_cache_event_ids, 
+                sizeof(hw_cache_event_ids));
+        return 0;
+}
diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 966512b2cac..2e8caf03f59 100644
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -56,6 +56,8 @@ static inline unsigned int nmi_perfctr_msr_to_bit(unsigned int msr)
                switch (boot_cpu_data.x86) {
                case 6:
                        return msr - MSR_P6_PERFCTR0;
+                case 11:
+                        return msr - MSR_KNC_PERFCTR0;
                case 15:
                        return msr - MSR_P4_BPU_PERFCTR0;
                }
@@ -82,6 +84,8 @@ static inline unsigned int nmi_evntsel_msr_to_bit(unsigned int msr)
                switch (boot_cpu_data.x86) {
                case 6:
                        return msr - MSR_P6_EVNTSEL0;
+                case 11:
+                        return msr - MSR_KNC_EVNTSEL0;
                case 15:
                        return msr - MSR_P4_BSU_ESCR0;
                }
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 8f9ed1afde8..a1193aef6d7 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -299,12 +299,20 @@ ENTRY(ret_from_fork)
        CFI_ENDPROC
 END(ret_from_fork)
-ENTRY(ret_from_kernel_execve)
+ENTRY(ret_from_kernel_thread)
-        movl %eax, %esp
+        CFI_STARTPROC
-        movl $0,PT_EAX(%esp)
+        pushl_cfi %eax
+        call schedule_tail
        GET_THREAD_INFO(%ebp)
+        popl_cfi %eax
+        pushl_cfi $0x0202               # Reset kernel eflags
+        popfl_cfi
+        movl PT_EBP(%esp),%eax
+        call *PT_EBX(%esp)
+        movl $0,PT_EAX(%esp)
        jmp syscall_exit
-END(ret_from_kernel_execve)
+        CFI_ENDPROC
+ENDPROC(ret_from_kernel_thread)
 /*
 * Interrupt exit functions should be protected against kprobes
@@ -622,6 +630,10 @@ work_notifysig:				# deal with pending signals and
        movl %esp, %eax
        jne work_notifysig_v86          # returning to kernel-space or
                                        # vm86-space
+1:
+#else
+        movl %esp, %eax
+#endif
        TRACE_IRQS_ON
        ENABLE_INTERRUPTS(CLBR_NONE)
        movb PT_CS(%esp), %bl
@@ -632,24 +644,15 @@ work_notifysig:				# deal with pending signals and
        call do_notify_resume
        jmp resume_userspace
+#ifdef CONFIG_VM86
        ALIGN
 work_notifysig_v86:
        pushl_cfi %ecx                  # save ti_flags for do_notify_resume
        call save_v86_state             # %eax contains pt_regs pointer
        popl_cfi %ecx
        movl %eax, %esp
-#else
+        jmp 1b
-        movl %esp, %eax
 #endif
-        TRACE_IRQS_ON
-        ENABLE_INTERRUPTS(CLBR_NONE)
-        movb PT_CS(%esp), %bl
-        andb $SEGMENT_RPL_MASK, %bl
-        cmpb $USER_RPL, %bl
-        jb resume_kernel
-        xorl %edx, %edx
-        call do_notify_resume
-        jmp resume_userspace
 END(work_pending)
        # perform syscall exit tracing
@@ -1020,21 +1023,6 @@ END(spurious_interrupt_bug)
 */
        .popsection
-ENTRY(ret_from_kernel_thread)
-        CFI_STARTPROC
-        pushl_cfi %eax
-        call schedule_tail
-        GET_THREAD_INFO(%ebp)
-        popl_cfi %eax
-        pushl_cfi $0x0202               # Reset kernel eflags
-        popfl_cfi
-        movl PT_EBP(%esp),%eax
-        call *PT_EBX(%esp)
-        call do_exit
-        ud2                     # padding for call trace
-        CFI_ENDPROC
-ENDPROC(ret_from_kernel_thread)
 #ifdef CONFIG_XEN
 /* Xen doesn't set %esp to be precisely what the normal sysenter
   entrypoint expects, so fix it up before using the normal path. */
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index cdc790c78f3..0c58952d64e 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -563,15 +563,13 @@ ENTRY(ret_from_fork)
        jmp ret_from_sys_call                   # go to the SYSRET fastpath
 1:
-        subq $REST_SKIP, %rsp   # move the stack pointer back
+        subq $REST_SKIP, %rsp   # leave space for volatiles
        CFI_ADJUST_CFA_OFFSET   REST_SKIP
        movq %rbp, %rdi
        call *%rbx
-        # exit
+        movl $0, RAX(%rsp)
-        mov %eax, %edi
+        RESTORE_REST
-        call do_exit
+        jmp int_ret_from_sys_call
-        ud2                     # padding for call trace
        CFI_ENDPROC
 END(ret_from_fork)
@@ -1326,20 +1324,6 @@ bad_gs:
        jmp  2b
        .previous
-ENTRY(ret_from_kernel_execve)
-        movq %rdi, %rsp
-        movl $0, RAX(%rsp)
-        // RESTORE_REST
-        movq 0*8(%rsp), %r15
-        movq 1*8(%rsp), %r14
-        movq 2*8(%rsp), %r13
-        movq 3*8(%rsp), %r12
-        movq 4*8(%rsp), %rbp
-        movq 5*8(%rsp), %rbx
-        addq $(6*8), %rsp
-        jmp int_ret_from_sys_call
-END(ret_from_kernel_execve)
 /* Call softirq on interrupt stack. Interrupts are off. */
 ENTRY(call_softirq)
        CFI_STARTPROC
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 3f61904365c..836f8322960 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -746,7 +746,9 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
 int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
 {
        int err;
+#ifdef CONFIG_DEBUG_RODATA
        char opc[BREAK_INSTR_SIZE];
+#endif /* CONFIG_DEBUG_RODATA */
        bpt->type = BP_BREAKPOINT;
        err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index d609be046b5..a2bb18e0283 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -68,6 +68,7 @@
 #include <linux/percpu.h>
 #include <linux/crash_dump.h>
 #include <linux/tboot.h>
+#include <linux/jiffies.h>
 #include <video/edid.h>
@@ -1032,6 +1033,8 @@ void __init setup_arch(char **cmdline_p)
        mcheck_init();
        arch_init_ideal_nops();
+        register_refined_jiffies(CLOCK_TICK_RATE);
 }
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 8d141b30904..3a3e8c9e280 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -28,7 +28,7 @@
 #include <linux/jiffies.h>
 #include <linux/sysctl.h>
 #include <linux/topology.h>
-#include <linux/clocksource.h>
+#include <linux/timekeeper_internal.h>
 #include <linux/getcpu.h>
 #include <linux/cpu.h>
 #include <linux/smp.h>
@@ -82,32 +82,41 @@ void update_vsyscall_tz(void)
        vsyscall_gtod_data.sys_tz = sys_tz;
 }
-void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
+void update_vsyscall(struct timekeeper *tk)
-                        struct clocksource *clock, u32 mult)
 {
-        struct timespec monotonic;
+        struct vsyscall_gtod_data *vdata = &vsyscall_gtod_data;
-        write_seqcount_begin(&vsyscall_gtod_data.seq);
+        write_seqcount_begin(&vdata->seq);
        /* copy vsyscall data */
-        vsyscall_gtod_data.clock.vclock_mode    = clock->archdata.vclock_mode;
+        vdata->clock.vclock_mode        = tk->clock->archdata.vclock_mode;
-        vsyscall_gtod_data.clock.cycle_last     = clock->cycle_last;
+        vdata->clock.cycle_last         = tk->clock->cycle_last;
-        vsyscall_gtod_data.clock.mask           = clock->mask;
+        vdata->clock.mask               = tk->clock->mask;
-        vsyscall_gtod_data.clock.mult           = mult;
+        vdata->clock.mult               = tk->mult;
-        vsyscall_gtod_data.clock.shift          = clock->shift;
+        vdata->clock.shift              = tk->shift;
-        vsyscall_gtod_data.wall_time_sec        = wall_time->tv_sec;
+        vdata->wall_time_sec            = tk->xtime_sec;
-        vsyscall_gtod_data.wall_time_nsec       = wall_time->tv_nsec;
+        vdata->wall_time_snsec          = tk->xtime_nsec;
+        vdata->monotonic_time_sec       = tk->xtime_sec
+                                        + tk->wall_to_monotonic.tv_sec;
+        vdata->monotonic_time_snsec     = tk->xtime_nsec
+                                        + (tk->wall_to_monotonic.tv_nsec
+                                                << tk->shift);
+        while (vdata->monotonic_time_snsec >=
+                                        (((u64)NSEC_PER_SEC) << tk->shift)) {
+                vdata->monotonic_time_snsec -=
+                                        ((u64)NSEC_PER_SEC) << tk->shift;
+                vdata->monotonic_time_sec++;
+        }
-        monotonic = timespec_add(*wall_time, *wtm);
+        vdata->wall_time_coarse.tv_sec  = tk->xtime_sec;
-        vsyscall_gtod_data.monotonic_time_sec   = monotonic.tv_sec;
+        vdata->wall_time_coarse.tv_nsec = (long)(tk->xtime_nsec >> tk->shift);
-        vsyscall_gtod_data.monotonic_time_nsec  = monotonic.tv_nsec;
-        vsyscall_gtod_data.wall_time_coarse     = __current_kernel_time();
+        vdata->monotonic_time_coarse    = timespec_add(vdata->wall_time_coarse,
-        vsyscall_gtod_data.monotonic_time_coarse =
+                                                        tk->wall_to_monotonic);
-                timespec_add(vsyscall_gtod_data.wall_time_coarse, *wtm);
-        write_seqcount_end(&vsyscall_gtod_data.seq);
+        write_seqcount_end(&vdata->seq);
 }
 static void warn_bad_vsyscall(const char *level, struct pt_regs *regs,
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 30c4eec033a..07611759ce3 100644
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -14,6 +14,7 @@ config UML_X86
        def_bool y
        select GENERIC_FIND_FIRST_BIT
        select GENERIC_KERNEL_THREAD
+        select GENERIC_KERNEL_EXECVE
 config 64BIT
        bool "64-bit kernel" if SUBARCH = "x86"
@@ -23,9 +24,11 @@ config X86_32
        def_bool !64BIT
        select HAVE_AOUT
        select ARCH_WANT_IPC_PARSE_VERSION
+        select MODULES_USE_ELF_REL
 config X86_64
        def_bool 64BIT
+        select MODULES_USE_ELF_RELA
 config RWSEM_XCHGADD_ALGORITHM
        def_bool X86_XADD && 64BIT
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index 885eff49d6a..4df6c373421 100644
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -80,7 +80,7 @@ notrace static long vdso_fallback_gtod(struct timeval *tv, struct timezone *tz)
 }
-notrace static inline long vgetns(void)
+notrace static inline u64 vgetsns(void)
 {
        long v;
        cycles_t cycles;
@@ -91,21 +91,24 @@ notrace static inline long vgetns(void)
        else
                return 0;
        v = (cycles - gtod->clock.cycle_last) & gtod->clock.mask;
-        return (v * gtod->clock.mult) >> gtod->clock.shift;
+        return v * gtod->clock.mult;
 }
 /* Code size doesn't matter (vdso is 4k anyway) and this is faster. */
 notrace static int __always_inline do_realtime(struct timespec *ts)
 {
-        unsigned long seq, ns;
+        unsigned long seq;
+        u64 ns;
        int mode;
+        ts->tv_nsec = 0;
        do {
                seq = read_seqcount_begin(&gtod->seq);
                mode = gtod->clock.vclock_mode;
                ts->tv_sec = gtod->wall_time_sec;
-                ts->tv_nsec = gtod->wall_time_nsec;
+                ns = gtod->wall_time_snsec;
-                ns = vgetns();
+                ns += vgetsns();
+                ns >>= gtod->clock.shift;
        } while (unlikely(read_seqcount_retry(&gtod->seq, seq)));
        timespec_add_ns(ts, ns);
@@ -114,15 +117,18 @@ notrace static int __always_inline do_realtime(struct timespec *ts)
 notrace static int do_monotonic(struct timespec *ts)
 {
-        unsigned long seq, ns;
+        unsigned long seq;
+        u64 ns;
        int mode;
+        ts->tv_nsec = 0;
        do {
                seq = read_seqcount_begin(&gtod->seq);
                mode = gtod->clock.vclock_mode;
                ts->tv_sec = gtod->monotonic_time_sec;
-                ts->tv_nsec = gtod->monotonic_time_nsec;
+                ns = gtod->monotonic_time_snsec;
-                ns = vgetns();
+                ns += vgetsns();
+                ns >>= gtod->clock.shift;
        } while (unlikely(read_seqcount_retry(&gtod->seq, seq)));
        timespec_add_ns(ts, ns);
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index bf788d34530..e3497f240ea 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -987,7 +987,16 @@ static void xen_write_cr4(unsigned long cr4)
        native_write_cr4(cr4);
 }
+#ifdef CONFIG_X86_64
+static inline unsigned long xen_read_cr8(void)
+{
+        return 0;
+}
+static inline void xen_write_cr8(unsigned long val)
+{
+        BUG_ON(val);
+}
+#endif
 static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)
 {
        int ret;
@@ -1156,6 +1165,11 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = {
        .read_cr4_safe = native_read_cr4_safe,
        .write_cr4 = xen_write_cr4,
+#ifdef CONFIG_X86_64
+        .read_cr8 = xen_read_cr8,
+        .write_cr8 = xen_write_cr8,
+#endif
        .wbinvd = native_wbinvd,
        .read_msr = native_read_msr_safe,
@@ -1164,6 +1178,8 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = {
        .read_tsc = native_read_tsc,
        .read_pmc = native_read_pmc,
+        .read_tscp = native_read_tscp,
        .iret = xen_iret,
        .irq_enable_sysexit = xen_sysexit,
 #ifdef CONFIG_X86_64
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index fd28d86fe3d..6226c99729b 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -47,6 +47,7 @@
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/seq_file.h>
+#include <linux/crash_dump.h>
 #include <trace/events/xen.h>
@@ -2381,6 +2382,43 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order)
 EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region);
 #ifdef CONFIG_XEN_PVHVM
+#ifdef CONFIG_PROC_VMCORE
+/*
+ * This function is used in two contexts:
+ * - the kdump kernel has to check whether a pfn of the crashed kernel
+ *   was a ballooned page. vmcore is using this function to decide
+ *   whether to access a pfn of the crashed kernel.
+ * - the kexec kernel has to check whether a pfn was ballooned by the
+ *   previous kernel. If the pfn is ballooned, handle it properly.
+ * Returns 0 if the pfn is not backed by a RAM page, the caller may
+ * handle the pfn special in this case.
+ */
+static int xen_oldmem_pfn_is_ram(unsigned long pfn)
+{
+        struct xen_hvm_get_mem_type a = {
+                .domid = DOMID_SELF,
+                .pfn = pfn,
+        };
+        int ram;
+        if (HYPERVISOR_hvm_op(HVMOP_get_mem_type, &a))
+                return -ENXIO;
+        switch (a.mem_type) {
+                case HVMMEM_mmio_dm:
+                        ram = 0;
+                        break;
+                case HVMMEM_ram_rw:
+                case HVMMEM_ram_ro:
+                default:
+                        ram = 1;
+                        break;
+        }
+        return ram;
+}
+#endif
 static void xen_hvm_exit_mmap(struct mm_struct *mm)
 {
        struct xen_hvm_pagetable_dying a;
@@ -2411,6 +2449,9 @@ void __init xen_hvm_init_mmu_ops(void)
 {
        if (is_pagetable_dying_supported())
                pv_mmu_ops.exit_mmap = xen_hvm_exit_mmap;
+#ifdef CONFIG_PROC_VMCORE
+        register_oldmem_pfn_is_ram(&xen_oldmem_pfn_is_ram);
+#endif
 }
 #endif
diff --git a/arch/xtensa/include/asm/module.h b/arch/xtensa/include/asm/module.h
index d9b34bee4d4..488b40c6f9b 100644
--- a/arch/xtensa/include/asm/module.h
+++ b/arch/xtensa/include/asm/module.h
@@ -13,15 +13,8 @@
 #ifndef _XTENSA_MODULE_H
 #define _XTENSA_MODULE_H
-struct mod_arch_specific
-{
-        /* No special elements, yet. */
-};
 #define MODULE_ARCH_VERMAGIC "xtensa-" __stringify(XCHAL_CORE_ID) " "
-#define Elf_Shdr Elf32_Shdr
+#include <asm-generic/module.h>
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
 #endif  /* _XTENSA_MODULE_H */
diff --git a/arch/xtensa/include/asm/thread_info.h b/arch/xtensa/include/asm/thread_info.h
index 81abfd5d01a..9481004ac11 100644
--- a/arch/xtensa/include/asm/thread_info.h
+++ b/arch/xtensa/include/asm/thread_info.h
@@ -128,19 +128,14 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_SIGPENDING          1       /* signal pending */
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
 #define TIF_SINGLESTEP          3       /* restore singlestep on return to user mode */
-#define TIF_IRET                4       /* return with iret */
 #define TIF_MEMDIE              5       /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     6       /* restore signal mask in do_signal() */
 #define TIF_NOTIFY_RESUME       7       /* callback before returning to user */
-#define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define _TIF_SYSCALL_TRACE      (1<<TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
 #define _TIF_SINGLESTEP         (1<<TIF_SINGLESTEP)
-#define _TIF_IRET               (1<<TIF_IRET)
-#define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
-#define _TIF_RESTORE_SIGMASK    (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
 #define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index bc44311aa18..bc020825cce 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -328,13 +328,13 @@ long xtensa_execve(const char __user *name,
                   struct pt_regs *regs)
 {
        long error;
-        char * filename;
+        struct filename *filename;
        filename = getname(name);
        error = PTR_ERR(filename);
        if (IS_ERR(filename))
                goto out;
-        error = do_execve(filename, argv, envp, regs);
+        error = do_execve(filename->name, argv, envp, regs);
        putname(filename);
 out:
        return error;
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index efe4e854b3c..63c566f627b 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -19,7 +19,6 @@
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/personality.h>
-#include <linux/freezer.h>
 #include <linux/tracehook.h>
 #include <asm/ucontext.h>
@@ -527,9 +526,6 @@ static void do_signal(struct pt_regs *regs)
 void do_notify_resume(struct pt_regs *regs)
 {
-        if (!user_mode(regs))
-                return;
        if (test_thread_flag(TIF_SIGPENDING))
                do_signal(regs);