diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
| commit | 05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 (patch) | |
| tree | 65a01a1e0bc0e28c64fb5105cc763949f5412b4b /arch/x86/include/asm/smpboot_hooks.h | |
| parent | dd87cc53c42f3260b7eb7f60822de0fa9e58af59 (diff) | |
| parent | 589c7a39ae2f2b74fd13ae344ca1dcca61da6bca (diff) | |
Merge branch 'acpica' into release
Diffstat (limited to 'arch/x86/include/asm/smpboot_hooks.h')
| -rw-r--r-- | arch/x86/include/asm/smpboot_hooks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/smpboot_hooks.h b/arch/x86/include/asm/smpboot_hooks.h index 6c22bf353f2..725b7783199 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) | |||
| 34 | */ | 34 | */ |
| 35 | CMOS_WRITE(0, 0xf); | 35 | CMOS_WRITE(0, 0xf); |
| 36 | 36 | ||
| 37 | *((volatile long *)phys_to_virt(apic->trampoline_phys_low)) = 0; | 37 | *((volatile u32 *)phys_to_virt(apic->trampoline_phys_low)) = 0; |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | static inline void __init smpboot_setup_io_apic(void) | 40 | static inline void __init smpboot_setup_io_apic(void) |