Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

create_proc_cpu_mask() doesn't need an argument...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro fbd387ae b177a292

+6 -8
+2 -4
arch/s390/kernel/irq.c
··· 162 162 #ifdef CONFIG_PROC_FS 163 163 void init_irq_proc(void) 164 164 { 165 - struct proc_dir_entry *root_irq_dir; 166 - 167 - root_irq_dir = proc_mkdir("irq", NULL); 168 - create_prof_cpu_mask(root_irq_dir); 165 + if (proc_mkdir("irq", NULL)) 166 + create_prof_cpu_mask(); 169 167 } 170 168 #endif 171 169
+2 -2
include/linux/profile.h
··· 18 18 struct notifier_block; 19 19 20 20 #if defined(CONFIG_PROFILING) && defined(CONFIG_PROC_FS) 21 - void create_prof_cpu_mask(struct proc_dir_entry *de); 21 + void create_prof_cpu_mask(void); 22 22 int create_proc_profile(void); 23 23 #else 24 - static inline void create_prof_cpu_mask(struct proc_dir_entry *de) 24 + static inline void create_prof_cpu_mask(void) 25 25 { 26 26 } 27 27
+2 -2
kernel/profile.c
··· 462 462 .write = prof_cpu_mask_proc_write, 463 463 }; 464 464 465 - void create_prof_cpu_mask(struct proc_dir_entry *root_irq_dir) 465 + void create_prof_cpu_mask(void) 466 466 { 467 467 /* create /proc/irq/prof_cpu_mask */ 468 - proc_create("prof_cpu_mask", 0600, root_irq_dir, &prof_cpu_mask_proc_fops); 468 + proc_create("irq/prof_cpu_mask", 0600, NULL, &prof_cpu_mask_proc_fops); 469 469 } 470 470 471 471 /*