summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2009-07-13 16:14:37 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-07-14 16:25:05 +0200
commit2ad76643ff58bb8841f391ea8327c14abe273ea3 (patch)
treeca96bcbbe0a266dfff594a1c2cb81b65a6163547 /arch
parent7473727be884293c8171775a148e1d174d1606e6 (diff)
downloadop-kernel-dev-2ad76643ff58bb8841f391ea8327c14abe273ea3.zip
op-kernel-dev-2ad76643ff58bb8841f391ea8327c14abe273ea3.tar.gz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/pvclock.c2
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) );
OpenPOWER on IntegriCloud