Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / arch / sh / oprofile / op_model_sh7750.c

diff --git a/arch/sh/oprofile/op_model_sh7750.c b/arch/sh/oprofile/op_model_sh7750.c
index c265185b22a72b92a0d48c3f68fd1ca100bc45da..0104e44bc76a3be52352d7de5d9e5cabe37e6a6f 100644 (file)
--- a/arch/sh/oprofile/op_model_sh7750.c
+++ b/arch/sh/oprofile/op_model_sh7750.c
@@ -142,7 +142,7 @@ static u64 sh7750_read_counter(int counter)
  */
 static inline int to_counter(struct file *file)
 {
-       const unsigned char *name = file->f_dentry->d_parent->d_name.name;
+       const unsigned char *name = file->f_path.dentry->d_parent->d_name.name;
 
        return (int)simple_strtol(name, NULL, 10);
 }
@@ -187,7 +187,7 @@ static ssize_t sh7750_write_count(struct file *file, const char __user *buf,
        return count;
 }
 
-static struct file_operations count_fops = {
+static const struct file_operations count_fops = {
        .read           = sh7750_read_count,
        .write          = sh7750_write_count,
 };