mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Borislav Petkov <borislav.petkov@amd.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	a.p.zijlstra@chello.nl, torvalds@linux-foundation.org,
	frank.arnold@amd.com, akpm@linux-foundation.org,
	tglx@linutronix.de, borislav.petkov@amd.com
Subject: [tip:x86/mce] x86/mce: Fix 32-bit build
Date: Wed, 23 May 2012 09:08:17 -0700	[thread overview]
Message-ID: <tip-80f033610fb968e75f5d470233d8d0260d7a72ed@git.kernel.org> (raw)
In-Reply-To: <1337684026-19740-2-git-send-email-bp@amd64.org>

Commit-ID:  80f033610fb968e75f5d470233d8d0260d7a72ed
Gitweb:     http://git.kernel.org/tip/80f033610fb968e75f5d470233d8d0260d7a72ed
Author:     Borislav Petkov <borislav.petkov@amd.com>
AuthorDate: Tue, 22 May 2012 12:53:46 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 23 May 2012 17:16:43 +0200

x86/mce: Fix 32-bit build

Got bitten again by the BIT() macro:

 arch/x86/kernel/cpu/mcheck/mce.c: In function '__mcheck_cpu_apply_quirks':
 arch/x86/kernel/cpu/mcheck/mce.c:1453:6: warning: left shift
 count >= width of type arch/x86/kernel/cpu/mcheck/mce.c:1454:7: warning: left shift count >= width of type

Fix it already.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Frank Arnold <frank.arnold@amd.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1337684026-19740-2-git-send-email-bp@amd64.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/cpu/mcheck/mce.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 888fbf9..0456b9a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1450,9 +1450,9 @@ static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
 				 rdmsrl(msrs[i], val);
 
 				 /* CntP bit set? */
-				 if (val & BIT(62)) {
-					 val &= ~BIT(62);
-					 wrmsrl(msrs[i], val);
+				 if (val & BIT_64(62)) {
+					val &= ~BIT_64(62);
+					wrmsrl(msrs[i], val);
 				 }
 			 }
 

  reply	other threads:[~2012-05-23 16:08 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-22 10:53 [PATCH 1/2] x86, bitops: Move BIT_64 for a wider use Borislav Petkov
2012-05-22 10:53 ` [PATCH 2/2] x86, MCE: Fix 32-bit build Borislav Petkov
2012-05-23 16:08   ` tip-bot for Borislav Petkov [this message]
2012-05-23 16:18     ` [tip:x86/mce] x86/mce: " Peter Zijlstra
2012-05-23 16:23       ` Borislav Petkov
2012-05-23 16:31         ` Peter Zijlstra
2012-05-23 16:44           ` Borislav Petkov
2012-05-23 16:46             ` Peter Zijlstra
2012-05-23 16:54               ` Borislav Petkov
2012-05-23 16:07 ` [tip:x86/mce] x86/bitops: Move BIT_64() for a wider use tip-bot for Borislav Petkov
2012-05-23 16:10   ` Peter Zijlstra
2012-05-23 16:11     ` H. Peter Anvin
2012-05-23 16:19       ` Borislav Petkov
2012-05-23 16:29         ` Peter Zijlstra
2012-05-23 16:31           ` H. Peter Anvin
2012-05-23 16:43             ` Linus Torvalds
2012-05-23 16:47               ` H. Peter Anvin
2012-05-23 16:50                 ` H. Peter Anvin
2012-05-23 16:54                 ` Linus Torvalds
2012-05-23 16:55                   ` H. Peter Anvin
2012-05-23 16:53             ` Borislav Petkov
2012-05-23 16:57               ` Linus Torvalds
2012-05-23 17:11                 ` Borislav Petkov
2012-05-23 17:37                   ` Linus Torvalds
2012-05-23 16:54           ` Peter Zijlstra
2012-05-23 16:40         ` Linus Torvalds
2012-05-23 16:42           ` H. Peter Anvin
2012-05-23 16:45             ` Linus Torvalds

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-80f033610fb968e75f5d470233d8d0260d7a72ed@git.kernel.org \
    --to=borislav.petkov@amd.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=akpm@linux-foundation.org \
    --cc=frank.arnold@amd.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome