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

Commit e520c410 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

xtensa: convert to asm-generic/hardirq.h 



Also remove lots of unused irq_cpustat fields.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 498900fc

arch/xtensa/include/asm/hardirq.h

+3 −12
Original line number Diff line number Diff line
@@ -11,18 +11,9 @@ 
#ifndef _XTENSA_HARDIRQ_H

#define _XTENSA_HARDIRQ_H



#include <linux/cache.h>

#include <asm/irq.h>



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

typedef struct {

	unsigned int __softirq_pending;

	unsigned int __syscall_count;

	struct task_struct * __ksoftirqd_task; /* waitqueue is too large */

	unsigned int __nmi_count;	       /* arch dependent */

} ____cacheline_aligned irq_cpustat_t;



void ack_bad_irq(unsigned int irq);

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

#define ack_bad_irq ack_bad_irq



#include <asm-generic/hardirq.h>



#endif	/* _XTENSA_HARDIRQ_H */

arch/xtensa/kernel/irq.c

+0 −9
Original line number Diff line number Diff line
@@ -26,15 +26,6 @@ static unsigned int cached_irq_mask; 


atomic_t irq_err_count;



/*

 * 'what should we do if we get a hw irq event on an illegal vector'.

 * each architecture has to answer this themselves.

 */

void ack_bad_irq(unsigned int irq)

{

          printk("unexpected IRQ trap at vector %02x\n", irq);

}



/*

 * do_IRQ handles all normal device IRQ's (the special

 * SMP cross-CPU interrupts have their own specific