diff --git a/[refs] b/[refs] index 3aa74403325a..6c785c3619f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5821e1b74f0d08952cb5da4bfd2d9a388d8df58e +refs/heads/master: e270219f4372b58bd3eeac12bd9f7edc592b8f6b diff --git a/trunk/kernel/profile.c b/trunk/kernel/profile.c index 9830a037d8db..5b7d1ac7124c 100644 --- a/trunk/kernel/profile.c +++ b/trunk/kernel/profile.c @@ -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) { }