Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9c35e90c6fcf7f5baf27a63d9565e9f47633f299

Authored by Ian Campbell
1 parent 1dc7ce99b0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield 

by defining in terms of (1<<N).

XEN_UNPLUG_UNNECESSARY and XEN_UNPLUG_NEVER are only used within the
kernel and are not defined as a bit on the unplug IO port. Therefore
use a bit which is outside the potentially valid range of the 16 bit
IO port.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Acked-by: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>

Showing 1 changed file with 9 additions and 6 deletions Side-by-side Diff

include/xen/platform_pci.h
Diff comments   View file @ 9c35e90
... ... @@ -16,12 +16,15 @@
16 16 #define XEN_IOPORT_PROTOVER (XEN_IOPORT_BASE + 2) /* 1 byte access (R) */
17 17 #define XEN_IOPORT_PRODNUM (XEN_IOPORT_BASE + 2) /* 2 byte access (W) */
18 18  
19   -#define XEN_UNPLUG_ALL_IDE_DISKS 1
20   -#define XEN_UNPLUG_ALL_NICS 2
21   -#define XEN_UNPLUG_AUX_IDE_DISKS 4
22   -#define XEN_UNPLUG_ALL 7
23   -#define XEN_UNPLUG_UNNECESSARY 8
24   -#define XEN_UNPLUG_NEVER 16
  19 +#define XEN_UNPLUG_ALL_IDE_DISKS (1<<0)
  20 +#define XEN_UNPLUG_ALL_NICS (1<<1)
  21 +#define XEN_UNPLUG_AUX_IDE_DISKS (1<<2)
  22 +#define XEN_UNPLUG_ALL (XEN_UNPLUG_ALL_IDE_DISKS|\
  23 + XEN_UNPLUG_ALL_NICS|\
  24 + XEN_UNPLUG_AUX_IDE_DISKS)
  25 +
  26 +#define XEN_UNPLUG_UNNECESSARY (1<<16)
  27 +#define XEN_UNPLUG_NEVER (1<<17)
25 28  
26 29 static inline int xen_must_unplug_nics(void) {
27 30 #if (defined(CONFIG_XEN_NETDEV_FRONTEND) || \