xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq"
@ 2010-03-10 18:42 Sander Eikelenboom
  2010-03-10 19:54 ` Konrad Rzeszutek Wilk
  0 siblings, 1 reply; 6+ messages in thread
From: Sander Eikelenboom @ 2010-03-10 18:42 UTC (permalink / raw)
  To: Jeremy Fitzhardinge; +Cc: xen-devel@lists.xensource.com



Hi All,

xen stable-2.6.31/master doesn't seem to compile:


  CC [M]  drivers/watchdog/w83877f_wdt.o
  CC [M]  drivers/watchdog/w83977f_wdt.o
  CC [M]  drivers/watchdog/machzwd.o
  CC [M]  drivers/watchdog/sbc_epx_c3.o
  CC [M]  drivers/watchdog/wm8350_wdt.o
  CC [M]  drivers/watchdog/softdog.o
  CC      drivers/xen/grant-table.o
  CC      drivers/xen/features.o
  CC      drivers/xen/events.o
drivers/xen/events.c:605: error: redefinition of âxen_destroy_irqâ
/usr/src/linux-2.6-xen/arch/x86/include/asm/xen/pci.h:28: note: previous definition of âxen_destroy_irqâ was here
drivers/xen/events.c:637: error: redefinition of âxen_create_msi_irqâ
/usr/src/linux-2.6-xen/arch/x86/include/asm/xen/pci.h:22: note: previous definition of âxen_create_msi_irqâ was here
make[2]: *** [drivers/xen/events.o] Error 1
make[1]: *** [drivers/xen] Error 2
make: *** [drivers] Error 2



git show
commit eb739cf358e03cd6ab69437d2429bcc8ad57d45b
Merge: be6c421 5e20b95
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date:   Wed Mar 3 15:36:03 2010 -0800

    Merge remote branch 'stable-2.6.31/master' into xen/stable-2.6.31.x



--

Sander

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq"
  2010-03-10 18:42 [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq" Sander Eikelenboom
@ 2010-03-10 19:54 ` Konrad Rzeszutek Wilk
  2010-03-10 22:19   ` Sander Eikelenboom
  2010-03-11  8:51   ` Sander Eikelenboom
  0 siblings, 2 replies; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2010-03-10 19:54 UTC (permalink / raw)
  To: Sander Eikelenboom; +Cc: Jeremy Fitzhardinge, xen-devel@lists.xensource.com

On Wed, Mar 10, 2010 at 07:42:35PM +0100, Sander Eikelenboom wrote:
> 
> 
> Hi All,
> 
> xen stable-2.6.31/master doesn't seem to compile:

This should fix it:


diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index 5e94f3c..5a7c7e8 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -1,24 +1,13 @@
 #ifndef _ASM_X86_XEN_PCI_H
 #define _ASM_X86_XEN_PCI_H
 
-#ifdef CONFIG_XEN_DOM0_PCI
-int xen_register_gsi(u32 gsi, int triggering, int polarity);
+#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN)
 int xen_create_msi_irq(struct pci_dev *dev,
 			struct msi_desc *msidesc,
 			int type, int pirq_override);
 int xen_destroy_irq(int irq);
-void xen_teardown_msi_dev(struct pci_dev *dev);
-
-int xen_find_device_domain_owner(struct pci_dev *dev);
-int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
-int xen_unregister_device_domain_owner(struct pci_dev *dev);
 
 #else
-static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
-{
-	return -1;
-}
-
 static inline int xen_create_msi_irq(struct pci_dev *dev,
 				struct msi_desc *msidesc,
 				int type, int pirq_override)
@@ -29,6 +18,21 @@ static inline int xen_destroy_irq(int irq)
 {
 	return -1;
 }
+#endif
+#ifdef CONFIG_XEN_DOM0_PCI
+int xen_register_gsi(u32 gsi, int triggering, int polarity);
+void xen_teardown_msi_dev(struct pci_dev *dev);
+
+int xen_find_device_domain_owner(struct pci_dev *dev);
+int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
+int xen_unregister_device_domain_owner(struct pci_dev *dev);
+
+#else
+static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
+{
+	return -1;
+}
+
 static inline int xen_find_device_domain_owner(struct pci_dev *dev)
 {
 	return -1;

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq"
  2010-03-10 19:54 ` Konrad Rzeszutek Wilk
@ 2010-03-10 22:19   ` Sander Eikelenboom
  2010-03-11  8:51   ` Sander Eikelenboom
  1 sibling, 0 replies; 6+ messages in thread
From: Sander Eikelenboom @ 2010-03-10 22:19 UTC (permalink / raw)
  To: Konrad Rzeszutek Wilk; +Cc: Jeremy Fitzhardinge, xen-devel@lists.xensource.com

Hello Konrad,

Hmm that seems to give another one:

  AS      arch/x86/lib/thunk_64.o
  CC      arch/x86/lib/usercopy_64.o
  AR      arch/x86/lib/lib.a
  LD      vmlinux.o
  MODPOST vmlinux.o
WARNING: modpost: Found 1 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
  GEN     .version
  CHK     include/linux/compile.h
  UPD     include/linux/compile.h
  CC      init/version.o
  LD      init/built-in.o
  LD      .tmp_vmlinux1
drivers/built-in.o: In function `pcifront_init':
xen-pcifront.c:(.init.text+0x257b): undefined reference to `xen_pci_frontend'
drivers/built-in.o: In function `pcifront_cleanup':
xen-pcifront.c:(.exit.text+0xa8): undefined reference to `xen_pci_frontend'
make: *** [.tmp_vmlinux1] Error 1



--Sander





Wednesday, March 10, 2010, 8:54:11 PM, you wrote:

> On Wed, Mar 10, 2010 at 07:42:35PM +0100, Sander Eikelenboom wrote:
>> 
>> 
>> Hi All,
>> 
>> xen stable-2.6.31/master doesn't seem to compile:

> This should fix it:


> diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
> index 5e94f3c..5a7c7e8 100644
> --- a/arch/x86/include/asm/xen/pci.h
> +++ b/arch/x86/include/asm/xen/pci.h
> @@ -1,24 +1,13 @@
>  #ifndef _ASM_X86_XEN_PCI_H
>  #define _ASM_X86_XEN_PCI_H
>  
> -#ifdef CONFIG_XEN_DOM0_PCI
> -int xen_register_gsi(u32 gsi, int triggering, int polarity);
> +#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN)
>  int xen_create_msi_irq(struct pci_dev *dev,
>                         struct msi_desc *msidesc,
>                         int type, int pirq_override);
>  int xen_destroy_irq(int irq);
> -void xen_teardown_msi_dev(struct pci_dev *dev);
> -
> -int xen_find_device_domain_owner(struct pci_dev *dev);
> -int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
> -int xen_unregister_device_domain_owner(struct pci_dev *dev);
>  
>  #else
> -static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
> -{
> -       return -1;
> -}
> -
>  static inline int xen_create_msi_irq(struct pci_dev *dev,
>                                 struct msi_desc *msidesc,
>                                 int type, int pirq_override)
> @@ -29,6 +18,21 @@ static inline int xen_destroy_irq(int irq)
>  {
>         return -1;
>  }
> +#endif
> +#ifdef CONFIG_XEN_DOM0_PCI
> +int xen_register_gsi(u32 gsi, int triggering, int polarity);
> +void xen_teardown_msi_dev(struct pci_dev *dev);
> +
> +int xen_find_device_domain_owner(struct pci_dev *dev);
> +int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
> +int xen_unregister_device_domain_owner(struct pci_dev *dev);
> +
> +#else
> +static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
> +{
> +       return -1;
> +}
> +
>  static inline int xen_find_device_domain_owner(struct pci_dev *dev)
>  {
>         return -1;



-- 
Best regards,
 Sander                            mailto:linux@eikelenboom.it

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq"
  2010-03-10 19:54 ` Konrad Rzeszutek Wilk
  2010-03-10 22:19   ` Sander Eikelenboom
@ 2010-03-11  8:51   ` Sander Eikelenboom
  2010-03-16  1:50     ` Konrad Rzeszutek Wilk
  1 sibling, 1 reply; 6+ messages in thread
From: Sander Eikelenboom @ 2010-03-11  8:51 UTC (permalink / raw)
  To: Konrad Rzeszutek Wilk; +Cc: Jeremy Fitzhardinge, xen-devel@lists.xensource.com

Hello Konrad,

You patch results in another compile error, it seems these are all caused by NOT enabling dom0 support in the kernel (i was building a kernel for a domU, so I thought I don't need it, just leave it out)

Hello Konrad,

Hmm that seems to give another one:

  AS      arch/x86/lib/thunk_64.o
  CC      arch/x86/lib/usercopy_64.o
  AR      arch/x86/lib/lib.a
  LD      vmlinux.o
  MODPOST vmlinux.o
WARNING: modpost: Found 1 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
  GEN     .version
  CHK     include/linux/compile.h
  UPD     include/linux/compile.h
  CC      init/version.o
  LD      init/built-in.o
  LD      .tmp_vmlinux1
drivers/built-in.o: In function `pcifront_init':
xen-pcifront.c:(.init.text+0x257b): undefined reference to `xen_pci_frontend'
drivers/built-in.o: In function `pcifront_cleanup':
xen-pcifront.c:(.exit.text+0xa8): undefined reference to `xen_pci_frontend'
make: *** [.tmp_vmlinux1] Error 1



--Sander





Wednesday, March 10, 2010, 8:54:11 PM, you wrote:

> On Wed, Mar 10, 2010 at 07:42:35PM +0100, Sander Eikelenboom wrote:
>> 
>> 
>> Hi All,
>> 
>> xen stable-2.6.31/master doesn't seem to compile:

> This should fix it:


> diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
> index 5e94f3c..5a7c7e8 100644
> --- a/arch/x86/include/asm/xen/pci.h
> +++ b/arch/x86/include/asm/xen/pci.h
> @@ -1,24 +1,13 @@
>  #ifndef _ASM_X86_XEN_PCI_H
>  #define _ASM_X86_XEN_PCI_H
>  
> -#ifdef CONFIG_XEN_DOM0_PCI
> -int xen_register_gsi(u32 gsi, int triggering, int polarity);
> +#if defined(CONFIG_PCI_MSI) && defined(CONFIG_XEN)
>  int xen_create_msi_irq(struct pci_dev *dev,
>                         struct msi_desc *msidesc,
>                         int type, int pirq_override);
>  int xen_destroy_irq(int irq);
> -void xen_teardown_msi_dev(struct pci_dev *dev);
> -
> -int xen_find_device_domain_owner(struct pci_dev *dev);
> -int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
> -int xen_unregister_device_domain_owner(struct pci_dev *dev);
>  
>  #else
> -static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
> -{
> -       return -1;
> -}
> -
>  static inline int xen_create_msi_irq(struct pci_dev *dev,
>                                 struct msi_desc *msidesc,
>                                 int type, int pirq_override)
> @@ -29,6 +18,21 @@ static inline int xen_destroy_irq(int irq)
>  {
>         return -1;
>  }
> +#endif
> +#ifdef CONFIG_XEN_DOM0_PCI
> +int xen_register_gsi(u32 gsi, int triggering, int polarity);
> +void xen_teardown_msi_dev(struct pci_dev *dev);
> +
> +int xen_find_device_domain_owner(struct pci_dev *dev);
> +int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
> +int xen_unregister_device_domain_owner(struct pci_dev *dev);
> +
> +#else
> +static inline int xen_register_gsi(u32 gsi, int triggering, int polarity)
> +{
> +       return -1;
> +}
> +
>  static inline int xen_find_device_domain_owner(struct pci_dev *dev)
>  {
>         return -1;



-- 
Best regards,
 Sander                            mailto:linux@eikelenboom.it

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq"
  2010-03-11  8:51   ` Sander Eikelenboom
@ 2010-03-16  1:50     ` Konrad Rzeszutek Wilk
  2010-03-16 19:58       ` Konrad Rzeszutek Wilk
  0 siblings, 1 reply; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2010-03-16  1:50 UTC (permalink / raw)
  To: Sander Eikelenboom; +Cc: Jeremy Fitzhardinge, xen-devel@lists.xensource.com

On Thu, Mar 11, 2010 at 09:51:54AM +0100, Sander Eikelenboom wrote:
> Hello Konrad,
> 
> You patch results in another compile error, it seems these are all caused by NOT enabling dom0 support in the kernel (i was building a kernel for a domU, so I thought I don't need it, just leave it out)
> 
> Hello Konrad,
> 
> Hmm that seems to give another one:
> 
>   AS      arch/x86/lib/thunk_64.o
>   CC      arch/x86/lib/usercopy_64.o
>   AR      arch/x86/lib/lib.a
>   LD      vmlinux.o
>   MODPOST vmlinux.o
> WARNING: modpost: Found 1 section mismatch(es).
> To see full details build your kernel with:
> 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
>   GEN     .version
>   CHK     include/linux/compile.h
>   UPD     include/linux/compile.h
>   CC      init/version.o
>   LD      init/built-in.o
>   LD      .tmp_vmlinux1
> drivers/built-in.o: In function `pcifront_init':
> xen-pcifront.c:(.init.text+0x257b): undefined reference to `xen_pci_frontend'
> drivers/built-in.o: In function `pcifront_cleanup':
> xen-pcifront.c:(.exit.text+0xa8): undefined reference to `xen_pci_frontend'
> make: *** [.tmp_vmlinux1] Error 1

Ugh. Let me spin out another patch to address this fallout.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq"
  2010-03-16  1:50     ` Konrad Rzeszutek Wilk
@ 2010-03-16 19:58       ` Konrad Rzeszutek Wilk
  0 siblings, 0 replies; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2010-03-16 19:58 UTC (permalink / raw)
  To: Sander Eikelenboom; +Cc: Jeremy Fitzhardinge, xen-devel@lists.xensource.com

[-- Attachment #1: Type: text/plain, Size: 4238 bytes --]

On Mon, Mar 15, 2010 at 09:50:32PM -0400, Konrad Rzeszutek Wilk wrote:
> On Thu, Mar 11, 2010 at 09:51:54AM +0100, Sander Eikelenboom wrote:
> > Hello Konrad,
> > 
> > You patch results in another compile error, it seems these are all caused by NOT enabling dom0 support in the kernel (i was building a kernel for a domU, so I thought I don't need it, just leave it out)
> > 
> > Hello Konrad,
> > 
> > Hmm that seems to give another one:
> > 
> >   AS      arch/x86/lib/thunk_64.o
> >   CC      arch/x86/lib/usercopy_64.o
> >   AR      arch/x86/lib/lib.a
> >   LD      vmlinux.o
> >   MODPOST vmlinux.o
> > WARNING: modpost: Found 1 section mismatch(es).
> > To see full details build your kernel with:
> > 'make CONFIG_DEBUG_SECTION_MISMATCH=y'
> >   GEN     .version
> >   CHK     include/linux/compile.h
> >   UPD     include/linux/compile.h
> >   CC      init/version.o
> >   LD      init/built-in.o
> >   LD      .tmp_vmlinux1
> > drivers/built-in.o: In function `pcifront_init':
> > xen-pcifront.c:(.init.text+0x257b): undefined reference to `xen_pci_frontend'
> > drivers/built-in.o: In function `pcifront_cleanup':
> > xen-pcifront.c:(.exit.text+0xa8): undefined reference to `xen_pci_frontend'
> > make: *** [.tmp_vmlinux1] Error 1
> 
> Ugh. Let me spin out another patch to address this fallout.

Can you try this patch, please:

commit a184e032784a330bf6dc5cc7546be6f31da1eabd
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date:   Tue Mar 16 12:37:26 2010 -0400

    xen: Fix the co-dependency of PCI frontend driver and various CONFIG
    options.
    
    We have a big turn knob called CONFIG_PCI_XEN_PASSTHROUGH that selects
    two pieces of logic: XEN_SWIOTLB and XEN_PCI. The PCI frontend depends
    on that but did not have the right depend in its Kconfig.
    
    Also fixed the header file since there are a mulitple of declerations
    that are from different files: arch/x86/xen/pci.c, arch/x86/pci/xen.c
    and drivers/xen/events.c.

diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index d68637f..abea466 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -1,11 +1,9 @@
 #ifndef _ASM_X86_XEN_PCI_H
 #define _ASM_X86_XEN_PCI_H
 
+/* in arch/x86/pci/xen.c */
 #if defined(CONFIG_PCI_MSI)
 #if defined(CONFIG_PCI_XEN)
-int xen_create_msi_irq(struct pci_dev *dev,
-			struct msi_desc *msidesc,
-			int type);
 void xen_pci_teardown_msi_dev(struct pci_dev *dev);
 void xen_pci_teardown_msi_irq(int irq);
 int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
@@ -47,12 +45,6 @@ static inline void xen_pci_frontend_disable_msix(struct pci_dev *dev)
 			xen_pci_frontend->disable_msix(dev);
 }
 #else
-static inline int xen_create_msi_irq(struct pci_dev *dev,
-				struct msi_desc *msidesc,
-				int type)
-{
-	return -1;
-}
 static inline void xen_pci_teardown_msi_dev(struct pci_dev *dev) { }
 static inline void xen_pci_teardown_msi_irq(int irq) { }
 static inline int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
@@ -60,9 +52,23 @@ static inline int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type
 	return -ENODEV;
 }
 #endif /* CONFIG_PCI_XEN */
-
 #endif /* CONFIG_PCI_MSI */
 
+/* in drivers/xen/events.c */
+#ifdef CONFIG_PCI_MSI
+int xen_create_msi_irq(struct pci_dev *dev,
+			struct msi_desc *msidesc,
+			int type);
+#else
+static inline int xen_create_msi_irq(struct pci_dev *dev,
+				struct msi_desc *msidesc,
+				int type)
+{
+	return -1;
+}
+#endif
+
+/* in arch/x86/xen/pci.c */
 #ifdef CONFIG_XEN_DOM0_PCI
 int xen_register_gsi(u32 gsi, int triggering, int polarity);
 int xen_find_device_domain_owner(struct pci_dev *dev);
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 7802fcd..0dd2187 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -53,7 +53,7 @@ config PCI_STUB
 
 config XEN_PCIDEV_FRONTEND
         tristate "Xen PCI Frontend"
-        depends on XEN && PCI && X86
+        depends on XEN && PCI && X86 && XEN_PCI_PASSTHROUGH
         select HOTPLUG
 	select XEN_XENBUS_FRONTEND
 	default y

> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel

[-- Attachment #2: p.patch --]
[-- Type: text/plain, Size: 2747 bytes --]

commit a184e032784a330bf6dc5cc7546be6f31da1eabd
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date:   Tue Mar 16 12:37:26 2010 -0400

    xen: Fix the co-dependency of PCI frontend driver and various CONFIG
    options.
    
    We have a big turn knob called CONFIG_PCI_XEN_PASSTHROUGH that selects
    two pieces of logic: XEN_SWIOTLB and XEN_PCI. The PCI frontend depends
    on that but did not have the right depend in its Kconfig.
    
    Also fixed the header file since there are a mulitple of declerations
    that are from different files: arch/x86/xen/pci.c, arch/x86/pci/xen.c
    and drivers/xen/events.c.

diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index d68637f..abea466 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -1,11 +1,9 @@
 #ifndef _ASM_X86_XEN_PCI_H
 #define _ASM_X86_XEN_PCI_H
 
+/* in arch/x86/pci/xen.c */
 #if defined(CONFIG_PCI_MSI)
 #if defined(CONFIG_PCI_XEN)
-int xen_create_msi_irq(struct pci_dev *dev,
-			struct msi_desc *msidesc,
-			int type);
 void xen_pci_teardown_msi_dev(struct pci_dev *dev);
 void xen_pci_teardown_msi_irq(int irq);
 int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
@@ -47,12 +45,6 @@ static inline void xen_pci_frontend_disable_msix(struct pci_dev *dev)
 			xen_pci_frontend->disable_msix(dev);
 }
 #else
-static inline int xen_create_msi_irq(struct pci_dev *dev,
-				struct msi_desc *msidesc,
-				int type)
-{
-	return -1;
-}
 static inline void xen_pci_teardown_msi_dev(struct pci_dev *dev) { }
 static inline void xen_pci_teardown_msi_irq(int irq) { }
 static inline int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
@@ -60,9 +52,23 @@ static inline int xen_pci_setup_msi_irqs(struct pci_dev *dev, int nvec, int type
 	return -ENODEV;
 }
 #endif /* CONFIG_PCI_XEN */
-
 #endif /* CONFIG_PCI_MSI */
 
+/* in drivers/xen/events.c */
+#ifdef CONFIG_PCI_MSI
+int xen_create_msi_irq(struct pci_dev *dev,
+			struct msi_desc *msidesc,
+			int type);
+#else
+static inline int xen_create_msi_irq(struct pci_dev *dev,
+				struct msi_desc *msidesc,
+				int type)
+{
+	return -1;
+}
+#endif
+
+/* in arch/x86/xen/pci.c */
 #ifdef CONFIG_XEN_DOM0_PCI
 int xen_register_gsi(u32 gsi, int triggering, int polarity);
 int xen_find_device_domain_owner(struct pci_dev *dev);
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 7802fcd..0dd2187 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -53,7 +53,7 @@ config PCI_STUB
 
 config XEN_PCIDEV_FRONTEND
         tristate "Xen PCI Frontend"
-        depends on XEN && PCI && X86
+        depends on XEN && PCI && X86 && XEN_PCI_PASSTHROUGH
         select HOTPLUG
 	select XEN_XENBUS_FRONTEND
 	default y

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-03-16 19:58 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-10 18:42 [stable-2.6.31/master] Compile error "error: redefinition of xen_destroy_irq" Sander Eikelenboom
2010-03-10 19:54 ` Konrad Rzeszutek Wilk
2010-03-10 22:19   ` Sander Eikelenboom
2010-03-11  8:51   ` Sander Eikelenboom
2010-03-16  1:50     ` Konrad Rzeszutek Wilk
2010-03-16 19:58       ` Konrad Rzeszutek Wilk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).