git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
acpi
/
processor_core.c
diff --git
a/drivers/acpi/processor_core.c
b/drivers/acpi/processor_core.c
index
84e0f3c
..
2cc4b30
100644
(file)
--- a/
drivers/acpi/processor_core.c
+++ b/
drivers/acpi/processor_core.c
@@
-1151,6
+1151,9
@@
static int __init acpi_processor_init(void)
{
int result = 0;
+ if (acpi_disabled)
+ return 0;
+
memset(&errata, 0, sizeof(errata));
#ifdef CONFIG_SMP
@@
-1197,6
+1200,9
@@
out_proc:
static void __exit acpi_processor_exit(void)
{
+ if (acpi_disabled)
+ return;
+
acpi_processor_ppc_exit();
acpi_thermal_cpufreq_exit();