summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 21:56:42 +0200
committerClark Williams <williams@redhat.com>2012-04-13 11:01:36 -0500
commit4129ff18455f835a48ba750e0b6c66dfa06ae13d (patch)
treec84c20c1c9d0d88e9f16c433bd98739c2cdb8dbf /include
parentd21fde7c0f20c55d59614dc808f508aa69cae0a2 (diff)
ftrace-migrate-disable-tracing.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ftrace_event.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 5f3f3be5af09..c5c58856f102 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -49,7 +49,8 @@ struct trace_entry {
unsigned char flags;
unsigned char preempt_count;
int pid;
- int padding;
+ unsigned short migrate_disable;
+ unsigned short padding;
};
#define FTRACE_MAX_EVENT \