Skip to contentSkip to conversation

proc: merge array.c into base.c

RFC PATCH New Américo Wang 1 participant 1 message Apr 13, 2009 Proc filesystem

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 proc: merge array.c into base.c

The last four functions in array.c can be merged into base.c, since they are only used in base.c.

I only tested this patch in UML.

Cc Alexey Dobriyan <[email protected]>

---

fs/proc/Makefile +1 -1
index 63d9651..93121c3 100644
@@ -7,7 +7,7 @@ obj-$(CONFIG_PROC_FS) += proc.o
 proc-y			:= nommu.o task_nommu.o
 proc-$(CONFIG_MMU)	:= mmu.o task_mmu.o
 
-proc-y       += inode.o root.o base.o generic.o array.o \
+proc-y       += inode.o root.o base.o generic.o \
 		proc_tty.o
 proc-y	+= cmdline.o
 proc-y	+= cpuinfo.o
fs/proc/array.c deleted +0 -531

531 lines not on this page · raw message

fs/proc/base.c +471 -2

502 lines not on this page · raw message

fs/proc/internal.h +0 -8
index f6db961..bed3ae0 100644
@@ -43,14 +43,6 @@ do {						\
 } while(0)
 #endif
 
-extern int proc_tid_stat(struct seq_file *m, struct pid_namespace *ns,
-				struct pid *pid, struct task_struct *task);
-extern int proc_tgid_stat(struct seq_file *m, struct pid_namespace *ns,
-				struct pid *pid, struct task_struct *task);
-extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
-				struct pid *pid, struct task_struct *task);
-extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
-				struct pid *pid, struct task_struct *task);
 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
 
 extern const struct file_operations proc_maps_operations;