Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 116661
b: refs/heads/master
c: 70255b5
h: refs/heads/master
i:
  116659: b39ba3e
v: v3
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Oct 14, 2008
1 parent 3bbf48b commit dc2ac7d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9e9efffb7848fe53c334996819139b431b983ac2
refs/heads/master: 70255b5e3f1bd1a5af5b1e425ec2c4db7c735112
8 changes: 4 additions & 4 deletions trunk/kernel/trace/ring_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer,
if (atomic_read(&buffer->record_disabled))
return NULL;

raw_local_irq_save(*flags);
local_irq_save(*flags);
cpu = raw_smp_processor_id();

if (!cpu_isset(cpu, buffer->cpumask))
Expand Down Expand Up @@ -909,7 +909,7 @@ int ring_buffer_unlock_commit(struct ring_buffer *buffer,
rb_commit(cpu_buffer, event);

spin_unlock(&cpu_buffer->lock);
raw_local_irq_restore(flags);
local_irq_restore(flags);

return 0;
}
Expand Down Expand Up @@ -1583,13 +1583,13 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
if (!cpu_isset(cpu, buffer->cpumask))
return;

raw_local_irq_save(flags);
local_irq_save(flags);
spin_lock(&cpu_buffer->lock);

rb_reset_cpu(cpu_buffer);

spin_unlock(&cpu_buffer->lock);
raw_local_irq_restore(flags);
local_irq_restore(flags);
}

/**
Expand Down

0 comments on commit dc2ac7d

Please sign in to comment.