diff options
| author | Eric Auger | 2018-06-22 14:28:35 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-22 14:28:35 +0200 |
| commit | 77d361b13c19fdf881bff044a5bec99108cf2da2 (patch) | |
| tree | 0a5299d47105940413b941fc40270fbe41032256 /linux-headers/asm-arm | |
| parent | target-arm: fix a segmentation fault due to illegal memory access (diff) | |
| download | qemu-77d361b13c19fdf881bff044a5bec99108cf2da2.tar.gz qemu-77d361b13c19fdf881bff044a5bec99108cf2da2.tar.xz qemu-77d361b13c19fdf881bff044a5bec99108cf2da2.zip | |
linux-headers: Update to kernel mainline commit b357bf602
Update our kernel headers to mainline commit
b357bf6023a948cf6a9472f07a1b0caac0e4f8e8
("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm")
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Message-id: 1529072910-16156-2-git-send-email-eric.auger@redhat.com
[PMM: clarified commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/asm-arm')
| -rw-r--r-- | linux-headers/asm-arm/kvm.h | 1 | ||||
| -rw-r--r-- | linux-headers/asm-arm/unistd-common.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h index 670b43c9e9..72aa226e6c 100644 --- a/linux-headers/asm-arm/kvm.h +++ b/linux-headers/asm-arm/kvm.h @@ -91,6 +91,7 @@ struct kvm_regs { #define KVM_VGIC_V3_ADDR_TYPE_DIST 2 #define KVM_VGIC_V3_ADDR_TYPE_REDIST 3 #define KVM_VGIC_ITS_ADDR_TYPE 4 +#define KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION 5 #define KVM_VGIC_V3_DIST_SIZE SZ_64K #define KVM_VGIC_V3_REDIST_SIZE (2 * SZ_64K) diff --git a/linux-headers/asm-arm/unistd-common.h b/linux-headers/asm-arm/unistd-common.h index 8d5ceaee1a..60c2d931d0 100644 --- a/linux-headers/asm-arm/unistd-common.h +++ b/linux-headers/asm-arm/unistd-common.h @@ -354,5 +354,6 @@ #define __NR_pkey_alloc (__NR_SYSCALL_BASE + 395) #define __NR_pkey_free (__NR_SYSCALL_BASE + 396) #define __NR_statx (__NR_SYSCALL_BASE + 397) +#define __NR_rseq (__NR_SYSCALL_BASE + 398) #endif /* _ASM_ARM_UNISTD_COMMON_H */ |