diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-11-20 09:02:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 09:02:39 +0100 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /kernel/profile.c | |
| parent | x86, UV: fix redundant creation of sgi_uv (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (diff) | |
| download | linux-dev-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.tar.xz linux-dev-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.zip | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'kernel/profile.c')
| -rw-r--r-- | kernel/profile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index a9e422df6bf6..5b7d1ac7124c 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -102,7 +102,7 @@ int profile_setup(char *str) __setup("profile=", profile_setup); -int profile_init(void) +int __ref profile_init(void) { int buffer_bytes; if (!prof_on) @@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = { }; #ifdef CONFIG_SMP -static void __init profile_nop(void *unused) +static inline void profile_nop(void *unused) { } |