Philippe Gerum wrote: > On Fri, 2007-02-23 at 19:57 +0100, Philippe Gerum wrote: >> On Tue, 2007-02-20 at 22:23 +0100, Jan Kiszka wrote: >>> As long as there is obviously a conflict, catch it during kernel >>> configuration and urge the user to disable CONFIG_HPET_TIMER. >>> >> Applied, thanks. >> > > Reverted from the trunk/ though, since this won't work as is for x86_64. >
Yeah, noticed this as well. The attached version works, but... could you explain to me what I'm patching here? What is different about our HPET issue on x86_64 so that we are not being bitten there? Jan
Index: scripts/Kconfig.frag
===================================================================
--- scripts/Kconfig.frag (Revision 2238)
+++ scripts/Kconfig.frag (Arbeitskopie)
@@ -12,12 +12,12 @@ comment "(menu Device Drivers/Input devi
depends on !X86_TSC && X86 && INPUT_PCSPKR
comment "NOTE: Xenomai currently conflicts with HPET support."
- depends on HPET_TIMER
+ depends on HPET_TIMER && !X86_64
comment "(menu Processor type and features)"
- depends on HPET_TIMER
+ depends on HPET_TIMER && !X86_64
config XENOMAI
- depends on (X86_TSC || !X86 || !INPUT_PCSPKR) && !HPET_TIMER
+ depends on (X86_TSC || !X86 || !INPUT_PCSPKR) && (!HPET_TIMER || X86_64)
bool "Xenomai"
default y
select IPIPE
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Xenomai-core mailing list Xenomai-core@gna.org https://mail.gna.org/listinfo/xenomai-core
