Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit ee799f41eb2b · 2015-04-13T13:32:35.000-07:00
Pull x86 platform change from Ingo Molnar:
 "An Intel Quark SoC fix"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel/quark: Run IMR self-test on IMR capble hw only
diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
@@ -11,6 +11,7 @@
  */
 
 #include <asm-generic/sections.h>
+#include <asm/cpu_device_id.h>
 #include <asm/imr.h>
 #include <linux/init.h>
 #include <linux/mm.h>
@@ -101,14 +102,21 @@ static void __init imr_self_test(void)
 	}
 }
 
+static const struct x86_cpu_id imr_ids[] __initconst = {
+	{ X86_VENDOR_INTEL, 5, 9 },	/* Intel Quark SoC X1000. */
+	{}
+};
+MODULE_DEVICE_TABLE(x86cpu, imr_ids);
+
 /**
  * imr_self_test_init - entry point for IMR driver.
  *
  * return: -ENODEV for no IMR support 0 if good to go.
  */
 static int __init imr_self_test_init(void)
 {
-	imr_self_test();
+	if (x86_match_cpu(imr_ids))
+		imr_self_test();
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`
`13`	`13`	`#include <asm-generic/sections.h>`
	`14`	`+#include <asm/cpu_device_id.h>`
`14`	`15`	`#include <asm/imr.h>`
`15`	`16`	`#include <linux/init.h>`
`16`	`17`	`#include <linux/mm.h>`
`@@ -101,14 +102,21 @@ static void __init imr_self_test(void)`
`101`	`102`	`}`
`102`	`103`	`}`
`103`	`104`
	`105`	`+static const struct x86_cpu_id imr_ids[] __initconst = {`
	`106`	`+ { X86_VENDOR_INTEL, 5, 9 }, /* Intel Quark SoC X1000. */`
	`107`	`+ {}`
	`108`	`+};`
	`109`	`+MODULE_DEVICE_TABLE(x86cpu, imr_ids);`
	`110`	`+`
`104`	`111`	`/**`
`105`	`112`	`* imr_self_test_init - entry point for IMR driver.`
`106`	`113`	`*`
`107`	`114`	`* return: -ENODEV for no IMR support 0 if good to go.`
`108`	`115`	`*/`
`109`	`116`	`static int __init imr_self_test_init(void)`
`110`	`117`	`{`
`111`		`- imr_self_test();`
	`118`	`+ if (x86_match_cpu(imr_ids))`
	`119`	`+ imr_self_test();`
`112`	`120`	`return 0;`
`113`	`121`	`}`
`114`	`122`