diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RCU/NMI-RCU.txt | 2 | ||||
-rw-r--r-- | Documentation/kprobes.txt | 11 |
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. | |||
25 | This nmi_callback variable is a global function pointer to the current | 25 | This nmi_callback variable is a global function pointer to the current |
26 | NMI handler. | 26 | NMI 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., | |||
92 | 64 bytes on i386. | 92 | 64 bytes on i386. |
93 | 93 | ||
94 | Note that the probed function's args may be passed on the stack | 94 | Note that the probed function's args may be passed on the stack |
95 | or in registers (e.g., for x86_64 or for an i386 fastcall function). | 95 | or in registers. The jprobe will work in either case, so long as the |
96 | The jprobe will work in either case, so long as the handler's | 96 | handler's prototype matches that of the probed function. |
97 | prototype matches that of the probed function. | ||
98 | 97 | ||
99 | 1.3 Return Probes | 98 | 1.3 Return Probes |
100 | 99 | ||
@@ -270,9 +269,9 @@ Kprobes runs the handler whose address is jp->entry. | |||
270 | The handler should have the same arg list and return type as the probed | 269 | The handler should have the same arg list and return type as the probed |
271 | function; and just before it returns, it must call jprobe_return(). | 270 | function; 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 |
273 | control to Kprobes.) If the probed function is declared asmlinkage, | 272 | control to Kprobes.) If the probed function is declared asmlinkage |
274 | fastcall, or anything else that affects how args are passed, the | 273 | or anything else that affects how args are passed, the handler's |
275 | handler's declaration must match. | 274 | declaration must match. |
276 | 275 | ||
277 | register_jprobe() returns 0 on success, or a negative errno otherwise. | 276 | register_jprobe() returns 0 on success, or a negative errno otherwise. |
278 | 277 | ||