diff options
Diffstat (limited to 'arch/ia64/kernel/perfmon.c')
-rw-r--r-- | arch/ia64/kernel/perfmon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 39e534f5a3b0..f099b82703d8 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
@@ -1542,7 +1542,7 @@ pfm_exit_smpl_buffer(pfm_buffer_fmt_t *fmt) | |||
1542 | * any operations on the root directory. However, we need a non-trivial | 1542 | * any operations on the root directory. However, we need a non-trivial |
1543 | * d_name - pfm: will go nicely and kill the special-casing in procfs. | 1543 | * d_name - pfm: will go nicely and kill the special-casing in procfs. |
1544 | */ | 1544 | */ |
1545 | static struct vfsmount *pfmfs_mnt; | 1545 | static struct vfsmount *pfmfs_mnt __read_mostly; |
1546 | 1546 | ||
1547 | static int __init | 1547 | static int __init |
1548 | init_pfm_fs(void) | 1548 | init_pfm_fs(void) |
@@ -2185,7 +2185,7 @@ static const struct file_operations pfm_file_ops = { | |||
2185 | }; | 2185 | }; |
2186 | 2186 | ||
2187 | static int | 2187 | static int |
2188 | pfmfs_delete_dentry(struct dentry *dentry) | 2188 | pfmfs_delete_dentry(const struct dentry *dentry) |
2189 | { | 2189 | { |
2190 | return 1; | 2190 | return 1; |
2191 | } | 2191 | } |
@@ -2233,7 +2233,7 @@ pfm_alloc_file(pfm_context_t *ctx) | |||
2233 | } | 2233 | } |
2234 | path.mnt = mntget(pfmfs_mnt); | 2234 | path.mnt = mntget(pfmfs_mnt); |
2235 | 2235 | ||
2236 | path.dentry->d_op = &pfmfs_dentry_operations; | 2236 | d_set_d_op(path.dentry, &pfmfs_dentry_operations); |
2237 | d_add(path.dentry, inode); | 2237 | d_add(path.dentry, inode); |
2238 | 2238 | ||
2239 | file = alloc_file(&path, FMODE_READ, &pfm_file_ops); | 2239 | file = alloc_file(&path, FMODE_READ, &pfm_file_ops); |