diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-22 16:28:19 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-22 16:28:19 +0000 |
| commit | 7efb35af738e96565934cc640d863eb18dba0206 (patch) | |
| tree | 29ed331d864b0cfa73fdca5fd3982896e56f9530 /scripts | |
| parent | 748c5151deb56e4b7b5a9b07a884243764933831 (diff) | |
| parent | 55b70a0300b873c0ec7ea6e33752af56f41250ce (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkstack.pl | 3 | ||||
| -rw-r--r-- | scripts/kconfig/qconf.cc | 4 |
2 files changed, 7 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; diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index e4eeb59a8c24..b9bb32dfd628 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1274,8 +1274,12 @@ ConfigMainWindow::ConfigMainWindow(void) QMenuBar* menu; bool ok; int x, y, width, height; + char title[256]; QWidget *d = configApp->desktop(); + snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"), + getenv("KERNELVERSION")); + setCaption(title); width = configSettings->readNumEntry("/window width", d->width() - 64); height = configSettings->readNumEntry("/window height", d->height() - 64); |