lkml.org 
[lkml]   [2008]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
SubjectRE: next-20081107: ia64 vs kvm
Alexey Dobriyan wrote:
> On ia64-smp-n-debug-n-preempt-n:
>
> arch/ia64/kvm/vmm.c:63: error: 'raw_spinlock_t' has no member named
> 'lock'
>
Hi, Avi
This patch should fix the issue Alex met, please apply to kvm.git and queue it for 2.6.28 fixes. Thanks!
Xiantao

From fae5782b369f4bd6e8edecad5912fea7624f0374 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Sat, 8 Nov 2008 15:46:59 +0800
Subject: [PATCH] KVM: IA64: Fix vmm_spin_{un}lock for !CONFIG_SMP.
In the case of !CONFIG_SMP, raw_spinlock_t has no any member
so vmm_spin_lock should also defines the version for !CONFIG_SMP.

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
arch/ia64/kvm/vcpu.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/ia64/kvm/vcpu.h b/arch/ia64/kvm/vcpu.h
index 341e3fe..e9b2a4e 100644
--- a/arch/ia64/kvm/vcpu.h
+++ b/arch/ia64/kvm/vcpu.h
@@ -384,6 +384,10 @@ static inline u64 __gpfn_is_io(u64 gpfn)
#define MODE_IND(psr) \
(((psr).it << 2) + ((psr).dt << 1) + (psr).rt)

+#ifndef CONFIG_SMP
+#define _vmm_raw_spin_lock(x) do {}while(0)
+#define _vmm_raw_spin_unlock(x) do {}while(0)
+#else
#define _vmm_raw_spin_lock(x) \
do { \
__u32 *ia64_spinlock_ptr = (__u32 *) (x); \
@@ -403,6 +407,7 @@ static inline u64 __gpfn_is_io(u64 gpfn)
do { barrier(); \
((spinlock_t *)x)->raw_lock.lock = 0; } \
while (0)
+#endif

void vmm_spin_lock(spinlock_t *lock);
void vmm_spin_unlock(spinlock_t *lock);
--
1.6.0[unhandled content-type:application/octet-stream]
\
 
 \ /
  Last update: 2008-11-08 08:59    [from the cache]
©2003-2011 Jasper Spaans