diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 21:56:42 +0200 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-01-16 13:00:24 -0600 |
commit | 00360dc69702b65644f0685c9755b83f61994e45 (patch) | |
tree | 80c7d0b27186cc093ef00750ee6b7c39b7ee8b0f /include | |
parent | 8f7a02261f1c87341732d50a8daaf2fc70ddbd34 (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 \ |