Skip to contentSkip to conversation

extend HPET-disabled requirement

PATCH New Jan Kiszka 1 participant 1 message Jan 7, 2008

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 extend HPET-disabled requirement

As this thread [1] demonstrated, there is another nasty corner-case where enabled CONFIG_HPET_TIMER bites us. The attached patch aims at catching this case as well.

Jan

[1] https://mail.gna.org/public/xenomai-help/2008-01/msg00009.html

Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux
---
 scripts/Kconfig.frag |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
scripts/Kconfig.frag +3 -3
Index: xenomai/scripts/Kconfig.frag
===================================================================
@@ -12,12 +12,12 @@ comment "(menu Device Drivers/Input devi
 	depends on !X86_TSC && X86 && INPUT_PCSPKR
 
 comment "NOTE: Xenomai needs either X86_LOCAL_APIC enabled or HPET_TIMER disabled."
-	depends on !X86_LOCAL_APIC && X86 && HPET_TIMER
+	depends on (!X86_LOCAL_APIC || !X86_TSC) && X86 && HPET_TIMER
 comment "(menu Processor type and features)"
-	depends on !X86_LOCAL_APIC && X86 && HPET_TIMER
+	depends on (!X86_LOCAL_APIC || !X86_TSC) && X86 && HPET_TIMER
 
 config XENOMAI
-	depends on ((X86_TSC || !X86 || !INPUT_PCSPKR) && (!HPET_TIMER || !X86 || X86_LOCAL_APIC))
+	depends on ((X86_TSC || !X86 || !INPUT_PCSPKR) && (!HPET_TIMER || !X86 || (X86_LOCAL_APIC && X86_TSC)))
 	bool "Xenomai"
 	default y
         select IPIPE