projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.3-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
x86
/
xen
/
enlighten.c
diff --git
a/arch/x86/xen/enlighten.c
b/arch/x86/xen/enlighten.c
index 25309c1683117a49b295003a0f8c3cf50544d5ed..30d12afe52ed173b2a81720cd5c89c24e667de2a 100644
(file)
--- a/
arch/x86/xen/enlighten.c
+++ b/
arch/x86/xen/enlighten.c
@@
-1219,11
+1219,8
@@
static const struct pv_cpu_ops xen_cpu_ops __initconst = {
.read_msr = xen_read_msr_safe,
.write_msr = xen_write_msr_safe,
- .read_tsc = native_read_tsc,
.read_pmc = xen_read_pmc,
- .read_tscp = native_read_tscp,
-
.iret = xen_iret,
#ifdef CONFIG_X86_64
.usergs_sysret32 = xen_sysret32,