diff options
author | Marc Zyngier <maz@kernel.org> | 2021-03-19 13:01:04 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2021-03-19 13:01:04 +0100 |
commit | a1baa01f7691972964320349a9bb010386fe0dab (patch) | |
tree | 77cbab937f28dbcc787774169c66109f28fb4a59 /arch/sparc/include/asm/elf_64.h | |
parent | KVM: arm64: Fix host's ZCR_EL2 restore on nVHE (diff) | |
parent | Linux 5.12-rc3 (diff) | |
download | linux-a1baa01f7691972964320349a9bb010386fe0dab.tar.xz linux-a1baa01f7691972964320349a9bb010386fe0dab.zip |
Merge tag 'v5.12-rc3' into kvm-arm64/host-stage2
Linux 5.12-rc3
Signed-off-by: Marc Zyngier <maz@kernel.org>
# gpg: Signature made Sun 14 Mar 2021 21:41:02 GMT
# gpg: using RSA key ABAF11C65A2970B130ABE3C479BE3E4300411886
# gpg: issuer "torvalds@linux-foundation.org"
# gpg: Can't check signature: No public key
Diffstat (limited to 'arch/sparc/include/asm/elf_64.h')
-rw-r--r-- | arch/sparc/include/asm/elf_64.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h index 7e078bc73ef5..8fb09eec8c3e 100644 --- a/arch/sparc/include/asm/elf_64.h +++ b/arch/sparc/include/asm/elf_64.h @@ -8,7 +8,6 @@ #include <asm/ptrace.h> #include <asm/processor.h> -#include <asm/extable_64.h> #include <asm/spitfire.h> #include <asm/adi.h> |