All of lore.kernel.org
 help / color / mirror / Atom feed
* Fix warning in pvclock.c
@ 2009-07-13 20:14 Dave Jones
  2009-07-14 14:28 ` [tip:x86/urgent] x86: " tip-bot for Dave Jones
  0 siblings, 1 reply; 2+ messages in thread
From: Dave Jones @ 2009-07-13 20:14 UTC (permalink / raw)
  To: Linux Kernel; +Cc: x86

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>

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) );

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [tip:x86/urgent] x86: Fix warning in pvclock.c
  2009-07-13 20:14 Fix warning in pvclock.c Dave Jones
@ 2009-07-14 14:28 ` tip-bot for Dave Jones
  0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Dave Jones @ 2009-07-14 14:28 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, davej, tglx

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) );

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-07-14 14:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-13 20:14 Fix warning in pvclock.c Dave Jones
2009-07-14 14:28 ` [tip:x86/urgent] x86: " tip-bot for Dave Jones

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.