From: H. Peter Anvin <hpa@zytor.com>
Date: Fri, 6 Aug 2010 19:18:11 +0000 (-0700)
Subject: x86, kvm: Remove cast obsoleted by set_64bit() prototype cleanup
X-Git-Tag: v2.6.36-rc1~516
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7645e4320497b35ce9fb6c2269ebcd57af9fe735;p=~shefty%2Frdma-dev.git

x86, kvm: Remove cast obsoleted by set_64bit() prototype cleanup

KVM ended up having to put a pretty ugly wrapper around set_64bit()
in order to get the type right.  Now set_64bit() takes the expected
u64 type, and this wrapper can be cleaned up.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Avi Kivity <avi@redhat.com>
LKML-Reference: <4C5C4E7A.8040603@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 0dcc95e0987..311f6dad895 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -281,11 +281,7 @@ static gfn_t pse36_gfn_delta(u32 gpte)
 
 static void __set_spte(u64 *sptep, u64 spte)
 {
-#ifdef CONFIG_X86_64
-	set_64bit((unsigned long *)sptep, spte);
-#else
-	set_64bit((unsigned long long *)sptep, spte);
-#endif
+	set_64bit(sptep, spte);
 }
 
 static u64 __xchg_spte(u64 *sptep, u64 new_spte)