summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 19:56:42 (GMT)
committerScott Wood <scottwood@freescale.com>2013-04-04 22:09:22 (GMT)
commit04afba88ec7c030c1ff81a80bb418d761f5fd320 (patch)
tree2139a55bd1f73c7c88a117ccb9414b8d2bdbc330 /include
parent32d0add0c33f1eb77f84093d4832112541ae3ffb (diff)
downloadlinux-fsl-qoriq-04afba88ec7c030c1ff81a80bb418d761f5fd320.tar.xz
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 a3d4895..806c02b 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 \