diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-25 12:04:22 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-25 12:04:22 +0400 |
| commit | 42ebd27bcbda7895fa07c61185a26d8379945ed0 (patch) | |
| tree | 51be64b0c2c0defd1a0ce3e6d55452dbd8a7aaae /include/uapi | |
| parent | a81fef347b32dea2b31275826afe1c93fa0d2d54 (diff) | |
| parent | 9f7ff8931e3c5ddc8535476971ec9501e9555c05 (diff) | |
| download | linux-42ebd27bcbda7895fa07c61185a26d8379945ed0.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/tegra_drm.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/hyperv.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h index b042b48495d9..b75482112428 100644 --- a/include/uapi/drm/tegra_drm.h +++ b/include/uapi/drm/tegra_drm.h @@ -120,7 +120,6 @@ struct drm_tegra_submit { __u32 num_waitchks; __u32 waitchk_mask; __u32 timeout; - __u32 pad; __u64 syncpts; __u64 cmdbufs; __u64 relocs; diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h index 9beb7c991638..78e4a86030dd 100644 --- a/include/uapi/linux/hyperv.h +++ b/include/uapi/linux/hyperv.h @@ -305,6 +305,7 @@ enum hv_kvp_exchg_pool { #define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F #define HV_INVALIDARG 0x80070057 #define HV_GUID_NOTFOUND 0x80041002 +#define HV_ERROR_ALREADY_EXISTS 0x80070050 #define ADDR_FAMILY_NONE 0x00 #define ADDR_FAMILY_IPV4 0x01 |