4.4-stable patches

added patches:
	x86-vsdo-fix-build-on-paravirt_clock-y-kvm_guest-n.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index d963757c9bde9432c0f7e461f13253eb9ba78c17..3a831ddc45b7c97c336b0ef5e815171fe1c39591 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -11,3 +11,4 @@ mips-also-verify-sizeof-elf_fpreg_t-with-ptrace_setregset.patch
 mips-disallow-outsized-ptrace_setregset-nt_prfpreg-regset-accesses.patch
 net-mac80211-debugfs.c-prevent-build-failure-with-config_ubsan-y.patch
 kvm-vmx-scrub-hardware-gprs-at-vm-exit.patch
+x86-vsdo-fix-build-on-paravirt_clock-y-kvm_guest-n.patch

diff --git a/queue-4.4/x86-vsdo-fix-build-on-paravirt_clock-y-kvm_guest-n.patch b/queue-4.4/x86-vsdo-fix-build-on-paravirt_clock-y-kvm_guest-n.patch
new file mode 100644 (file)
index 0000000..c4cfd9a
--- /dev/null
+++ b/queue-4.4/x86-vsdo-fix-build-on-paravirt_clock-y-kvm_guest-n.patch
@@ -0,0 +1,39 @@
+From 8705d603edd49f1cff165cd3b7998f4c7f098d27 Mon Sep 17 00:00:00 2001
+From: Andy Lutomirski <luto@kernel.org>
+Date: Tue, 29 Dec 2015 20:12:18 -0800
+Subject: x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n
+
+From: Andy Lutomirski <luto@kernel.org>
+
+commit 8705d603edd49f1cff165cd3b7998f4c7f098d27 upstream.
+
+arch/x86/built-in.o: In function `arch_setup_additional_pages':
+ (.text+0x587): undefined reference to `pvclock_pvti_cpu0_va'
+
+KVM_GUEST selects PARAVIRT_CLOCK, so we can make pvclock_pvti_cpu0_va depend
+on KVM_GUEST.
+
+Signed-off-by: Andy Lutomirski <luto@kernel.org>
+Tested-by: Borislav Petkov <bp@alien8.de>
+Cc: Oleg Nesterov <oleg@redhat.com>
+Cc: Kees Cook <keescook@chromium.org>
+Link: http://lkml.kernel.org/r/444d38a9bcba832685740ea1401b569861d09a72.1451446564.git.luto@kernel.org
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: James Dingwall <james@dingwall.me.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/include/asm/pvclock.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/include/asm/pvclock.h
++++ b/arch/x86/include/asm/pvclock.h
+@@ -4,7 +4,7 @@
+ #include <linux/clocksource.h>
+ #include <asm/pvclock-abi.h>
+ 
+-#ifdef CONFIG_PARAVIRT_CLOCK
++#ifdef CONFIG_KVM_GUEST
+ extern struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void);
+ #else
+ static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void)