From: tip-bot for Dave Jones <davej@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
davej@redhat.com, tglx@linutronix.de
Subject: [tip:x86/urgent] x86: Fix warning in pvclock.c
Date: Tue, 14 Jul 2009 14:28:01 GMT [thread overview]
Message-ID: <tip-2ad76643ff58bb8841f391ea8327c14abe273ea3@git.kernel.org> (raw)
In-Reply-To: <20090713201437.GA12165@redhat.com>
Commit-ID: 2ad76643ff58bb8841f391ea8327c14abe273ea3
Gitweb: http://git.kernel.org/tip/2ad76643ff58bb8841f391ea8327c14abe273ea3
Author: Dave Jones <davej@redhat.com>
AuthorDate: Mon, 13 Jul 2009 16:14:37 -0400
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 14 Jul 2009 16:25:05 +0200
x86: Fix warning in pvclock.c
when building 32-bit, I see this ..
arch/x86/kernel/pvclock.c:63:7: warning: "__x86_64__" is not defined
Signed-off-by: Dave Jones <davej@redhat.com>
LKML-Reference: <20090713201437.GA12165@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/kernel/pvclock.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
index 4f9c55f..03801f2 100644
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
@@ -60,7 +60,7 @@ static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
"adc %5,%%edx ; "
: "=A" (product), "=r" (tmp1), "=r" (tmp2)
: "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
-#elif __x86_64__
+#elif defined(__x86_64__)
__asm__ (
"mul %%rdx ; shrd $32,%%rdx,%%rax"
: "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );
prev parent reply other threads:[~2009-07-14 14:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-13 20:14 Fix warning in pvclock.c Dave Jones
2009-07-14 14:28 ` tip-bot for Dave Jones [this message]
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-2ad76643ff58bb8841f391ea8327c14abe273ea3@git.kernel.org \
--to=davej@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.