[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-354dbaa7ff5b53a0ed1c0f7a9773d5953b3a1bb9@git.kernel.org>
Date: Sat, 7 Nov 2015 01:42:49 -0800
From: tip-bot for Andy Shevchenko <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com,
andriy.shevchenko@...ux.intel.com, tglx@...utronix.de,
mingo@...nel.org
Subject: [tip:x86/urgent] x86/cpu/intel:
Enable X86_FEATURE_NONSTOP_TSC_S3 for Merrifield
Commit-ID: 354dbaa7ff5b53a0ed1c0f7a9773d5953b3a1bb9
Gitweb: http://git.kernel.org/tip/354dbaa7ff5b53a0ed1c0f7a9773d5953b3a1bb9
Author: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
AuthorDate: Thu, 8 Oct 2015 18:56:26 +0300
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Sat, 7 Nov 2015 10:37:30 +0100
x86/cpu/intel: Enable X86_FEATURE_NONSTOP_TSC_S3 for Merrifield
The Intel Merrifield SoC is a successor of the Intel MID line of
SoCs. Let's set the neccessary capability for that chip. See commit
c54fdbb2823d (x86: Add cpu capability flag X86_FEATURE_NONSTOP_TSC_S3)
for the details.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Link: http://lkml.kernel.org/r/1444319786-36125-1-git-send-email-andriy.shevchenko@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/x86/kernel/cpu/intel.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 98a13db..209ac1e 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -97,6 +97,7 @@ static void early_init_intel(struct cpuinfo_x86 *c)
switch (c->x86_model) {
case 0x27: /* Penwell */
case 0x35: /* Cloverview */
+ case 0x4a: /* Merrifield */
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
break;
default:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists