Commit e4251e130deef9de5226cc36faa70a1c6671d3c5
Committed by
Andi Kleen
Andi Kleen
1 parent
f2c2cca3ac
Exists in
master
and in
4 other branches
[PATCH] Remove some cruft in apic id checking during processor setup
- Remove a define that was used only once - Remove the too large APIC ID check because we always support the full 8bit range of APICs. - Restructure code a bit to be simpler. Cc: len.brown@intel.com Signed-off-by: Andi Kleen <ak@suse.de>
Showing 2 changed files with 1 additions and 19 deletions Side-by-side Diff
arch/x86_64/kernel/mpparse.c
| ... | ... | @@ -100,7 +100,6 @@ |
| 100 | 100 | disabled_cpus++; |
| 101 | 101 | return; |
| 102 | 102 | } |
| 103 | - | |
| 104 | 103 | if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { |
| 105 | 104 | bootup_cpu = " (Bootup-CPU)"; |
| 106 | 105 | boot_cpu_id = m->mpc_apicid; |
| ... | ... | @@ -118,13 +117,6 @@ |
| 118 | 117 | cpus_complement(tmp_map, cpu_present_map); |
| 119 | 118 | cpu = first_cpu(tmp_map); |
| 120 | 119 | |
| 121 | -#if MAX_APICS < 255 | |
| 122 | - if ((int)m->mpc_apicid > MAX_APICS) { | |
| 123 | - printk(KERN_ERR "Processor #%d INVALID. (Max ID: %d).\n", | |
| 124 | - m->mpc_apicid, MAX_APICS); | |
| 125 | - return; | |
| 126 | - } | |
| 127 | -#endif | |
| 128 | 120 | physid_set(m->mpc_apicid, phys_cpu_present_map); |
| 129 | 121 | if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { |
| 130 | 122 | /* |
| ... | ... | @@ -603,8 +595,6 @@ |
| 603 | 595 | set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr); |
| 604 | 596 | if (boot_cpu_id == -1U) |
| 605 | 597 | boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID)); |
| 606 | - | |
| 607 | - Dprintk("Boot CPU = %d\n", boot_cpu_physical_apicid); | |
| 608 | 598 | } |
| 609 | 599 | |
| 610 | 600 | void __cpuinit mp_register_lapic (u8 id, u8 enabled) |
| ... | ... | @@ -612,13 +602,7 @@ |
| 612 | 602 | struct mpc_config_processor processor; |
| 613 | 603 | int boot_cpu = 0; |
| 614 | 604 | |
| 615 | - if (id >= MAX_APICS) { | |
| 616 | - printk(KERN_WARNING "Processor #%d invalid (max %d)\n", | |
| 617 | - id, MAX_APICS); | |
| 618 | - return; | |
| 619 | - } | |
| 620 | - | |
| 621 | - if (id == boot_cpu_physical_apicid) | |
| 605 | + if (id == boot_cpu_id) | |
| 622 | 606 | boot_cpu = 1; |
| 623 | 607 | |
| 624 | 608 | processor.mpc_type = MP_PROCESSOR; |