Commit 22067d45 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: unify irq.h 



Not much difference in those files.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 22dc12d1

include/asm-x86/irq.h

+48 −3
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "irq_32.h"

#ifndef _ASM_IRQ_H

#define _ASM_IRQ_H

/*

 *	(C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar

 *

 *	IRQ/IPI changes taken from work by Thomas Radke

 *	<tomsoft@informatik.tu-chemnitz.de>

 */



#include <asm/apicdef.h>

#include <asm/irq_vectors.h>



static inline int irq_canonicalize(int irq)

{

	return ((irq == 2) ? 9 : irq);

}



#ifdef CONFIG_X86_LOCAL_APIC

# define ARCH_HAS_NMI_WATCHDOG

#endif



#ifdef CONFIG_4KSTACKS

  extern void irq_ctx_init(int cpu);

  extern void irq_ctx_exit(int cpu);

# define __ARCH_HAS_DO_SOFTIRQ

#else

# include "irq_64.h"

# define irq_ctx_init(cpu) do { } while (0)

# define irq_ctx_exit(cpu) do { } while (0)

# ifdef CONFIG_X86_64

#  define __ARCH_HAS_DO_SOFTIRQ

# endif

#endif



#ifdef CONFIG_IRQBALANCE

extern int irqbalance_disable(char *str);

#endif



#ifdef CONFIG_HOTPLUG_CPU

#include <linux/cpumask.h>

extern void fixup_irqs(cpumask_t map);

#endif



extern unsigned int do_IRQ(struct pt_regs *regs);

extern void init_IRQ(void);

extern void native_init_IRQ(void);



/* Interrupt vector management */

extern DECLARE_BITMAP(used_vectors, NR_VECTORS);



#endif /* _ASM_IRQ_H */

include/asm-x86/irq_32.h

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
#ifndef _ASM_IRQ_H

#define _ASM_IRQ_H



/*

 *	linux/include/asm/irq.h

 *

 *	(C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar

 *

 *	IRQ/IPI changes taken from work by Thomas Radke

 *	<tomsoft@informatik.tu-chemnitz.de>

 */



#include <linux/sched.h>

/* include comes from machine specific directory */

#include <asm/irq_vectors.h>

#include <asm/thread_info.h>



static inline int irq_canonicalize(int irq)

{

	return ((irq == 2) ? 9 : irq);

}



#ifdef CONFIG_X86_LOCAL_APIC

# define ARCH_HAS_NMI_WATCHDOG		/* See include/linux/nmi.h */

#endif



#ifdef CONFIG_4KSTACKS

  extern void irq_ctx_init(int cpu);

  extern void irq_ctx_exit(int cpu);

# define __ARCH_HAS_DO_SOFTIRQ

#else

# define irq_ctx_init(cpu) do { } while (0)

# define irq_ctx_exit(cpu) do { } while (0)

#endif



#ifdef CONFIG_IRQBALANCE

extern int irqbalance_disable(char *str);

#endif



#ifdef CONFIG_HOTPLUG_CPU

extern void fixup_irqs(cpumask_t map);

#endif



unsigned int do_IRQ(struct pt_regs *regs);

void init_IRQ(void);

void __init native_init_IRQ(void);



/* Interrupt vector management */

extern DECLARE_BITMAP(used_vectors, NR_VECTORS);



#endif /* _ASM_IRQ_H */

include/asm-x86/irq_64.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
#ifndef _ASM_IRQ_H

#define _ASM_IRQ_H



/*

 *	linux/include/asm/irq.h

 *

 *	(C) 1992, 1993 Linus Torvalds, (C) 1997 Ingo Molnar

 *

 *	IRQ/IPI changes taken from work by Thomas Radke

 *	<tomsoft@informatik.tu-chemnitz.de>

 */



#include <asm/apicdef.h>

#include <asm/irq_vectors.h>



static inline int irq_canonicalize(int irq)

{

	return ((irq == 2) ? 9 : irq);

}



#define ARCH_HAS_NMI_WATCHDOG		/* See include/linux/nmi.h */



#ifdef CONFIG_HOTPLUG_CPU

#include <linux/cpumask.h>

extern void fixup_irqs(cpumask_t map);

#endif



#define __ARCH_HAS_DO_SOFTIRQ 1



extern void native_init_IRQ(void);



#endif /* _ASM_IRQ_H */