diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 14:31:52 -0500 |
| commit | 57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch) | |
| tree | 978bd46ca765a88e9c101cb705bbb0bf46015643 /arch/sparc | |
| parent | 76052749143d03006271cc0ce8205ad756917062 (diff) | |
| parent | 5a9e67b1a19e08a82387709f325d26e07b891d27 (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/sparc')
| -rw-r--r-- | arch/sparc/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/kprobes.c b/arch/sparc/kernel/kprobes.c index 201a6e547e4a..3bc6527c95af 100644 --- a/arch/sparc/kernel/kprobes.c +++ b/arch/sparc/kernel/kprobes.c | |||
| @@ -517,7 +517,7 @@ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) | |||
| 517 | /* | 517 | /* |
| 518 | * It is possible to have multiple instances associated with a given | 518 | * It is possible to have multiple instances associated with a given |
| 519 | * task either because an multiple functions in the call path | 519 | * task either because an multiple functions in the call path |
| 520 | * have a return probe installed on them, and/or more then one return | 520 | * have a return probe installed on them, and/or more than one return |
| 521 | * return probe was registered for a target function. | 521 | * return probe was registered for a target function. |
| 522 | * | 522 | * |
| 523 | * We can handle this because: | 523 | * We can handle this because: |