diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 05:33:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 05:33:38 +0200 |
| commit | efdfce2b7ff3205ba0fba10270b92b80bbc6187d (patch) | |
| tree | 6275099128c1e228b79dc0923ae936c24ea5a36f /arch/ia64/include/asm/iosapic.h | |
| parent | Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert... (diff) | |
| parent | ia64: remove paravirt code (diff) | |
| download | linux-efdfce2b7ff3205ba0fba10270b92b80bbc6187d.tar.xz linux-efdfce2b7ff3205ba0fba10270b92b80bbc6187d.zip | |
Merge tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 paravirt removal from Tony Luck:
"Nobody cares about paravirtualization on ia64 anymore"
* tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: remove paravirt code
Diffstat (limited to 'arch/ia64/include/asm/iosapic.h')
| -rw-r--r-- | arch/ia64/include/asm/iosapic.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/iosapic.h b/arch/ia64/include/asm/iosapic.h index 94c89a2d97fe..4ae1fbd7f10e 100644 --- a/arch/ia64/include/asm/iosapic.h +++ b/arch/ia64/include/asm/iosapic.h @@ -55,14 +55,10 @@ #define NR_IOSAPICS 256 -#ifdef CONFIG_PARAVIRT_GUEST -#include <asm/paravirt.h> -#else #define iosapic_pcat_compat_init ia64_native_iosapic_pcat_compat_init #define __iosapic_read __ia64_native_iosapic_read #define __iosapic_write __ia64_native_iosapic_write #define iosapic_get_irq_chip ia64_native_iosapic_get_irq_chip -#endif extern void __init ia64_native_iosapic_pcat_compat_init(void); extern struct irq_chip *ia64_native_iosapic_get_irq_chip(unsigned long trigger); |