diff options
| author | Christopher Ferris <cferris@google.com> | 2015-07-14 22:52:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 22:52:36 +0000 |
| commit | db47ea76ab83f2ef5aca42de240035885dc7ad1a (patch) | |
| tree | 877dfb56aa7792fbdd0622d83f9263e2e3f5b6df | |
| parent | bed0ffadd7316307a87a7126349a7b59b924e4fd (diff) | |
| parent | 6bab84bbc715738d7de393a6b2943926cf0402f1 (diff) | |
| download | kernel-headers-db47ea76ab83f2ef5aca42de240035885dc7ad1a.tar.gz | |
am 6bab84bb: Merge "Update to v3.18.18 kernel headers."
* commit '6bab84bbc715738d7de393a6b2943926cf0402f1':
Update to v3.18.18 kernel headers.
| -rw-r--r-- | original/uapi/asm-arm/asm/kvm.h | 8 | ||||
| -rw-r--r-- | original/uapi/asm-arm64/asm/kvm.h | 8 | ||||
| -rw-r--r-- | original/uapi/drm/radeon_drm.h | 1 | ||||
| -rw-r--r-- | original/uapi/linux/version.h | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/original/uapi/asm-arm/asm/kvm.h b/original/uapi/asm-arm/asm/kvm.h index 09ee408..b404cf8 100644 --- a/original/uapi/asm-arm/asm/kvm.h +++ b/original/uapi/asm-arm/asm/kvm.h @@ -193,8 +193,14 @@ struct kvm_arch_memory_slot { #define KVM_ARM_IRQ_CPU_IRQ 0 #define KVM_ARM_IRQ_CPU_FIQ 1 -/* Highest supported SPI, from VGIC_NR_IRQS */ +/* + * This used to hold the highest supported SPI, but it is now obsolete + * and only here to provide source code level compatibility with older + * userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS. + */ +#ifndef __KERNEL__ #define KVM_ARM_IRQ_GIC_MAX 127 +#endif /* PSCI interface */ #define KVM_PSCI_FN_BASE 0x95c1ba5e diff --git a/original/uapi/asm-arm64/asm/kvm.h b/original/uapi/asm-arm64/asm/kvm.h index 8e38878..d9e9822 100644 --- a/original/uapi/asm-arm64/asm/kvm.h +++ b/original/uapi/asm-arm64/asm/kvm.h @@ -179,8 +179,14 @@ struct kvm_arch_memory_slot { #define KVM_ARM_IRQ_CPU_IRQ 0 #define KVM_ARM_IRQ_CPU_FIQ 1 -/* Highest supported SPI, from VGIC_NR_IRQS */ +/* + * This used to hold the highest supported SPI, but it is now obsolete + * and only here to provide source code level compatibility with older + * userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS. + */ +#ifndef __KERNEL__ #define KVM_ARM_IRQ_GIC_MAX 127 +#endif /* PSCI interface */ #define KVM_PSCI_FN_BASE 0x95c1ba5e diff --git a/original/uapi/drm/radeon_drm.h b/original/uapi/drm/radeon_drm.h index 50d0fb4..76d2ede 100644 --- a/original/uapi/drm/radeon_drm.h +++ b/original/uapi/drm/radeon_drm.h @@ -1034,6 +1034,7 @@ struct drm_radeon_cs { #define RADEON_INFO_VRAM_USAGE 0x1e #define RADEON_INFO_GTT_USAGE 0x1f #define RADEON_INFO_ACTIVE_CU_COUNT 0x20 +#define RADEON_INFO_VA_UNMAP_WORKING 0x25 struct drm_radeon_info { uint32_t request; diff --git a/original/uapi/linux/version.h b/original/uapi/linux/version.h index b8e4ed0..78351e6 100644 --- a/original/uapi/linux/version.h +++ b/original/uapi/linux/version.h @@ -1,2 +1,2 @@ -#define LINUX_VERSION_CODE 201226 +#define LINUX_VERSION_CODE 201234 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |