git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
irq.h
diff --git
a/arch/x86/include/asm/irq.h
b/arch/x86/include/asm/irq.h
index
bae0eda
..
592688e
100644
(file)
--- a/
arch/x86/include/asm/irq.h
+++ b/
arch/x86/include/asm/irq.h
@@
-31,13
+31,9
@@
static inline int irq_canonicalize(int irq)
# endif
#endif
# endif
#endif
-#ifdef CONFIG_IRQBALANCE
-extern int irqbalance_disable(char *str);
-#endif
-
#ifdef CONFIG_HOTPLUG_CPU
#include <linux/cpumask.h>
#ifdef CONFIG_HOTPLUG_CPU
#include <linux/cpumask.h>
-extern void fixup_irqs(
cpumask_t map
);
+extern void fixup_irqs(
void
);
#endif
extern unsigned int do_IRQ(struct pt_regs *regs);
#endif
extern unsigned int do_IRQ(struct pt_regs *regs);
@@
-46,5
+42,6
@@
extern void native_init_IRQ(void);
/* Interrupt vector management */
extern DECLARE_BITMAP(used_vectors, NR_VECTORS);
/* Interrupt vector management */
extern DECLARE_BITMAP(used_vectors, NR_VECTORS);
+extern int vector_used_by_percpu_irq(unsigned int vector);
#endif /* _ASM_X86_IRQ_H */
#endif /* _ASM_X86_IRQ_H */