summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-18 22:06:10 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-18 22:06:10 +0000
commitaba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch)
tree23921efb2b4af590160f034a89ff3da2ecca6e47 /fs/proc
parent9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff)
Merge with Linux 2.3.43.
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/base.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 1dd50817c..4670b456c 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -498,9 +498,6 @@ enum pid_directory_inos {
PROC_PID_STAT,
PROC_PID_STATM,
PROC_PID_MAPS,
-#if CONFIG_AP1000
- PROC_PID_RINGBUF,
-#endif
PROC_PID_CPU,
PROC_PID_FD_DIR = 0x8000, /* 0x8000-0xffff */
};
@@ -516,9 +513,6 @@ static struct pid_entry base_stuff[] = {
#ifdef __SMP__
E(PROC_PID_CPU, "cpu", S_IFREG|S_IRUGO),
#endif
-#if CONFIG_AP1000
- E(PROC_PID_RINGBUF, "ringbuf", S_IFREG|S_IRUGO|S_IWUSR),
-#endif
E(PROC_PID_MAPS, "maps", S_IFREG|S_IRUGO),
E(PROC_PID_MEM, "mem", S_IFREG|S_IRUSR|S_IWUSR),
E(PROC_PID_CWD, "cwd", S_IFLNK|S_IRWXUGO),
@@ -871,11 +865,6 @@ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
inode->u.proc_i.op.proc_read = proc_pid_cpu;
break;
#endif
-#if CONFIG_AP1000
- case PROC_PID_RINGBUF:
- inode->i_op = &proc_ringbuf_inode_operations;
- break;
-#endif
case PROC_PID_MEM:
inode->i_op = &proc_mem_inode_operations;
break;