From: Wei Liu Date: Fri, 30 Jun 2017 16:29:15 +0000 (+0100) Subject: x86/smpboot.c: use plain bool X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1824 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=466ce821e0e4813657923db71d0f95571ed6a7e2;p=xen.git x86/smpboot.c: use plain bool Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index f375eb682d..8d91f6ca01 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -106,7 +106,7 @@ static void smp_store_cpu_info(int id) * TSC's upper 32 bits can't be written in earlier CPUs (before * Prescott), there is no way to resync one AP against BP. */ -bool_t disable_tsc_sync; +bool disable_tsc_sync; static atomic_t tsc_count; static uint64_t tsc_value; @@ -975,7 +975,8 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) /* Physically added CPUs do not have synchronised TSC. */ if ( boot_cpu_has(X86_FEATURE_TSC_RELIABLE) ) { - static bool_t once_only; + static bool once_only; + if ( !test_and_set_bool(once_only) ) printk(XENLOG_WARNING " ** New physical CPU %u may have skewed TSC and hence " diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 780baa55a3..b988b94d2e 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1568,7 +1568,7 @@ static void __init tsc_check_writability(void) cpuidle_disable_deep_cstate(); /* synchronize_tsc_slave() must do nothing */ - disable_tsc_sync = 1; + disable_tsc_sync = true; } static void __init reset_percpu_time(void *unused) diff --git a/xen/include/asm-x86/time.h b/xen/include/asm-x86/time.h index ef989a69b3..046302ef19 100644 --- a/xen/include/asm-x86/time.h +++ b/xen/include/asm-x86/time.h @@ -24,7 +24,7 @@ typedef u64 cycles_t; -extern bool_t disable_tsc_sync; +extern bool disable_tsc_sync; static inline cycles_t get_cycles(void) {