Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e78256b8 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86-64/i386: Use common X86_PM_TIMER option and make it EMBEDDED 



This makes x86-64 use the common X86_PM_TIMER Kconfig entry in drivers/acpi

And since PM timer is needed for correct timing on a lot of systems
now (e.g. AMD dual cores) and we often get bug reports from people
who forgot to set it make it depend on CONFIG_EMBEDDED. x86-64 had
this change before and it's a good thing.

I also fixed the description slightly to make this more clear.

Cc: len.brown@intel.com

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6070f9ec

arch/x86_64/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -354,21 +354,6 @@ config HPET_TIMER 
	  as it is off-chip.  You can find the HPET spec at

	  <http://www.intel.com/hardwaredesign/hpetspec.htm>.



config X86_PM_TIMER

	bool "PM timer" if EMBEDDED

	depends on ACPI

	default y

	help

	  Support the ACPI PM timer for time keeping. This is slow,

	  but is useful on some chipsets without HPET on systems with more

	  than one CPU. On a single processor or single socket multi core

	  system it is normally not required.

	  When the PM timer is active 64bit vsyscalls are disabled

	  and should not be enabled (/proc/sys/kernel/vsyscall64 should

	  not be changed).

	  The kernel selects the PM timer only as a last resort, so it is

	  useful to enable just in case.



config HPET_EMULATE_RTC

	bool "Provide RTC interrupt"

	depends on HPET_TIMER && RTC=y

drivers/acpi/Kconfig

+3 −5
Original line number Diff line number Diff line
@@ -285,9 +285,8 @@ config ACPI_SYSTEM 
	  dump your ACPI DSDT table using /proc/acpi/dsdt.



config X86_PM_TIMER

	bool "Power Management Timer Support"

	bool "Power Management Timer Support" if EMBEDDED

	depends on X86

	depends on !X86_64

	default y

	help

	  The Power Management Timer is available on all ACPI-capable,
@@ -298,9 +297,8 @@ config X86_PM_TIMER 
	  voltage scaling, unlike the commonly used Time Stamp Counter

	  (TSC) timing source.



	  So, if you see messages like 'Losing too many ticks!' in the

	  kernel logs, and/or you are using this on a notebook which

	  does not yet have an HPET, you should say "Y" here.

	  You should nearly always say Y here because many modern

	  systems require this timer. 



config ACPI_CONTAINER

	tristate "ACPI0004,PNP0A05 and PNP0A06 Container Driver (EXPERIMENTAL)"