projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
kernel
/
trace
/
blktrace.c
diff --git
a/kernel/trace/blktrace.c
b/kernel/trace/blktrace.c
index
475e294
..
0735ae8
100644
(file)
--- a/
kernel/trace/blktrace.c
+++ b/
kernel/trace/blktrace.c
@@
-68,14
+68,14
@@
static void trace_note(struct blk_trace *bt, pid_t pid, int action,
{
struct blk_io_trace *t;
struct ring_buffer_event *event = NULL;
{
struct blk_io_trace *t;
struct ring_buffer_event *event = NULL;
- struct
ring
_buffer *buffer = NULL;
+ struct
trace
_buffer *buffer = NULL;
int pc = 0;
int cpu = smp_processor_id();
bool blk_tracer = blk_tracer_enabled;
ssize_t cgid_len = cgid ? sizeof(cgid) : 0;
if (blk_tracer) {
int pc = 0;
int cpu = smp_processor_id();
bool blk_tracer = blk_tracer_enabled;
ssize_t cgid_len = cgid ? sizeof(cgid) : 0;
if (blk_tracer) {
- buffer = blk_tr->
trace
_buffer.buffer;
+ buffer = blk_tr->
array
_buffer.buffer;
pc = preempt_count();
event = trace_buffer_lock_reserve(buffer, TRACE_BLK,
sizeof(*t) + len + cgid_len,
pc = preempt_count();
event = trace_buffer_lock_reserve(buffer, TRACE_BLK,
sizeof(*t) + len + cgid_len,
@@
-215,7
+215,7
@@
static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
{
struct task_struct *tsk = current;
struct ring_buffer_event *event = NULL;
{
struct task_struct *tsk = current;
struct ring_buffer_event *event = NULL;
- struct
ring
_buffer *buffer = NULL;
+ struct
trace
_buffer *buffer = NULL;
struct blk_io_trace *t;
unsigned long flags = 0;
unsigned long *sequence;
struct blk_io_trace *t;
unsigned long flags = 0;
unsigned long *sequence;
@@
-248,7
+248,7
@@
static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
if (blk_tracer) {
tracing_record_cmdline(current);
if (blk_tracer) {
tracing_record_cmdline(current);
- buffer = blk_tr->
trace
_buffer.buffer;
+ buffer = blk_tr->
array
_buffer.buffer;
pc = preempt_count();
event = trace_buffer_lock_reserve(buffer, TRACE_BLK,
sizeof(*t) + pdu_len + cgid_len,
pc = preempt_count();
event = trace_buffer_lock_reserve(buffer, TRACE_BLK,
sizeof(*t) + pdu_len + cgid_len,