diff options
| author | Al Stone <al.stone@linaro.org> | 2013-11-22 15:13:13 -0700 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-11-26 12:19:57 +0000 |
| commit | b80b713b86c62636c2b08cd1a1b2d53f3448579c (patch) | |
| tree | 0bbffab0a4d1b846256351d0494b83ebe0bef654 | |
| parent | 53abf75d76989a674f4e660a01c24285b8d655b4 (diff) | |
ACPI: ARM: clean up comments and disable PAD code for ARM
Remove a bunch of comments left over from some initial prototyping work.
PAD (Processor Aggregator Device) is intended for use on x86 systems for
now. Remove it from the ACPI configuration options for ARM.
Signed-off-by: Al Stone <al.stone@linaro.org>
| -rw-r--r-- | drivers/acpi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpi_pad.c | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index eade8916498a..32ec313a734a 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -205,7 +205,7 @@ config ACPI_HOTPLUG_CPU config ACPI_PROCESSOR_AGGREGATOR tristate "Processor Aggregator" depends on ACPI_PROCESSOR - depends on X86 || ARM || ARM64 + depends on X86 help ACPI 4.0 defines processor Aggregator, which enables OS to perform specific processor configuration and control that applies to all diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index 36d993c1aee9..129e052b9f28 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c @@ -30,10 +30,7 @@ #include <linux/slab.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ #include <asm/mwait.h> -#endif #define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" @@ -50,8 +47,6 @@ static unsigned char lapic_marked_unstable; static void power_saving_mwait_init(void) { -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ unsigned int eax, ebx, ecx, edx; unsigned int highest_cstate = 0; unsigned int highest_subcstate = 0; @@ -77,9 +72,7 @@ static void power_saving_mwait_init(void) } power_saving_mwait_eax = (highest_cstate << MWAIT_SUBSTATE_SIZE) | (highest_subcstate - 1); -#endif -#if defined(CONFIG_X86) switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: case X86_VENDOR_INTEL: @@ -97,7 +90,6 @@ static void power_saving_mwait_init(void) tsc_detected_unstable = 1; lapic_detected_unstable = 1; } -#endif } static unsigned long cpu_weight[NR_CPUS]; @@ -179,11 +171,8 @@ static int power_saving_thread(void *data) while (!need_resched()) { if (tsc_detected_unstable && !tsc_marked_unstable) { -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ /* TSC could halt in idle, so notify users */ mark_tsc_unstable("TSC halts in idle"); -#endif tsc_marked_unstable = 1; } if (lapic_detected_unstable && !lapic_marked_unstable) { @@ -202,16 +191,10 @@ static int power_saving_thread(void *data) CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu); stop_critical_timings(); -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ __monitor((void *)¤t_thread_info()->flags, 0, 0); -#endif smp_mb(); -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ if (!need_resched()) __mwait(power_saving_mwait_eax, 1); -#endif start_critical_timings(); if (lapic_marked_unstable) |