From: Wanpeng Li Date: Tue, 8 Mar 2022 08:18:49 +0000 (-0800) Subject: x86/kvm: Don't waste kvmclock memory if there is nopv parameter X-Git-Tag: microblaze-v5.20~139^2~78 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=77d727926607ba42f0c4ba82baaec1076e8cbebf;p=linux-2.6-microblaze.git x86/kvm: Don't waste kvmclock memory if there is nopv parameter When the "nopv" command line parameter is used, it should not waste memory for kvmclock. Signed-off-by: Wanpeng Li Message-Id: <1646727529-11774-1-git-send-email-wanpengli@tencent.com> Signed-off-by: Paolo Bonzini --- diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index c5caa7311bd8..16333ba1904b 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -239,7 +239,7 @@ static void __init kvmclock_init_mem(void) static int __init kvm_setup_vsyscall_timeinfo(void) { - if (!kvm_para_available() || !kvmclock) + if (!kvm_para_available() || !kvmclock || nopv) return 0; kvmclock_init_mem();