diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 09:50:18 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 09:50:18 +0100 |
| commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
| tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /arch/x86_64/kernel/smpboot.c | |
| parent | [ACPI] fix pnpacpi regression resulting from ACPICA 20051117 (diff) | |
| parent | [ACPI] enable PNPACPI support for resource types used by HP serial ports (diff) | |
| download | linux-ed03f430cdc8c802652467e9097606fedc2c7abc.tar.xz linux-ed03f430cdc8c802652467e9097606fedc2c7abc.zip | |
Pull pnpacpi into acpica branch
Diffstat (limited to 'arch/x86_64/kernel/smpboot.c')
| -rw-r--r-- | arch/x86_64/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 683c33f7b967..ecbd7b83acc1 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c @@ -1181,7 +1181,7 @@ int __cpu_disable(void) if (cpu == 0) return -EBUSY; - disable_APIC_timer(); + clear_local_APIC(); /* * HACK: |