diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:19:22 -0400 |
| commit | f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch) | |
| tree | 44419bd03c33e662302dd003f57d36e133144f91 /arch/x86/kernel/apic/apic.c | |
| parent | e910b63d009701ad4ebbeb089aba35707fa5d68e (diff) | |
| parent | 5da3e714e30d40145f4dd37d79de6bbbcb9e6137 (diff) | |
Merge branch 'shmobile' into devel
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(); |