w1: fix omap 1-wire driver compilation

[safe/jmp/linux-2.6] / drivers / oprofile / oprofile_stats.c

diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
index f99b28e..917d28e 100644 (file)
--- a/drivers/oprofile/oprofile_stats.c
+++ b/drivers/oprofile/oprofile_stats.c
@@ -11,36 +11,38 @@
 #include <linux/smp.h>
 #include <linux/cpumask.h>
 #include <linux/threads.h>
- 
+
 #include "oprofile_stats.h"
 #include "cpu_buffer.h"
- 
+
 struct oprofile_stat_struct oprofile_stats;
- 
+
 void oprofile_reset_stats(void)
 {
-       struct oprofile_cpu_buffer * cpu_buf; 
+       struct oprofile_cpu_buffer *cpu_buf;
        int i;
- 
+
        for_each_possible_cpu(i) {
-               cpu_buf = &per_cpu(cpu_buffer, i);
+               cpu_buf = &per_cpu(op_cpu_buffer, i);
                cpu_buf->sample_received = 0;
                cpu_buf->sample_lost_overflow = 0;
                cpu_buf->backtrace_aborted = 0;
                cpu_buf->sample_invalid_eip = 0;
        }
- 
+
        atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
        atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
        atomic_set(&oprofile_stats.event_lost_overflow, 0);
+       atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
+       atomic_set(&oprofile_stats.multiplex_counter, 0);
 }
 
 
-void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
+void oprofile_create_stats_files(struct super_block *sb, struct dentry *root)
 {
-       struct oprofile_cpu_buffer * cpu_buf;
-       struct dentry * cpudir;
-       struct dentry * dir;
+       struct oprofile_cpu_buffer *cpu_buf;
+       struct dentry *cpudir;
+       struct dentry *dir;
        char buf[10];
        int i;
 
@@ -49,10 +51,10 @@ void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
                return;
 
        for_each_possible_cpu(i) {
-               cpu_buf = &per_cpu(cpu_buffer, i);
+               cpu_buf = &per_cpu(op_cpu_buffer, i);
                snprintf(buf, 10, "cpu%d", i);
                cpudir = oprofilefs_mkdir(sb, dir, buf);
- 
+
                /* Strictly speaking access to these ulongs is racy,
                 * but we can't simply lock them, and they are
                 * informational only.
@@ -66,7 +68,7 @@ void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
                oprofilefs_create_ro_ulong(sb, cpudir, "sample_invalid_eip",
                        &cpu_buf->sample_invalid_eip);
        }
- 
+
        oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mm",
                &oprofile_stats.sample_lost_no_mm);
        oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mapping",
@@ -75,4 +77,8 @@ void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
                &oprofile_stats.event_lost_overflow);
        oprofilefs_create_ro_atomic(sb, dir, "bt_lost_no_mapping",
                &oprofile_stats.bt_lost_no_mapping);
+#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
+       oprofilefs_create_ro_atomic(sb, dir, "multiplex_counter",
+               &oprofile_stats.multiplex_counter);
+#endif
 }