diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 16:32:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 16:32:35 -0400 |
commit | ee799f41eb2bc0484711b0fc942fddf54248289f (patch) | |
tree | 5e584db09e57856f7c9a1e7f53cd7f46c3e38736 | |
parent | 6cf78d4b3766bcd25348d72377796f9566ac8e1a (diff) | |
parent | a6fcb6d4804b51ffcae7881c7f99483f4981ddf1 (diff) |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
-rw-r--r-- | arch/x86/platform/intel-quark/imr_selftest.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c index c9a0838890e2..278e4da4222f 100644 --- a/arch/x86/platform/intel-quark/imr_selftest.c +++ b/arch/x86/platform/intel-quark/imr_selftest.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <asm-generic/sections.h> | 13 | #include <asm-generic/sections.h> |
14 | #include <asm/cpu_device_id.h> | ||
14 | #include <asm/imr.h> | 15 | #include <asm/imr.h> |
15 | #include <linux/init.h> | 16 | #include <linux/init.h> |
16 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
@@ -101,6 +102,12 @@ 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 | * imr_self_test_init - entry point for IMR driver. | 112 | * imr_self_test_init - entry point for IMR driver. |
106 | * | 113 | * |
@@ -108,7 +115,8 @@ static void __init imr_self_test(void) | |||
108 | */ | 115 | */ |
109 | static int __init imr_self_test_init(void) | 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 | return 0; | 120 | return 0; |
113 | } | 121 | } |
114 | 122 | ||