diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-07 13:03:03 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-07 13:03:03 -0400 |
| commit | aa24865fb5e33701c93521460a2d05ab76d6bddc (patch) | |
| tree | 754ddda12fa38c97f98df5e671b571c37544c71b /arch/powerpc/include | |
| parent | a96cb3bf390eebfead5fc7a2092f8452a7997d1b (diff) | |
| parent | 5ef2f3d4e747c7851678ad2b70e37be886a8c9eb (diff) | |
| download | linux-stable-aa24865fb5e33701c93521460a2d05ab76d6bddc.tar.gz linux-stable-aa24865fb5e33701c93521460a2d05ab76d6bddc.tar.bz2 linux-stable-aa24865fb5e33701c93521460a2d05ab76d6bddc.zip | |
Merge tag 'kvm-riscv-6.10-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv changes for 6.10
- Support guest breakpoints using ebreak
- Introduce per-VCPU mp_state_lock and reset_cntx_lock
- Virtualize SBI PMU snapshot and counter overflow interrupts
- New selftests for SBI PMU and Guest ebreak
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/vdso/gettimeofday.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/vdso/gettimeofday.h b/arch/powerpc/include/asm/vdso/gettimeofday.h index f0a4cf01e85c..78302f6c2580 100644 --- a/arch/powerpc/include/asm/vdso/gettimeofday.h +++ b/arch/powerpc/include/asm/vdso/gettimeofday.h @@ -4,7 +4,6 @@ #ifndef __ASSEMBLY__ -#include <asm/page.h> #include <asm/vdso/timebase.h> #include <asm/barrier.h> #include <asm/unistd.h> @@ -95,7 +94,7 @@ const struct vdso_data *__arch_get_vdso_data(void); static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd) { - return (void *)vd + PAGE_SIZE; + return (void *)vd + (1U << CONFIG_PAGE_SHIFT); } #endif |