Commit 22da7b3d authored by Brian Gerst's avatar Brian Gerst Committed by Tejun Heo
Browse files

x86: merge hardirq_{32,64}.h into hardirq.h 



Impact: cleanup

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 658a9a2c

arch/x86/include/asm/hardirq.h

+38 −5
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "hardirq_32.h"

#else

# include "hardirq_64.h"

#endif

#ifndef _ASM_X86_HARDIRQ_H

#define _ASM_X86_HARDIRQ_H



#include <linux/threads.h>

#include <linux/irq.h>



typedef struct {

	unsigned int __softirq_pending;

	unsigned int __nmi_count;	/* arch dependent */

	unsigned int apic_timer_irqs;	/* arch dependent */

	unsigned int irq0_irqs;

	unsigned int irq_resched_count;

	unsigned int irq_call_count;

	unsigned int irq_tlb_count;

	unsigned int irq_thermal_count;

	unsigned int irq_spurious_count;

	unsigned int irq_threshold_count;

} ____cacheline_aligned irq_cpustat_t;



DECLARE_PER_CPU(irq_cpustat_t, irq_stat);



/* We can have at most NR_VECTORS irqs routed to a cpu at a time */

#define MAX_HARDIRQS_PER_CPU NR_VECTORS



#define __ARCH_IRQ_STAT



#define inc_irq_stat(member)	percpu_add(irq_stat.member, 1)



#define local_softirq_pending()	percpu_read(irq_stat.__softirq_pending)



#define __ARCH_SET_SOFTIRQ_PENDING



#define set_softirq_pending(x)	percpu_write(irq_stat.__softirq_pending, (x))

#define or_softirq_pending(x)	percpu_or(irq_stat.__softirq_pending, (x))



extern void ack_bad_irq(unsigned int irq);



extern u64 arch_irq_stat_cpu(unsigned int cpu);

#define arch_irq_stat_cpu	arch_irq_stat_cpu



extern u64 arch_irq_stat(void);

#define arch_irq_stat		arch_irq_stat



#endif /* _ASM_X86_HARDIRQ_H */

arch/x86/include/asm/hardirq_32.h

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
#ifndef _ASM_X86_HARDIRQ_32_H

#define _ASM_X86_HARDIRQ_32_H



#include <linux/threads.h>

#include <linux/irq.h>



typedef struct {

	unsigned int __softirq_pending;

	unsigned int __nmi_count;	/* arch dependent */

	unsigned int apic_timer_irqs;	/* arch dependent */

	unsigned int irq0_irqs;

	unsigned int irq_resched_count;

	unsigned int irq_call_count;

	unsigned int irq_tlb_count;

	unsigned int irq_thermal_count;

	unsigned int irq_spurious_count;

	unsigned int irq_threshold_count;

} ____cacheline_aligned irq_cpustat_t;



DECLARE_PER_CPU(irq_cpustat_t, irq_stat);



/* We can have at most NR_VECTORS irqs routed to a cpu at a time */

#define MAX_HARDIRQS_PER_CPU NR_VECTORS



#define __ARCH_IRQ_STAT



#define inc_irq_stat(member)	percpu_add(irq_stat.member, 1)



#define local_softirq_pending()	percpu_read(irq_stat.__softirq_pending)



#define __ARCH_SET_SOFTIRQ_PENDING



#define set_softirq_pending(x)	percpu_write(irq_stat.__softirq_pending, (x))

#define or_softirq_pending(x)	percpu_or(irq_stat.__softirq_pending, (x))



extern void ack_bad_irq(unsigned int irq);



#endif /* _ASM_X86_HARDIRQ_32_H */

arch/x86/include/asm/hardirq_64.h

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
#ifndef _ASM_X86_HARDIRQ_64_H

#define _ASM_X86_HARDIRQ_64_H



#include <linux/threads.h>

#include <linux/irq.h>



typedef struct {

	unsigned int __softirq_pending;

	unsigned int __nmi_count;	/* arch dependent */

	unsigned int apic_timer_irqs;	/* arch dependent */

	unsigned int irq0_irqs;

	unsigned int irq_resched_count;

	unsigned int irq_call_count;

	unsigned int irq_tlb_count;

	unsigned int irq_thermal_count;

	unsigned int irq_spurious_count;

	unsigned int irq_threshold_count;

} ____cacheline_aligned irq_cpustat_t;



DECLARE_PER_CPU(irq_cpustat_t, irq_stat);



/* We can have at most NR_VECTORS irqs routed to a cpu at a time */

#define MAX_HARDIRQS_PER_CPU NR_VECTORS



#define __ARCH_IRQ_STAT



#define inc_irq_stat(member)	percpu_add(irq_stat.member, 1)



#define local_softirq_pending()	percpu_read(irq_stat.__softirq_pending)



#define __ARCH_SET_SOFTIRQ_PENDING



#define set_softirq_pending(x)	percpu_write(irq_stat.__softirq_pending, (x))

#define or_softirq_pending(x)	percpu_or(irq_stat.__softirq_pending, (x))



extern void ack_bad_irq(unsigned int irq);



#endif /* _ASM_X86_HARDIRQ_64_H */