git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
kernel
/
trace
/
trace.c
diff --git
a/kernel/trace/trace.c
b/kernel/trace/trace.c
index
8a76339
..
086d363
100644
(file)
--- a/
kernel/trace/trace.c
+++ b/
kernel/trace/trace.c
@@
-1936,7
+1936,7
@@
static enum print_line_t print_trace_fmt(struct trace_iterator *iter)
}
if (event)
}
if (event)
- return event->
trace(iter, sym_flags
);
+ return event->
funcs->trace(iter, sym_flags, event
);
if (!trace_seq_printf(s, "Unknown type %d\n", entry->type))
goto partial;
if (!trace_seq_printf(s, "Unknown type %d\n", entry->type))
goto partial;
@@
-1962,7
+1962,7
@@
static enum print_line_t print_raw_fmt(struct trace_iterator *iter)
event = ftrace_find_event(entry->type);
if (event)
event = ftrace_find_event(entry->type);
if (event)
- return event->
raw(iter, 0
);
+ return event->
funcs->raw(iter, 0, event
);
if (!trace_seq_printf(s, "%d ?\n", entry->type))
goto partial;
if (!trace_seq_printf(s, "%d ?\n", entry->type))
goto partial;
@@
-1989,7
+1989,7
@@
static enum print_line_t print_hex_fmt(struct trace_iterator *iter)
event = ftrace_find_event(entry->type);
if (event) {
event = ftrace_find_event(entry->type);
if (event) {
- enum print_line_t ret = event->
hex(iter, 0
);
+ enum print_line_t ret = event->
funcs->hex(iter, 0, event
);
if (ret != TRACE_TYPE_HANDLED)
return ret;
}
if (ret != TRACE_TYPE_HANDLED)
return ret;
}
@@
-2014,7
+2014,8
@@
static enum print_line_t print_bin_fmt(struct trace_iterator *iter)
}
event = ftrace_find_event(entry->type);
}
event = ftrace_find_event(entry->type);
- return event ? event->binary(iter, 0) : TRACE_TYPE_HANDLED;
+ return event ? event->funcs->binary(iter, 0, event) :
+ TRACE_TYPE_HANDLED;
}
int trace_empty(struct trace_iterator *iter)
}
int trace_empty(struct trace_iterator *iter)
@@
-3665,7
+3666,6
@@
tracing_buffers_read(struct file *filp, char __user *ubuf,
size_t count, loff_t *ppos)
{
struct ftrace_buffer_info *info = filp->private_data;
size_t count, loff_t *ppos)
{
struct ftrace_buffer_info *info = filp->private_data;
- unsigned int pos;
ssize_t ret;
size_t size;
ssize_t ret;
size_t size;
@@
-3692,11
+3692,6
@@
tracing_buffers_read(struct file *filp, char __user *ubuf,
if (ret < 0)
return 0;
if (ret < 0)
return 0;
- pos = ring_buffer_page_len(info->spare);
-
- if (pos < PAGE_SIZE)
- memset(info->spare + pos, 0, PAGE_SIZE - pos);
-
read:
size = PAGE_SIZE - info->read;
if (size > count)
read:
size = PAGE_SIZE - info->read;
if (size > count)