diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 14:03:37 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-09-24 14:03:37 +0200 |
| commit | 73e6d6c6467771838c1fc6949e6768a12ed72464 (patch) | |
| tree | 94dd60891869a0a275cd332c4e675cf0b101fcfa /include/xen/platform_pci.h | |
| parent | 12e5272585901217e919da810c801e5084ee0cb1 (diff) | |
| parent | a850ea30374ebed32a0724742601861853fde869 (diff) | |
| download | kernel_replicant_linux-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.gz kernel_replicant_linux-73e6d6c6467771838c1fc6949e6768a12ed72464.tar.bz2 kernel_replicant_linux-73e6d6c6467771838c1fc6949e6768a12ed72464.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/xen/platform_pci.h')
| -rw-r--r-- | include/xen/platform_pci.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/xen/platform_pci.h b/include/xen/platform_pci.h index ce9d671c636c..a785a3b0c8c7 100644 --- a/include/xen/platform_pci.h +++ b/include/xen/platform_pci.h @@ -16,11 +16,15 @@ #define XEN_IOPORT_PROTOVER (XEN_IOPORT_BASE + 2) /* 1 byte access (R) */ #define XEN_IOPORT_PRODNUM (XEN_IOPORT_BASE + 2) /* 2 byte access (W) */ -#define XEN_UNPLUG_ALL_IDE_DISKS 1 -#define XEN_UNPLUG_ALL_NICS 2 -#define XEN_UNPLUG_AUX_IDE_DISKS 4 -#define XEN_UNPLUG_ALL 7 -#define XEN_UNPLUG_IGNORE 8 +#define XEN_UNPLUG_ALL_IDE_DISKS (1<<0) +#define XEN_UNPLUG_ALL_NICS (1<<1) +#define XEN_UNPLUG_AUX_IDE_DISKS (1<<2) +#define XEN_UNPLUG_ALL (XEN_UNPLUG_ALL_IDE_DISKS|\ + XEN_UNPLUG_ALL_NICS|\ + XEN_UNPLUG_AUX_IDE_DISKS) + +#define XEN_UNPLUG_UNNECESSARY (1<<16) +#define XEN_UNPLUG_NEVER (1<<17) static inline int xen_must_unplug_nics(void) { #if (defined(CONFIG_XEN_NETDEV_FRONTEND) || \ |