From c7a60c09605432ddc6d484e661103eeec46f221f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 8 May 2016 11:07:10 +0200 Subject: [PATCH] fix up 3.14/x86-llvmlinux-fix-incomplete-type-const-struct-x86cpu_device_id.patch --- ...e-type-const-struct-x86cpu_device_id.patch | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/queue-3.14/x86-llvmlinux-fix-incomplete-type-const-struct-x86cpu_device_id.patch b/queue-3.14/x86-llvmlinux-fix-incomplete-type-const-struct-x86cpu_device_id.patch index a02115cb2a0..af9dba1d992 100644 --- a/queue-3.14/x86-llvmlinux-fix-incomplete-type-const-struct-x86cpu_device_id.patch +++ b/queue-3.14/x86-llvmlinux-fix-incomplete-type-const-struct-x86cpu_device_id.patch @@ -55,15 +55,24 @@ x86cpu_device_id Signed-off-by: Behan Webster Signed-off-by: Jan-Simon Möller Acked-by: Greg Kroah-Hartman +[added vmbus, mei, and rapdio #defines, needed for 3.14 - gregkh] Signed-off-by: Greg Kroah-Hartman --- - include/linux/mod_devicetable.h | 5 +++++ - 1 file changed, 5 insertions(+) + include/linux/mod_devicetable.h | 8 ++++++++ + 1 file changed, 8 insertions(+) --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h -@@ -548,6 +548,11 @@ struct amba_id { +@@ -398,6 +398,7 @@ struct virtio_device_id { + /* + * For Hyper-V devices we use the device guid as the id. + */ ++#define vmbus_device_id hv_vmbus_device_id + struct hv_vmbus_device_id { + __u8 guid[16]; + kernel_ulong_t driver_data; /* Data private to the driver */ +@@ -548,6 +549,11 @@ struct amba_id { * See documentation of "x86_match_cpu" for details. */ @@ -75,3 +84,19 @@ Signed-off-by: Greg Kroah-Hartman struct x86_cpu_id { __u16 vendor; __u16 family; +@@ -575,6 +581,7 @@ struct ipack_device_id { + #define MEI_CL_MODULE_PREFIX "mei:" + #define MEI_CL_NAME_SIZE 32 + ++#define mei_device_id mei_cl_device_id + struct mei_cl_device_id { + char name[MEI_CL_NAME_SIZE]; + kernel_ulong_t driver_info; +@@ -594,6 +601,7 @@ struct mei_cl_device_id { + * Identifies a RapidIO device based on both the device/vendor IDs and + * the assembly device/vendor IDs. + */ ++#define rapidio_device_id rio_device_id + struct rio_device_id { + __u16 did, vid; + __u16 asm_did, asm_vid; -- 2.47.3