projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
[linux-2.6-microblaze.git]
/
include
/
linux
/
hrtimer.h
diff --git
a/include/linux/hrtimer.h
b/include/linux/hrtimer.h
index
bb5e7b0
..
0ee1401
100644
(file)
--- a/
include/linux/hrtimer.h
+++ b/
include/linux/hrtimer.h
@@
-318,16
+318,12
@@
struct clock_event_device;
extern void hrtimer_interrupt(struct clock_event_device *dev);
extern void hrtimer_interrupt(struct clock_event_device *dev);
-extern void clock_was_set_delayed(void);
-
extern unsigned int hrtimer_resolution;
#else
#define hrtimer_resolution (unsigned int)LOW_RES_NSEC
extern unsigned int hrtimer_resolution;
#else
#define hrtimer_resolution (unsigned int)LOW_RES_NSEC
-static inline void clock_was_set_delayed(void) { }
-
#endif
static inline ktime_t
#endif
static inline ktime_t
@@
-351,13
+347,13
@@
hrtimer_expires_remaining_adjusted(const struct hrtimer *timer)
timer->base->get_time());
}
timer->base->get_time());
}
-extern void clock_was_set(void);
#ifdef CONFIG_TIMERFD
extern void timerfd_clock_was_set(void);
#ifdef CONFIG_TIMERFD
extern void timerfd_clock_was_set(void);
+extern void timerfd_resume(void);
#else
static inline void timerfd_clock_was_set(void) { }
#else
static inline void timerfd_clock_was_set(void) { }
+static inline void timerfd_resume(void) { }
#endif
#endif
-extern void hrtimers_resume(void);
DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
DECLARE_PER_CPU(struct tick_device, tick_cpu_device);