Merge tag 'metag-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

Pull Metag architecture changes from James Hogan:
 - Remove unused NUMA definition (SD_NODE_INIT)
 - Refactor signal code to use struct ksignal
 - IRQ migration cleanup to use irq_set_affinity
 - Clean up main Kconfig file a little

* tag 'metag-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  sched: remove unused SCHED_INIT_NODE
  metag: Use get_signal() signal_setup_done()
  metag: Fix METAG Kconfig symbol select ordering
  metag: Use irq_set_affinity instead of homebrewn code

4 files changed, 25 insertions, 74 deletions

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index e56abd2c1b4f..b1d3c9c0eff8 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -9,6 +9,7 @@ config METAG
         select HAVE_ARCH_TRACEHOOK
         select HAVE_C_RECORDMCOUNT
         select HAVE_DEBUG_KMEMLEAK
+        select HAVE_DEBUG_STACKOVERFLOW
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_FUNCTION_TRACER
@@ -29,7 +30,6 @@ config METAG
         select OF
         select OF_EARLY_FLATTREE
         select SPARSE_IRQ
-        select HAVE_DEBUG_STACKOVERFLOW
 
 config STACKTRACE_SUPPORT
         def_bool y
diff --git a/arch/metag/include/asm/topology.h b/arch/metag/include/asm/topology.h
index 8e9c0b3b9691..e95f874ded1b 100644
--- a/arch/metag/include/asm/topology.h
+++ b/arch/metag/include/asm/topology.h
@@ -3,33 +3,6 @@
 
 #ifdef CONFIG_NUMA
 
-/* sched_domains SD_NODE_INIT for Meta machines */
-#define SD_NODE_INIT (struct sched_domain) {            \
-        .parent                 = NULL,                 \
-        .child                  = NULL,                 \
-        .groups                 = NULL,                 \
-        .min_interval           = 8,                    \
-        .max_interval           = 32,                   \
-        .busy_factor            = 32,                   \
-        .imbalance_pct          = 125,                  \
-        .cache_nice_tries       = 2,                    \
-        .busy_idx               = 3,                    \
-        .idle_idx               = 2,                    \
-        .newidle_idx            = 0,                    \
-        .wake_idx               = 0,                    \
-        .forkexec_idx           = 0,                    \
-        .flags                  = SD_LOAD_BALANCE       \
-                                | SD_BALANCE_FORK       \
-                                | SD_BALANCE_EXEC       \
-                                | SD_BALANCE_NEWIDLE    \
-                                | SD_SERIALIZE,         \
-        .last_balance           = jiffies,              \
-        .balance_interval       = 1,                    \
-        .nr_balance_failed      = 0,                    \
-        .max_newidle_lb_cost    = 0,                    \
-        .next_decay_max_lb_cost = jiffies,              \
-}
-
 #define cpu_to_node(cpu)        ((void)(cpu), 0)
 #define parent_node(node)       ((void)(node), 0)
 
diff --git a/arch/metag/kernel/irq.c b/arch/metag/kernel/irq.c
index 3b4b7f6c0950..5385dd1216b7 100644
--- a/arch/metag/kernel/irq.c
+++ b/arch/metag/kernel/irq.c
@@ -261,18 +261,6 @@ int __init arch_probe_nr_irqs(void)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static void route_irq(struct irq_data *data, unsigned int irq, unsigned int cpu)
-{
-        struct irq_desc *desc = irq_to_desc(irq);
-        struct irq_chip *chip = irq_data_get_irq_chip(data);
-        unsigned long flags;
-
-        raw_spin_lock_irqsave(&desc->lock, flags);
-        if (chip->irq_set_affinity)
-                chip->irq_set_affinity(data, cpumask_of(cpu), false);
-        raw_spin_unlock_irqrestore(&desc->lock, flags);
-}
-
 /*
  * The CPU has been marked offline.  Migrate IRQs off this CPU.  If
  * the affinity settings do not allow other CPUs, force them onto any
@@ -281,10 +269,9 @@ static void route_irq(struct irq_data *data, unsigned int irq, unsigned int cpu)
 void migrate_irqs(void)
 {
         unsigned int i, cpu = smp_processor_id();
-        struct irq_desc *desc;
 
-        for_each_irq_desc(i, desc) {
-                struct irq_data *data = irq_desc_get_irq_data(desc);
+        for_each_active_irq(i) {
+                struct irq_data *data = irq_get_irq_data(i);
                 unsigned int newcpu;
 
                 if (irqd_is_per_cpu(data))
@@ -300,11 +287,8 @@ void migrate_irqs(void)
                                             i, cpu);
 
                         cpumask_setall(data->affinity);
-                        newcpu = cpumask_any_and(data->affinity,
-                                                 cpu_online_mask);
                 }
-
-                route_irq(data, i, newcpu);
+                irq_set_affinity(i, data->affinity);
         }
 }
 #endif /* CONFIG_HOTPLUG_CPU */
diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
index 3be61cf0b147..b9e4a82d2bd4 100644
--- a/arch/metag/kernel/signal.c
+++ b/arch/metag/kernel/signal.c
@@ -152,18 +152,18 @@ static void __user *get_sigframe(struct k_sigaction *ka, unsigned long sp,
         return (void __user *)sp;
 }
 
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
-        int err = -EFAULT;
+        int err;
         unsigned long code;
 
-        frame = get_sigframe(ka, regs->REG_SP, sizeof(*frame));
+        frame = get_sigframe(&ksig->ka, regs->REG_SP, sizeof(*frame));
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto out;
+                return -EFAULT;
 
-        err = copy_siginfo_to_user(&frame->info, info);
+        err = copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -174,7 +174,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
 
         if (err)
-                goto out;
+                return -EFAULT;
 
         /* Set up to return from userspace.  */
 
@@ -187,15 +187,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= __put_user(code, (unsigned long __user *)(&frame->retcode[1]));
 
         if (err)
-                goto out;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
         regs->REG_RTP = (unsigned long) frame->retcode;
         regs->REG_SP = (unsigned long) frame + sizeof(*frame);
-        regs->REG_ARG1 = sig;
+        regs->REG_ARG1 = ksig->sig;
         regs->REG_ARG2 = (unsigned long) &frame->info;
         regs->REG_ARG3 = (unsigned long) &frame->uc;
-        regs->REG_PC = (unsigned long) ka->sa.sa_handler;
+        regs->REG_PC = (unsigned long) ksig->ka.sa.sa_handler;
 
         pr_debug("SIG deliver (%s:%d): sp=%p pc=%08x pr=%08x\n",
                  current->comm, current->pid, frame, regs->REG_PC,
@@ -205,24 +205,19 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
          * effective cache flush - directed rather than 'full flush'.
          */
         flush_cache_sigtramp(regs->REG_RTP, sizeof(frame->retcode));
-out:
-        if (err) {
-                force_sigsegv(sig, current);
-                return -EFAULT;
-        }
+
         return 0;
 }
 
-static void handle_signal(unsigned long sig, siginfo_t *info,
-                          struct k_sigaction *ka, struct pt_regs *regs)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
+        int ret;
 
         /* Set up the stack frame */
-        if (setup_rt_frame(sig, ka, info, oldset, regs))
-                return;
+        ret = setup_rt_frame(ksig, oldset, regs);
 
-        signal_delivered(sig, info, ka, regs, test_thread_flag(TIF_SINGLESTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
  /*
@@ -235,10 +230,8 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
 static int do_signal(struct pt_regs *regs, int syscall)
 {
         unsigned int retval = 0, continue_addr = 0, restart_addr = 0;
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
         int restart = 0;
+        struct ksignal ksig;
 
         /*
          * By the end of rt_sigreturn the context describes the point that the
@@ -275,7 +268,8 @@ static int do_signal(struct pt_regs *regs, int syscall)
          * Get the signal to deliver. When running under ptrace, at this point
          * the debugger may change all our registers ...
          */
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+        get_signal(&ksig);
+
         /*
          * Depending on the signal settings we may need to revert the decision
          * to restart the system call. But skip this if a debugger has chosen to
@@ -283,19 +277,19 @@ static int do_signal(struct pt_regs *regs, int syscall)
          */
         if (regs->REG_PC != restart_addr)
                 restart = 0;
-        if (signr > 0) {
+        if (ksig.sig > 0) {
                 if (unlikely(restart)) {
                         if (retval == -ERESTARTNOHAND
                             || retval == -ERESTART_RESTARTBLOCK
                             || (retval == -ERESTARTSYS
-                                && !(ka.sa.sa_flags & SA_RESTART))) {
+                                && !(ksig.ka.sa.sa_flags & SA_RESTART))) {
                                 regs->REG_RETVAL = -EINTR;
                                 regs->REG_PC = continue_addr;
                         }
                 }
 
                 /* Whee! Actually deliver the signal.  */
-                handle_signal(signr, &info, &ka, regs);
+                handle_signal(&ksig, regs);
                 return 0;
         }