diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-01 05:44:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-01 05:44:23 +0100 |
| commit | 1e5005979e45337dab9e2c2e4a75ebd71168c004 (patch) | |
| tree | fe87325927ebb5d8192b0147be394c690d5688b5 /arch/x86 | |
| parent | Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mc... (diff) | |
| parent | x86/kvm: Fix pvclock vsyscall fixmap (diff) | |
| download | linux-1e5005979e45337dab9e2c2e4a75ebd71168c004.tar.xz linux-1e5005979e45337dab9e2c2e4a75ebd71168c004.zip | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/pvclock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index 85c39590c1a4..2cb9470ea85b 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -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); } |