Skip to content

Commit

Permalink
x86, cleanup: Remove obsolete boot_cpu_id variable
Browse files Browse the repository at this point in the history
boot_cpu_id is there for historical reasons and was renamed to
boot_cpu_physical_apicid in patch:

 c70dcb7 x86: change boot_cpu_id to boot_cpu_physical_apicid

However, there are some remaining occurrences of boot_cpu_id that are
never touched in the kernel and thus its value is always 0.

This patch removes boot_cpu_id completely.

Signed-off-by: Robert Richter <robert.richter@amd.com>
LKML-Reference: <1279731838-1522-8-git-send-email-robert.richter@amd.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Robert Richter authored and H. Peter Anvin committed Aug 12, 2010
1 parent ad41a1e commit f6e9456
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 18 deletions.
1 change: 0 additions & 1 deletion arch/x86/include/asm/apb_timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ extern struct clock_event_device *global_clock_event;
extern unsigned long apbt_quick_calibrate(void);
extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);
extern void apbt_setup_secondary_clock(void);
extern unsigned int boot_cpu_id;

extern struct sfi_timer_table_entry *sfi_get_mtmr(int hint);
extern void sfi_free_mtmr(struct sfi_timer_table_entry *mtmr);
Expand Down
1 change: 0 additions & 1 deletion arch/x86/include/asm/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ extern void arch_unregister_cpu(int);

DECLARE_PER_CPU(int, cpu_state);

extern unsigned int boot_cpu_id;

#endif /* _ASM_X86_CPU_H */
2 changes: 1 addition & 1 deletion arch/x86/kernel/apb_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void apbt_setup_secondary_clock(void)

/* Don't register boot CPU clockevent */
cpu = smp_processor_id();
if (cpu == boot_cpu_id)
if (!cpu)
return;
/*
* We need to calculate the scaled math multiplication factor for
Expand Down
12 changes: 6 additions & 6 deletions arch/x86/kernel/apic/io_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ int __init arch_early_irq_init(void)

cfg = irq_cfgx;
count = ARRAY_SIZE(irq_cfgx);
node= cpu_to_node(boot_cpu_id);
node = cpu_to_node(0);

for (i = 0; i < count; i++) {
desc = irq_to_desc(i);
Expand Down Expand Up @@ -1483,7 +1483,7 @@ static void __init setup_IO_APIC_irqs(void)
int notcon = 0;
struct irq_desc *desc;
struct irq_cfg *cfg;
int node = cpu_to_node(boot_cpu_id);
int node = cpu_to_node(0);

apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n");

Expand Down Expand Up @@ -1548,7 +1548,7 @@ static void __init setup_IO_APIC_irqs(void)
void setup_IO_APIC_irq_extra(u32 gsi)
{
int apic_id = 0, pin, idx, irq;
int node = cpu_to_node(boot_cpu_id);
int node = cpu_to_node(0);
struct irq_desc *desc;
struct irq_cfg *cfg;

Expand Down Expand Up @@ -2925,7 +2925,7 @@ static inline void __init check_timer(void)
{
struct irq_desc *desc = irq_to_desc(0);
struct irq_cfg *cfg = desc->chip_data;
int node = cpu_to_node(boot_cpu_id);
int node = cpu_to_node(0);
int apic1, pin1, apic2, pin2;
unsigned long flags;
int no_pin1 = 0;
Expand Down Expand Up @@ -3279,7 +3279,7 @@ unsigned int create_irq_nr(unsigned int irq_want, int node)

int create_irq(void)
{
int node = cpu_to_node(boot_cpu_id);
int node = cpu_to_node(0);
unsigned int irq_want;
int irq;

Expand Down Expand Up @@ -3901,7 +3901,7 @@ static int __io_apic_set_pci_routing(struct device *dev, int irq,
if (dev)
node = dev_to_node(dev);
else
node = cpu_to_node(boot_cpu_id);
node = cpu_to_node(0);

desc = irq_to_desc_alloc_node(irq, node);
if (!desc) {
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_SMP
/* calling is from identify_secondary_cpu() ? */
if (c->cpu_index == boot_cpu_id)
if (!c->cpu_index)
return;

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
this_cpu->c_early_init(c);

#ifdef CONFIG_SMP
c->cpu_index = boot_cpu_id;
c->cpu_index = 0;
#endif
filter_cpuid_features(c, false);
}
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/cpu/intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static void __cpuinit intel_smp_check(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_SMP
/* calling is from identify_secondary_cpu() ? */
if (c->cpu_index == boot_cpu_id)
if (!c->cpu_index)
return;

/*
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static int __init reboot_setup(char *str)
}
/* we will leave sorting out the final value
when we are ready to reboot, since we might not
have set up boot_cpu_id or smp_num_cpu */
have detected BSP APIC ID or smp_num_cpu */
break;
#endif /* CONFIG_SMP */

Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ unsigned long max_pfn_mapped;
RESERVE_BRK(dmi_alloc, 65536);
#endif

unsigned int boot_cpu_id __read_mostly;

static __initdata unsigned long _brk_start = (unsigned long)__brk_base;
unsigned long _brk_end = (unsigned long)__brk_base;
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/setup_percpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void __init setup_per_cpu_areas(void)
* Up to this point, the boot CPU has been using .init.data
* area. Reload any changed state for the boot CPU.
*/
if (cpu == boot_cpu_id)
if (!cpu)
switch_to_new_gdt(cpu);
}

Expand Down
6 changes: 3 additions & 3 deletions arch/x86/mm/k8topology_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ static __init int find_northbridge(void)
static __init void early_get_boot_cpu_id(void)
{
/*
* need to get boot_cpu_id so can use that to create apicid_to_node
* in k8_scan_nodes()
* need to get the APIC ID of the BSP so can use that to
* create apicid_to_node in k8_scan_nodes()
*/
#ifdef CONFIG_X86_MPPARSE
/*
Expand Down Expand Up @@ -212,7 +212,7 @@ int __init k8_scan_nodes(void)
bits = boot_cpu_data.x86_coreid_bits;
cores = (1<<bits);
apicid_base = 0;
/* need to get boot_cpu_id early for system with apicid lifting */
/* get the APIC ID of the BSP early for systems with apicid lifting */
early_get_boot_cpu_id();
if (boot_cpu_physical_apicid > 0) {
pr_info("BSP APIC ID: %02x\n", boot_cpu_physical_apicid);
Expand Down

0 comments on commit f6e9456

Please sign in to comment.