Merge branch 'master' of hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

* 'master' of hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (29 commits)
  [PARISC] fix uninitialized variable warning in asm/rtc.h
  [PARISC] Port checkstack.pl to parisc
  [PARISC] Make palo target work when $obj != $src
  [PARISC] Zap unused variable warnings in pci.c
  [PARISC] Fix tests in palo target
  [PARISC] Fix palo target
  [PARISC] Restore palo target
  [PARISC] Attempt to clean up parisc/Makefile
  [PARISC] Fix infinite loop in /proc/iomem
  [PARISC] Quiet sysfs_create_link __must_check warnings in pdc_stable
  [PARISC] Squelch pci_enable_device __must_check warning in superio
  [PARISC] Kill off broken irqstack code
  [PARISC] Remove hardcoded uses of PAGE_SIZE
  [PARISC] Clean up pointless ASM_PAGE_SIZE_DIV use
  [PARISC] Kill off the last vestiges of ASM_PAGE_SIZE
  [PARISC] Kill off ASM_PAGE_SIZE use
  [PARISC] Beautify parisc vmlinux.lds.S
  [PARISC] Clean up a resource_size_t warning in sba_iommu
  [PARISC] Kill incorrect cast warning in unwinder
  [PARISC] Kill zone_to_nid printk warning
  ...

Fixed trivial conflict in include/asm-parisc/tlbflush.h manually

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 90b240878520..5901092e0196 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -289,7 +289,7 @@ ENTRY(copy_user_page_asm)
          */
 
         ldd             0(%r25), %r19
-        ldi             ASM_PAGE_SIZE_DIV128, %r1
+        ldi             (PAGE_SIZE / 128), %r1
 
         ldw             64(%r25), %r0           /* prefetch 1 cacheline ahead */
         ldw             128(%r25), %r0          /* prefetch 2 */
@@ -355,7 +355,7 @@ ENTRY(copy_user_page_asm)
          * use ldd/std on a 32 bit kernel.
          */
         ldw             0(%r25), %r19
-        ldi             ASM_PAGE_SIZE_DIV64, %r1
+        ldi             (PAGE_SIZE / 64), %r1
 
 1:
         ldw             4(%r25), %r20
@@ -553,7 +553,7 @@ ENTRY(__clear_user_page_asm)
         pdtlb           0(%r28)
 
 #ifdef CONFIG_64BIT
-        ldi             ASM_PAGE_SIZE_DIV128, %r1
+        ldi             (PAGE_SIZE / 128), %r1
 
         /* PREFETCH (Write) has not (yet) been proven to help here */
         /* #define      PREFETCHW_OP    ldd             256(%0), %r0 */
@@ -578,7 +578,7 @@ ENTRY(__clear_user_page_asm)
         ldo             128(%r28), %r28
 
 #else   /* ! CONFIG_64BIT */
-        ldi             ASM_PAGE_SIZE_DIV64, %r1
+        ldi             (PAGE_SIZE / 64), %r1
 
 1:
         stw             %r0, 0(%r28)