diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /kernel/profile.c | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/profile.c')
| -rw-r--r-- | kernel/profile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index a9e422df6bf6..9830a037d8db 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
| @@ -102,7 +102,7 @@ int profile_setup(char *str) | |||
| 102 | __setup("profile=", profile_setup); | 102 | __setup("profile=", profile_setup); |
| 103 | 103 | ||
| 104 | 104 | ||
| 105 | int profile_init(void) | 105 | int __ref profile_init(void) |
| 106 | { | 106 | { |
| 107 | int buffer_bytes; | 107 | int buffer_bytes; |
| 108 | if (!prof_on) | 108 | if (!prof_on) |