diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:10:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:10:44 -0500 |
| commit | a5a64498c194c82ecad3a2d67cff6231cda8d3dd (patch) | |
| tree | 723d5d81419f9960b8d30ed9a2ece8a58d6c4328 /kernel/profile.c | |
| parent | bb93d802ae5c1949977cc6da247b218240677f11 (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into timers/rtc
Conflicts:
drivers/rtc/rtc-cmos.c
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) |