Move several *_SUPER_MAGIC symbols to include/linux/magic.h.

[safe/jmp/linux-2.6] / include / linux / proc_fs.h

diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index d4d2081..3435ca3 100644 (file)
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -4,6 +4,7 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/spinlock.h>
+#include <linux/magic.h>
 #include <asm/atomic.h>
 
 /*
@@ -24,8 +25,6 @@ enum {
        PROC_ROOT_INO = 1,
 };
 
-#define PROC_SUPER_MAGIC 0x9fa0
-
 /*
  * This is not completely implemented yet. The idea is to
  * create an in-memory tree (like the actual /proc filesystem
@@ -246,7 +245,7 @@ extern void kclist_add(struct kcore_list *, void *, size_t);
 #endif
 
 struct proc_inode {
-       struct task_struct *task;
+       struct pid *pid;
        int fd;
        union {
                int (*proc_get_link)(struct inode *, struct dentry **, struct vfsmount **);
@@ -266,4 +265,10 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode)
        return PROC_I(inode)->pde;
 }
 
+struct proc_maps_private {
+       struct pid *pid;
+       struct task_struct *task;
+       struct vm_area_struct *tail_vma;
+};
+
 #endif /* _LINUX_PROC_FS_H */