7 files changed, 48 insertions, 35 deletions

diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index d8a4ca021aac..360b7391cb8c 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -89,7 +89,7 @@ update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)
         if (pfn_valid(page_to_pfn(page)) && page_mapping(page) &&
             test_bit(PG_dcache_dirty, &page->flags)) {
 
-                flush_kernel_dcache_page(page_address(page));
+                flush_kernel_dcache_page(page);
                 clear_bit(PG_dcache_dirty, &page->flags);
         }
 }
@@ -278,7 +278,7 @@ void flush_dcache_page(struct page *page)
                 return;
         }
 
-        flush_kernel_dcache_page(page_address(page));
+        flush_kernel_dcache_page(page);
 
         if (!mapping)
                 return;
@@ -317,7 +317,7 @@ EXPORT_SYMBOL(flush_dcache_page);
 
 /* Defined in arch/parisc/kernel/pacache.S */
 EXPORT_SYMBOL(flush_kernel_dcache_range_asm);
-EXPORT_SYMBOL(flush_kernel_dcache_page);
+EXPORT_SYMBOL(flush_kernel_dcache_page_asm);
 EXPORT_SYMBOL(flush_data_cache_local);
 EXPORT_SYMBOL(flush_kernel_icache_range_asm);
 
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 9af4b22a6d77..7c95d7663c29 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -563,10 +563,10 @@
         extrd,u,*=      \pte,_PAGE_GATEWAY_BIT+32,1,%r0
         depd            %r0,11,2,\prot  /* If Gateway, Set PL2 to 0 */
 
-        /* Get rid of prot bits and convert to page addr for iitlbt */
+        /* Get rid of prot bits and convert to page addr for iitlbt and idtlbt */
 
         depd            %r0,63,PAGE_SHIFT,\pte
-        extrd,u         \pte,56,32,\pte
+        extrd,s         \pte,(63-PAGE_SHIFT)+(63-58),64-PAGE_SHIFT,\pte
         .endm
 
         /* Identical macro to make_insert_tlb above, except it
@@ -584,7 +584,7 @@
 
         /* Get rid of prot bits and convert to page addr for iitlba */
 
-        depi            0,31,12,\pte
+        depi            0,31,PAGE_SHIFT,\pte
         extru           \pte,24,25,\pte
 
         .endm
@@ -1014,14 +1014,21 @@ intr_restore:
         nop
         nop
 
+#ifndef CONFIG_PREEMPT
+# define intr_do_preempt        intr_restore
+#endif /* !CONFIG_PREEMPT */
+
         .import schedule,code
 intr_do_resched:
-        /* Only do reschedule if we are returning to user space */
+        /* Only call schedule on return to userspace. If we're returning
+         * to kernel space, we may schedule if CONFIG_PREEMPT, otherwise
+         * we jump back to intr_restore.
+         */
         LDREG   PT_IASQ0(%r16), %r20
-        CMPIB= 0,%r20,intr_restore /* backward */
+        CMPIB=  0, %r20, intr_do_preempt
         nop
         LDREG   PT_IASQ1(%r16), %r20
-        CMPIB= 0,%r20,intr_restore /* backward */
+        CMPIB=  0, %r20, intr_do_preempt
         nop
 
 #ifdef CONFIG_64BIT
@@ -1037,6 +1044,32 @@ intr_do_resched:
 #endif
         ldo     R%intr_check_sig(%r2), %r2
 
+        /* preempt the current task on returning to kernel
+         * mode from an interrupt, iff need_resched is set,
+         * and preempt_count is 0. otherwise, we continue on
+         * our merry way back to the current running task.
+         */
+#ifdef CONFIG_PREEMPT
+        .import preempt_schedule_irq,code
+intr_do_preempt:
+        rsm     PSW_SM_I, %r0           /* disable interrupts */
+
+        /* current_thread_info()->preempt_count */
+        mfctl   %cr30, %r1
+        LDREG   TI_PRE_COUNT(%r1), %r19
+        CMPIB<> 0, %r19, intr_restore   /* if preempt_count > 0 */
+        nop                             /* prev insn branched backwards */
+
+        /* check if we interrupted a critical path */
+        LDREG   PT_PSW(%r16), %r20
+        bb,<,n  %r20, 31 - PSW_SM_I, intr_restore
+        nop
+
+        BL      preempt_schedule_irq, %r2
+        nop
+
+        b       intr_restore            /* ssm PSW_SM_I done by intr_restore */
+#endif /* CONFIG_PREEMPT */
 
         .import do_signal,code
 intr_do_signal:
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 9534ee17b9be..7a4f07e8d3c3 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -621,9 +621,9 @@ __clear_user_page_asm:
 
         .procend
 
-        .export flush_kernel_dcache_page
+        .export flush_kernel_dcache_page_asm
 
-flush_kernel_dcache_page:
+flush_kernel_dcache_page_asm:
         .proc
         .callinfo NO_CALLS
         .entry
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index 1d00c365f2b1..47ca5c0a323b 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -30,22 +30,7 @@
 #include <linux/syscalls.h>
 
 #include <linux/string.h>
-EXPORT_SYMBOL(memchr);
-EXPORT_SYMBOL(memcmp);
-EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(memscan);
 EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(strcat);
-EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strcmp);
-EXPORT_SYMBOL(strcpy);
-EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strncat);
-EXPORT_SYMBOL(strncmp);
-EXPORT_SYMBOL(strncpy);
-EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strrchr);
-EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strpbrk);
 
 #include <asm/atomic.h>
@@ -82,16 +67,12 @@ EXPORT_SYMBOL($global$);
 #endif
 
 #include <asm/io.h>
-EXPORT_SYMBOL(__ioremap);
-EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(memcpy_toio);
 EXPORT_SYMBOL(memcpy_fromio);
 EXPORT_SYMBOL(memset_io);
 
 #include <asm/unistd.h>
-EXPORT_SYMBOL(sys_open);
 EXPORT_SYMBOL(sys_lseek);
-EXPORT_SYMBOL(sys_read);
 EXPORT_SYMBOL(sys_write);
 
 #include <asm/semaphore.h>
diff --git a/arch/parisc/kernel/pdc_chassis.c b/arch/parisc/kernel/pdc_chassis.c
index 0cea6958f427..a45e2e2ffd9f 100644
--- a/arch/parisc/kernel/pdc_chassis.c
+++ b/arch/parisc/kernel/pdc_chassis.c
@@ -5,9 +5,8 @@
  *    Copyright (C) 2002-2004 Thibaut VARENE <varenet@parisc-linux.org>
  *
  *    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.
+ *    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
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index 53f861c82f93..ac8ee205c351 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -805,7 +805,7 @@ static int perf_write_image(uint64_t *memaddr)
                 return -1;
         }
 
-        runway = ioremap(cpu_device->hpa.start, 4096);
+        runway = ioremap_nocache(cpu_device->hpa.start, 4096);
 
         /* Merge intrigue bits into Runway STATUS 0 */
         tmp64 = __raw_readq(runway + RUNWAY_STATUS) & 0xffecfffffffffffful;
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 89b6c56ea0a8..bbeeb614cfab 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -287,7 +287,7 @@
         ENTRY_SAME(chown)               /* 180 */
         /* setsockopt() used by iptables: SO_SET_REPLACE/SO_SET_ADD_COUNTERS */
         ENTRY_COMP(setsockopt)
-        ENTRY_SAME(getsockopt)
+        ENTRY_COMP(getsockopt)
         ENTRY_COMP(sendmsg)
         ENTRY_COMP(recvmsg)
         ENTRY_SAME(semop)               /* 185 */