3 files changed, 12 insertions, 75 deletions

diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index 81d5cb9b6569..bf6e949a2f87 100644
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -524,7 +524,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask)
 static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
 {
         struct uart_icount *icount = &port->uart.icount;
-        struct tty_struct *tty = port->uart.state->port.tty;
+        struct tty_port *tport = &port->uart.state->port;
         unsigned ix;
         int count;
         u8 st, ch, push, status, overrun;
@@ -534,10 +534,10 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
         push = 0;
 
         count = CIRC_CNT(port->rx_inp, port->rx_outp, MNSC_BUFFER_SIZE);
-        count = tty_buffer_request_room(tty, count);
+        count = tty_buffer_request_room(tport, count);
         if (count == 0) {
-                if (!tty->low_latency)
-                        tty_flip_buffer_push(tty);
+                if (!tport->low_latency)
+                        tty_flip_buffer_push(tport);
                 return;
         }
 
@@ -545,8 +545,8 @@ try_again:
         /* pull chars out of the hat */
         ix = ACCESS_ONCE(port->rx_outp);
         if (CIRC_CNT(port->rx_inp, ix, MNSC_BUFFER_SIZE) == 0) {
-                if (push && !tty->low_latency)
-                        tty_flip_buffer_push(tty);
+                if (push && !tport->low_latency)
+                        tty_flip_buffer_push(tport);
                 return;
         }
 
@@ -666,19 +666,19 @@ insert:
                 else
                         flag = TTY_NORMAL;
 
-                tty_insert_flip_char(tty, ch, flag);
+                tty_insert_flip_char(tport, ch, flag);
         }
 
         /* overrun is special, since it's reported immediately, and doesn't
          * affect the current character
          */
         if (overrun)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
 
         count--;
         if (count <= 0) {
-                if (!tty->low_latency)
-                        tty_flip_buffer_push(tty);
+                if (!tport->low_latency)
+                        tty_flip_buffer_push(tport);
                 return;
         }
 
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c
index eb09f5a552ff..84f4e97e3074 100644
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
@@ -37,12 +37,6 @@
 #include "internal.h"
 
 /*
- * power management idle function, if any..
- */
-void (*pm_idle)(void);
-EXPORT_SYMBOL(pm_idle);
-
-/*
  * return saved PC of a blocked thread.
  */
 unsigned long thread_saved_pc(struct task_struct *tsk)
@@ -113,7 +107,6 @@ void cpu_idle(void)
                         void (*idle)(void);
 
                         smp_rmb();
-                        idle = pm_idle;
                         if (!idle) {
 #if defined(CONFIG_SMP) && !defined(CONFIG_HOTPLUG_CPU)
                                 idle = poll_idle;
diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c
index f570b3085ef9..9dfac5cd16e6 100644
--- a/arch/mn10300/kernel/signal.c
+++ b/arch/mn10300/kernel/signal.c
@@ -32,59 +32,6 @@
 #define DEBUG_SIG 0
 
 /*
- * atomically swap in the new signal mask, and wait for a signal.
- */
-asmlinkage long sys_sigsuspend(int history0, int history1, old_sigset_t mask)
-{
-        sigset_t blocked;
-        siginitset(&blocked, mask);
-        return sigsuspend(&blocked);
-}
-
-/*
- * set signal action syscall
- */
-asmlinkage long sys_sigaction(int sig,
-                              const struct old_sigaction __user *act,
-                              struct old_sigaction __user *oact)
-{
-        struct k_sigaction new_ka, old_ka;
-        int ret;
-
-        if (act) {
-                old_sigset_t mask;
-                if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
-                    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-                    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||
-                    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
-                    __get_user(mask, &act->sa_mask))
-                        return -EFAULT;
-                siginitset(&new_ka.sa.sa_mask, mask);
-        }
-
-        ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
-
-        if (!ret && oact) {
-                if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
-                    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-                    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||
-                    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
-                    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
-                        return -EFAULT;
-        }
-
-        return ret;
-}
-
-/*
- * set alternate signal stack syscall
- */
-asmlinkage long sys_sigaltstack(const stack_t __user *uss, stack_t *uoss)
-{
-        return do_sigaltstack(uss, uoss, current_frame()->sp);
-}
-
-/*
  * do a signal return; undo the signal stack.
  */
 static int restore_sigcontext(struct pt_regs *regs,
@@ -193,8 +140,7 @@ asmlinkage long sys_rt_sigreturn(void)
         if (restore_sigcontext(current_frame(), &frame->uc.uc_mcontext, &d0))
                 goto badframe;
 
-        if (do_sigaltstack(&frame->uc.uc_stack, NULL, current_frame()->sp) ==
-            -EFAULT)
+        if (restore_altstack(&frame->uc.uc_stack))
                 goto badframe;
 
         return d0;
@@ -359,9 +305,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         /* create the ucontext.  */
         if (__put_user(0, &frame->uc.uc_flags) ||
             __put_user(0, &frame->uc.uc_link) ||
-            __put_user((void *)current->sas_ss_sp, &frame->uc.uc_stack.ss_sp) ||
-            __put_user(sas_ss_flags(regs->sp), &frame->uc.uc_stack.ss_flags) ||
-            __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size) ||
+            __save_altstack(&frame->uc.uc_stack, regs->sp) ||
             setup_sigcontext(&frame->uc.uc_mcontext,
                              &frame->fpuctx, regs, set->sig[0]) ||
             __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)))