diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
| commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
| tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /include/linux/sched_clock.h | |
| parent | 1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
Diffstat (limited to 'include/linux/sched_clock.h')
| -rw-r--r-- | include/linux/sched_clock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h index fa7922c80a41..cddf0c2940b6 100644 --- a/include/linux/sched_clock.h +++ b/include/linux/sched_clock.h | |||
| @@ -15,7 +15,7 @@ static inline void sched_clock_postinit(void) { } | |||
| 15 | #endif | 15 | #endif |
| 16 | 16 | ||
| 17 | extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate); | 17 | extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate); |
| 18 | 18 | extern void sched_clock_register(u64 (*read)(void), int bits, | |
| 19 | extern unsigned long long (*sched_clock_func)(void); | 19 | unsigned long rate); |
| 20 | 20 | ||
| 21 | #endif | 21 | #endif |