diff options
| author | Cornelia Huck | 2016-06-07 15:11:44 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2016-06-14 13:34:50 +0200 |
| commit | ff804f15a120dee62bdcf17a8db84bf59d83d6eb (patch) | |
| tree | f65980b93a3d6b6224d4f70631676cd60bc42220 /linux-headers/asm-x86 | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160614' into... (diff) | |
| download | qemu-ff804f15a120dee62bdcf17a8db84bf59d83d6eb.tar.gz qemu-ff804f15a120dee62bdcf17a8db84bf59d83d6eb.tar.xz qemu-ff804f15a120dee62bdcf17a8db84bf59d83d6eb.zip | |
linux-headers: update
Update to 4.7-rc2.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'linux-headers/asm-x86')
| -rw-r--r-- | linux-headers/asm-x86/kvm.h | 6 | ||||
| -rw-r--r-- | linux-headers/asm-x86/unistd_x32.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/linux-headers/asm-x86/kvm.h b/linux-headers/asm-x86/kvm.h index cd54147cb3..739c0c5940 100644 --- a/linux-headers/asm-x86/kvm.h +++ b/linux-headers/asm-x86/kvm.h @@ -216,9 +216,9 @@ struct kvm_cpuid_entry2 { __u32 padding[3]; }; -#define KVM_CPUID_FLAG_SIGNIFCANT_INDEX BIT(0) -#define KVM_CPUID_FLAG_STATEFUL_FUNC BIT(1) -#define KVM_CPUID_FLAG_STATE_READ_NEXT BIT(2) +#define KVM_CPUID_FLAG_SIGNIFCANT_INDEX (1 << 0) +#define KVM_CPUID_FLAG_STATEFUL_FUNC (1 << 1) +#define KVM_CPUID_FLAG_STATE_READ_NEXT (1 << 2) /* for KVM_SET_CPUID2 */ struct kvm_cpuid2 { diff --git a/linux-headers/asm-x86/unistd_x32.h b/linux-headers/asm-x86/unistd_x32.h index 8f77ee868a..0230779a84 100644 --- a/linux-headers/asm-x86/unistd_x32.h +++ b/linux-headers/asm-x86/unistd_x32.h @@ -306,7 +306,9 @@ #define __NR_vmsplice (__X32_SYSCALL_BIT + 532) #define __NR_move_pages (__X32_SYSCALL_BIT + 533) #define __NR_preadv (__X32_SYSCALL_BIT + 534) +#define __NR_preadv2 (__X32_SYSCALL_BIT + 534) #define __NR_pwritev (__X32_SYSCALL_BIT + 535) +#define __NR_pwritev2 (__X32_SYSCALL_BIT + 535) #define __NR_rt_tgsigqueueinfo (__X32_SYSCALL_BIT + 536) #define __NR_recvmmsg (__X32_SYSCALL_BIT + 537) #define __NR_sendmmsg (__X32_SYSCALL_BIT + 538) |