x86: pvclock kvm: align allocation size to page size

To match whats mapped via vsyscalls to userspace.

Reported-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 220a360010f8..5bedbdddf1f2 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -218,6 +218,9 @@ static void kvm_shutdown(void)
 void __init kvmclock_init(void)
 {
         unsigned long mem;
+        int size;
+
+        size = PAGE_ALIGN(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
 
         if (!kvm_para_available())
                 return;
@@ -231,16 +234,14 @@ void __init kvmclock_init(void)
         printk(KERN_INFO "kvm-clock: Using msrs %x and %x",
                 msr_kvm_system_time, msr_kvm_wall_clock);
 
-        mem = memblock_alloc(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS,
-                             PAGE_SIZE);
+        mem = memblock_alloc(size, PAGE_SIZE);
         if (!mem)
                 return;
         hv_clock = __va(mem);
 
         if (kvm_register_clock("boot clock")) {
                 hv_clock = NULL;
-                memblock_free(mem,
-                        sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
+                memblock_free(mem, size);
                 return;
         }
         pv_time_ops.sched_clock = kvm_clock_read;
@@ -275,7 +276,7 @@ int __init kvm_setup_vsyscall_timeinfo(void)
         struct pvclock_vcpu_time_info *vcpu_time;
         unsigned int size;
 
-        size = sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS;
+        size = PAGE_ALIGN(sizeof(struct pvclock_vsyscall_time_info)*NR_CPUS);
 
         preempt_disable();
         cpu = smp_processor_id();