diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:11:24 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:11:24 +0100 |
| commit | 3fbc4d63744b21ed6814ce768672531500bd3f14 (patch) | |
| tree | 661663d6d5e577e0a4462e89ee8d693298c7eb44 /arch/x86/include | |
| parent | 8e32e47dbb98fd24e4c541753427a576e6ab5bb3 (diff) | |
| parent | 764d022133979f9d9a179152cd89717e9752c61a (diff) | |
| download | talos-obmc-linux-3fbc4d63744b21ed6814ce768672531500bd3f14.tar.gz talos-obmc-linux-3fbc4d63744b21ed6814ce768672531500bd3f14.zip | |
Merge branch 'acpi-processor'
* acpi-processor:
ACPI / processor: fixed a brace coding style issue
ACPI / processor: Remove outdated comments
ACPI / processor: remove unnecessary if (!pr) check
ACPI / processor: remove some dead code in acpi_processor_get_info()
x86 / ACPI: simplify _acpi_map_lsapic()
ACPI / processor: use apic_id and remove duplicated _MAT evaluation
ACPI / processor: Introduce apic_id in struct processor to save parsed APIC id
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mpspec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 626cf70082d7..3142a94c7b4b 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -94,7 +94,7 @@ static inline void early_reserve_e820_mpc_new(void) { } #define default_get_smp_config x86_init_uint_noop #endif -void generic_processor_info(int apicid, int version); +int generic_processor_info(int apicid, int version); #ifdef CONFIG_ACPI extern void mp_register_ioapic(int id, u32 address, u32 gsi_base); extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, |
