diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /fs/proc/internal.h | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'fs/proc/internal.h')
| -rw-r--r-- | fs/proc/internal.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 987c773dbb20..277dcd66ebe2 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h | |||
| @@ -38,13 +38,13 @@ extern int proc_tgid_stat(struct task_struct *, char *); | |||
| 38 | extern int proc_pid_status(struct task_struct *, char *); | 38 | extern int proc_pid_status(struct task_struct *, char *); |
| 39 | extern int proc_pid_statm(struct task_struct *, char *); | 39 | extern int proc_pid_statm(struct task_struct *, char *); |
| 40 | 40 | ||
| 41 | extern struct file_operations proc_maps_operations; | 41 | extern const struct file_operations proc_maps_operations; |
| 42 | extern struct file_operations proc_numa_maps_operations; | 42 | extern const struct file_operations proc_numa_maps_operations; |
| 43 | extern struct file_operations proc_smaps_operations; | 43 | extern const struct file_operations proc_smaps_operations; |
| 44 | 44 | ||
| 45 | extern struct file_operations proc_maps_operations; | 45 | extern const struct file_operations proc_maps_operations; |
| 46 | extern struct file_operations proc_numa_maps_operations; | 46 | extern const struct file_operations proc_numa_maps_operations; |
| 47 | extern struct file_operations proc_smaps_operations; | 47 | extern const struct file_operations proc_smaps_operations; |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | void free_proc_entry(struct proc_dir_entry *de); | 50 | void free_proc_entry(struct proc_dir_entry *de); |