lkml.org 
[lkml]   [2008]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 28/31] proc: move all /proc/kcore stuff to fs/proc/kcore.c

From 5bfbdb7509742b1fe949c61d61966a3ed418820d Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 6 Oct 2008 14:14:19 +0400
Subject: [PATCH 28/31] proc: move all /proc/kcore stuff to fs/proc/kcore.c

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
fs/proc/kcore.c | 14 +++++++++++++-
fs/proc/proc_misc.c | 8 --------
include/linux/proc_fs.h | 4 ----
3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index c2370c7..59b43a0 100644
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -27,6 +27,8 @@
#define ELF_CORE_EFLAGS 0
#endif

+static struct proc_dir_entry *proc_root_kcore;
+
static int open_kcore(struct inode * inode, struct file * filp)
{
return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
@@ -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 *);

-const struct file_operations proc_kcore_operations = {
+static const struct file_operations proc_kcore_operations = {
.read = read_kcore,
.open = open_kcore,
};
@@ -399,3 +401,13 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)

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);
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 981efbf..69c8244 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -187,19 +187,11 @@ static struct file_operations proc_kpageflags_operations = {
};
#endif /* CONFIG_PROC_PAGE_MONITOR */

-struct proc_dir_entry *proc_root_kcore;
-
void __init proc_misc_init(void)
{
proc_symlink("mounts", NULL, "self/mounts");

/* 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
proc_create("kpagecount", S_IRUSR, NULL, &proc_kpagecount_operations);
proc_create("kpageflags", S_IRUSR, NULL, &proc_kpageflags_operations);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 27d534f..9d83089 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -97,8 +97,6 @@ struct vmcore {

#ifdef CONFIG_PROC_FS

-extern struct proc_dir_entry *proc_root_kcore;
-
extern spinlock_t proc_subdir_lock;

extern void proc_root_init(void);
@@ -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 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 void pid_ns_release_proc(struct pid_namespace *ns);

--
1.5.6.5


\
 
 \ /
  Last update: 2008-10-17 14:53    [W:0.031 / U:0.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site