Attachment 311826 Details for Bug 455422 – Upstream fix for this issue

[patch] Upstream fix for this issue

59 (text/plain), 4.21 KB, created by Prarit Bhargava on 2008-07-15 13:54:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-07-15 13:54:37 UTC

Size: 4.21 KB

patch

obsolete

>Return-path: <git-commits-head-owner@vger.kernel.org>
>Envelope-to: arjan@infradead.org
>Delivery-date: Fri, 18 Apr 2008 17:05:45 +0000
>Received: from vger.kernel.org ([209.132.176.167])
>	by pentafluge.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux))
>	id 1Jmu1w-0008QN-GQ
>	for arjan@infradead.org; Fri, 18 Apr 2008 17:05:44 +0000
>Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
>	id S1755602AbYDRRFn (ORCPT <rfc822;arjan@infradead.org>);
>	Fri, 18 Apr 2008 13:05:43 -0400
>Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755621AbYDRRFn
>	(ORCPT <rfc822;git-commits-head-outgoing>);
>	Fri, 18 Apr 2008 13:05:43 -0400
>Received: from hera.kernel.org ([140.211.167.34]:39348 "EHLO hera.kernel.org"
>	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
>	id S1755602AbYDRRFn (ORCPT
>	<rfc822;git-commits-head@vger.kernel.org>);
>	Fri, 18 Apr 2008 13:05:43 -0400
>Received: from hera.kernel.org (IDENT:U2FsdGVkX19P/RDL/aN8WLVWn0b7gBIdLvbeuwPHA/0@localhost [127.0.0.1])
>	by hera.kernel.org (8.13.8/8.13.8) with ESMTP id m3IH5fkv009016
>	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
>	for <git-commits-head@vger.kernel.org>; Fri, 18 Apr 2008 17:05:41 GMT
>Received: (from dwmw2@localhost)
>	by hera.kernel.org (8.13.8/8.13.1/Submit) id m3IH5ebm009001
>	for git-commits-head@vger.kernel.org; Fri, 18 Apr 2008 17:05:40 GMT
>Date:	Fri, 18 Apr 2008 17:05:40 GMT
>Message-Id: <200804181705.m3IH5ebm009001@hera.kernel.org>
>From:	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
>To:	git-commits-head@vger.kernel.org
>Subject: x86: add power management line in /proc/cpuinfo
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>X-Git-Commit: f84c3a429f83a98bb0b0fd7eed7ad1edc512b91c
>X-Git-Parent: a967ceac01cd3847011e2a777b8365b30afa770a
>X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00
>	autolearn=ham version=3.2.3
>X-Spam-Checker-Version:	SpamAssassin 3.2.3 (2007-08-08) on hera.kernel.org
>Sender:	git-commits-head-owner@vger.kernel.org
>Precedence: bulk
>List-ID: <git-commits-head.vger.kernel.org>
>X-Mailing-List:	git-commits-head@vger.kernel.org
>
>Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f84c3a429f83a98bb0b0fd7eed7ad1edc512b91c
>Commit:     f84c3a429f83a98bb0b0fd7eed7ad1edc512b91c
>Parent:     a967ceac01cd3847011e2a777b8365b30afa770a
>Author:     Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>AuthorDate: Wed Feb 20 10:47:12 2008 -0800
>Committer:  Ingo Molnar <mingo@elte.hu>
>CommitDate: Thu Apr 17 17:40:48 2008 +0200
>
>    x86: add power management line in /proc/cpuinfo
>    
>    Change /proc/cpuinfo on 32-bit, it will look like on 64-bit.
>    'power management' line is added and power management information
>    will be printed at the line.
>    
>    Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
>    Signed-off-by: Ingo Molnar <mingo@elte.hu>
>---
> arch/x86/kernel/cpu/proc.c |   14 +++++++++-----
> 1 files changed, 9 insertions(+), 5 deletions(-)
>
>diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
>index 9bc3b04..fd3823a 100644
>--- a/arch/x86/kernel/cpu/proc.c
>+++ b/arch/x86/kernel/cpu/proc.c
>@@ -94,7 +94,13 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> 		if (cpu_has(c, i) && x86_cap_flags[i] != NULL)
> 			seq_printf(m, " %s", x86_cap_flags[i]);
> 
>-	for (i = 0; i < 32; i++)
>+	seq_printf(m, "\nbogomips\t: %lu.%02lu\n",
>+		   c->loops_per_jiffy/(500000/HZ),
>+		   (c->loops_per_jiffy/(5000/HZ)) % 100);
>+	seq_printf(m, "clflush size\t: %u\n", c->x86_clflush_size);
>+
>+	seq_printf(m, "power management:");
>+	for (i = 0; i < 32; i++) {
> 		if (c->x86_power & (1 << i)) {
> 			if (i < ARRAY_SIZE(x86_power_flags) &&
> 			    x86_power_flags[i])
>@@ -104,11 +110,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
> 			else
> 				seq_printf(m, " [%d]", i);
> 		}
>+	}
> 
>-	seq_printf(m, "\nbogomips\t: %lu.%02lu\n",
>-		   c->loops_per_jiffy/(500000/HZ),
>-		   (c->loops_per_jiffy/(5000/HZ)) % 100);
>-	seq_printf(m, "clflush size\t: %u\n\n", c->x86_clflush_size);
>+	seq_printf(m, "\n\n");
> 
> 	return 0;
> }
>--
>To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

Actions: View | Diff

Attachments on bug 455422: 311826