diff options
-rw-r--r-- | arch/ia64/include/asm/acpi.h | 1 | ||||
-rw-r--r-- | arch/ia64/kernel/acpi.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index d651102a4d45..b47821931ca6 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h | |||
@@ -85,6 +85,7 @@ ia64_acpi_release_global_lock (unsigned int *lock) | |||
85 | ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) | 85 | ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock)) |
86 | 86 | ||
87 | #ifdef CONFIG_ACPI | 87 | #ifdef CONFIG_ACPI |
88 | extern int acpi_lapic; | ||
88 | #define acpi_disabled 0 /* ACPI always enabled on IA64 */ | 89 | #define acpi_disabled 0 /* ACPI always enabled on IA64 */ |
89 | #define acpi_noirq 0 /* ACPI always enabled on IA64 */ | 90 | #define acpi_noirq 0 /* ACPI always enabled on IA64 */ |
90 | #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ | 91 | #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ |
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 0d407b300762..615ef81def49 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -56,6 +56,7 @@ | |||
56 | 56 | ||
57 | #define PREFIX "ACPI: " | 57 | #define PREFIX "ACPI: " |
58 | 58 | ||
59 | int acpi_lapic; | ||
59 | unsigned int acpi_cpei_override; | 60 | unsigned int acpi_cpei_override; |
60 | unsigned int acpi_cpei_phys_cpuid; | 61 | unsigned int acpi_cpei_phys_cpuid; |
61 | 62 | ||
@@ -676,6 +677,8 @@ int __init early_acpi_boot_init(void) | |||
676 | if (ret < 1) | 677 | if (ret < 1) |
677 | printk(KERN_ERR PREFIX | 678 | printk(KERN_ERR PREFIX |
678 | "Error parsing MADT - no LAPIC entries\n"); | 679 | "Error parsing MADT - no LAPIC entries\n"); |
680 | else | ||
681 | acpi_lapic = 1; | ||
679 | 682 | ||
680 | #ifdef CONFIG_SMP | 683 | #ifdef CONFIG_SMP |
681 | if (available_cpus == 0) { | 684 | if (available_cpus == 0) { |