]> git.baikalelectronics.ru Git - kernel.git/commit
xen/pci: Fix compiler error when CONFIG_XEN_PRIVILEGED_GUEST is not set.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 16 May 2011 17:47:30 +0000 (13:47 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 16 May 2011 17:47:30 +0000 (13:47 -0400)
commite29bff107f35bc6f0fb0ba94b41b7d071b68e47e
treefbc280be92169b55a57e21aea129df7ea696db92
parent3e2fa7c5201f4d22a77822db0007a3f58473b311
xen/pci: Fix compiler error when CONFIG_XEN_PRIVILEGED_GUEST is not set.

If we have CONFIG_XEN and the other parameters to build an
Linux kernel that is non-privileged, the xen_[find|register|unregister]_
device_domain_owner functions should not be compiled. They should
use the nops defined in arch/x86/include/asm/xen/pci.h instead.

This fixes:

arch/x86/pci/xen.c:496: error: redefinition of ‘xen_find_device_domain_owner’
arch/x86/include/asm/xen/pci.h:25: note: previous definition of ‘xen_find_device_domain_owner’ was here
arch/x86/pci/xen.c:510: error: redefinition of ‘xen_register_device_domain_owner’
arch/x86/include/asm/xen/pci.h:29: note: previous definition of ‘xen_register_device_domain_owner’ was here
arch/x86/pci/xen.c:532: error: redefinition of ‘xen_unregister_device_domain_owner’
arch/x86/include/asm/xen/pci.h:34: note: previous definition of ‘xen_unregister_device_domain_owner’ was here

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
arch/x86/pci/xen.c