diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-23 10:52:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-23 10:52:33 +0100 |
| commit | 9f1441644213e5f6faa150206399fe511eba2eb6 (patch) | |
| tree | e59d4e6475aa84f7e821a8c607deb56b85e19e95 /arch/ia64/kvm/vcpu.h | |
| parent | 3ff68a6a106c362a6811d3e51bced58e6fc87de7 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into irq/urgent
Diffstat (limited to 'arch/ia64/kvm/vcpu.h')
| -rw-r--r-- | 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 341e3fee280c..e9b2a4e121c0 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); |