Commit d7b90689 authored by Russell King's avatar Russell King Committed by Heiko Carstens
Browse files

[S390] genirq/clockevents: move irq affinity prototypes/inlines to interrupt.h 



> Generic code is not supposed to include irq.h. Replace this include
> by linux/hardirq.h instead and add/replace an include of linux/irq.h
> in asm header files where necessary.
> This change should only matter for architectures that make use of
> GENERIC_CLOCKEVENTS.
> Architectures in question are mips, x86, arm, sh, powerpc, uml and sparc64.
>
> I did some cross compile tests for mips, x86_64, arm, powerpc and sparc64.
> This patch fixes also build breakages caused by the include replacement in
> tick-common.h.

I generally dislike adding optional linux/* includes in asm/* includes -
I'm nervous about this causing include loops.

However, there's a separate point to be discussed here.

That is, what interfaces are expected of every architecture in the kernel.
If generic code wants to be able to set the affinity of interrupts, then
that needs to become part of the interfaces listed in linux/interrupt.h
rather than linux/irq.h.

So what I suggest is this approach instead (against Linus' tree of a
couple of days ago) - we move irq_set_affinity() and irq_can_set_affinity()
to linux/interrupt.h, change the linux/irq.h includes to linux/interrupt.h
and include asm/irq_regs.h where needed (asm/irq_regs.h is supposed to be
rarely used include since not much touches the stacked parent context
registers.)

Build tested on ARM PXA family kernels and ARM's Realview platform
kernels which both use genirq.

[ tglx@linutronix.de: add GENERIC_HARDIRQ dependencies ]

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 43ca5c3a

include/linux/interrupt.h

+19 −0
Original line number Diff line number Diff line
@@ -102,6 +102,25 @@ extern void disable_irq_nosync(unsigned int irq); 
extern void disable_irq(unsigned int irq);

extern void enable_irq(unsigned int irq);



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



extern int irq_set_affinity(unsigned int irq, cpumask_t cpumask);

extern int irq_can_set_affinity(unsigned int irq);



#else /* CONFIG_SMP */



static inline int irq_set_affinity(unsigned int irq, cpumask_t cpumask)

{

	return -EINVAL;

}



static inline int irq_can_set_affinity(unsigned int irq)

{

	return 0;

}



#endif /* CONFIG_SMP && CONFIG_GENERIC_HARDIRQS */



#ifdef CONFIG_GENERIC_HARDIRQS

/*

 * Special lockdep variants of irq disabling/enabling.

include/linux/irq.h

+0 −10
Original line number Diff line number Diff line
@@ -228,21 +228,11 @@ static inline void set_pending_irq(unsigned int irq, cpumask_t mask) 


#endif /* CONFIG_GENERIC_PENDING_IRQ */



extern int irq_set_affinity(unsigned int irq, cpumask_t cpumask);

extern int irq_can_set_affinity(unsigned int irq);



#else /* CONFIG_SMP */



#define move_native_irq(x)

#define move_masked_irq(x)



static inline int irq_set_affinity(unsigned int irq, cpumask_t cpumask)

{

	return -EINVAL;

}



static inline int irq_can_set_affinity(unsigned int irq) { return 0; }



#endif /* CONFIG_SMP */



#ifdef CONFIG_IRQBALANCE

kernel/time/tick-broadcast.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/cpu.h>

#include <linux/err.h>

#include <linux/hrtimer.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/percpu.h>

#include <linux/profile.h>

#include <linux/sched.h>

kernel/time/tick-common.c

+3 −1
Original line number Diff line number Diff line
@@ -14,12 +14,14 @@ 
#include <linux/cpu.h>

#include <linux/err.h>

#include <linux/hrtimer.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/percpu.h>

#include <linux/profile.h>

#include <linux/sched.h>

#include <linux/tick.h>



#include <asm/irq_regs.h>



#include "tick-internal.h"



/*

kernel/time/tick-oneshot.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/cpu.h>

#include <linux/err.h>

#include <linux/hrtimer.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/percpu.h>

#include <linux/profile.h>

#include <linux/sched.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE