diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-17 15:00:34 +0100 | 
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-17 15:00:34 +0100 | 
| commit | 7946ada30bc45546cefc85809ba0fd07879eff52 (patch) | |
| tree | 03c382e8e4f9b81f151be953de3b7f61411c9303 /fs/proc/base.c | |
| parent | 98b270362bb9ea6629732e7f5b65b8a6ce4743c7 (diff) | |
| parent | 3d80636a0d5f056ffc26472d05b6027a7a9f6e1c (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 12 | 
1 files changed, 12 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 3b33f94020db..a170450aadb1 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -103,7 +103,9 @@ enum pid_directory_inos {  	PROC_TGID_NUMA_MAPS,  	PROC_TGID_MOUNTS,  	PROC_TGID_WCHAN, +#ifdef CONFIG_MMU  	PROC_TGID_SMAPS, +#endif  #ifdef CONFIG_SCHEDSTATS  	PROC_TGID_SCHEDSTAT,  #endif @@ -141,7 +143,9 @@ enum pid_directory_inos {  	PROC_TID_NUMA_MAPS,  	PROC_TID_MOUNTS,  	PROC_TID_WCHAN, +#ifdef CONFIG_MMU  	PROC_TID_SMAPS, +#endif  #ifdef CONFIG_SCHEDSTATS  	PROC_TID_SCHEDSTAT,  #endif @@ -195,7 +199,9 @@ static struct pid_entry tgid_base_stuff[] = {  	E(PROC_TGID_ROOT,      "root",    S_IFLNK|S_IRWXUGO),  	E(PROC_TGID_EXE,       "exe",     S_IFLNK|S_IRWXUGO),  	E(PROC_TGID_MOUNTS,    "mounts",  S_IFREG|S_IRUGO), +#ifdef CONFIG_MMU  	E(PROC_TGID_SMAPS,     "smaps",   S_IFREG|S_IRUGO), +#endif  #ifdef CONFIG_SECURITY  	E(PROC_TGID_ATTR,      "attr",    S_IFDIR|S_IRUGO|S_IXUGO),  #endif @@ -235,7 +241,9 @@ static struct pid_entry tid_base_stuff[] = {  	E(PROC_TID_ROOT,       "root",    S_IFLNK|S_IRWXUGO),  	E(PROC_TID_EXE,        "exe",     S_IFLNK|S_IRWXUGO),  	E(PROC_TID_MOUNTS,     "mounts",  S_IFREG|S_IRUGO), +#ifdef CONFIG_MMU  	E(PROC_TID_SMAPS,      "smaps",   S_IFREG|S_IRUGO), +#endif  #ifdef CONFIG_SECURITY  	E(PROC_TID_ATTR,       "attr",    S_IFDIR|S_IRUGO|S_IXUGO),  #endif @@ -630,6 +638,7 @@ static struct file_operations proc_numa_maps_operations = {  };  #endif +#ifdef CONFIG_MMU  extern struct seq_operations proc_pid_smaps_op;  static int smaps_open(struct inode *inode, struct file *file)  { @@ -648,6 +657,7 @@ static struct file_operations proc_smaps_operations = {  	.llseek		= seq_lseek,  	.release	= seq_release,  }; +#endif  extern struct seq_operations mounts_op;  static int mounts_open(struct inode *inode, struct file *file) @@ -1681,10 +1691,12 @@ static struct dentry *proc_pident_lookup(struct inode *dir,  		case PROC_TGID_MOUNTS:  			inode->i_fop = &proc_mounts_operations;  			break; +#ifdef CONFIG_MMU  		case PROC_TID_SMAPS:  		case PROC_TGID_SMAPS:  			inode->i_fop = &proc_smaps_operations;  			break; +#endif  #ifdef CONFIG_SECURITY  		case PROC_TID_ATTR:  			inode->i_nlink = 2;  | 
