On 15.08.2025 22:41, Andrew Cooper wrote:
> With asm/tsc.h split out, asm/time.h shouldn't be including asm/msr.h, but it
> turns out that an outrageous number of files (even some headers) are pulling
> their dependentices transitively through asm/time.h -> asm/msr.h
>
> Most are asm/msr{,-index}.h, but in some cases it's printk(), va_args, and
> even PRIxxx macros.
>
> Give asm/time.h an SPDX tag, and strip trailing whitespace.
>
> No functional change.
>
> Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
Acked-by: Jan Beulich <jbeul...@suse.com>
preferably ...
> --- a/xen/arch/x86/include/asm/time.h
> +++ b/xen/arch/x86/include/asm/time.h
> @@ -1,8 +1,7 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +#ifndef X86_TIME_H
> +#define X86_TIME_H
>
> -#ifndef __X86_TIME_H__
> -#define __X86_TIME_H__
> -
> -#include <asm/msr.h>
> #include <asm/tsc.h>
>
> typedef u64 cycles_t;
> @@ -38,6 +37,7 @@ uint64_t cf_check acpi_pm_tick_to_ns(uint64_t ticks);
>
> uint64_t tsc_ticks2ns(uint64_t ticks);
>
> +struct cpu_user_regs;
> uint64_t pv_soft_rdtsc(const struct vcpu *v, const struct cpu_user_regs
> *regs);
> uint64_t gtime_to_gtsc(const struct domain *d, uint64_t time);
> uint64_t gtsc_to_gtime(const struct domain *d, uint64_t tsc);
> @@ -47,7 +47,7 @@ int tsc_set_info(struct domain *d, uint32_t tsc_mode,
> uint64_t elapsed_nsec,
>
> void tsc_get_info(struct domain *d, uint32_t *tsc_mode, uint64_t
> *elapsed_nsec,
> uint32_t *gtsc_khz, uint32_t *incarnation);
> -
> +
>
> void force_update_vcpu_system_time(struct vcpu *v);
... with that one line dropped rather than just pruned of trailing blanks, so
we no longer have a double blank line here.
Jan
