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

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

[K.R. Foley]

[-- Attachment #1: Type: text/plain, Size: 128 bytes --]

Ingo,

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

-- 
    kr

[-- Attachment #2: nohrtfix.patch --]
[-- Type: text/x-patch, Size: 1291 bytes --]

--- linux-2.6.13/include/linux/timer.h.orig	2005-08-24 11:15:22.000000000 -0500
+++ linux-2.6.13/include/linux/timer.h	2005-08-24 11:15:35.000000000 -0500
@@ -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);
 
--- linux-2.6.13/kernel/timer.c.orig	2005-08-24 11:16:04.000000000 -0500
+++ linux-2.6.13/kernel/timer.c	2005-08-24 11:06:32.000000000 -0500
@@ -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)
 {

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

[Ingo Molnar]

* K.R. Foley <kr@cybsft.com> wrote:

> 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