Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce1fc742 authored by Isaku Yamahata's avatar Isaku Yamahata Committed by Tony Luck
Browse files

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: default avatarIsaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 749da791

arch/ia64/include/asm/paravirt.h

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/ia64/kernel/paravirt.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ ia64_native_iosapic_write(char __iomem *iosapic, unsigned int reg, u32 val) 


struct pv_iosapic_ops pv_iosapic_ops = {

	.pcat_compat_init = ia64_native_iosapic_pcat_compat_init,

	.get_irq_chip = ia64_native_iosapic_get_irq_chip,

	.__get_irq_chip = ia64_native_iosapic_get_irq_chip,



	.__read = ia64_native_iosapic_read,

	.__write = ia64_native_iosapic_write,