Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e62feab authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'x86/cleanups' into irq/sparseirq 



Reason: Avoid conflicts with removal of boot_cpu_id

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 8ffcfa4e 234bb549

arch/x86/include/asm/apb_timer.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/include/asm/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

arch/x86/kernel/apb_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/apic/io_apic.c

+6 −6
Original line number Diff line number Diff line
@@ -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);
@@ -1469,7 +1469,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");
@@ -1534,7 +1534,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;
@@ -2913,7 +2913,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;
@@ -3267,7 +3267,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;
@@ -3882,7 +3882,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) {

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -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;



	/*