diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 16:19:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 16:19:32 -0400 |
| commit | d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4 (patch) | |
| tree | 1051c0dbd14bcd05b9a17a08b6af1f25b0a9c0d6 /arch/x86/kernel/apic/apic.c | |
| parent | 46ac0cc92eedf92f7909e563ffcd2dbc4b914bc3 (diff) | |
| parent | f82c3d71d6fd2e6a3e3416f09099e29087e39abf (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, pci, mrst: Add extra sanity check in walking the PCI extended cap chain
x86: Fix x2apic preenabled system with kexec
x86: Force HPET readback_cmp for all ATI chipsets
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index c02cc692985c..a96489ee6cab 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
| @@ -921,7 +921,7 @@ void disable_local_APIC(void) | |||
| 921 | unsigned int value; | 921 | unsigned int value; |
| 922 | 922 | ||
| 923 | /* APIC hasn't been mapped yet */ | 923 | /* APIC hasn't been mapped yet */ |
| 924 | if (!apic_phys) | 924 | if (!x2apic_mode && !apic_phys) |
| 925 | return; | 925 | return; |
| 926 | 926 | ||
| 927 | clear_local_APIC(); | 927 | clear_local_APIC(); |