Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird

[linux-2.6-omap-h63xx.git] / include / asm-arm / mach / time.h

diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h
index 047980ad18d119aeb2e6136bba3221294fb75883..9f28073559e8f6140788546012acecdd16479330 100644 (file)
--- a/include/asm-arm/mach/time.h
+++ b/include/asm-arm/mach/time.h
@@ -47,11 +47,10 @@ struct sys_timer {
 
 #ifdef CONFIG_NO_IDLE_HZ
 
-#define DYN_TICK_SKIPPING      (1 << 2)
 #define DYN_TICK_ENABLED       (1 << 1)
-#define DYN_TICK_SUITABLE      (1 << 0)
 
 struct dyn_tick_timer {
+       spinlock_t      lock;
        unsigned int    state;                  /* Current state */
        int             (*enable)(void);        /* Enables dynamic tick */
        int             (*disable)(void);       /* Disables dynamic tick */
@@ -60,6 +59,8 @@ struct dyn_tick_timer {
 };
 
 void timer_dyn_reprogram(void);
+#else
+#define timer_dyn_reprogram()  do { } while (0)
 #endif
 
 extern struct sys_timer *system_timer;