diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/sched_clock.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/sched_clock.h')
| -rw-r--r-- | include/linux/sched_clock.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h index 411b52e424e1..abe28d5cb3f4 100644 --- a/include/linux/sched_clock.h +++ b/include/linux/sched_clock.h | |||
| @@ -9,17 +9,16 @@ | |||
| 9 | #define LINUX_SCHED_CLOCK | 9 | #define LINUX_SCHED_CLOCK |
| 10 | 10 | ||
| 11 | #ifdef CONFIG_GENERIC_SCHED_CLOCK | 11 | #ifdef CONFIG_GENERIC_SCHED_CLOCK |
| 12 | extern void sched_clock_postinit(void); | 12 | extern void generic_sched_clock_init(void); |
| 13 | 13 | ||
| 14 | extern void sched_clock_register(u64 (*read)(void), int bits, | 14 | extern void sched_clock_register(u64 (*read)(void), int bits, |
| 15 | unsigned long rate); | 15 | unsigned long rate); |
| 16 | #else | 16 | #else |
| 17 | static inline void sched_clock_postinit(void) { } | 17 | static inline void generic_sched_clock_init(void) { } |
| 18 | 18 | ||
| 19 | static inline void sched_clock_register(u64 (*read)(void), int bits, | 19 | static inline void sched_clock_register(u64 (*read)(void), int bits, |
| 20 | unsigned long rate) | 20 | unsigned long rate) |
| 21 | { | 21 | { |
| 22 | ; | ||
| 23 | } | 22 | } |
| 24 | #endif | 23 | #endif |
| 25 | 24 | ||
