x86/platform change for v4.1
Linus,
Please pull the latest x86-platform-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus
# HEAD: a6fcb6d4804b51ffcae7881c7f99483f4981ddf1 x86/intel/quark: Run IMR self-test on IMR capble hw only
An Intel Quark SoC fix.
Thanks,
Ingo
------------------>
Bryan O'Donoghue (1):
x86/intel/quark: Run IMR self-test on IMR capble hw only
arch/x86/platform/intel-quark/imr_selftest.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
arch/x86/platform/intel-quark/imr_selftest.c +9 -1
@@ -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,6 +102,12 @@ 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. *
@@ -108,7 +115,8 @@ static void __init imr_self_test(void)*/ static int __init imr_self_test_init (void ) { -imr_self_test (); +if (x86_match_cpu (imr_ids)) +imr_self_test ();return 0 ; }