Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / s390 / kernel / irq.c

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 4f5ef62934a4d5b59565ae0b71a4f948e576f16c..f7fb58903f6aa67d6d78b409286827614ac70a5c 100644 (file)
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -162,10 +162,8 @@ asmlinkage void do_softirq(void)
 #ifdef CONFIG_PROC_FS
 void init_irq_proc(void)
 {
-       struct proc_dir_entry *root_irq_dir;
-
-       root_irq_dir = proc_mkdir("irq", NULL);
-       create_prof_cpu_mask(root_irq_dir);
+       if (proc_mkdir("irq", NULL))
+               create_prof_cpu_mask();
 }
 #endif