11 files changed, 74 insertions, 160 deletions

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 333b85e80c07..0bf44231aaf9 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -22,6 +22,7 @@ config MICROBLAZE
         select GENERIC_PCI_IOMAP
         select GENERIC_CPU_DEVICES
         select GENERIC_ATOMIC64
+        select GENERIC_CLOCKEVENTS
 
 config SWAP
         def_bool n
@@ -50,12 +51,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
         def_bool y
 
-config GENERIC_TIME_VSYSCALL
-        def_bool n
-
-config GENERIC_CLOCKEVENTS
-        def_bool y
-
 config GENERIC_GPIO
         bool
 
@@ -79,8 +74,6 @@ source "arch/microblaze/platform/Kconfig.platform"
 
 menu "Processor type and features"
 
-source "kernel/time/Kconfig"
-
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"
diff --git a/arch/microblaze/include/asm/gpio.h b/arch/microblaze/include/asm/gpio.h
index 2b2c18be71c6..b3799d88ffcf 100644
--- a/arch/microblaze/include/asm/gpio.h
+++ b/arch/microblaze/include/asm/gpio.h
@@ -1,53 +1,4 @@
-/*
- * Generic GPIO API implementation for PowerPC.
- *
- * Copyright (c) 2007-2008  MontaVista Software, Inc.
- *
- * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef _ASM_MICROBLAZE_GPIO_H
-#define _ASM_MICROBLAZE_GPIO_H
-
-#include <linux/errno.h>
-#include <asm-generic/gpio.h>
-
-#ifdef CONFIG_GPIOLIB
-
-/*
- * We don't (yet) implement inlined/rapid versions for on-chip gpios.
- * Just call gpiolib.
- */
-static inline int gpio_get_value(unsigned int gpio)
-{
-        return __gpio_get_value(gpio);
-}
-
-static inline void gpio_set_value(unsigned int gpio, int value)
-{
-        __gpio_set_value(gpio, value);
-}
-
-static inline int gpio_cansleep(unsigned int gpio)
-{
-        return __gpio_cansleep(gpio);
-}
-
-static inline int gpio_to_irq(unsigned int gpio)
-{
-        return __gpio_to_irq(gpio);
-}
-
-static inline int irq_to_gpio(unsigned int irq)
-{
-        return -EINVAL;
-}
-
-#endif /* CONFIG_GPIOLIB */
-
-#endif /* _ASM_MICROBLAZE_GPIO_H */
+#ifndef __LINUX_GPIO_H
+#warning Include linux/gpio.h instead of asm/gpio.h
+#include <linux/gpio.h>
+#endif
diff --git a/arch/microblaze/include/asm/kvm_para.h b/arch/microblaze/include/asm/kvm_para.h
new file mode 100644
index 000000000000..14fab8f0b957
--- /dev/null
+++ b/arch/microblaze/include/asm/kvm_para.h
@@ -0,0 +1 @@
+#include <asm-generic/kvm_para.h>
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index bffb54527299..af2bb9652392 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -23,7 +23,6 @@ extern const struct seq_operations cpuinfo_op;
 
 # define cpu_relax()            barrier()
 # define cpu_sleep()            do {} while (0)
-# define prepare_to_copy(tsk)   do {} while (0)
 
 #define task_pt_regs(tsk) \
                 (((struct pt_regs *)(THREAD_SIZE + task_stack_page(tsk))) - 1)
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile
index 494b63b72dd7..928c950fc14c 100644
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
@@ -16,7 +16,7 @@ endif
 extra-y := head.o vmlinux.lds
 
 obj-y += dma.o exceptions.o \
-        hw_exception_handler.o init_task.o intc.o irq.o \
+        hw_exception_handler.o intc.o irq.o \
         process.o prom.o prom_parse.o ptrace.o \
         reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
 
diff --git a/arch/microblaze/kernel/entry-nommu.S b/arch/microblaze/kernel/entry-nommu.S
index 34b526f59b43..75c3ea1f48a1 100644
--- a/arch/microblaze/kernel/entry-nommu.S
+++ b/arch/microblaze/kernel/entry-nommu.S
@@ -132,11 +132,10 @@ ret_from_intr:
         beqi    r11, 1f
         bralid  r15, schedule
         nop
-1:      andi    r11, r19, _TIF_SIGPENDING
+1:      andi    r11, r19, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME
         beqid   r11, no_intr_resched
         addk    r5, r1, r0
-        addk    r7, r0, r0
-        bralid  r15, do_signal
+        bralid  r15, do_notify_resume
         addk    r6, r0, r0
 
 no_intr_resched:
@@ -292,8 +291,8 @@ ENTRY(_user_exception)
 
 /*
  * Debug traps are like a system call, but entered via brki r14, 0x60
- * All we need to do is send the SIGTRAP signal to current, ptrace and do_signal
- * will handle the rest
+ * All we need to do is send the SIGTRAP signal to current, ptrace and
+ * do_notify_resume will handle the rest
  */
 ENTRY(_debug_exception)
         swi     r1, r0, PER_CPU(ENTRY_SP)       /* save the current sp */
@@ -482,12 +481,11 @@ work_pending:
         beqi    r11, 1f
         bralid  r15, schedule
         nop
-1:      andi    r11, r19, _TIF_SIGPENDING
+1:      andi    r11, r19, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME
         beqi    r11, no_work_pending
         addk    r5, r1, r0
-        addik   r7, r0, 1
-        bralid  r15, do_signal
-        addk    r6, r0, r0
+        bralid  r15, do_notify_resume
+        addik   r6, r0, 1
         bri     no_work_pending
 
 ENTRY(ret_to_user)
@@ -569,10 +567,6 @@ sys_rt_sigreturn_wrapper:
         brid    sys_rt_sigreturn
         addk    r5, r1, r0
 
-sys_rt_sigsuspend_wrapper:
-        brid    sys_rt_sigsuspend
-        addk    r7, r1, r0
-
         /* Interrupt vector table */
         .section        .init.ivt, "ax"
         .org 0x0
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index 288678c5fea6..03f7b8ce6b6b 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -430,13 +430,12 @@ C_ENTRY(ret_from_trap):
 5:      /* get thread info from current task*/
         lwi     r11, CURRENT_TASK, TS_THREAD_INFO;
         lwi     r11, r11, TI_FLAGS;     /* get flags in thread info */
-        andi    r11, r11, _TIF_SIGPENDING;
+        andi    r11, r11, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME;
         beqi    r11, 1f;                /* Signals to handle, handle them */
 
         addik   r5, r1, 0;              /* Arg 1: struct pt_regs *regs */
-        addi    r7, r0, 1;              /* Arg 3: int in_syscall */
-        bralid  r15, do_signal; /* Handle any signals */
-        add     r6, r0, r0;             /* Arg 2: sigset_t *oldset */
+        bralid  r15, do_notify_resume;  /* Handle any signals */
+        addi    r6, r0, 1;              /* Arg 2: int in_syscall */
 
 /* Finally, return to user state.  */
 1:      set_bip;                        /*  Ints masked for state restore */
@@ -623,7 +622,7 @@ C_ENTRY(ret_from_exc):
         /* Maybe handle a signal */
 5:      lwi     r11, CURRENT_TASK, TS_THREAD_INFO;      /* get thread info */
         lwi     r11, r11, TI_FLAGS;     /* get flags in thread info */
-        andi    r11, r11, _TIF_SIGPENDING;
+        andi    r11, r11, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME;
         beqi    r11, 1f;                /* Signals to handle, handle them */
 
         /*
@@ -636,11 +635,10 @@ C_ENTRY(ret_from_exc):
          * traps), but signal handlers may want to examine or change the
          * complete register state.  Here we save anything not saved by
          * the normal entry sequence, so that it may be safely restored
-         * (in a possibly modified form) after do_signal returns. */
+         * (in a possibly modified form) after do_notify_resume returns. */
         addik   r5, r1, 0;              /* Arg 1: struct pt_regs *regs */
-        addi    r7, r0, 0;              /* Arg 3: int in_syscall */
-        bralid  r15, do_signal; /* Handle any signals */
-        add     r6, r0, r0;             /* Arg 2: sigset_t *oldset */
+        bralid  r15, do_notify_resume;  /* Handle any signals */
+        addi    r6, r0, 0;              /* Arg 2: int in_syscall */
 
 /* Finally, return to user state.  */
 1:      set_bip;                        /* Ints masked for state restore */
@@ -733,13 +731,12 @@ ret_from_irq:
     /* Maybe handle a signal */
 5:      lwi     r11, CURRENT_TASK, TS_THREAD_INFO; /* MS: get thread info */
         lwi     r11, r11, TI_FLAGS; /* get flags in thread info */
-        andi    r11, r11, _TIF_SIGPENDING;
+        andi    r11, r11, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME;
         beqid   r11, no_intr_resched
 /* Handle a signal return; Pending signals should be in r18. */
-        addi    r7, r0, 0; /* Arg 3: int in_syscall */
         addik   r5, r1, 0; /* Arg 1: struct pt_regs *regs */
-        bralid  r15, do_signal; /* Handle any signals */
-        add     r6, r0, r0; /* Arg 2: sigset_t *oldset */
+        bralid  r15, do_notify_resume;  /* Handle any signals */
+        addi    r6, r0, 0; /* Arg 2: int in_syscall */
 
 /* Finally, return to user state. */
 no_intr_resched:
@@ -870,13 +867,12 @@ dbtrap_call: /* Return point for kernel/user entry + 8 because of rtsd r15, 8 */
         /* Maybe handle a signal */
 5:      lwi     r11, CURRENT_TASK, TS_THREAD_INFO;      /* get thread info */
         lwi     r11, r11, TI_FLAGS;     /* get flags in thread info */
-        andi    r11, r11, _TIF_SIGPENDING;
+        andi    r11, r11, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME;
         beqi    r11, 1f;                /* Signals to handle, handle them */
 
         addik   r5, r1, 0;              /* Arg 1: struct pt_regs *regs */
-        addi  r7, r0, 0;        /* Arg 3: int in_syscall */
-        bralid  r15, do_signal; /* Handle any signals */
-        add     r6, r0, r0;             /* Arg 2: sigset_t *oldset */
+        bralid  r15, do_notify_resume;  /* Handle any signals */
+        addi  r6, r0, 0;        /* Arg 2: int in_syscall */
 
 /* Finally, return to user state.  */
 1:      swi     CURRENT_TASK, r0, PER_CPU(CURRENT_SAVE); /* save current */
diff --git a/arch/microblaze/kernel/init_task.c b/arch/microblaze/kernel/init_task.c
deleted file mode 100644
index b5d711f94ff8..000000000000
--- a/arch/microblaze/kernel/init_task.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2009 Michal Simek <monstr@monstr.eu>
- * Copyright (C) 2009 PetaLogix
- * Copyright (C) 2006 Atmark Techno, Inc.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/init_task.h>
-#include <linux/fs.h>
-#include <linux/mqueue.h>
-
-#include <asm/pgtable.h>
-
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-
-union thread_union init_thread_union __init_task_data =
-        { INIT_THREAD_INFO(init_task) };
-
-struct task_struct init_task = INIT_TASK(init_task);
-EXPORT_SYMBOL(init_task);
diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c
index 6eb2aa927d89..ab1b9db661f3 100644
--- a/arch/microblaze/kernel/ptrace.c
+++ b/arch/microblaze/kernel/ptrace.c
@@ -136,7 +136,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
 {
         long ret = 0;
 
-        secure_computing(regs->r12);
+        secure_computing_strict(regs->r12);
 
         if (test_thread_flag(TIF_SYSCALL_TRACE) &&
             tracehook_report_syscall_entry(regs))
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index 599671168980..7f4c7bef1642 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -31,6 +31,7 @@
 #include <linux/personality.h>
 #include <linux/percpu.h>
 #include <linux/linkage.h>
+#include <linux/tracehook.h>
 #include <asm/entry.h>
 #include <asm/ucontext.h>
 #include <linux/uaccess.h>
@@ -42,8 +43,6 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
-asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset, int in_sycall);
-
 asmlinkage long
 sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
                 struct pt_regs *regs)
@@ -98,6 +97,9 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
         sigset_t set;
         int rval;
 
+        /* Always make any pending restarted system calls return -EINTR */
+        current_thread_info()->restart_block.fn = do_no_restart_syscall;
+
         if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
                 goto badframe;
 
@@ -105,10 +107,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
                 goto badframe;
 
         sigdelsetmask(&set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&set);
 
         if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &rval))
                 goto badframe;
@@ -169,7 +168,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
         return (void __user *)((sp - frame_size) & -8UL);
 }
 
-static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                         sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
@@ -267,12 +266,11 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 current->comm, current->pid, frame, regs->pc);
 #endif
 
-        return;
+        return 0;
 
 give_sigsegv:
-        if (sig == SIGSEGV)
-                ka->sa.sa_handler = SIG_DFL;
-        force_sig(SIGSEGV, current);
+        force_sigsegv(sig, current);
+        return -EFAULT;
 }
 
 /* Handle restarting system calls */
@@ -316,24 +314,20 @@ static int
 handle_signal(unsigned long sig, struct k_sigaction *ka,
                 siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
 {
+        int ret;
+
         /* Set up the stack frame */
         if (ka->sa.sa_flags & SA_SIGINFO)
-                setup_rt_frame(sig, ka, info, oldset, regs);
+                ret = setup_rt_frame(sig, ka, info, oldset, regs);
         else
-                setup_rt_frame(sig, ka, NULL, oldset, regs);
-
-        if (ka->sa.sa_flags & SA_ONESHOT)
-                ka->sa.sa_handler = SIG_DFL;
-
-        if (!(ka->sa.sa_flags & SA_NODEFER)) {
-                spin_lock_irq(&current->sighand->siglock);
-                sigorsets(&current->blocked,
-                                &current->blocked, &ka->sa.sa_mask);
-                sigaddset(&current->blocked, sig);
-                recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
-        }
-        return 1;
+                ret = setup_rt_frame(sig, ka, NULL, oldset, regs);
+
+        if (ret)
+                return ret;
+
+        block_sigmask(ka, sig);
+
+        return 0;
 }
 
 /*
@@ -345,24 +339,17 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
  * the kernel can handle, and then we build all the user-level signal handling
  * stack-frames in one go after that.
  */
-int do_signal(struct pt_regs *regs, sigset_t *oldset, int in_syscall)
+static void do_signal(struct pt_regs *regs, int in_syscall)
 {
         siginfo_t info;
         int signr;
         struct k_sigaction ka;
+        sigset_t *oldset;
 #ifdef DEBUG_SIG
-        printk(KERN_INFO "do signal: %p %p %d\n", regs, oldset, in_syscall);
+        printk(KERN_INFO "do signal: %p %d\n", regs, in_syscall);
         printk(KERN_INFO "do signal2: %lx %lx %ld [%lx]\n", regs->pc, regs->r1,
                         regs->r12, current_thread_info()->flags);
 #endif
-        /*
-         * 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 (kernel_mode(regs))
-                return 1;
 
         if (current_thread_info()->status & TS_RESTORE_SIGMASK)
                 oldset = &current->saved_sigmask;
@@ -374,7 +361,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int in_syscall)
                 /* Whee! Actually deliver the signal. */
                 if (in_syscall)
                         handle_restart(regs, &ka, 1);
-                if (handle_signal(signr, &ka, &info, oldset, regs)) {
+                if (!handle_signal(signr, &ka, &info, oldset, regs)) {
                         /*
                          * A signal was successfully delivered; the saved
                          * sigmask will have been stored in the signal frame,
@@ -384,7 +371,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int in_syscall)
                         current_thread_info()->status &=
                             ~TS_RESTORE_SIGMASK;
                 }
-                return 1;
+                return;
         }
 
         if (in_syscall)
@@ -398,7 +385,25 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int in_syscall)
                 current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
         }
+}
 
-        /* Did we come from a system call? */
-        return 0;
+void do_notify_resume(struct pt_regs *regs, int in_syscall)
+{
+        /*
+         * 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 (kernel_mode(regs))
+                return;
+
+        if (test_thread_flag(TIF_SIGPENDING))
+                do_signal(regs, in_syscall);
+
+        if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
+                tracehook_notify_resume(regs);
+                if (current->replacement_session_keyring)
+                        key_replace_session_keyring();
+        }
 }
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index d10403dadd2b..ed22bfc5db14 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -1422,6 +1422,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 
 static void __devinit pcibios_setup_phb_resources(struct pci_controller *hose, struct list_head *resources)
 {
+        unsigned long io_offset;
         struct resource *res;
         int i;