2009-04-25 18:54:52

by Remy Bohmer

[permalink] [raw]
Subject: [patch 1/1] PREEMPT_RT: Fix compile error in case high-res-timers are not configured.

2.6.29.1-rt does not compile if high-res-timers are not configured
It can, for example, be reproduced by using at91sam9261ek_defconfig (ARM)

Signed-off-by: Remy Bohmer <[email protected]>
---
kernel/hrtimer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.29/kernel/hrtimer.c
===================================================================
--- linux-2.6.29.orig/kernel/hrtimer.c 2009-04-25 18:32:54.000000000 +0200
+++ linux-2.6.29/kernel/hrtimer.c 2009-04-25 18:36:27.000000000 +0200
@@ -1230,7 +1230,7 @@ static void __run_hrtimer(struct hrtimer
timer->state &= ~HRTIMER_STATE_CALLBACK;
}

-#ifdef CONFIG_PREEMPT_RT
+#if defined(CONFIG_PREEMPT_RT) && defined(CONFIG_HIGH_RES_TIMERS)


static void hrtimer_rt_reprogram(int restart, struct hrtimer *timer,

--