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

Commit 3e57615b authored by linuxppc@jdl.com's avatar linuxppc@jdl.com Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Revised merge asm-ppc*/hardirq.h 



This is a revised patch to merge asm-ppc*/hardirq.h.
It removes some unnecessary #includes, but then requires
the addition of #include <asm/irq.h> in PPC32's hw_irq.h
much like ppc64 already does.  Furthermore, several
unnecessary #includes were removed from some ppc32 boards
in order to break resulting bad #include cycles.

Builds pSeries_defconfig and all ppc32 platforms except
the already b0rken bseip.

Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c7aeffc4

arch/ppc/platforms/83xx/mpc834x_sys.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <linux/config.h>

#include <linux/init.h>

#include <linux/seq_file.h>

#include <syslib/ppc83xx_setup.h>

#include <asm/ppcboot.h>

arch/ppc/platforms/85xx/mpc85xx_ads_common.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <linux/config.h>

#include <linux/init.h>

#include <linux/seq_file.h>

#include <asm/ppcboot.h>



#define BOARD_CCSRBAR		((uint)0xe0000000)

arch/ppc/platforms/85xx/stx_gp3.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#include <linux/config.h>

#include <linux/init.h>

#include <linux/seq_file.h>

#include <asm/ppcboot.h>



#define BOARD_CCSRBAR		((uint)0xe0000000)

include/asm-ppc/hardirq.h→include/asm-powerpc/hardirq.h

+4 −11
Original line number Diff line number Diff line 
#ifdef __KERNEL__

#ifndef __ASM_HARDIRQ_H

#define __ASM_HARDIRQ_H



#include <linux/config.h>

#include <linux/cache.h>

#include <linux/smp_lock.h>

#include <asm/irq.h>

#ifndef _ASM_POWERPC_HARDIRQ_H

#define _ASM_POWERPC_HARDIRQ_H



/* The __last_jiffy_stamp field is needed to ensure that no decrementer

 * interrupt is lost on SMP machines. Since on most CPUs it is in the same
@@ -13,7 +7,7 @@ 
 * for uniformity.

 */

typedef struct {

	unsigned long __softirq_pending;	/* set_bit is used on this */

	unsigned int __softirq_pending;	/* set_bit is used on this */

	unsigned int __last_jiffy_stamp;

} ____cacheline_aligned irq_cpustat_t;
@@ -27,5 +21,4 @@ static inline void ack_bad_irq(int irq) 
	BUG();

}



#endif /* __ASM_HARDIRQ_H */

#endif /* __KERNEL__ */
 
#endif /* _ASM_POWERPC_HARDIRQ_H */

include/asm-ppc/hw_irq.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <asm/ptrace.h>

#include <asm/reg.h>

#include <asm/irq.h>



extern void timer_interrupt(struct pt_regs *);