Commit 97179fd4 authored by David Daney's avatar David Daney Committed by Linus Torvalds
Browse files

cpumask fallout: Initialize irq_default_affinity earlier 



Move the initialization of irq_default_affinity to early_irq_init as
core_initcall is too late.

irq_default_affinity can be used in init_IRQ and potentially timer and
SMP init as well.  All of these happen before core_initcall.  Moving
the initialization to early_irq_init ensures that it is initialized
before it is used.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Acked-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1267a8df

kernel/irq/handle.c

+16 −0
Original line number Diff line number Diff line
@@ -39,6 +39,18 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc) 
	ack_bad_irq(irq);

}



#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)

static void __init init_irq_default_affinity(void)

{

	alloc_bootmem_cpumask_var(&irq_default_affinity);

	cpumask_setall(irq_default_affinity);

}

#else

static void __init init_irq_default_affinity(void)

{

}

#endif



/*

 * Linux has a controller-independent interrupt architecture.

 * Every controller has a 'controller-template', that is used
@@ -134,6 +146,8 @@ int __init early_irq_init(void) 
	int legacy_count;

	int i;



	init_irq_default_affinity();



	desc = irq_desc_legacy;

	legacy_count = ARRAY_SIZE(irq_desc_legacy);
@@ -219,6 +233,8 @@ int __init early_irq_init(void) 
	int count;

	int i;



	init_irq_default_affinity();



	desc = irq_desc;

	count = ARRAY_SIZE(irq_desc);

kernel/irq/manage.c

+0 −8
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ 
#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)

cpumask_var_t irq_default_affinity;



static int init_irq_default_affinity(void)

{

	alloc_cpumask_var(&irq_default_affinity, GFP_KERNEL);

	cpumask_setall(irq_default_affinity);

	return 0;

}

core_initcall(init_irq_default_affinity);



/**

 *	synchronize_irq - wait for pending IRQ handlers (on other CPUs)

 *	@irq: interrupt number to wait for

CRA Git | Maintained and supported by SUSTech CRA and CCSE