summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-01-07 22:28:40 -0800
committerLinus Torvalds <torvalds@evo.osdl.org>2005-01-07 22:28:40 -0800
commit0b7d79ffb397eb845e5f8de93396d65dbd0e8abd (patch)
tree34274b09b631e675513f27064940bfed3e4754ab
parent283b7bfb037330f8acf2999228e0c11c621fed9c (diff)
[PATCH] small proc_fs cleanups
The patch below does the following cleanups in the proc_fs code: - remove an unused global function - make two functions static Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/proc/kcore.c17
-rw-r--r--fs/proc/proc_misc.c4
-rw-r--r--include/linux/proc_fs.h5
3 files changed, 2 insertions, 24 deletions
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index f7c0cda58f82..5cc4361de09a 100644
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -68,23 +68,6 @@ kclist_add(struct kcore_list *new, void *addr, size_t size)
write_unlock(&kclist_lock);
}
-struct kcore_list *
-kclist_del(void *addr)
-{
- struct kcore_list *m, **p = &kclist;
-
- write_lock(&kclist_lock);
- for (m = *p; m; p = &m->next) {
- if (m->addr == (unsigned long)addr) {
- *p = m->next;
- write_unlock(&kclist_lock);
- return m;
- }
- }
- write_unlock(&kclist_lock);
- return NULL;
-}
-
static size_t get_kcore_size(int *nphdr, size_t *elf_buflen)
{
size_t try, size;
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 04420987fcbb..c7322cfefe13 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -318,7 +318,7 @@ static struct file_operations proc_slabinfo_operations = {
.release = seq_release,
};
-int show_stat(struct seq_file *p, void *v)
+static int show_stat(struct seq_file *p, void *v)
{
int i;
unsigned long jif;
@@ -461,7 +461,7 @@ static struct seq_operations int_seq_ops = {
.show = show_interrupts
};
-int interrupts_open(struct inode *inode, struct file *filp)
+static int interrupts_open(struct inode *inode, struct file *filp)
{
return seq_open(filp, &int_seq_ops);
}
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 14b0b41e5ecc..59e505261fd6 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -231,13 +231,8 @@ extern struct proc_dir_entry proc_root;
static inline void kclist_add(struct kcore_list *new, void *addr, size_t size)
{
}
-static inline struct kcore_list * kclist_del(void *addr)
-{
- return NULL;
-}
#else
extern void kclist_add(struct kcore_list *, void *, size_t);
-extern struct kcore_list *kclist_del(void *);
#endif
struct proc_inode {