git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kvm
/
vmm.c
diff --git
a/arch/ia64/kvm/vmm.c
b/arch/ia64/kvm/vmm.c
index f4b4c899bb6ce9d77d42d7a796931cb13e47ab03..7a62f75778c535f7421fc16ec4525407e3686e9b 100644
(file)
--- a/
arch/ia64/kvm/vmm.c
+++ b/
arch/ia64/kvm/vmm.c
@@
-60,12
+60,12
@@
static void __exit kvm_vmm_exit(void)
return ;
}
-void vmm_spin_lock(spinlock_t *lock)
+void vmm_spin_lock(
vmm_
spinlock_t *lock)
{
_vmm_raw_spin_lock(lock);
}
-void vmm_spin_unlock(spinlock_t *lock)
+void vmm_spin_unlock(
vmm_
spinlock_t *lock)
{
_vmm_raw_spin_unlock(lock);
}