diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-16 07:22:56 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-16 07:22:56 -1000 |
| commit | efba92d58fa37d714d665deddb5cc6458b39bb88 (patch) | |
| tree | 3f7c598b41b340b98bbf9bd042fafe039c9269bd /net/mpls | |
| parent | f763cf8e47d3aa4b081e0537d060c12818de8d0f (diff) | |
| parent | e3ff9c3678b4d80e22d2557b68726174578eaf52 (diff) | |
| download | linux-efba92d58fa37d714d665deddb5cc6458b39bb88.tar.bz2 | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"A set of small fixes:
- Repair the ktime_get_coarse() functions so they actually deliver
what they are supposed to: tick granular time stamps. The current
code missed to add the accumulated nanoseconds part of the
timekeeper so the resulting granularity was 1 second.
- Prevent the tracer from infinitely recursing into time getter
functions in the arm architectured timer by marking these functions
notrace
- Fix a trivial compiler warning caused by wrong qualifier ordering"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Repair ktime_get_coarse*() granularity
clocksource/drivers/arm_arch_timer: Don't trace count reader functions
clocksource/drivers/timer-ti-dm: Change to new style declaration
Diffstat (limited to 'net/mpls')
0 files changed, 0 insertions, 0 deletions