fedora core 6 1.2949 + vserver 2.2.0

[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 de09ba7..60402ee 100644 (file)
--- a/arch/sh/oprofile/op_model_sh7750.c
+++ b/arch/sh/oprofile/op_model_sh7750.c
@@ -112,14 +112,9 @@ static struct op_counter_config ctr[NR_CNTRS];
  */
 
 static int sh7750_timer_notify(struct notifier_block *self,
-                              unsigned long val, void *data)
+                              unsigned long val, void *regs)
 {
-       struct pt_regs *regs = data;
-       unsigned long pc;
-
-       pc = instruction_pointer(regs);
-       oprofile_add_sample(pc, !user_mode(regs), 0, smp_processor_id());
-
+       oprofile_add_sample((struct pt_regs *)regs, 0);
        return 0;
 }
 
@@ -147,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);
 }
@@ -203,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;
-               char buf[3];
+               char buf[4];
 
                snprintf(buf, sizeof(buf), "%d", i);
                dir = oprofilefs_mkdir(sb, root, buf);