aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-10-04 06:39:12 -0400
committerAlexey Dobriyan <adobriyan@gmail.com>2008-10-23 06:35:08 -0400
commitae048112c099b0f3adb57f7c0b3a49bc62244609 (patch)
tree2ac80f435ab8d5a30e5eb461baa5d86050ec5c55 /fs
parent659689280ad91d31235db79cda6c7c799c4d3781 (diff)
proc: move /proc/kmsg creation to fs/proc/kmsg.c
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/internal.h1
-rw-r--r--fs/proc/kmsg.c12
-rw-r--r--fs/proc/proc_misc.c3
3 files changed, 9 insertions, 7 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index d5bf4dec6b0a..3e8aeb8b61ce 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -61,7 +61,6 @@ extern const struct file_operations proc_smaps_operations;
61extern const struct file_operations proc_clear_refs_operations; 61extern const struct file_operations proc_clear_refs_operations;
62extern const struct file_operations proc_pagemap_operations; 62extern const struct file_operations proc_pagemap_operations;
63extern const struct file_operations proc_net_operations; 63extern const struct file_operations proc_net_operations;
64extern const struct file_operations proc_kmsg_operations;
65extern const struct inode_operations proc_net_inode_operations; 64extern const struct inode_operations proc_net_inode_operations;
66 65
67void free_proc_entry(struct proc_dir_entry *de); 66void free_proc_entry(struct proc_dir_entry *de);
diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
index 9fd5df3f40ce..7ca78346d3f0 100644
--- a/fs/proc/kmsg.c
+++ b/fs/proc/kmsg.c
@@ -10,13 +10,12 @@
10#include <linux/time.h> 10#include <linux/time.h>
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/poll.h> 12#include <linux/poll.h>
13#include <linux/proc_fs.h>
13#include <linux/fs.h> 14#include <linux/fs.h>
14 15
15#include <asm/uaccess.h> 16#include <asm/uaccess.h>
16#include <asm/io.h> 17#include <asm/io.h>
17 18
18#include "internal.h"
19
20extern wait_queue_head_t log_wait; 19extern wait_queue_head_t log_wait;
21 20
22extern int do_syslog(int type, char __user *bug, int count); 21extern int do_syslog(int type, char __user *bug, int count);
@@ -49,9 +48,16 @@ static unsigned int kmsg_poll(struct file *file, poll_table *wait)
49} 48}
50 49
51 50
52const struct file_operations proc_kmsg_operations = { 51static const struct file_operations proc_kmsg_operations = {
53 .read = kmsg_read, 52 .read = kmsg_read,
54 .poll = kmsg_poll, 53 .poll = kmsg_poll,
55 .open = kmsg_open, 54 .open = kmsg_open,
56 .release = kmsg_release, 55 .release = kmsg_release,
57}; 56};
57
58static int __init proc_kmsg_init(void)
59{
60 proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations);
61 return 0;
62}
63module_init(proc_kmsg_init);
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index e177f42496c4..fcac25edaef7 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -605,9 +605,6 @@ void __init proc_misc_init(void)
605 proc_symlink("mounts", NULL, "self/mounts"); 605 proc_symlink("mounts", NULL, "self/mounts");
606 606
607 /* And now for trickier ones */ 607 /* And now for trickier ones */
608#ifdef CONFIG_PRINTK
609 proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations);
610#endif
611#ifdef CONFIG_FILE_LOCKING 608#ifdef CONFIG_FILE_LOCKING
612 proc_create("locks", 0, NULL, &proc_locks_operations); 609 proc_create("locks", 0, NULL, &proc_locks_operations);
613#endif 610#endif