diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/sh/oprofile | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sh/oprofile')
| -rw-r--r-- | arch/sh/oprofile/op_model_sh7750.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/oprofile/op_model_sh7750.c b/arch/sh/oprofile/op_model_sh7750.c index c265185b22a7..60402eec4b4d 100644 --- 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) | |||
| 142 | */ | 142 | */ |
| 143 | static inline int to_counter(struct file *file) | 143 | static inline int to_counter(struct file *file) |
| 144 | { | 144 | { |
| 145 | const unsigned char *name = file->f_dentry->d_parent->d_name.name; | 145 | const unsigned char *name = file->f_path.dentry->d_parent->d_name.name; |
| 146 | 146 | ||
| 147 | return (int)simple_strtol(name, NULL, 10); | 147 | return (int)simple_strtol(name, NULL, 10); |
| 148 | } | 148 | } |