diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-11-08 12:13:48 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-11-08 12:13:48 -0500 |
| commit | e3e0f9b7ae280f2f479f74ef7799f4108d0e7f77 (patch) | |
| tree | 85a1717293b6536f51176b6daa6e87e5f8338a88 /arch/mips | |
| parent | 5cb1659f412041e4780f2e8ee49b2e03728a2ba6 (diff) | |
| parent | 332fa4a802b16ccb727199da685294f85f9880cb (diff) | |
Merge tag 'kvm-riscv-6.13-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv changes for 6.13
- Accelerate KVM RISC-V when running as a guest
- Perf support to collect KVM guest statistics from host side
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/boot/compressed/decompress.c | 2 | ||||
| -rw-r--r-- | arch/mips/crypto/crc32-mips.c | 2 | ||||
| -rw-r--r-- | arch/mips/crypto/poly1305-glue.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c index adb6d5b0e6eb..90021c6a8cab 100644 --- a/arch/mips/boot/compressed/decompress.c +++ b/arch/mips/boot/compressed/decompress.c @@ -16,7 +16,7 @@ #include <linux/libfdt.h> #include <asm/addrspace.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <asm-generic/vmlinux.lds.h> #include "decompress.h" diff --git a/arch/mips/crypto/crc32-mips.c b/arch/mips/crypto/crc32-mips.c index 2a59b85f88aa..a7a1d43a1b2c 100644 --- a/arch/mips/crypto/crc32-mips.c +++ b/arch/mips/crypto/crc32-mips.c @@ -14,7 +14,7 @@ #include <linux/module.h> #include <linux/string.h> #include <asm/mipsregs.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <crypto/internal/hash.h> diff --git a/arch/mips/crypto/poly1305-glue.c b/arch/mips/crypto/poly1305-glue.c index 867728ee535a..c03ad0bbe69c 100644 --- a/arch/mips/crypto/poly1305-glue.c +++ b/arch/mips/crypto/poly1305-glue.c @@ -5,7 +5,7 @@ * Copyright (C) 2019 Linaro Ltd. <ard.biesheuvel@linaro.org> */ -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <crypto/algapi.h> #include <crypto/internal/hash.h> #include <crypto/internal/poly1305.h> |