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 branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
kvm_para.h
diff --git
a/arch/x86/include/asm/kvm_para.h
b/arch/x86/include/asm/kvm_para.h
index 3aea2658323a5ea5c76f2524b7315eb08149d9e1..4c723632c036e4c53f320e5caf39dbf472a41486 100644
(file)
--- a/
arch/x86/include/asm/kvm_para.h
+++ b/
arch/x86/include/asm/kvm_para.h
@@
-7,7
+7,6
@@
#include <uapi/asm/kvm_para.h>
extern void kvmclock_init(void);
-extern int kvm_register_clock(char *txt);
#ifdef CONFIG_KVM_GUEST
bool kvm_check_and_clear_guest_paused(void);