ia64/pv_ops: avoid name conflict of get_irq_chip().

The macro get_irq_chip() is defined in linux/include/linux/irq.h
which cause name conflict with one in linux/arch/ia64/include/asm/paravirt.h.
rename the latter to __get_irq_chip().

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/ia64/include/asm/paravirt.h b/arch/ia64/include/asm/paravirt.h
index 660cab044834..2bf3636473fe 100644
--- a/arch/ia64/include/asm/paravirt.h
+++ b/arch/ia64/include/asm/paravirt.h
@@ -117,7 +117,7 @@ static inline void paravirt_post_smp_prepare_boot_cpu(void)
 struct pv_iosapic_ops {
         void (*pcat_compat_init)(void);
 
-        struct irq_chip *(*get_irq_chip)(unsigned long trigger);
+        struct irq_chip *(*__get_irq_chip)(unsigned long trigger);
 
         unsigned int (*__read)(char __iomem *iosapic, unsigned int reg);
         void (*__write)(char __iomem *iosapic, unsigned int reg, u32 val);
@@ -135,7 +135,7 @@ iosapic_pcat_compat_init(void)
 static inline struct irq_chip*
 iosapic_get_irq_chip(unsigned long trigger)
 {
-        return pv_iosapic_ops.get_irq_chip(trigger);
+        return pv_iosapic_ops.__get_irq_chip(trigger);
 }
 
 static inline unsigned int