Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[~andy/linux] / kernel / trace / ring_buffer.c

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index acf6b68dc4a8c2f9fa4e8b15313e3c4fc66b8b73..f5b7b5c1195beaf806f19d59e0ce7114c0e36add 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -478,7 +478,7 @@ struct ring_buffer_per_cpu {
        int                             cpu;
        atomic_t                        record_disabled;
        struct ring_buffer              *buffer;
-       spinlock_t                      reader_lock;    /* serialize readers */
+       raw_spinlock_t                  reader_lock;    /* serialize readers */
        arch_spinlock_t                 lock;
        struct lock_class_key           lock_key;
        struct list_head                *pages;
@@ -1064,7 +1064,7 @@ rb_allocate_cpu_buffer(struct ring_buffer *buffer, int cpu)
 
        cpu_buffer->cpu = cpu;
        cpu_buffer->buffer = buffer;
-       spin_lock_init(&cpu_buffer->reader_lock);
+       raw_spin_lock_init(&cpu_buffer->reader_lock);
        lockdep_set_class(&cpu_buffer->reader_lock, buffer->reader_lock_key);
        cpu_buffer->lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
 
@@ -1261,7 +1261,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages)
        struct list_head *p;
        unsigned i;
 
-       spin_lock_irq(&cpu_buffer->reader_lock);
+       raw_spin_lock_irq(&cpu_buffer->reader_lock);
        rb_head_page_deactivate(cpu_buffer);
 
        for (i = 0; i < nr_pages; i++) {
@@ -1279,7 +1279,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages)
        rb_check_pages(cpu_buffer);
 
 out:
-       spin_unlock_irq(&cpu_buffer->reader_lock);
+       raw_spin_unlock_irq(&cpu_buffer->reader_lock);
 }
 
 static void
@@ -1290,7 +1290,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer,
        struct list_head *p;
        unsigned i;
 
-       spin_lock_irq(&cpu_buffer->reader_lock);
+       raw_spin_lock_irq(&cpu_buffer->reader_lock);
        rb_head_page_deactivate(cpu_buffer);
 
        for (i = 0; i < nr_pages; i++) {
@@ -1305,7 +1305,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer,
        rb_check_pages(cpu_buffer);
 
 out:
-       spin_unlock_irq(&cpu_buffer->reader_lock);
+       raw_spin_unlock_irq(&cpu_buffer->reader_lock);
 }
 
 /**
@@ -2689,7 +2689,7 @@ unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
                return 0;
 
        cpu_buffer = buffer->buffers[cpu];
-       spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
+       raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
        /*
         * if the tail is on reader_page, oldest time stamp is on the reader
         * page
@@ -2699,7 +2699,7 @@ unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
        else
                bpage = rb_set_head_page(cpu_buffer);
        ret = bpage->page->time_stamp;
-       spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
+       raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 
        return ret;
 }
@@ -2869,9 +2869,9 @@ void ring_buffer_iter_reset(struct ring_buffer_iter *iter)
 
        cpu_buffer = iter->cpu_buffer;
 
-       spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
+       raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
        rb_iter_reset(iter);
-       spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
+       raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 }
 EXPORT_SYMBOL_GPL(ring_buffer_iter_reset);
 
@@ -3330,12 +3330,12 @@ ring_buffer_peek(struct ring_buffer *buffer, int cpu, u64 *ts,
  again:
        local_irq_save(flags);
        if (dolock)
-               spin_lock(&cpu_buffer->reader_lock);
+               raw_spin_lock(&cpu_buffer->reader_lock);
        event = rb_buffer_peek(cpu_buffer, ts, lost_events);
        if (event && event->type_len == RINGBUF_TYPE_PADDING)
                rb_advance_reader(cpu_buffer);
        if (dolock)
-               spin_unlock(&cpu_buffer->reader_lock);
+               raw_spin_unlock(&cpu_buffer->reader_lock);
        local_irq_restore(flags);
 
        if (event && event->type_len == RINGBUF_TYPE_PADDING)
@@ -3360,9 +3360,9 @@ ring_buffer_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
        unsigned long flags;
 
  again:
-       spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
+       raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
        event = rb_iter_peek(iter, ts);
-       spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
+       raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 
        if (event && event->type_len == RINGBUF_TYPE_PADDING)
                goto again;
@@ -3402,7 +3402,7 @@ ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts,
        cpu_buffer = buffer->buffers[cpu];
        local_irq_save(flags);
        if (dolock)
-               spin_lock(&cpu_buffer->reader_lock);
+               raw_spin_lock(&cpu_buffer->reader_lock);
 
        event = rb_buffer_peek(cpu_buffer, ts, lost_events);
        if (event) {
@@ -3411,7 +3411,7 @@ ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts,
        }
 
        if (dolock)
-               spin_unlock(&cpu_buffer->reader_lock);
+               raw_spin_unlock(&cpu_buffer->reader_lock);
        local_irq_restore(flags);
 
  out:
@@ -3503,11 +3503,11 @@ ring_buffer_read_start(struct ring_buffer_iter *iter)
 
        cpu_buffer = iter->cpu_buffer;
 
-       spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
+       raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
        arch_spin_lock(&cpu_buffer->lock);
        rb_iter_reset(iter);
        arch_spin_unlock(&cpu_buffer->lock);
-       spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
+       raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 }
 EXPORT_SYMBOL_GPL(ring_buffer_read_start);
 
@@ -3542,7 +3542,7 @@ ring_buffer_read(struct ring_buffer_iter *iter, u64 *ts)
        struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer;
        unsigned long flags;
 
-       spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
+       raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
  again:
        event = rb_iter_peek(iter, ts);
        if (!event)
@@ -3553,7 +3553,7 @@ ring_buffer_read(struct ring_buffer_iter *iter, u64 *ts)
 
        rb_advance_iter(iter);
  out:
-       spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
+       raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 
        return event;
 }
@@ -3624,7 +3624,7 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
 
        atomic_inc(&cpu_buffer->record_disabled);
 
-       spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
+       raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
 
        if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing)))
                goto out;
@@ -3636,7 +3636,7 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
        arch_spin_unlock(&cpu_buffer->lock);
 
  out:
-       spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
+       raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 
        atomic_dec(&cpu_buffer->record_disabled);
 }
@@ -3674,10 +3674,10 @@ int ring_buffer_empty(struct ring_buffer *buffer)
                cpu_buffer = buffer->buffers[cpu];
                local_irq_save(flags);
                if (dolock)
-                       spin_lock(&cpu_buffer->reader_lock);
+                       raw_spin_lock(&cpu_buffer->reader_lock);
                ret = rb_per_cpu_empty(cpu_buffer);
                if (dolock)
-                       spin_unlock(&cpu_buffer->reader_lock);
+                       raw_spin_unlock(&cpu_buffer->reader_lock);
                local_irq_restore(flags);
 
                if (!ret)
@@ -3708,10 +3708,10 @@ int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu)
        cpu_buffer = buffer->buffers[cpu];
        local_irq_save(flags);
        if (dolock)
-               spin_lock(&cpu_buffer->reader_lock);
+               raw_spin_lock(&cpu_buffer->reader_lock);
        ret = rb_per_cpu_empty(cpu_buffer);
        if (dolock)
-               spin_unlock(&cpu_buffer->reader_lock);
+               raw_spin_unlock(&cpu_buffer->reader_lock);
        local_irq_restore(flags);
 
        return ret;
@@ -3908,7 +3908,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
        if (!bpage)
                goto out;
 
-       spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
+       raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
 
        reader = rb_get_reader_page(cpu_buffer);
        if (!reader)
@@ -4032,7 +4032,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
                memset(&bpage->data[commit], 0, BUF_PAGE_SIZE - commit);
 
  out_unlock:
-       spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
+       raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
 
  out:
        return ret;