diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-06 06:49:39 -0400 |
---|---|---|
committer | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-23 10:54:05 -0400 |
commit | 59c7572e82d69483a66eaa67b46548baeb69ecf4 (patch) | |
tree | a395888324ac02149f77920e06337e8612f37535 | |
parent | 5aa140c2deca3701238d5acddf436ad7b02664c7 (diff) |
proc: remove fs/proc/proc_misc.c
Now that everything was moved to their more or less expected places,
apply rm(1).
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
-rw-r--r-- | fs/proc/Makefile | 2 | ||||
-rw-r--r-- | fs/proc/proc_misc.c | 65 | ||||
-rw-r--r-- | fs/proc/root.c | 2 | ||||
-rw-r--r-- | include/linux/proc_fs.h | 1 |
4 files changed, 2 insertions, 68 deletions
diff --git a/fs/proc/Makefile b/fs/proc/Makefile index fef524410e86..63d965193b22 100644 --- a/fs/proc/Makefile +++ b/fs/proc/Makefile | |||
@@ -8,7 +8,7 @@ proc-y := nommu.o task_nommu.o | |||
8 | proc-$(CONFIG_MMU) := mmu.o task_mmu.o | 8 | proc-$(CONFIG_MMU) := mmu.o task_mmu.o |
9 | 9 | ||
10 | proc-y += inode.o root.o base.o generic.o array.o \ | 10 | proc-y += inode.o root.o base.o generic.o array.o \ |
11 | proc_tty.o proc_misc.o | 11 | proc_tty.o |
12 | proc-y += cmdline.o | 12 | proc-y += cmdline.o |
13 | proc-y += cpuinfo.o | 13 | proc-y += cpuinfo.o |
14 | proc-y += devices.o | 14 | proc-y += devices.o |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c deleted file mode 100644 index e2db35006c05..000000000000 --- a/fs/proc/proc_misc.c +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | /* | ||
2 | * linux/fs/proc/proc_misc.c | ||
3 | * | ||
4 | * linux/fs/proc/array.c | ||
5 | * Copyright (C) 1992 by Linus Torvalds | ||
6 | * based on ideas by Darren Senn | ||
7 | * | ||
8 | * This used to be the part of array.c. See the rest of history and credits | ||
9 | * there. I took this into a separate file and switched the thing to generic | ||
10 | * proc_file_inode_operations, leaving in array.c only per-process stuff. | ||
11 | * Inumbers allocation made dynamic (via create_proc_entry()). AV, May 1999. | ||
12 | * | ||
13 | * Changes: | ||
14 | * Fulton Green : Encapsulated position metric calculations. | ||
15 | * <kernel@FultonGreen.com> | ||
16 | */ | ||
17 | |||
18 | #include <linux/types.h> | ||
19 | #include <linux/errno.h> | ||
20 | #include <linux/time.h> | ||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/kernel_stat.h> | ||
23 | #include <linux/fs.h> | ||
24 | #include <linux/tty.h> | ||
25 | #include <linux/string.h> | ||
26 | #include <linux/mman.h> | ||
27 | #include <linux/quicklist.h> | ||
28 | #include <linux/proc_fs.h> | ||
29 | #include <linux/ioport.h> | ||
30 | #include <linux/mm.h> | ||
31 | #include <linux/mmzone.h> | ||
32 | #include <linux/pagemap.h> | ||
33 | #include <linux/irq.h> | ||
34 | #include <linux/interrupt.h> | ||
35 | #include <linux/swap.h> | ||
36 | #include <linux/slab.h> | ||
37 | #include <linux/genhd.h> | ||
38 | #include <linux/smp.h> | ||
39 | #include <linux/signal.h> | ||
40 | #include <linux/module.h> | ||
41 | #include <linux/init.h> | ||
42 | #include <linux/seq_file.h> | ||
43 | #include <linux/times.h> | ||
44 | #include <linux/profile.h> | ||
45 | #include <linux/utsname.h> | ||
46 | #include <linux/blkdev.h> | ||
47 | #include <linux/hugetlb.h> | ||
48 | #include <linux/jiffies.h> | ||
49 | #include <linux/vmalloc.h> | ||
50 | #include <linux/crash_dump.h> | ||
51 | #include <linux/pid_namespace.h> | ||
52 | #include <linux/bootmem.h> | ||
53 | #include <asm/uaccess.h> | ||
54 | #include <asm/pgtable.h> | ||
55 | #include <asm/io.h> | ||
56 | #include <asm/tlb.h> | ||
57 | #include <asm/div64.h> | ||
58 | #include "internal.h" | ||
59 | |||
60 | void __init proc_misc_init(void) | ||
61 | { | ||
62 | proc_symlink("mounts", NULL, "self/mounts"); | ||
63 | |||
64 | /* And now for trickier ones */ | ||
65 | } | ||
diff --git a/fs/proc/root.c b/fs/proc/root.c index 2a3abd25b30b..7761602af9de 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -117,7 +117,7 @@ void __init proc_root_init(void) | |||
117 | return; | 117 | return; |
118 | } | 118 | } |
119 | 119 | ||
120 | proc_misc_init(); | 120 | proc_symlink("mounts", NULL, "self/mounts"); |
121 | 121 | ||
122 | proc_net_init(); | 122 | proc_net_init(); |
123 | 123 | ||
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 9d8308905053..b8bdb96eff78 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
@@ -100,7 +100,6 @@ struct vmcore { | |||
100 | extern spinlock_t proc_subdir_lock; | 100 | extern spinlock_t proc_subdir_lock; |
101 | 101 | ||
102 | extern void proc_root_init(void); | 102 | extern void proc_root_init(void); |
103 | extern void proc_misc_init(void); | ||
104 | 103 | ||
105 | void proc_flush_task(struct task_struct *task); | 104 | void proc_flush_task(struct task_struct *task); |
106 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *); | 105 | struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *); |