Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / drivers / oprofile / cpu_buffer.c

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index b47ce038490f1fd436c282f20e23ac8f745ab066..01d38e78cde18bd341fca22940249e4a80068217 100644 (file)
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -22,7 +22,7 @@
 #include <linux/oprofile.h>
 #include <linux/vmalloc.h>
 #include <linux/errno.h>
- 
+
 #include "event_buffer.h"
 #include "cpu_buffer.h"
 #include "buffer_sync.h"
@@ -38,27 +38,40 @@ static int work_enabled;
 void free_cpu_buffers(void)
 {
        int i;
- 
-       for_each_online_cpu(i) {
+
+       for_each_possible_cpu(i) {
                vfree(per_cpu(cpu_buffer, i).buffer);
                per_cpu(cpu_buffer, i).buffer = NULL;
        }
 }
 
+unsigned long oprofile_get_cpu_buffer_size(void)
+{
+       return fs_cpu_buffer_size;
+}
+
+void oprofile_cpu_buffer_inc_smpl_lost(void)
+{
+       struct oprofile_cpu_buffer *cpu_buf
+               = &__get_cpu_var(cpu_buffer);
+
+       cpu_buf->sample_lost_overflow++;
+}
+
 int alloc_cpu_buffers(void)
 {
        int i;
- 
+
        unsigned long buffer_size = fs_cpu_buffer_size;
- 
-       for_each_online_cpu(i) {
+
+       for_each_possible_cpu(i) {
                struct oprofile_cpu_buffer *b = &per_cpu(cpu_buffer, i);
- 
+
                b->buffer = vmalloc_node(sizeof(struct op_sample) * buffer_size,
                        cpu_to_node(i));
                if (!b->buffer)
                        goto fail;
- 
+
                b->last_task = NULL;
                b->last_is_kernel = -1;
                b->tracing = 0;
@@ -150,7 +163,7 @@ static void increment_head(struct oprofile_cpu_buffer *b)
 
 static inline void
 add_sample(struct oprofile_cpu_buffer *cpu_buf,
-           unsigned long pc, unsigned long event)
+          unsigned long pc, unsigned long event)
 {
        struct op_sample *entry = &cpu_buf->buffer[cpu_buf->head_pos];
        entry->eip = pc;
@@ -205,7 +218,7 @@ static int log_sample(struct oprofile_cpu_buffer *cpu_buf, unsigned long pc,
                cpu_buf->last_task = task;
                add_code(cpu_buf, (unsigned long)task);
        }
- 
+
        add_sample(cpu_buf, pc, event);
        return 1;
 }
@@ -350,6 +363,11 @@ static void wq_sync_buffer(struct work_struct *work)
        if (b->cpu != smp_processor_id()) {
                printk(KERN_DEBUG "WQ on CPU%d, prefer CPU%d\n",
                       smp_processor_id(), b->cpu);
+
+               if (!cpu_online(b->cpu)) {
+                       cancel_delayed_work(&b->work);
+                       return;
+               }
        }
        sync_buffer(b->cpu);