diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 09:33:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 09:33:40 -0800 |
| commit | db4fcb45a482a247f7b62fef658d990ed81855f2 (patch) | |
| tree | a1bf56f80e0c02f2c971672e2ff45b756dbdfc91 /arch/ia64/kernel/nr-irqs.c | |
| parent | 09854dde949d611c6675075cb22927444a28faf6 (diff) | |
| parent | d52eefb47d4eb6fe40d4c92bc711dd34a8ce1747 (diff) | |
Merge tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 Xen removal from Tony Luck:
"Nobody has been maintaining xen in ia64 for a long time. Rip it all
out so people do not waste time making updates to broken/dead code"
* tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64/xen: Remove Xen support for ia64
Diffstat (limited to 'arch/ia64/kernel/nr-irqs.c')
| -rw-r--r-- | arch/ia64/kernel/nr-irqs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/kernel/nr-irqs.c b/arch/ia64/kernel/nr-irqs.c index ee564575148e..f6769cd54bd9 100644 --- a/arch/ia64/kernel/nr-irqs.c +++ b/arch/ia64/kernel/nr-irqs.c @@ -10,15 +10,11 @@ #include <linux/kbuild.h> #include <linux/threads.h> #include <asm/native/irq.h> -#include <asm/xen/irq.h> void foo(void) { union paravirt_nr_irqs_max { char ia64_native_nr_irqs[IA64_NATIVE_NR_IRQS]; -#ifdef CONFIG_XEN - char xen_nr_irqs[XEN_NR_IRQS]; -#endif }; DEFINE(NR_IRQS, sizeof (union paravirt_nr_irqs_max)); |