aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/perfmon.c
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-04-29 04:02:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:21 -0400
commite23637681bef5b69a68c8ac399732b941f1af023 (patch)
tree90cc355ac83b58080da3213b99351717d9f0ffb6 /arch/ia64/kernel/perfmon.c
parentc293819a3caa77d96b801a7795f81a5913ec21d7 (diff)
ia64: use non-racy method for proc entries creation
Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data be setup before gluing PDE to main tree. Signed-off-by: Denis V. Lunev <den@openvz.org> Cc: Tony Luck <tony.luck@intel.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
-rw-r--r--arch/ia64/kernel/perfmon.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index c8e403752a0..7fbb51e10bb 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -6695,16 +6695,12 @@ pfm_init(void)
6695 /* 6695 /*
6696 * create /proc/perfmon (mostly for debugging purposes) 6696 * create /proc/perfmon (mostly for debugging purposes)
6697 */ 6697 */
6698 perfmon_dir = create_proc_entry("perfmon", S_IRUGO, NULL); 6698 perfmon_dir = proc_create("perfmon", S_IRUGO, NULL, &pfm_proc_fops);
6699 if (perfmon_dir == NULL) { 6699 if (perfmon_dir == NULL) {
6700 printk(KERN_ERR "perfmon: cannot create /proc entry, perfmon disabled\n"); 6700 printk(KERN_ERR "perfmon: cannot create /proc entry, perfmon disabled\n");
6701 pmu_conf = NULL; 6701 pmu_conf = NULL;
6702 return -1; 6702 return -1;
6703 } 6703 }
6704 /*
6705 * install customized file operations for /proc/perfmon entry
6706 */
6707 perfmon_dir->proc_fops = &pfm_proc_fops;
6708 6704
6709 /* 6705 /*
6710 * create /proc/sys/kernel/perfmon (for debugging purposes) 6706 * create /proc/sys/kernel/perfmon (for debugging purposes)