diff options
Diffstat (limited to 'arch/x86/kernel/apic_32.c')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 56352c11a896..1ee443a8e61b 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -1078,7 +1078,7 @@ static int __init detect_init_APIC (void) | |||
1078 | printk(KERN_WARNING "Could not enable APIC!\n"); | 1078 | printk(KERN_WARNING "Could not enable APIC!\n"); |
1079 | return -1; | 1079 | return -1; |
1080 | } | 1080 | } |
1081 | set_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability); | 1081 | set_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); |
1082 | mp_lapic_addr = APIC_DEFAULT_PHYS_BASE; | 1082 | mp_lapic_addr = APIC_DEFAULT_PHYS_BASE; |
1083 | 1083 | ||
1084 | /* The BIOS may have set up the APIC at some other address */ | 1084 | /* The BIOS may have set up the APIC at some other address */ |
@@ -1168,7 +1168,7 @@ fake_ioapic_page: | |||
1168 | int __init APIC_init_uniprocessor (void) | 1168 | int __init APIC_init_uniprocessor (void) |
1169 | { | 1169 | { |
1170 | if (enable_local_apic < 0) | 1170 | if (enable_local_apic < 0) |
1171 | clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability); | 1171 | clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); |
1172 | 1172 | ||
1173 | if (!smp_found_config && !cpu_has_apic) | 1173 | if (!smp_found_config && !cpu_has_apic) |
1174 | return -1; | 1174 | return -1; |
@@ -1180,7 +1180,7 @@ int __init APIC_init_uniprocessor (void) | |||
1180 | APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) { | 1180 | APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) { |
1181 | printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n", | 1181 | printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n", |
1182 | boot_cpu_physical_apicid); | 1182 | boot_cpu_physical_apicid); |
1183 | clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability); | 1183 | clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); |
1184 | return -1; | 1184 | return -1; |
1185 | } | 1185 | } |
1186 | 1186 | ||
@@ -1536,7 +1536,7 @@ early_param("lapic", parse_lapic); | |||
1536 | static int __init parse_nolapic(char *arg) | 1536 | static int __init parse_nolapic(char *arg) |
1537 | { | 1537 | { |
1538 | enable_local_apic = -1; | 1538 | enable_local_apic = -1; |
1539 | clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability); | 1539 | clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); |
1540 | return 0; | 1540 | return 0; |
1541 | } | 1541 | } |
1542 | early_param("nolapic", parse_nolapic); | 1542 | early_param("nolapic", parse_nolapic); |