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

Commit 99558f0b authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

sparseirq: Change irq_desc_ptrs to static 



Add replace_irq_desc() instead of poking at the array directly.

-v2: remove unneeded boundary check in replace_irq_desc

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-31-git-send-email-yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 773e3eb7

kernel/irq/handle.c

+6 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void init_one_irq_desc(int irq, struct irq_desc *desc, int node) 
 */

DEFINE_RAW_SPINLOCK(sparse_irq_lock);



struct irq_desc **irq_desc_ptrs __read_mostly;

static struct irq_desc **irq_desc_ptrs __read_mostly;



static struct irq_desc irq_desc_legacy[NR_IRQS_LEGACY] __cacheline_aligned_in_smp = {

	[0 ... NR_IRQS_LEGACY-1] = {
@@ -192,6 +192,11 @@ struct irq_desc *irq_to_desc(unsigned int irq) 
	return NULL;

}



void replace_irq_desc(unsigned int irq, struct irq_desc *desc)

{

	irq_desc_ptrs[irq] = desc;

}



struct irq_desc * __ref irq_to_desc_alloc_node(unsigned int irq, int node)

{

	struct irq_desc *desc;

kernel/irq/internals.h

+1 −5
Original line number Diff line number Diff line
@@ -21,11 +21,7 @@ extern void clear_kstat_irqs(struct irq_desc *desc); 
extern raw_spinlock_t sparse_irq_lock;



#ifdef CONFIG_SPARSE_IRQ

/* irq_desc_ptrs allocated at boot time */

extern struct irq_desc **irq_desc_ptrs;

#else

/* irq_desc_ptrs is a fixed size array */

extern struct irq_desc *irq_desc_ptrs[NR_IRQS];

void replace_irq_desc(unsigned int irq, struct irq_desc *desc);

#endif



#ifdef CONFIG_PROC_FS

kernel/irq/numa_migrate.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc, 
	raw_spin_lock_irqsave(&sparse_irq_lock, flags);



	/* We have to check it to avoid races with another CPU */

	desc = irq_desc_ptrs[irq];

	desc = irq_to_desc(irq);



	if (desc && old_desc != desc)

		goto out_unlock;
@@ -90,7 +90,7 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc, 
		goto out_unlock;

	}



	irq_desc_ptrs[irq] = desc;

	replace_irq_desc(irq, desc);

	raw_spin_unlock_irqrestore(&sparse_irq_lock, flags);



	/* free the old one */