History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull "trivial tree" updates from Jiri Kosina: "Usual pile from trivial tree everyone is so eagerly waiting for" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) Remove MN10300_PROC_MN2WS0038 mei: fix comments treewide: Fix typos in Kconfig kprobes: update jprobe_example.c for do_fork() change Documentation: change "&" to "and" in Documentation/applying-patches.txt Documentation: remove obsolete pcmcia-cs from Changes Documentation: update links in Changes Documentation: Docbook: Fix generated DocBook/kernel-api.xml score: Remove GENERIC_HAS_IOMAP gpio: fix 'CONFIG_GPIO_IRQCHIP' comments tty: doc: Fix grammar in serial/tty dma-debug: modify check_for_stack output treewide: fix errors in printk genirq: fix reference in devm_request_threaded_irq comment treewide: fix synchronize_rcu() in comments checkstack.pl: port to AArch64 doc: queue-sysfs: minor fixes init/do_mounts: better syntax description MIPS: fix comment spelling powerpc/simpleboot: fix comment ...

Linus Torvalds committed 12 years ago

Commit 28596c92 parents b6420eb 7bb38d592 files · +125 −135Browse files

Showing the changes to scripts/checkstack.pl (1 of 92 files). Show all

Unified · Split

scripts/checkstack.pl+5−2
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 # Random bits by Matt Mackall <mpm@selenic.com>
1414 # M68k port by Geert Uytterhoeven and Andreas Schwab
1515 # AVR32 port by Haavard Skinnemoen (Atmel)
16−# PARISC port by Kyle McMartin <kyle@parisc-linux.org>
16+# AArch64, PARISC ports by Kyle McMartin
1717 # sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk>
1818 #
1919 # Usage:
@@ -45,7 +45,10 @@ my (@stack, $re, $dre, $x, $xs, $funcre); · 25 unmodified lines
4545 $x = "[0-9a-f]"; # hex character
4646 $xs = "[0-9a-f ]"; # hex character or space
4747 $funcre = qr/^$x* <(.*)>:$/;
48− if ($arch eq 'arm') {
48+ if ($arch eq 'aarch64') {
49+ #ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp,#-80]!
50+ $re = qr/^.*stp.*sp,\#-([0-9]{1,8})\]\!/o;
51+ } elsif ($arch eq 'arm') {
4952 #c0008ffc: e24dd064 sub sp, sp, #100 ; 0x64
5053 $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o;
5154 } elsif ($arch eq 'avr32') {