Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile

[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 5a178065cfa0be546c5266d85e3d7d54ad6e38f6..01d38e78cde18bd341fca22940249e4a80068217 100644 (file)
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -39,19 +39,32 @@ 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,
@@ -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);