Commit 97ce5d6d authored by Alexey Dobriyan's avatar Alexey Dobriyan

proc: move all /proc/kcore stuff to fs/proc/kcore.c

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
parent b5aadf7f
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#define ELF_CORE_EFLAGS 0 #define ELF_CORE_EFLAGS 0
#endif #endif
static struct proc_dir_entry *proc_root_kcore;
static int open_kcore(struct inode * inode, struct file * filp) static int open_kcore(struct inode * inode, struct file * filp)
{ {
return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
...@@ -34,7 +36,7 @@ static int open_kcore(struct inode * inode, struct file * filp) ...@@ -34,7 +36,7 @@ static int open_kcore(struct inode * inode, struct file * filp)
static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
const struct file_operations proc_kcore_operations = { static const struct file_operations proc_kcore_operations = {
.read = read_kcore, .read = read_kcore,
.open = open_kcore, .open = open_kcore,
}; };
...@@ -399,3 +401,13 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) ...@@ -399,3 +401,13 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
return acc; return acc;
} }
static int __init proc_kcore_init(void)
{
proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &proc_kcore_operations);
if (proc_root_kcore)
proc_root_kcore->size =
(size_t)high_memory - PAGE_OFFSET + PAGE_SIZE;
return 0;
}
module_init(proc_kcore_init);
...@@ -188,19 +188,11 @@ static struct file_operations proc_kpageflags_operations = { ...@@ -188,19 +188,11 @@ static struct file_operations proc_kpageflags_operations = {
}; };
#endif /* CONFIG_PROC_PAGE_MONITOR */ #endif /* CONFIG_PROC_PAGE_MONITOR */
struct proc_dir_entry *proc_root_kcore;
void __init proc_misc_init(void) void __init proc_misc_init(void)
{ {
proc_symlink("mounts", NULL, "self/mounts"); proc_symlink("mounts", NULL, "self/mounts");
/* And now for trickier ones */ /* And now for trickier ones */
#ifdef CONFIG_PROC_KCORE
proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &proc_kcore_operations);
if (proc_root_kcore)
proc_root_kcore->size =
(size_t)high_memory - PAGE_OFFSET + PAGE_SIZE;
#endif
#ifdef CONFIG_PROC_PAGE_MONITOR #ifdef CONFIG_PROC_PAGE_MONITOR
proc_create("kpagecount", S_IRUSR, NULL, &proc_kpagecount_operations); proc_create("kpagecount", S_IRUSR, NULL, &proc_kpagecount_operations);
proc_create("kpageflags", S_IRUSR, NULL, &proc_kpageflags_operations); proc_create("kpageflags", S_IRUSR, NULL, &proc_kpageflags_operations);
......
...@@ -97,8 +97,6 @@ struct vmcore { ...@@ -97,8 +97,6 @@ struct vmcore {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern struct proc_dir_entry *proc_root_kcore;
extern spinlock_t proc_subdir_lock; extern spinlock_t proc_subdir_lock;
extern void proc_root_init(void); extern void proc_root_init(void);
...@@ -138,8 +136,6 @@ extern struct inode *proc_get_inode(struct super_block *, unsigned int, struct p ...@@ -138,8 +136,6 @@ extern struct inode *proc_get_inode(struct super_block *, unsigned int, struct p
extern int proc_readdir(struct file *, void *, filldir_t); extern int proc_readdir(struct file *, void *, filldir_t);
extern struct dentry *proc_lookup(struct inode *, struct dentry *, struct nameidata *); extern struct dentry *proc_lookup(struct inode *, struct dentry *, struct nameidata *);
extern const struct file_operations proc_kcore_operations;
extern int pid_ns_prepare_proc(struct pid_namespace *ns); extern int pid_ns_prepare_proc(struct pid_namespace *ns);
extern void pid_ns_release_proc(struct pid_namespace *ns); extern void pid_ns_release_proc(struct pid_namespace *ns);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment