git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[pandora-kernel.git]
/
arch
/
x86
/
kvm
/
kvm_timer.h
diff --git
a/arch/x86/kvm/kvm_timer.h
b/arch/x86/kvm/kvm_timer.h
index
55c7524
..
64bc6ea
100644
(file)
--- a/
arch/x86/kvm/kvm_timer.h
+++ b/
arch/x86/kvm/kvm_timer.h
@@
-10,9
+10,7
@@
struct kvm_timer {
};
struct kvm_timer_ops {
-
bool (*is_periodic)(struct kvm_timer *);
+ bool (*is_periodic)(struct kvm_timer *);
};
-
enum hrtimer_restart kvm_timer_fn(struct hrtimer *data);
-