summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-28 20:44:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-28 20:44:23 -0800
commit1e5005979e45337dab9e2c2e4a75ebd71168c004 (patch)
treefe87325927ebb5d8192b0147be394c690d5688b5
parentad6c2c2eb34f234d6253292b9b3c047614fbfe7e (diff)
parent3d2a80a230250c2534ce5b17503670adaf1d7fff (diff)
downloadop-kernel-dev-1e5005979e45337dab9e2c2e4a75ebd71168c004.zip
op-kernel-dev-1e5005979e45337dab9e2c2e4a75ebd71168c004.tar.gz
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
-rw-r--r--arch/x86/kernel/pvclock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
index 85c3959..2cb9470 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);
}
OpenPOWER on IntegriCloud