diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:12:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:12:11 +0200 |
| commit | b0338e99b2a775c157e3e795f49fdcfb6c257f7a (patch) | |
| tree | 59573cd20718ebb5145b05938ef3fb428bde65c7 /arch/x86/xen | |
| parent | 90574ebb7e6e0f7f74636ee87315890ba88d6a4a (diff) | |
| parent | 715c85b1fc824e9cd0ea07d6ceb80d2262f32e90 (diff) | |
| download | op-kernel-dev-b0338e99b2a775c157e3e795f49fdcfb6c257f7a.zip op-kernel-dev-b0338e99b2a775c157e3e795f49fdcfb6c257f7a.tar.gz | |
Merge branch 'x86/cpu' into perf/core
Merge this branch because we changed the wrmsr*_safe() API and there's
a conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index ff962d4..ed7d549 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1124,9 +1124,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { .wbinvd = native_wbinvd, .read_msr = native_read_msr_safe, - .rdmsr_regs = native_rdmsr_safe_regs, .write_msr = xen_write_msr_safe, - .wrmsr_regs = native_wrmsr_safe_regs, .read_tsc = native_read_tsc, .read_pmc = native_read_pmc, |
