dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
linuxppc@jdl.com 2005-09-19 09:32:07 -05:00 committed by Paul Mackerras
parent c7aeffc4d3
commit 3e57615bb5
6 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/ppc/platforms/83xx/mpc834x_sys.h
View File

@ -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>

1
arch/ppc/platforms/85xx/mpc85xx_ads_common.h
View File

@ -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)

1
arch/ppc/platforms/85xx/stx_gp3.h
View File

@ -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)

15
include/asm-ppc/hardirq.h → include/asm-powerpc/hardirq.h
View File

@ -1,11 +1,5 @@
#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 */

1
include/asm-ppc/hw_irq.h
View File

@ -7,6 +7,7 @@
#include <asm/ptrace.h>
#include <asm/reg.h>
#include <asm/irq.h>
extern void timer_interrupt(struct pt_regs *);

27
include/asm-ppc64/hardirq.h
View File

@ -1,27 +0,0 @@
#ifndef __ASM_HARDIRQ_H
#define __ASM_HARDIRQ_H
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*/
#include <linux/config.h>
#include <linux/cache.h>
#include <linux/preempt.h>
typedef struct {
unsigned int __softirq_pending;
} ____cacheline_aligned irq_cpustat_t;
#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
static inline void ack_bad_irq(int irq)
{
printk(KERN_CRIT "illegal vector %d received!\n", irq);
BUG();
}
#endif /* __ASM_HARDIRQ_H */