Commit 136867f5 authored Feb 05, 2013 by Shuah Khan Committed by Ingo Molnar Feb 11, 2013

x86/kvm: Fix compile warning in kvm_register_steal_time()



Fix the following compile warning in kvm_register_steal_time():

  CC      arch/x86/kernel/kvm.o
  arch/x86/kernel/kvm.c: In function ‘kvm_register_steal_time’: arch/x86/kernel/kvm.c:302:3:
  warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘phys_addr_t’ [-Wformat]

Introduced via:

  5dfd486c x86, kvm: Fix kvm's use of __pa() on percpu areas
  d7656534 x86, mm: Create slow_virt_to_phys()
  f3c4fbb6 x86, mm: Use new pagetable helpers in try_preserve_large_page()
  4cbeb51b x86, mm: Pagetable level size/shift/mask helpers
  a25b9316 x86, mm: Make DEBUG_VIRTUAL work earlier in boot

Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: shuahkhan@gmail.com
Cc: avi@redhat.com
Cc: gleb@redhat.com
Cc: mst@redhat.com
Link: http://lkml.kernel.org/r/1360119442.8356.8.camel@lorien2


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 96477b4c

arch/x86/kernel/kvm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -298,8 +298,8 @@ static void kvm_register_steal_time(void)
		memset(st, 0, sizeof(*st));

		wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) \| KVM_MSR_ENABLED));
		printk(KERN_INFO "kvm-stealtime: cpu %d, msr %lx\n",
		cpu, slow_virt_to_phys(st));
		pr_info("kvm-stealtime: cpu %d, msr %llx\n",
		cpu, (unsigned long long) slow_virt_to_phys(st));
		}

		static DEFINE_PER_CPU(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED;

Admin message