mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge branch 'tip/tracing/core3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
This commit is contained in:
commit
788d70dce0
6 changed files with 248 additions and 59 deletions
|
|
@ -57,6 +57,7 @@ struct trace_iterator {
|
|||
/* The below is zeroed out in pipe_read */
|
||||
struct trace_seq seq;
|
||||
struct trace_entry *ent;
|
||||
int leftover;
|
||||
int cpu;
|
||||
u64 ts;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ struct trace_seq {
|
|||
unsigned char buffer[PAGE_SIZE];
|
||||
unsigned int len;
|
||||
unsigned int readpos;
|
||||
int full;
|
||||
};
|
||||
|
||||
static inline void
|
||||
|
|
@ -21,6 +22,7 @@ trace_seq_init(struct trace_seq *s)
|
|||
{
|
||||
s->len = 0;
|
||||
s->readpos = 0;
|
||||
s->full = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -33,7 +35,7 @@ extern int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args)
|
|||
__attribute__ ((format (printf, 2, 0)));
|
||||
extern int
|
||||
trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary);
|
||||
extern void trace_print_seq(struct seq_file *m, struct trace_seq *s);
|
||||
extern int trace_print_seq(struct seq_file *m, struct trace_seq *s);
|
||||
extern ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
|
||||
size_t cnt);
|
||||
extern int trace_seq_puts(struct trace_seq *s, const char *str);
|
||||
|
|
@ -55,8 +57,9 @@ trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline void trace_print_seq(struct seq_file *m, struct trace_seq *s)
|
||||
static inline int trace_print_seq(struct seq_file *m, struct trace_seq *s)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
|
||||
size_t cnt)
|
||||
|
|
|
|||
Loading…
Reference in a new issue