diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 07:39:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 07:39:31 -0500 |
| commit | 4913ae3991acf00b414701852ee2193d1edd9c2d (patch) | |
| tree | b079652f0a897f86c5ecc16b2d4ba4bc3fefd220 /kernel/trace/trace_clock.c | |
| parent | ff7532ca2c631e7e96dcd305a967b610259dc0ea (diff) | |
| parent | 0b07436d95b5404134da4d661fd183eac863513e (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steve Rostedt.
This commit:
tracing: Remove the extra 4 bytes of padding in events
changes the ABI. All involved parties seem to agree that it's safe to
do now, but the devil is in the details ...
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_clock.c')
| -rw-r--r-- | kernel/trace/trace_clock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c index 394783531cbb..22b638b28e48 100644 --- a/kernel/trace/trace_clock.c +++ b/kernel/trace/trace_clock.c | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | #include <linux/ktime.h> | 21 | #include <linux/ktime.h> |
| 22 | #include <linux/trace_clock.h> | 22 | #include <linux/trace_clock.h> |
| 23 | 23 | ||
| 24 | #include "trace.h" | ||
| 25 | |||
| 26 | /* | 24 | /* |
| 27 | * trace_clock_local(): the simplest and least coherent tracing clock. | 25 | * trace_clock_local(): the simplest and least coherent tracing clock. |
| 28 | * | 26 | * |