diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-09 00:51:21 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-09 00:51:21 +0200 |
| commit | 81db4dbf592b486ac2bc7cabfb328ee2a6c4725d (patch) | |
| tree | bb42fbbee400f55b13f49f30b392367798602652 /fs | |
| parent | Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
| parent | Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux... (diff) | |
| download | linux-81db4dbf592b486ac2bc7cabfb328ee2a6c4725d.tar.xz linux-81db4dbf592b486ac2bc7cabfb328ee2a6c4725d.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
- Trivial: unused variable removal
- Posix-timers: Add the clock ID to the new proc interface to make it
useful. The interface is new and should be functional when we reach
the final 3.10 release.
- Cure a false positive warning in the tick code introduced by the
overhaul in 3.10
- Fix for a persistent clock detection regression introduced in this
cycle
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Correct run-time detection of persistent_clock.
ntp: Remove unused variable flags in __hardpps
posix-timers: Show clock ID in proc file
tick: Cure broadcast false positive pending bit warning
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index dd51e50001fe..c3834dad09b3 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2118,6 +2118,7 @@ static int show_timer(struct seq_file *m, void *v) nstr[notify & ~SIGEV_THREAD_ID], (notify & SIGEV_THREAD_ID) ? "tid" : "pid", pid_nr_ns(timer->it_pid, tp->ns)); + seq_printf(m, "ClockID: %d\n", timer->it_clock); return 0; } |