aboutsummaryrefslogtreecommitdiffstats
path: root/xen/include/xen/timer.h
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-08-18 14:56:01 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-08-18 14:56:01 +0100
commit116d62ddfd1157364e2e5a2a44ef89573da37595 (patch)
tree137eba64fb80d0c04b52765a5a280ac8399bc0a2 /xen/include/xen/timer.h
parent6d91c142bca75bbac5bbc4ecea5da47967b6797b (diff)
downloadxen-116d62ddfd1157364e2e5a2a44ef89573da37595.tar.gz
xen-116d62ddfd1157364e2e5a2a44ef89573da37595.tar.bz2
xen-116d62ddfd1157364e2e5a2a44ef89573da37595.zip
timers: Simplify implementation logic.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/include/xen/timer.h')
-rw-r--r--xen/include/xen/timer.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/xen/include/xen/timer.h b/xen/include/xen/timer.h
index 53b3c3cc17..e8b80f248e 100644
--- a/xen/include/xen/timer.h
+++ b/xen/include/xen/timer.h
@@ -16,7 +16,6 @@
struct timer {
/* System time expiry value (nanoseconds since boot). */
s_time_t expires;
- s_time_t expires_end;
/* Position in active-timer data structure. */
union {
@@ -82,12 +81,8 @@ void kill_timer(struct timer *timer);
/* Bootstrap initialisation. Must be called before any other timer function. */
void timer_init(void);
-/*
- * Next timer deadline for each CPU.
- * Modified only by the local CPU and never in interrupt context.
- */
-DECLARE_PER_CPU(s_time_t, timer_deadline_start);
-DECLARE_PER_CPU(s_time_t, timer_deadline_end);
+/* Next timer deadline for each CPU. */
+DECLARE_PER_CPU(s_time_t, timer_deadline);
/* Arch-defined function to reprogram timer hardware for new deadline. */
int reprogram_timer(s_time_t timeout);