diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-18 23:06:08 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-18 23:06:08 +0100 |
| commit | 05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 (patch) | |
| tree | 65a01a1e0bc0e28c64fb5105cc763949f5412b4b /arch/x86/include | |
| parent | Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next (diff) | |
| parent | ACPICA: Update version to 20110211. (diff) | |
| download | linux-05534c9ffc9d5d950b14de8ba49a7609dc59b0b8.tar.xz linux-05534c9ffc9d5d950b14de8ba49a7609dc59b0b8.zip | |
Merge branch 'acpica' into release
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/acpi.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/smpboot_hooks.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index aa92684aa674..ef14da1f4ec5 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -88,6 +88,7 @@ extern int acpi_disabled; extern int acpi_pci_disabled; extern int acpi_skip_timer_override; extern int acpi_use_timer_override; +extern int acpi_fix_pin2_polarity; extern u8 acpi_sci_flags; extern int acpi_sci_override_gsi; diff --git a/arch/x86/include/asm/smpboot_hooks.h b/arch/x86/include/asm/smpboot_hooks.h index 6c22bf353f26..725b77831993 100644 --- a/arch/x86/include/asm/smpboot_hooks.h +++ b/arch/x86/include/asm/smpboot_hooks.h @@ -34,7 +34,7 @@ static inline void smpboot_restore_warm_reset_vector(void) */ CMOS_WRITE(0, 0xf); - *((volatile long *)phys_to_virt(apic->trampoline_phys_low)) = 0; + *((volatile u32 *)phys_to_virt(apic->trampoline_phys_low)) = 0; } static inline void __init smpboot_setup_io_apic(void) |