diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 18:05:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 18:05:05 +1100 |
| commit | 6e36bb79962f36dd22ac82f83360703de5a57f80 (patch) | |
| tree | 9ea20b4880876d26de9def583f9cc2c5350ce651 /include/linux | |
| parent | 42ba867f16d03c4fd22068ac250d6404c9a16ac4 (diff) | |
| parent | 4c7ff6ca38c50fd28413170d9016cf8f4bc9768c (diff) | |
Merge commit 'proc/proc'
Conflicts:
fs/proc/base.c
kernel/exit.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/magic.h | 1 | ||||
| -rw-r--r-- | include/linux/proc_fs.h | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index a07aa79593b7..ed0ab7dc2c74 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -30,6 +30,7 @@ #define NFS_SUPER_MAGIC 0x6969 #define OPENPROM_SUPER_MAGIC 0x9fa1 #define PROC_SUPER_MAGIC 0x9fa0 +#define PROC_NET_SUPER_MAGIC 0x706e6574 #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index b8bdb96eff78..4f13811bdcbd 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -101,6 +101,7 @@ extern spinlock_t proc_subdir_lock; extern void proc_root_init(void); +void proc_shrink_automounts(void); void proc_flush_task(struct task_struct *task); struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *); int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir); @@ -207,6 +208,10 @@ static inline void proc_flush_task(struct task_struct *task) { } +static inline void proc_shrink_automounts(void) +{ +} + static inline struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode, struct proc_dir_entry *parent) { return NULL; } static inline struct proc_dir_entry *proc_create(const char *name, @@ -299,11 +304,6 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode) return PROC_I(inode)->pde; } -static inline struct net *PDE_NET(struct proc_dir_entry *pde) -{ - return pde->parent->data; -} - struct proc_maps_private { struct pid *pid; struct task_struct *task; |