diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
| commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 (patch) | |
| tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 /include/acpi/processor.h | |
| parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 06ebb6ef72aa..3795590e152a 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
| @@ -255,7 +255,7 @@ extern void acpi_processor_unregister_performance(struct | |||
| 255 | int acpi_processor_notify_smm(struct module *calling_module); | 255 | int acpi_processor_notify_smm(struct module *calling_module); |
| 256 | 256 | ||
| 257 | /* for communication between multiple parts of the processor kernel module */ | 257 | /* for communication between multiple parts of the processor kernel module */ |
| 258 | extern struct acpi_processor *processors[NR_CPUS]; | 258 | DECLARE_PER_CPU(struct acpi_processor *, processors); |
| 259 | extern struct acpi_processor_errata errata; | 259 | extern struct acpi_processor_errata errata; |
| 260 | 260 | ||
| 261 | void arch_acpi_processor_init_pdc(struct acpi_processor *pr); | 261 | void arch_acpi_processor_init_pdc(struct acpi_processor *pr); |