Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull one kvm bugfix from Gleb Natapov.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  x86/kvm: Fix pvclock vsyscall fixmap
This commit is contained in:
Linus Torvalds 2013-02-28 20:44:23 -08:00
commit 1e5005979e
1 changed files with 1 additions and 1 deletions

View File

@ -185,7 +185,7 @@ int __init pvclock_init_vsyscall(struct pvclock_vsyscall_time_info *i,
for (idx = 0; idx <= (PVCLOCK_FIXMAP_END-PVCLOCK_FIXMAP_BEGIN); idx++) {
__set_fixmap(PVCLOCK_FIXMAP_BEGIN + idx,
__pa_symbol(i) + (idx*PAGE_SIZE),
__pa(i) + (idx*PAGE_SIZE),
PAGE_KERNEL_VVAR);
}