lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.28-rc7' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar
2008-12-04 09:07:19 +01:00
parent f0461d0146 061e41fdb5
commit b8307db247
278 changed files with 5436 additions and 2575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/profile.c
View File

@@ -351,7 +351,7 @@ out:
put_cpu();
}
static int __devinit profile_cpu_callback(struct notifier_block *info,
static int __cpuinit profile_cpu_callback(struct notifier_block *info,
unsigned long action, void *__cpu)
{
int node, cpu = (unsigned long)__cpu;
@@ -596,7 +596,7 @@ out_cleanup:
#define create_hash_tables() ({ 0; })
#endif
int create_proc_profile(void)
int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */
{
struct proc_dir_entry *entry;