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

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

FRV: Use asm/generic-hardirq.h 



Use asm/generic-hardirq.h to build asm/hardirq.h and also remove the unused
idle_timestamp field in irq_cpustat whilst we're at it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d19110ba

arch/frv/include/asm/hardirq.h

+4 −13
Original line number Diff line number Diff line
@@ -12,24 +12,15 @@ 
#ifndef __ASM_HARDIRQ_H

#define __ASM_HARDIRQ_H



#include <linux/threads.h>

#include <linux/irq.h>



typedef struct {

	unsigned int __softirq_pending;

	unsigned long idle_timestamp;

} ____cacheline_aligned irq_cpustat_t;



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



#ifdef CONFIG_SMP

#error SMP not available on FR-V

#endif /* CONFIG_SMP */

#include <asm/atomic.h>



extern atomic_t irq_err_count;

static inline void ack_bad_irq(int irq)

{

	atomic_inc(&irq_err_count);

}

#define ack_bad_irq ack_bad_irq



#include <asm-generic/hardirq.h>



#endif

arch/frv/kernel/process.c

+0 −4
Original line number Diff line number Diff line
@@ -83,13 +83,9 @@ void (*idle)(void) = core_sleep_idle; 
 */

void cpu_idle(void)

{

	int cpu = smp_processor_id();



	/* endless idle loop with no priority at all */

	while (1) {

		while (!need_resched()) {

			irq_stat[cpu].idle_timestamp = jiffies;



			check_pgt_cache();



			if (!frv_dma_inprogress && idle)