git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.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
5ec9ddc
..
60402ee
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)
{
*/
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);
}
return (int)simple_strtol(name, NULL, 10);
}
@@
-198,7
+198,7
@@
static int sh7750_perf_counter_create_files(struct super_block *sb, struct dentr
for (i = 0; i < NR_CNTRS; i++) {
struct dentry *dir;
for (i = 0; i < NR_CNTRS; i++) {
struct dentry *dir;
- char buf[
3
];
+ char buf[
4
];
snprintf(buf, sizeof(buf), "%d", i);
dir = oprofilefs_mkdir(sb, root, buf);
snprintf(buf, sizeof(buf), "%d", i);
dir = oprofilefs_mkdir(sb, root, buf);