Commit 0f4d3fd8 authored Oct 15, 2008 by David Brownell Committed by Linus Torvalds Oct 16, 2008

legacy rtc: remove needless/confusing HPET_RTC_IRQ option

HPET_RTC_IRQ is no longer needed; HPET_EMULATE_RTC suffices and is more
correct.  (http://bugzilla.kernel.org/show_bug.cgi?id=11111

)

Note that when using the legacy RTC driver, platforms don't really do a
dynamic switch between HPET and non-HPET modes based on whether HPET
hardware actually exists ...  only rtc-cmos (using the new RTC framework)
currently switches that way.

So this reflects bitrot in that legacy code, for x86/ia64: kernels with
HPET support configured (e.g.  for a clocksource) can't get IRQs from the
legacy RTC driver unless they really have HPET hardware.  (The obvious
workaround is to not use the legacy RTC driver on those platforms when you
configure HPET ...  unless you know the target really has a HPET.)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f841a487

drivers/char/Kconfig

+0 −9

Original line number	Diff line number	Diff line
		@@ -1043,15 +1043,6 @@ config HPET
		open selects one of the timers supported by the HPET. The timers are
		non-periodic and/or periodic.

		config HPET_RTC_IRQ
		bool
		default HPET_EMULATE_RTC
		depends on RTC && HPET
		help
		If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It
		is assumed the platform called hpet_alloc with the RTC IRQ values for
		the HPET timers.

		config HPET_MMAP
		bool "Allow mmap of HPET"
		default y

drivers/char/rtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ static unsigned long rtc_port;
		static int rtc_irq;
		#endif

		#ifdef CONFIG_HPET_RTC_IRQ
		#ifdef CONFIG_HPET_EMULATE_RTC
		#undef RTC_IRQ
		#endif