7 files changed, 10 insertions, 80 deletions

diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 4b12890642eb..83ded26cad06 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -421,14 +421,11 @@ void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
         /* Note: purge_tlb_entries can be called at startup with
            no context.  */
 
-        /* Disable preemption while we play with %sr1.  */
-        preempt_disable();
-        mtsp(mm->context, 1);
         purge_tlb_start(flags);
+        mtsp(mm->context, 1);
         pdtlb(addr);
         pitlb(addr);
         purge_tlb_end(flags);
-        preempt_enable();
 }
 EXPORT_SYMBOL(purge_tlb_entries);
 
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index 6795dc6c995f..568b2c61ea02 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -120,11 +120,13 @@ extern void __ashrdi3(void);
 extern void __ashldi3(void);
 extern void __lshrdi3(void);
 extern void __muldi3(void);
+extern void __ucmpdi2(void);
 
 EXPORT_SYMBOL(__ashrdi3);
 EXPORT_SYMBOL(__ashldi3);
 EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__muldi3);
+EXPORT_SYMBOL(__ucmpdi2);
 
 asmlinkage void * __canonicalize_funcptr_for_compare(void *);
 EXPORT_SYMBOL(__canonicalize_funcptr_for_compare);
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index d13507246c5d..55f92b614182 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -59,28 +59,6 @@
 #include <asm/unwind.h>
 #include <asm/sections.h>
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle(void)
-{
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        barrier();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-                check_pgt_cache();
-        }
-}
-
-
 #define COMMAND_GLOBAL  F_EXTEND(0xfffe0030)
 #define CMD_RESET       5       /* reset any module */
 
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 6266730efd61..fd1bb1519c2b 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -329,7 +329,7 @@ void __init smp_callin(void)
 
         local_irq_enable();  /* Interrupts have been off until now */
 
-        cpu_idle();      /* Wait for timer to schedule some work */
+        cpu_startup_entry(CPUHP_ONLINE);
 
         /* NOTREACHED */
         panic("smp_callin() AAAAaaaaahhhh....\n");
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 051c8b90231f..f517e08e7f0d 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -60,47 +60,6 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23,
     return -ENOSYS;
 }
 
-/* Note: it is necessary to treat out_fd and in_fd as unsigned ints, 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) and the register representation of a signed int (msr in 64-bit
- * mode) is performed.
- */
-asmlinkage long sys32_sendfile(u32 out_fd, u32 in_fd,
-                               compat_off_t __user *offset, compat_size_t count)
-{
-        return compat_sys_sendfile((int)out_fd, (int)in_fd, offset, count);
-}
-
-asmlinkage long sys32_sendfile64(u32 out_fd, u32 in_fd,
-                                 compat_loff_t __user *offset, compat_size_t count)
-{
-        return sys_sendfile64((int)out_fd, (int)in_fd,
-                                (loff_t __user *)offset, count);
-}
-
-asmlinkage long sys32_semctl(int semid, int semnum, int cmd, union semun arg)
-{
-        union semun u;
-        
-        if (cmd == SETVAL) {
-                /* Ugh.  arg is a union of int,ptr,ptr,ptr, so is 8 bytes.
-                 * The int should be in the first 4, but our argument
-                 * frobbing has left it in the last 4.
-                 */
-                u.val = *((int *)&arg + 1);
-                return sys_semctl (semid, semnum, cmd, u);
-        }
-        return sys_semctl (semid, semnum, cmd, arg);
-}
-
-long sys32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char __user *buf,
-                          size_t len)
-{
-        return sys_lookup_dcookie((u64)cookie_high << 32 | cookie_low,
-                                  buf, len);
-}
-
 asmlinkage long compat_sys_fanotify_mark(int fan_fd, int flags, u32 mask_hi,
                                          u32 mask_lo, int fd,
                                          const char __user *pathname)
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index f57dc137b8dd..0c9107285e66 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -198,7 +198,7 @@
         ENTRY_SAME(madvise)
         ENTRY_SAME(clone_wrapper)       /* 120 */
         ENTRY_SAME(setdomainname)
-        ENTRY_DIFF(sendfile)
+        ENTRY_COMP(sendfile)
         /* struct sockaddr... */
         ENTRY_SAME(recvfrom)
         /* struct timex contains longs */
@@ -282,7 +282,7 @@
         ENTRY_COMP(recvmsg)
         ENTRY_SAME(semop)               /* 185 */
         ENTRY_SAME(semget)
-        ENTRY_DIFF(semctl)
+        ENTRY_COMP(semctl)
         ENTRY_COMP(msgsnd)
         ENTRY_COMP(msgrcv)
         ENTRY_SAME(msgget)              /* 190 */
@@ -304,7 +304,7 @@
         ENTRY_SAME(gettid)
         ENTRY_OURS(readahead)
         ENTRY_SAME(tkill)
-        ENTRY_DIFF(sendfile64)
+        ENTRY_COMP(sendfile64)
         ENTRY_COMP(futex)               /* 210 */
         ENTRY_COMP(sched_setaffinity)
         ENTRY_COMP(sched_getaffinity)
@@ -318,7 +318,7 @@
         ENTRY_SAME(alloc_hugepages)     /* 220 */
         ENTRY_SAME(free_hugepages)
         ENTRY_SAME(exit_group)
-        ENTRY_DIFF(lookup_dcookie)
+        ENTRY_COMP(lookup_dcookie)
         ENTRY_SAME(epoll_create)
         ENTRY_SAME(epoll_ctl)           /* 225 */
         ENTRY_SAME(epoll_wait)
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index aeb8f8f2c07a..f702bff0bed9 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -126,6 +126,8 @@ void show_regs(struct pt_regs *regs)
         user = user_mode(regs);
         level = user ? KERN_DEBUG : KERN_CRIT;
 
+        show_regs_print_info(level);
+
         print_gr(level, regs);
 
         for (i = 0; i < 8; i += 4)
@@ -158,14 +160,6 @@ void show_regs(struct pt_regs *regs)
         }
 }
 
-
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 static void do_show_stack(struct unwind_frame_info *info)
 {
         int i = 1;