summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-04-03 13:49:54 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2014-04-03 13:49:54 +1100
commitb147ed0fede872ec492515b971c7d0ffe17b18a7 (patch)
treed3359b79d38c92350bb5d2c7f37e12a47c8376ab /Documentation
parent3efd62ee74f82a8f1f340656c3f3041f33074a49 (diff)
parent3862807880acc0adaef6749738d210c9f45c3049 (diff)
Merge remote-tracking branch 'ftrace/for-next'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/trace/ftrace-design.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/trace/ftrace-design.txt b/Documentation/trace/ftrace-design.txt
index 79fcafc7fd64..3f669b9e8852 100644
--- a/Documentation/trace/ftrace-design.txt
+++ b/Documentation/trace/ftrace-design.txt
@@ -358,11 +358,8 @@ Every arch has an init callback function. If you need to do something early on
to initialize some state, this is the time to do that. Otherwise, this simple
function below should be sufficient for most people:
-int __init ftrace_dyn_arch_init(void *data)
+int __init ftrace_dyn_arch_init(void)
{
- /* return value is done indirectly via data */
- *(unsigned long *)data = 0;
-
return 0;
}