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

Commit 10f939ff authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge MMU and non-MMU versions of asm/hardirq.h 



The contents of asm/hardirq.h are pretty strait forward for both the
MMU (hardirq_mm.h) and non-MMU (hardirq_no.h) include files. Merge the
two back into a single file.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent a66af298

arch/m68k/include/asm/hardirq.h

+32 −3
Original line number Original line Diff line number Diff line 
#ifdef __uClinux__

#ifndef __M68K_HARDIRQ_H

#include "hardirq_no.h"

#define __M68K_HARDIRQ_H



#include <linux/threads.h>

#include <linux/cache.h>

#include <asm/irq.h>



#define HARDIRQ_BITS	8



/*

 * The hardirq mask has to be large enough to have

 * space for potentially all IRQ sources in the system

 * nesting on a single CPU:

 */

#if (1 << HARDIRQ_BITS) < NR_IRQS

# error HARDIRQ_BITS is too low!

#endif



#ifdef CONFIG_MMU



/* entry.S is sensitive to the offsets of these fields */

typedef struct {

	unsigned int __softirq_pending;

} ____cacheline_aligned irq_cpustat_t;



#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */



#else

#else

#include "hardirq_mm.h"



#include <asm-generic/hardirq.h>



#endif /* !CONFIG_MMU */



#endif
 
#endif

arch/m68k/include/asm/hardirq_mm.h

deleted100644 → 0
+0 −16
Original line number Original line Diff line number Diff line 
#ifndef __M68K_HARDIRQ_H

#define __M68K_HARDIRQ_H



#include <linux/threads.h>

#include <linux/cache.h>



/* entry.S is sensitive to the offsets of these fields */

typedef struct {

	unsigned int __softirq_pending;

} ____cacheline_aligned irq_cpustat_t;



#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */



#define HARDIRQ_BITS	8



#endif

arch/m68k/include/asm/hardirq_no.h

deleted100644 → 0
+0 −19
Original line number Original line Diff line number Diff line 
#ifndef __M68K_HARDIRQ_H

#define __M68K_HARDIRQ_H



#include <asm/irq.h>



#define HARDIRQ_BITS	8



/*

 * The hardirq mask has to be large enough to have

 * space for potentially all IRQ sources in the system

 * nesting on a single CPU:

 */

#if (1 << HARDIRQ_BITS) < NR_IRQS

# error HARDIRQ_BITS is too low!

#endif



#include <asm-generic/hardirq.h>



#endif /* __M68K_HARDIRQ_H */

arch/m68k/include/asm/irq.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -32,15 +32,6 @@ 
#include <linux/irqreturn.h>

#include <linux/irqreturn.h>

#include <linux/spinlock_types.h>

#include <linux/spinlock_types.h>





/*

 * The hardirq mask has to be large enough to have

 * space for potentially all IRQ sources in the system

 * nesting on a single CPU:

 */

#if (1 << HARDIRQ_BITS) < NR_IRQS

# error HARDIRQ_BITS is too low!

#endif



/*

/*

 * Interrupt source definitions

 * Interrupt source definitions

 * General interrupt sources are the level 1-7.

 * General interrupt sources are the level 1-7.