aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RCU/NMI-RCU.txt2
-rw-r--r--Documentation/kprobes.txt11
2 files changed, 6 insertions, 7 deletions
diff --git a/Documentation/RCU/NMI-RCU.txt b/Documentation/RCU/NMI-RCU.txt
index d0634a5c3445..c64158ecde43 100644
--- a/Documentation/RCU/NMI-RCU.txt
+++ b/Documentation/RCU/NMI-RCU.txt
@@ -25,7 +25,7 @@ the NMI handler to take the default machine-specific action.
25This nmi_callback variable is a global function pointer to the current 25This nmi_callback variable is a global function pointer to the current
26NMI handler. 26NMI handler.
27 27
28 fastcall void do_nmi(struct pt_regs * regs, long error_code) 28 void do_nmi(struct pt_regs * regs, long error_code)
29 { 29 {
30 int cpu; 30 int cpu;
31 31
diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index 30c101761d0d..83f515c2905a 100644
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -92,9 +92,8 @@ handler has run. Up to MAX_STACK_SIZE bytes are copied -- e.g.,
9264 bytes on i386. 9264 bytes on i386.
93 93
94Note that the probed function's args may be passed on the stack 94Note that the probed function's args may be passed on the stack
95or in registers (e.g., for x86_64 or for an i386 fastcall function). 95or in registers. The jprobe will work in either case, so long as the
96The jprobe will work in either case, so long as the handler's 96handler's prototype matches that of the probed function.
97prototype matches that of the probed function.
98 97
991.3 Return Probes 981.3 Return Probes
100 99
@@ -270,9 +269,9 @@ Kprobes runs the handler whose address is jp->entry.
270The handler should have the same arg list and return type as the probed 269The handler should have the same arg list and return type as the probed
271function; and just before it returns, it must call jprobe_return(). 270function; and just before it returns, it must call jprobe_return().
272(The handler never actually returns, since jprobe_return() returns 271(The handler never actually returns, since jprobe_return() returns
273control to Kprobes.) If the probed function is declared asmlinkage, 272control to Kprobes.) If the probed function is declared asmlinkage
274fastcall, or anything else that affects how args are passed, the 273or anything else that affects how args are passed, the handler's
275handler's declaration must match. 274declaration must match.
276 275
277register_jprobe() returns 0 on success, or a negative errno otherwise. 276register_jprobe() returns 0 on success, or a negative errno otherwise.
278 277