iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2015-04-13 13:32:35 -07:00
commit ee799f41eb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/platform/intel-quark/imr_selftest.c
View File

@ -11,6 +11,7 @@
*/ */
#include <asm-generic/sections.h> #include <asm-generic/sections.h>
#include <asm/cpu_device_id.h>
#include <asm/imr.h> #include <asm/imr.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm.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. * 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) static int __init imr_self_test_init(void)
{ {
imr_self_test(); if (x86_match_cpu(imr_ids))
imr_self_test();
return 0; return 0;
} }