diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /include/linux/trace_clock.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/trace_clock.h')
| -rw-r--r-- | include/linux/trace_clock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/trace_clock.h b/include/linux/trace_clock.h index 7a8130384087..4eb490237d4c 100644 --- a/include/linux/trace_clock.h +++ b/include/linux/trace_clock.h | |||
| @@ -15,5 +15,6 @@ | |||
| 15 | extern u64 notrace trace_clock_local(void); | 15 | extern u64 notrace trace_clock_local(void); |
| 16 | extern u64 notrace trace_clock(void); | 16 | extern u64 notrace trace_clock(void); |
| 17 | extern u64 notrace trace_clock_global(void); | 17 | extern u64 notrace trace_clock_global(void); |
| 18 | extern u64 notrace trace_clock_counter(void); | ||
| 18 | 19 | ||
| 19 | #endif /* _LINUX_TRACE_CLOCK_H */ | 20 | #endif /* _LINUX_TRACE_CLOCK_H */ |