From 122293de26173eecf79c6eb84d74c9e41c4775e5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 10 Feb 2007 01:45:51 -0800 Subject: [PATCH] --- yaml --- r: 47575 b: refs/heads/master c: 100bb9349ea5cb4e667977de55bd6dc4ac7bc22f h: refs/heads/master i: 47573: 97756c163ff152c03983a88fb82d84baae6d940e 47571: 06cf8947da8b5cc0bd01847b3c8616dc4b22b53b 47567: 1746056588ce2c701fae30208669b00e55f0c0ed v: v3 --- [refs] | 2 +- trunk/fs/proc/proc_misc.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1d80a37cb295..b1041e93176c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb799b8988e40a7871ae8e976248c33c562e3555 +refs/heads/master: 100bb9349ea5cb4e667977de55bd6dc4ac7bc22f diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index 1d5b4fb2c725..5e2d4359c292 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/fs/proc/proc_misc.c @@ -667,7 +667,6 @@ void create_seq_entry(char *name, mode_t mode, const struct file_operations *f) void __init proc_misc_init(void) { - struct proc_dir_entry *entry; static struct { char *name; int (*read_proc)(char*,char**,off_t,int,int*,void*); @@ -695,9 +694,12 @@ void __init proc_misc_init(void) /* And now for trickier ones */ #ifdef CONFIG_PRINTK - entry = create_proc_entry("kmsg", S_IRUSR, &proc_root); - if (entry) - entry->proc_fops = &proc_kmsg_operations; + { + struct proc_dir_entry *entry; + entry = create_proc_entry("kmsg", S_IRUSR, &proc_root); + if (entry) + entry->proc_fops = &proc_kmsg_operations; + } #endif create_seq_entry("devices", 0, &proc_devinfo_operations); create_seq_entry("cpuinfo", 0, &proc_cpuinfo_operations); @@ -738,8 +740,11 @@ void __init proc_misc_init(void) proc_vmcore->proc_fops = &proc_vmcore_operations; #endif #ifdef CONFIG_MAGIC_SYSRQ - entry = create_proc_entry("sysrq-trigger", S_IWUSR, NULL); - if (entry) - entry->proc_fops = &proc_sysrq_trigger_operations; + { + struct proc_dir_entry *entry; + entry = create_proc_entry("sysrq-trigger", S_IWUSR, NULL); + if (entry) + entry->proc_fops = &proc_sysrq_trigger_operations; + } #endif }