openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Isaku Yamahata 2008-10-17 11:17:42 +09:00 committed by Tony Luck
parent 749da7912e
commit ce1fc742f9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/include/asm/paravirt.h
View File

@ -117,7 +117,7 @@ static inline void paravirt_post_smp_prepare_boot_cpu(void)
struct pv_iosapic_ops { struct pv_iosapic_ops {
void (*pcat_compat_init)(void); 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); unsigned int (*__read)(char __iomem *iosapic, unsigned int reg);
void (*__write)(char __iomem *iosapic, unsigned int reg, u32 val); void (*__write)(char __iomem *iosapic, unsigned int reg, u32 val);
@ -135,7 +135,7 @@ iosapic_pcat_compat_init(void)
static inline struct irq_chip* static inline struct irq_chip*
iosapic_get_irq_chip(unsigned long trigger) 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 static inline unsigned int

2
arch/ia64/kernel/paravirt.c
View File

@ -332,7 +332,7 @@ ia64_native_iosapic_write(char __iomem *iosapic, unsigned int reg, u32 val)
struct pv_iosapic_ops pv_iosapic_ops = { struct pv_iosapic_ops pv_iosapic_ops = {
.pcat_compat_init = ia64_native_iosapic_pcat_compat_init, .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, .__read = ia64_native_iosapic_read,
.__write = ia64_native_iosapic_write, .__write = ia64_native_iosapic_write,