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

Commit c4168505 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

sparc32: convert to asm-generic/hardirq.h 



From: Christoph Hellwig <hch@lst.de>

[akpm@linux-foundation.org: /arch/sparc/include/asm/irq_32.h: move NR_IRQS definition]

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1751388

arch/sparc/include/asm/hardirq_32.h

+1 −11
Original line number Diff line number Diff line
@@ -7,17 +7,7 @@ 
#ifndef __SPARC_HARDIRQ_H

#define __SPARC_HARDIRQ_H



#include <linux/threads.h>

#include <linux/spinlock.h>

#include <linux/cache.h>



/* entry.S is sensitive to the offsets of these fields */ /* XXX P3 Is it? */

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

#include <asm-generic/hardirq.h>



#endif /* __SPARC_HARDIRQ_H */

arch/sparc/include/asm/irq_32.h

+2 −2
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
#ifndef _SPARC_IRQ_H

#define _SPARC_IRQ_H



#include <linux/interrupt.h>



#define NR_IRQS    16



#include <linux/interrupt.h>



#define irq_canonicalize(irq)	(irq)



extern void __init init_IRQ(void);