diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 21:56:42 +0200 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:28:45 -0600 |
commit | d6bcc50c027ef0174ca939db634288bf4bb9e67e (patch) | |
tree | ba85154cb0582b036a49466460c7a5f8e2055a96 /include | |
parent | c4e310a919692ea1340317d331d755f42eeb8321 (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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index c3da42dd22ba..7c5e1765a0fd 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 \ |