Merge tag 'v3.15-rc1' into perf/urgent

Pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 27 insertions, 0 deletions

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 45e921401b06..44eeef0da186 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -432,6 +432,14 @@ struct spi_device_id {
         kernel_ulong_t driver_data;     /* Data private to the driver */
 };
 
+#define SPMI_NAME_SIZE  32
+#define SPMI_MODULE_PREFIX "spmi:"
+
+struct spmi_device_id {
+        char name[SPMI_NAME_SIZE];
+        kernel_ulong_t driver_data;     /* Data private to the driver */
+};
+
 /* dmi */
 enum dmi_field {
         DMI_NONE,
@@ -548,6 +556,11 @@ struct amba_id {
  * See documentation of "x86_match_cpu" for details.
  */
 
+/*
+ * MODULE_DEVICE_TABLE expects this struct to be called x86cpu_device_id.
+ * Although gcc seems to ignore this error, clang fails without this define.
+ */
+#define x86cpu_device_id x86_cpu_id
 struct x86_cpu_id {
         __u16 vendor;
         __u16 family;
@@ -564,6 +577,15 @@ struct x86_cpu_id {
 #define X86_MODEL_ANY  0
 #define X86_FEATURE_ANY 0       /* Same as FPU, you can't test for that */
 
+/*
+ * Generic table type for matching CPU features.
+ * @feature:    the bit number of the feature (0 - 65535)
+ */
+
+struct cpu_feature {
+        __u16   feature;
+};
+
 #define IPACK_ANY_FORMAT 0xff
 #define IPACK_ANY_ID (~0)
 struct ipack_device_id {
@@ -599,4 +621,9 @@ struct rio_device_id {
         __u16 asm_did, asm_vid;
 };
 
+struct mcb_device_id {
+        __u16 device;
+        kernel_ulong_t driver_data;
+};
+
 #endif /* LINUX_MOD_DEVICETABLE_H */