From: Doug Goldstein Date: Thu, 19 Jan 2017 09:36:14 +0000 (+0100) Subject: x86/mtrr: convert use_intel_if u32 to bool X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2950 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=850fd17ed2902ec92df4480fae2bb5c28569ba9e;p=xen.git x86/mtrr: convert use_intel_if u32 to bool This field is always only 1 currently but may allow 0 in the future so convert it to a bool to provide proper range checking by the compiler. Signed-off-by: Doug Goldstein Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index 8d4537aeb1..104baf951a 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -560,7 +560,7 @@ static int generic_have_wrcomb(void) /* generic structure... */ const struct mtrr_ops generic_mtrr_ops = { - .use_intel_if = 1, + .use_intel_if = true, .set_all = generic_set_all, .get = generic_get_mtrr, .get_free_region = generic_get_free_region, diff --git a/xen/arch/x86/cpu/mtrr/mtrr.h b/xen/arch/x86/cpu/mtrr/mtrr.h index bb57defca3..9a406e6f61 100644 --- a/xen/arch/x86/cpu/mtrr/mtrr.h +++ b/xen/arch/x86/cpu/mtrr/mtrr.h @@ -9,7 +9,7 @@ struct mtrr_ops { u32 vendor; - u32 use_intel_if; + bool use_intel_if; // void (*init)(void); void (*set)(unsigned int reg, unsigned long base, unsigned long size, mtrr_type type); @@ -39,7 +39,7 @@ extern u64 size_or_mask, size_and_mask; extern const struct mtrr_ops *mtrr_if; #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) -#define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) +#define use_intel() (mtrr_if && mtrr_if->use_intel_if) extern unsigned int num_var_ranges;