aboutsummaryrefslogtreecommitdiffstats
path: root/xen/include/xen/timer.h
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-03-09 18:26:47 +0000
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-03-09 18:26:47 +0000
commiteb1a565927c0fdcd89be41f6d063c458539cca8d (patch)
tree098888cc3dadfbd978e9381d069dd8346b6d6adc /xen/include/xen/timer.h
parentbc69003d96068102da46008481e5e449f2ef9b7d (diff)
downloadxen-eb1a565927c0fdcd89be41f6d063c458539cca8d.tar.gz
xen-eb1a565927c0fdcd89be41f6d063c458539cca8d.tar.bz2
xen-eb1a565927c0fdcd89be41f6d063c458539cca8d.zip
xen: New vcpu_op commands for setting periodic and single-shot timers.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/include/xen/timer.h')
-rw-r--r--xen/include/xen/timer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/include/xen/timer.h b/xen/include/xen/timer.h
index 495e81c4c3..4378f0f386 100644
--- a/xen/include/xen/timer.h
+++ b/xen/include/xen/timer.h
@@ -35,7 +35,7 @@ struct timer {
* The timer must *previously* have been initialised by init_timer(), or its
* structure initialised to all-zeroes.
*/
-static __inline__ int active_timer(struct timer *timer)
+static inline int active_timer(struct timer *timer)
{
return (timer->heap_offset != 0);
}
@@ -46,7 +46,7 @@ static __inline__ int active_timer(struct timer *timer)
* time (and multiple times) on an inactive timer. It must *never* execute
* concurrently with any other operation on the same timer.
*/
-static __inline__ void init_timer(
+static inline void init_timer(
struct timer *timer,
void (*function)(void *),
void *data,