18 files changed, 79 insertions, 161 deletions

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 0339181bf3ac..433e75a2ee9a 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -1,5 +1,6 @@
 config PARISC
         def_bool y
+        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_FUNCTION_TRACER if 64BIT
diff --git a/arch/parisc/Kconfig.debug b/arch/parisc/Kconfig.debug
index 7305ac8f7f5b..bc989e522a04 100644
--- a/arch/parisc/Kconfig.debug
+++ b/arch/parisc/Kconfig.debug
@@ -12,18 +12,4 @@ config DEBUG_RODATA
          portion of the kernel code won't be covered by a TLB anymore.
          If in doubt, say "N".
 
-config DEBUG_STRICT_USER_COPY_CHECKS
-        bool "Strict copy size checks"
-        depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
-        ---help---
-          Enabling this option turns a certain set of sanity checks for user
-          copy operations into compile time failures.
-
-          The copy_from_user() etc checks are there to help test if there
-          are sufficient security checks on the length argument of
-          the copy operation, by having gcc prove that the argument is
-          within bounds.
-
-          If unsure, or if you run an older (pre 4.4) gcc, say N.
-
 endmenu
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 01d95e2f0581..113e28206503 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -65,8 +65,10 @@ ifndef CONFIG_FUNCTION_TRACER
 endif
 
 # Use long jumps instead of long branches (needed if your linker fails to
-# link a too big vmlinux executable)
-cflags-$(CONFIG_MLONGCALLS)     += -mlong-calls
+# link a too big vmlinux executable). Not enabled for building modules.
+ifdef CONFIG_MLONGCALLS
+KBUILD_CFLAGS_KERNEL += -mlong-calls
+endif
 
 # select which processor to optimise for
 cflags-$(CONFIG_PA7100)         += -march=1.1 -mschedule=7100
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h
index 79f694f3ad9b..f0e2784e7cca 100644
--- a/arch/parisc/include/asm/cacheflush.h
+++ b/arch/parisc/include/asm/cacheflush.h
@@ -140,7 +140,10 @@ static inline void *kmap(struct page *page)
         return page_address(page);
 }
 
-#define kunmap(page)                    kunmap_parisc(page_address(page))
+static inline void kunmap(struct page *page)
+{
+        kunmap_parisc(page_address(page));
+}
 
 static inline void *kmap_atomic(struct page *page)
 {
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index 7df49fad29f9..1e40d7f86be3 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -16,6 +16,8 @@
 #include <asm/processor.h>
 #include <asm/cache.h>
 
+extern spinlock_t pa_dbit_lock;
+
 /*
  * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel
  * memory.  For the return value to be meaningful, ADDR must be >=
@@ -44,8 +46,11 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
 
 #define set_pte_at(mm, addr, ptep, pteval)                      \
         do {                                                    \
+                unsigned long flags;                            \
+                spin_lock_irqsave(&pa_dbit_lock, flags);        \
                 set_pte(ptep, pteval);                          \
                 purge_tlb_entries(mm, addr);                    \
+                spin_unlock_irqrestore(&pa_dbit_lock, flags);   \
         } while (0)
 
 #endif /* !__ASSEMBLY__ */
@@ -435,48 +440,46 @@ extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *);
 
 static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
 {
-#ifdef CONFIG_SMP
+        pte_t pte;
+        unsigned long flags;
+
         if (!pte_young(*ptep))
                 return 0;
-        return test_and_clear_bit(xlate_pabit(_PAGE_ACCESSED_BIT), &pte_val(*ptep));
-#else
-        pte_t pte = *ptep;
-        if (!pte_young(pte))
+
+        spin_lock_irqsave(&pa_dbit_lock, flags);
+        pte = *ptep;
+        if (!pte_young(pte)) {
+                spin_unlock_irqrestore(&pa_dbit_lock, flags);
                 return 0;
-        set_pte_at(vma->vm_mm, addr, ptep, pte_mkold(pte));
+        }
+        set_pte(ptep, pte_mkold(pte));
+        purge_tlb_entries(vma->vm_mm, addr);
+        spin_unlock_irqrestore(&pa_dbit_lock, flags);
         return 1;
-#endif
 }
 
-extern spinlock_t pa_dbit_lock;
-
 struct mm_struct;
 static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
         pte_t old_pte;
+        unsigned long flags;
 
-        spin_lock(&pa_dbit_lock);
+        spin_lock_irqsave(&pa_dbit_lock, flags);
         old_pte = *ptep;
         pte_clear(mm,addr,ptep);
-        spin_unlock(&pa_dbit_lock);
+        purge_tlb_entries(mm, addr);
+        spin_unlock_irqrestore(&pa_dbit_lock, flags);
 
         return old_pte;
 }
 
 static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
-#ifdef CONFIG_SMP
-        unsigned long new, old;
-
-        do {
-                old = pte_val(*ptep);
-                new = pte_val(pte_wrprotect(__pte (old)));
-        } while (cmpxchg((unsigned long *) ptep, old, new) != old);
+        unsigned long flags;
+        spin_lock_irqsave(&pa_dbit_lock, flags);
+        set_pte(ptep, pte_wrprotect(*ptep));
         purge_tlb_entries(mm, addr);
-#else
-        pte_t old_pte = *ptep;
-        set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
-#endif
+        spin_unlock_irqrestore(&pa_dbit_lock, flags);
 }
 
 #define pte_same(A,B)   (pte_val(A) == pte_val(B))
diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h
index d1fb79a36f3d..6182832e5b6c 100644
--- a/arch/parisc/include/asm/thread_info.h
+++ b/arch/parisc/include/asm/thread_info.h
@@ -77,8 +77,6 @@ struct thread_info {
 #define _TIF_SYSCALL_TRACE_MASK (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | \
                                  _TIF_BLOCKSTEP)
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_PARISC_THREAD_INFO_H */
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
index 4ba2c93770f1..e0a82358517e 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@@ -181,30 +181,24 @@ struct exception_data {
 #if !defined(CONFIG_64BIT)
 
 #define __put_kernel_asm64(__val,ptr) do {                  \
-        u64 __val64 = (u64)(__val);                         \
-        u32 hi = (__val64) >> 32;                           \
-        u32 lo = (__val64) & 0xffffffff;                    \
         __asm__ __volatile__ (                              \
                 "\n1:\tstw %2,0(%1)"                        \
-                "\n2:\tstw %3,4(%1)\n\t"                    \
+                "\n2:\tstw %R2,4(%1)\n\t"                   \
                 ASM_EXCEPTIONTABLE_ENTRY(1b,fixup_put_user_skip_2)\
                 ASM_EXCEPTIONTABLE_ENTRY(2b,fixup_put_user_skip_1)\
                 : "=r"(__pu_err)                            \
-                : "r"(ptr), "r"(hi), "r"(lo), "0"(__pu_err) \
+                : "r"(ptr), "r"(__val), "0"(__pu_err) \
                 : "r1");                                    \
 } while (0)
 
 #define __put_user_asm64(__val,ptr) do {                    \
-        u64 __val64 = (u64)(__val);                         \
-        u32 hi = (__val64) >> 32;                           \
-        u32 lo = (__val64) & 0xffffffff;                    \
         __asm__ __volatile__ (                              \
                 "\n1:\tstw %2,0(%%sr3,%1)"                  \
-                "\n2:\tstw %3,4(%%sr3,%1)\n\t"              \
+                "\n2:\tstw %R2,4(%%sr3,%1)\n\t"             \
                 ASM_EXCEPTIONTABLE_ENTRY(1b,fixup_put_user_skip_2)\
                 ASM_EXCEPTIONTABLE_ENTRY(2b,fixup_put_user_skip_1)\
                 : "=r"(__pu_err)                            \
-                : "r"(ptr), "r"(hi), "r"(lo), "0"(__pu_err) \
+                : "r"(ptr), "r"(__val), "0"(__pu_err) \
                 : "r1");                                    \
 } while (0)
 
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index ae9a46cbfd92..74d835820ee7 100644
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -170,12 +170,4 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)	\
 
 #undef STR
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
 #endif /* _ASM_PARISC_UNISTD_H_ */
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;
diff --git a/arch/parisc/lib/Makefile b/arch/parisc/lib/Makefile
index 5f2e6904d14a..5651536ac733 100644
--- a/arch/parisc/lib/Makefile
+++ b/arch/parisc/lib/Makefile
@@ -2,6 +2,7 @@
 # Makefile for parisc-specific library files
 #
 
-lib-y   := lusercopy.o bitops.o checksum.o io.o memset.o fixup.o memcpy.o
+lib-y   := lusercopy.o bitops.o checksum.o io.o memset.o fixup.o memcpy.o \
+           ucmpdi2.o
 
 obj-y   := iomap.o
diff --git a/arch/parisc/lib/ucmpdi2.c b/arch/parisc/lib/ucmpdi2.c
new file mode 100644
index 000000000000..149c016f32c5
--- /dev/null
+++ b/arch/parisc/lib/ucmpdi2.c
@@ -0,0 +1,25 @@
+#include <linux/module.h>
+
+union ull_union {
+        unsigned long long ull;
+        struct {
+                unsigned int high;
+                unsigned int low;
+        } ui;
+};
+
+int __ucmpdi2(unsigned long long a, unsigned long long b)
+{
+        union ull_union au = {.ull = a};
+        union ull_union bu = {.ull = b};
+
+        if (au.ui.high < bu.ui.high)
+                return 0;
+        else if (au.ui.high > bu.ui.high)
+                return 2;
+        if (au.ui.low < bu.ui.low)
+                return 0;
+        else if (au.ui.low > bu.ui.low)
+                return 2;
+        return 1;
+}
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 3ac462de53a4..157b931e7b09 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -505,7 +505,6 @@ static void __init map_pages(unsigned long start_vaddr,
 
 void free_initmem(void)
 {
-        unsigned long addr;
         unsigned long init_begin = (unsigned long)__init_begin;
         unsigned long init_end = (unsigned long)__init_end;
 
@@ -533,19 +532,10 @@ void free_initmem(void)
          * pages are no-longer executable */
         flush_icache_range(init_begin, init_end);
         
-        for (addr = init_begin; addr < init_end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                num_physpages++;
-                totalram_pages++;
-        }
+        num_physpages += free_initmem_default(0);
 
         /* set up a new led state on systems shipped LED State panel */
         pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE);
-        
-        printk(KERN_INFO "Freeing unused kernel memory: %luk freed\n",
-                (init_end - init_begin) >> 10);
 }
 
 
@@ -697,6 +687,8 @@ void show_mem(unsigned int filter)
 
         printk(KERN_INFO "Mem-info:\n");
         show_free_areas(filter);
+        if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+                return;
 #ifndef CONFIG_DISCONTIGMEM
         i = max_mapnr;
         while (i-- > 0) {
@@ -1107,15 +1099,6 @@ void flush_tlb_all(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        if (start >= end)
-                return;
-        printk(KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                num_physpages++;
-                totalram_pages++;
-        }
+        num_physpages += free_reserved_area(start, end, 0, "initrd");
 }
 #endif