Skip to content

Commit 15518e6

Browse files
jgross1bp3tk0v
authored andcommitted
arm/paravirt: Use common code for paravirt_steal_clock()
Remove the arch-specific variant of paravirt_steal_clock() and use the common one instead. This allows to remove paravirt.c and paravirt.h from arch/arm. Until all archs supporting Xen have been switched to the common code of paravirt_steal_clock(), drivers/xen/time.c needs to include asm/paravirt.h for those archs, while this is not necessary for arm any longer. Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://patch.msgid.link/20260105110520.21356-8-jgross@suse.com
1 parent e6b2aa6 commit 15518e6

5 files changed

Lines changed: 3 additions & 39 deletions

File tree

arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,6 +1320,7 @@ config UACCESS_WITH_MEMCPY
13201320

13211321
config PARAVIRT
13221322
bool "Enable paravirtualization code"
1323+
select HAVE_PV_STEAL_CLOCK_GEN
13231324
help
13241325
This changes the kernel so it can modify itself when it is run
13251326
under a hypervisor, potentially improving performance significantly

arch/arm/include/asm/paravirt.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

arch/arm/kernel/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt
8383
obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o
8484
obj-$(CONFIG_VDSO) += vdso.o
8585
obj-$(CONFIG_EFI) += efi.o
86-
obj-$(CONFIG_PARAVIRT) += paravirt.o
8786

8887
obj-y += head$(MMUEXT).o
8988
obj-$(CONFIG_DEBUG_LL) += debug.o

arch/arm/kernel/paravirt.c

Lines changed: 0 additions & 20 deletions
This file was deleted.

drivers/xen/time.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
#include <linux/static_call.h>
1111
#include <linux/sched/cputime.h>
1212

13+
#ifndef CONFIG_HAVE_PV_STEAL_CLOCK_GEN
1314
#include <asm/paravirt.h>
15+
#endif
1416
#include <asm/xen/hypervisor.h>
1517
#include <asm/xen/hypercall.h>
1618

0 commit comments

Comments
 (0)