0fe0de10c1
This reverts commitea99d5c0e7. This is a preparation change for merging android-4.19.37 into msm-4.19 branch. Functions sched_clock_suspend and sched_clock_resume are defined twice in different header files by [1] and [2] ([1] is part of upmerge[3]). When file includes those two header files, a redefinition error occurs. To prevent this [2] is reverted. [1] cd37fd4("timers/sched_clock: Prevent generic sched_clock wrap caused by tick_freeze()") [2] ea99d5c0("timers, sched/clock: Hook into s2idle freeze path") [3] Merge android-4.19.37 (9bf5904) into msm-4.19. Change-Id: I667a23598fd2a3bd2abcddd7286011b5ebc47559 Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
26 lines
666 B
C
26 lines
666 B
C
/*
|
|
* sched_clock.h: support for extending counters to full 64-bit ns counter
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#ifndef LINUX_SCHED_CLOCK
|
|
#define LINUX_SCHED_CLOCK
|
|
|
|
#ifdef CONFIG_GENERIC_SCHED_CLOCK
|
|
extern void generic_sched_clock_init(void);
|
|
|
|
extern void sched_clock_register(u64 (*read)(void), int bits,
|
|
unsigned long rate);
|
|
#else
|
|
static inline void generic_sched_clock_init(void) { }
|
|
|
|
static inline void sched_clock_register(u64 (*read)(void), int bits,
|
|
unsigned long rate)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif
|