Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / Documentation / RCU / NMI-RCU.txt

diff --git a/Documentation/RCU/NMI-RCU.txt b/Documentation/RCU/NMI-RCU.txt
index d0634a5c3445440f57104c589219bf71e8997a95..c64158ecde4371bd79b7fc9f43753fee50084546 100644 (file)
--- 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.
 This nmi_callback variable is a global function pointer to the current
 NMI handler.
 
-       fastcall void do_nmi(struct pt_regs * regs, long error_code)
+       void do_nmi(struct pt_regs * regs, long error_code)
        {
                int cpu;