From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752140AbbJKTMw (ORCPT ); Sun, 11 Oct 2015 15:12:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60568 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751073AbbJKTMv (ORCPT ); Sun, 11 Oct 2015 15:12:51 -0400 Date: Sun, 11 Oct 2015 12:12:38 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com Reply-To: mingo@kernel.org, andriy.shevchenko@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1444319786-36125-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1444319786-36125-1-git-send-email-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpufeature] x86/cpu/intel: Enable X86_FEATURE_NONSTOP_TSC_S3 for Merrifield Git-Commit-ID: 1cc0166752d598a69f6bb99381d828cbfb5fa9a5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1cc0166752d598a69f6bb99381d828cbfb5fa9a5 Gitweb: http://git.kernel.org/tip/1cc0166752d598a69f6bb99381d828cbfb5fa9a5 Author: Andy Shevchenko AuthorDate: Thu, 8 Oct 2015 18:56:26 +0300 Committer: Thomas Gleixner CommitDate: Sun, 11 Oct 2015 21:07:26 +0200 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 Link: http://lkml.kernel.org/r/1444319786-36125-1-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Thomas Gleixner --- 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: