diff options
| author |   Tony Lindgren <tony@atomide.com> | 2015-09-14 13:42:11 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 13:42:11 -0700 |
| commit | 7168e947291f0ead07e5638b4599fb7845288b69 (patch) | |
| tree | b39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /kernel/trace/trace_output.c | |
| parent | ARM: omap2plus_defconfig: Enable MUSB DMA support (diff) | |
| parent | ARM: dts: Fixup model name for HP t410 dts (diff) | |
| download | linux-dev-7168e947291f0ead07e5638b4599fb7845288b69.tar.xz linux-dev-7168e947291f0ead07e5638b4599fb7845288b69.zip | |
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'kernel/trace/trace_output.c')
| -rw-r--r-- | kernel/trace/trace_output.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index dfab253727dc..8e481a84aeea 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -496,6 +496,8 @@ static const struct trace_mark { char sym; } mark[] = { MARK(1000000000ULL , '$'), /* 1 sec */ + MARK(100000000ULL , '@'), /* 100 msec */ + MARK(10000000ULL , '*'), /* 10 msec */ MARK(1000000ULL , '#'), /* 1000 usecs */ MARK(100000ULL , '!'), /* 100 usecs */ MARK(10000ULL , '+'), /* 10 usecs */ @@ -508,7 +510,7 @@ char trace_find_mark(unsigned long long d) int size = ARRAY_SIZE(mark); for (i = 0; i < size; i++) { - if (d >= mark[i].val) + if (d > mark[i].val) break; } |