diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-12-11 21:22:01 +0100 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2014-01-03 20:54:53 +0100 |
| commit | 6f6c15ef912465b3aaafe709f39bd6026a8b3e72 (patch) | |
| tree | dc736eb7fe0105df23083a7e20c21c04ec1ceb68 | |
| parent | xen/pvhvm: If xen_platform_pci=0 is set don't blow up (v4). (diff) | |
| download | linux-6f6c15ef912465b3aaafe709f39bd6026a8b3e72.tar.xz linux-6f6c15ef912465b3aaafe709f39bd6026a8b3e72.zip | |
xen/pvhvm: Remove the xen_platform_pci int.
Since we have xen_has_pv_devices,xen_has_pv_disk_devices,
xen_has_pv_nic_devices, and xen_has_pv_and_legacy_disk_devices
to figure out the different 'unplug' behaviors - lets
use those instead of this single int.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
| -rw-r--r-- | arch/x86/xen/platform-pci-unplug.c | 5 | ||||
| -rw-r--r-- | include/xen/platform_pci.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/xen/platform-pci-unplug.c b/arch/x86/xen/platform-pci-unplug.c index ab84ac198a9a..a8261716d58d 100644 --- a/arch/x86/xen/platform-pci-unplug.c +++ b/arch/x86/xen/platform-pci-unplug.c @@ -30,10 +30,9 @@ #define XEN_PLATFORM_ERR_PROTOCOL -2 #define XEN_PLATFORM_ERR_BLACKLIST -3 -/* store the value of xen_emul_unplug after the unplug is done */ -int xen_platform_pci_unplug; -EXPORT_SYMBOL_GPL(xen_platform_pci_unplug); #ifdef CONFIG_XEN_PVHVM +/* store the value of xen_emul_unplug after the unplug is done */ +static int xen_platform_pci_unplug; static int xen_emul_unplug; static int check_platform_magic(void) diff --git a/include/xen/platform_pci.h b/include/xen/platform_pci.h index b49eeab0262e..5c52b5583917 100644 --- a/include/xen/platform_pci.h +++ b/include/xen/platform_pci.h @@ -46,8 +46,6 @@ static inline int xen_must_unplug_disks(void) { #endif } -extern int xen_platform_pci_unplug; - #if defined(CONFIG_XEN_PVHVM) extern bool xen_has_pv_devices(void); extern bool xen_has_pv_disk_devices(void); |