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, 3 insertions, 0 deletions

diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 28e480c8100f..d716b76098bb 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -13,6 +13,7 @@
 #       Random bits by Matt Mackall <mpm@selenic.com>
 #       M68k port by Geert Uytterhoeven and Andreas Schwab
 #       AVR32 port by Haavard Skinnemoen <hskinnemoen@atmel.com>
+#       PARISC port by Kyle McMartin <kyle@parisc-linux.org>
 #
 #       Usage:
 #       objdump -d vmlinux | scripts/checkstack.pl [arch]
@@ -61,6 +62,8 @@ my (@stack, $re, $x, $xs);
         } elsif ($arch eq 'mips') {
                 #88003254:       27bdffe0        addiu   sp,sp,-32
                 $re = qr/.*addiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;
+        } elsif ($arch eq 'parisc' || $arch eq 'parisc64') {
+                $re = qr/.*ldo ($x{1,8})\(sp\),sp/o;
         } elsif ($arch eq 'ppc') {
                 #c00029f4:       94 21 ff 30     stwu    r1,-208(r1)
                 $re = qr/.*stwu.*r1,-($x{1,8})\(r1\)/o;