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

Commit 3fde6900 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: change __setup_vector_irq with setup_vector_irq 



We create a version of it for i386, and then take the CONFIG_X86_64
ifdef out of the game. We could create a __setup_vector_irq for i386,
but it would incur in an unnecessary lock taking. Moreover, it is better
practice to only export setup_vector_irq anyway.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 86e430ed

arch/x86/kernel/io_apic_32.c

+5 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,11 @@ static int assign_irq_vector(int irq) 


	return vector;

}



void setup_vector_irq(int cpu)

{

}



static struct irq_chip ioapic_chip;



#define IOAPIC_AUTO	-1

arch/x86/kernel/io_apic_64.c

+8 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ static void __clear_irq_vector(int irq) 
	cpus_clear(cfg->domain);

}



void __setup_vector_irq(int cpu)

static void __setup_vector_irq(int cpu)

{

	/* Initialize vector_irq on a new cpu */

	/* This function must be called with vector_lock held */
@@ -824,6 +824,13 @@ void __setup_vector_irq(int cpu) 
	}

}



void setup_vector_irq(int cpu)

{

	spin_lock(&vector_lock);

	__setup_vector_irq(smp_processor_id());

	spin_unlock(&vector_lock);

}





static struct irq_chip ioapic_chip;

arch/x86/kernel/smpboot.c

+2 −9
Original line number Diff line number Diff line
@@ -329,15 +329,8 @@ static void __cpuinit start_secondary(void *unused) 
	 * smp_call_function().

	 */

	lock_ipi_call_lock();

#ifdef CONFIG_X86_64

	spin_lock(&vector_lock);



	/* Setup the per cpu irq handling data structures */

	__setup_vector_irq(smp_processor_id());

	/*

	 * Allow the master to continue.

	 */

	spin_unlock(&vector_lock);

#ifdef CONFIG_X86_IO_APIC

	setup_vector_irq(smp_processor_id());

#endif

	cpu_set(smp_processor_id(), cpu_online_map);

	unlock_ipi_call_lock();

include/asm-x86/hw_irq.h

+1 −1
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ extern void (*const interrupt[NR_IRQS])(void); 
#else

typedef int vector_irq_t[NR_VECTORS];

DECLARE_PER_CPU(vector_irq_t, vector_irq);

extern void __setup_vector_irq(int cpu);

extern spinlock_t vector_lock;

#endif

extern void setup_vector_irq(int cpu);



#endif /* !ASSEMBLY_ */