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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git]
/
include
/
linux
/
ftrace_event.h
diff --git
a/include/linux/ftrace_event.h
b/include/linux/ftrace_event.h
index
6b7c444
..
c0f4b36
100644
(file)
--- a/
include/linux/ftrace_event.h
+++ b/
include/linux/ftrace_event.h
@@
-131,12
+131,12
@@
struct ftrace_event_call {
void *mod;
void *data;
void *mod;
void *data;
- int p
rofile_
count;
- int (*p
rofile
_enable)(struct ftrace_event_call *);
- void (*p
rofile
_disable)(struct ftrace_event_call *);
+ int p
erf_ref
count;
+ int (*p
erf_event
_enable)(struct ftrace_event_call *);
+ void (*p
erf_event
_disable)(struct ftrace_event_call *);
};
};
-#define
FTRACE_MAX_PROFILE_SIZE
2048
+#define
PERF_MAX_TRACE_SIZE
2048
#define MAX_FILTER_PRED 32
#define MAX_FILTER_STR_VAL 256 /* Should handle KSYM_SYMBOL_LEN */
#define MAX_FILTER_PRED 32
#define MAX_FILTER_STR_VAL 256 /* Should handle KSYM_SYMBOL_LEN */
@@
-187,22
+187,25
@@
do { \
#ifdef CONFIG_PERF_EVENTS
struct perf_event;
#ifdef CONFIG_PERF_EVENTS
struct perf_event;
-extern int ftrace_profile_enable(int event_id);
-extern void ftrace_profile_disable(int event_id);
+
+DECLARE_PER_CPU(struct pt_regs, perf_trace_regs);
+
+extern int perf_trace_enable(int event_id);
+extern void perf_trace_disable(int event_id);
extern int ftrace_profile_set_filter(struct perf_event *event, int event_id,
char *filter_str);
extern void ftrace_profile_free_filter(struct perf_event *event);
extern void *
extern int ftrace_profile_set_filter(struct perf_event *event, int event_id,
char *filter_str);
extern void ftrace_profile_free_filter(struct perf_event *event);
extern void *
-
ftrace_perf
_buf_prepare(int size, unsigned short type, int *rctxp,
+
perf_trace
_buf_prepare(int size, unsigned short type, int *rctxp,
unsigned long *irq_flags);
static inline void
unsigned long *irq_flags);
static inline void
-
ftrace_perf
_buf_submit(void *raw_data, int size, int rctx, u64 addr,
- u64 count, unsigned long irq_flags)
+
perf_trace
_buf_submit(void *raw_data, int size, int rctx, u64 addr,
+ u64 count, unsigned long irq_flags
, struct pt_regs *regs
)
{
struct trace_entry *entry = raw_data;
{
struct trace_entry *entry = raw_data;
- perf_tp_event(entry->type, addr, count, raw_data, size);
+ perf_tp_event(entry->type, addr, count, raw_data, size
, regs
);
perf_swevent_put_recursion_context(rctx);
local_irq_restore(irq_flags);
}
perf_swevent_put_recursion_context(rctx);
local_irq_restore(irq_flags);
}