From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53400 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751036AbdKEPYi (ORCPT ); Sun, 5 Nov 2017 10:24:38 -0500 Subject: Patch "Revert "x86: do not use cpufreq_quick_get() for /proc/cpuinfo "cpu MHz""" has been added to the 4.13-stable tree To: torvalds@linux-foundation.org, gregkh@linuxfoundation.org, len.brown@intel.com, rafael.j.wysocki@intel.com, tglx@linutronix.de Cc: , From: Date: Sun, 05 Nov 2017 16:24:39 +0100 Message-ID: <1509895479190165@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Revert "x86: do not use cpufreq_quick_get() for /proc/cpuinfo "cpu MHz"" to the 4.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-x86-do-not-use-cpufreq_quick_get-for-proc-cpuinfo-cpu-mhz.patch and it can be found in the queue-4.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 890da9cf098364b11a7f7f5c22fa652531624d03 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 2 Nov 2017 14:06:32 -0700 Subject: Revert "x86: do not use cpufreq_quick_get() for /proc/cpuinfo "cpu MHz"" From: Linus Torvalds commit 890da9cf098364b11a7f7f5c22fa652531624d03 upstream. This reverts commit 51204e0639c49ada02fd823782ad673b6326d748. There wasn't really any good reason for it, and people are complaining (rightly) that it broke existing practice. Cc: Len Brown Cc: Thomas Gleixner Cc: Rafael J. Wysocki Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/proc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c @@ -2,6 +2,7 @@ #include #include #include +#include /* * Get CPU information for use by the procfs. @@ -75,9 +76,14 @@ static int show_cpuinfo(struct seq_file if (c->microcode) seq_printf(m, "microcode\t: 0x%x\n", c->microcode); - if (cpu_has(c, X86_FEATURE_TSC)) + if (cpu_has(c, X86_FEATURE_TSC)) { + unsigned int freq = cpufreq_quick_get(cpu); + + if (!freq) + freq = cpu_khz; seq_printf(m, "cpu MHz\t\t: %u.%03u\n", - cpu_khz / 1000, (cpu_khz % 1000)); + freq / 1000, (freq % 1000)); + } /* Cache size */ if (c->x86_cache_size >= 0) Patches currently in stable-queue which might be from torvalds@linux-foundation.org are queue-4.13/revert-x86-do-not-use-cpufreq_quick_get-for-proc-cpuinfo-cpu-mhz.patch queue-4.13/fs-hugetlbfs-inode.c-fix-hwpoison-reserve-accounting.patch queue-4.13/ocfs2-fstrim-fix-start-offset-of-first-cluster-group-during-fstrim.patch queue-4.13/userfaultfd-hugetlbfs-prevent-uffdio_copy-to-fill-beyond-the-end-of-i_size.patch queue-4.13/x86-cpu-fix-up-cpu-mhz-in-proc-cpuinfo.patch queue-4.13/mm-swap-fix-race-between-swap-count-continuation-operations.patch