diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-04 21:08:09 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-04 21:08:09 +0200 |
commit | 62b3f981886b9b899eb0fc5fb59375f4512a1bd1 (patch) | |
tree | 08064a8c97ac6fb3f65a6363d2fda6f7417644f5 /arch/x86/kernel/paravirt.c | |
parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
parent | b05f78f5c713eda2c34e495d92495ee4f1c3b5e1 (diff) | |
download | op-kernel-dev-62b3f981886b9b899eb0fc5fb59375f4512a1bd1.zip op-kernel-dev-62b3f981886b9b899eb0fc5fb59375f4512a1bd1.tar.gz |
Merge branch 'x86/debug' into x86/cpu
Diffstat (limited to 'arch/x86/kernel/paravirt.c')
-rw-r--r-- | arch/x86/kernel/paravirt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 300da17..e2f4376 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -330,6 +330,7 @@ struct pv_cpu_ops pv_cpu_ops = { #endif .wbinvd = native_wbinvd, .read_msr = native_read_msr_safe, + .read_msr_amd = native_read_msr_amd_safe, .write_msr = native_write_msr_safe, .read_tsc = native_read_tsc, .read_pmc = native_read_pmc, |