aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 14:31:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 14:31:52 -0500
commit57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch)
tree978bd46ca765a88e9c101cb705bbb0bf46015643 /arch/s390
parent76052749143d03006271cc0ce8205ad756917062 (diff)
parent5a9e67b1a19e08a82387709f325d26e07b891d27 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits) trivial: chack -> check typo fix in main Makefile trivial: Add a space (and a comma) to a printk in 8250 driver trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx trivial: Fix misspelling of "firmware" in powerpc Makefile trivial: Fix misspelling of "firmware" in usb.c trivial: Fix misspelling of "firmware" in qla1280.c trivial: Fix misspelling of "firmware" in a100u2w.c trivial: Fix misspelling of "firmware" in megaraid.c trivial: Fix misspelling of "firmware" in ql4_mbx.c trivial: Fix misspelling of "firmware" in acpi_memhotplug.c trivial: Fix misspelling of "firmware" in ipw2100.c trivial: Fix misspelling of "firmware" in atmel.c trivial: Fix misspelled firmware in Kconfig trivial: fix an -> a typos in documentation and comments trivial: fix then -> than typos in comments and documentation trivial: update Jesper Juhl CREDITS entry with new email trivial: fix singal -> signal typo trivial: Fix incorrect use of "loose" in event.c trivial: printk: fix indentation of new_text_line declaration trivial: rtc-stk17ta8: fix sparse warning ...
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/Kconfig2
-rw-r--r--arch/s390/kernel/kprobes.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 19577aeffd7b..a94a3c3ae932 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -299,7 +299,7 @@ config WARN_STACK
299 This option enables the compiler options -mwarn-framesize and 299 This option enables the compiler options -mwarn-framesize and
300 -mwarn-dynamicstack. If the compiler supports these options it 300 -mwarn-dynamicstack. If the compiler supports these options it
301 will generate warnings for function which either use alloca or 301 will generate warnings for function which either use alloca or
302 create a stack frame bigger then CONFIG_WARN_STACK_SIZE. 302 create a stack frame bigger than CONFIG_WARN_STACK_SIZE.
303 303
304 Say N if you are unsure. 304 Say N if you are unsure.
305 305
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 9b92856632cf..a01cf0284db2 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -382,7 +382,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
382 /* 382 /*
383 * It is possible to have multiple instances associated with a given 383 * It is possible to have multiple instances associated with a given
384 * task either because an multiple functions in the call path 384 * task either because an multiple functions in the call path
385 * have a return probe installed on them, and/or more then one return 385 * have a return probe installed on them, and/or more than one return
386 * return probe was registered for a target function. 386 * return probe was registered for a target function.
387 * 387 *
388 * We can handle this because: 388 * We can handle this because: