Skip to contentSkip to conversation

2.6.13-rc6-rt15 won't compile without HR-Timers

PATCH Applied K.R. Foley 2 participants 2 messages Aug 24, 2005 – Aug 25, 2005 High-resolution timers, timer wheel, clockevents

lore
Share & tools
lore

K.R. Foley

author
#0 lore raw

Ingo,

Without the attached patch 2.6.13-rc6-rt15 won't compile for me with CONFIG_HIGH_RES_TIMERS not configured.

Signature · 1 line
   kr
include/linux/timer.h renamed from include/linux/timer.h.orig +1 -1
@@ -76,6 +76,7 @@
 
 #ifdef CONFIG_HIGH_RES_TIMERS
 extern void add_hres_timer_us(struct timer_list *timer, unsigned long usec);
+extern void init_hrtimers(void);
 #else
 #define add_hres_timer_us(t,exp) mod_timer(t,(exp*HZ)/1000000)
 #endif
@@ -125,7 +126,6 @@
 #define del_singleshot_timer_sync(t) del_timer_sync(t)
 
 extern void init_timers(void);
-extern void init_hrtimers(void);
 extern void run_local_timers(void);
 extern void it_real_fn(unsigned long);
 
kernel/timer.c renamed from kernel/timer.c.orig +2 -2
@@ -1920,9 +1920,9 @@
 	.notifier_call	= timer_cpu_notify,
 };
 
+#ifdef CONFIG_HIGH_RES_TIMERS
 void __init init_hrtimers(void)
 {
-#ifdef CONFIG_HIGH_RES_TIMERS
 	open_softirq(HRTIMER_SOFTIRQ,
 		     (void (*)(struct softirq_action*))hrtimers_expire_timers,
 		     NULL);
@@ -1931,8 +1931,8 @@
 	printk("arch_cycles_per_jiffy: %ld\n", arch_cycles_per_jiffy);
 	printk("hr_max_jiffies_expiry: %d\n", hr_max_jiffies_expiry);
 	printk("hr_max_expiry: %d\n", hr_max_expiry);
-#endif
 }
+#endif
 
 void __init init_timers(void)
 {
Applied
#1 lore raw
Quoted 4 lines · K.R. Foley

Ingo,

Without the attached patch 2.6.13-rc6-rt15 won't compile for me with CONFIG_HIGH_RES_TIMERS not configured.

thanks, applied.

Ingo