4.2-stable patches

added patches:
	kvm-provide-function-for-vcpu-lookup-by-id.patch
	tile-fix-build-failure.patch

diff --git a/queue-4.2/kvm-provide-function-for-vcpu-lookup-by-id.patch b/queue-4.2/kvm-provide-function-for-vcpu-lookup-by-id.patch
new file mode 100644 (file)
index 0000000..c3a0df8
--- /dev/null
+++ b/queue-4.2/kvm-provide-function-for-vcpu-lookup-by-id.patch
@@ -0,0 +1,42 @@
+From db27a7a37aa0b1f8b373f8b0fb72a2ccaafb85b7 Mon Sep 17 00:00:00 2001
+From: David Hildenbrand <dahi@linux.vnet.ibm.com>
+Date: Thu, 5 Nov 2015 09:03:50 +0100
+Subject: KVM: Provide function for VCPU lookup by id
+
+From: David Hildenbrand <dahi@linux.vnet.ibm.com>
+
+commit db27a7a37aa0b1f8b373f8b0fb72a2ccaafb85b7 upstream.
+
+Let's provide a function to lookup a VCPU by id.
+
+Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
+Reviewed-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
+Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
+Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
+[split patch from refactoring patch]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/kvm_host.h |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/include/linux/kvm_host.h
++++ b/include/linux/kvm_host.h
+@@ -436,6 +436,17 @@ static inline struct kvm_vcpu *kvm_get_v
+            (vcpup = kvm_get_vcpu(kvm, idx)) != NULL; \
+            idx++)
+ 
++static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id)
++{
++      struct kvm_vcpu *vcpu;
++      int i;
++
++      kvm_for_each_vcpu(i, vcpu, kvm)
++              if (vcpu->vcpu_id == id)
++                      return vcpu;
++      return NULL;
++}
++
+ #define kvm_for_each_memslot(memslot, slots)  \
+       for (memslot = &slots->memslots[0];     \
+             memslot < slots->memslots + KVM_MEM_SLOTS_NUM && memslot->npages;\

diff --git a/queue-4.2/series b/queue-4.2/series
index c677ea5bcd80edf1c3953fffac5f8adbb386e8e5..5055c8f7022a4cde3a20ac95a9baaf3b314b46c5 100644 (file)
--- a/queue-4.2/series
+++ b/queue-4.2/series
@@ -89,6 +89,7 @@ arm64-page-align-sections-for-debug_rodata.patch
 ath10k-use-station-s-current-operating-mode-from-assoc-request.patch
 ath10k-fix-invalid-nss-for-4x4-devices.patch
 kvm-s390-sca-must-not-cross-page-boundaries.patch
+kvm-provide-function-for-vcpu-lookup-by-id.patch
 kvm-s390-fix-wrong-lookup-of-vcpus-by-array-index.patch
 kvm-s390-avoid-memory-overwrites-on-emergency-signal-injection.patch
 revert-usb-dwc3-gadget-drop-unnecessary-loop-when-cleaning-up-trbs.patch
@@ -122,3 +123,4 @@ xhci-workaround-to-get-intel-xhci-reset-working-more-reliably.patch
 staging-lustre-use-jiffies-for-lp_last_query-times.patch
 xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch
 kvm-s390-enable-simd-only-when-no-vcpus-were-created.patch
+tile-fix-build-failure.patch

diff --git a/queue-4.2/tile-fix-build-failure.patch b/queue-4.2/tile-fix-build-failure.patch
new file mode 100644 (file)
index 0000000..91e4021
--- /dev/null
+++ b/queue-4.2/tile-fix-build-failure.patch
@@ -0,0 +1,36 @@
+From 3a48d13d76c0088a988a2e4f5b4d94872bdf58f3 Mon Sep 17 00:00:00 2001
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Date: Mon, 7 Sep 2015 20:06:57 +0530
+Subject: tile: fix build failure
+
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+
+commit 3a48d13d76c0088a988a2e4f5b4d94872bdf58f3 upstream.
+
+When building with allmodconfig the build was failing with the error:
+
+arch/tile/kernel/usb.c:70:1: warning: data definition has no type or storage class [enabled by default]
+arch/tile/kernel/usb.c:70:1: error: type defaults to 'int' in declaration of 'arch_initcall' [-Werror=implicit-int]
+arch/tile/kernel/usb.c:70:1: warning: parameter names (without types) in function declaration [enabled by default]
+arch/tile/kernel/usb.c:63:19: warning: 'tilegx_usb_init' defined but not used [-Wunused-function]
+
+Include linux/module.h to resolve the build failure.
+
+Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
+Signed-off-by: Chris Metcalf <cmetcalf@ezchip.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/tile/kernel/usb.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/tile/kernel/usb.c
++++ b/arch/tile/kernel/usb.c
+@@ -22,6 +22,7 @@
+ #include <linux/platform_device.h>
+ #include <linux/usb/tilegx.h>
+ #include <linux/init.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ 
+ static u64 ehci_dmamask = DMA_BIT_MASK(32);

diff --git a/queue-4.2/xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch b/queue-4.2/xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch
index 41c0f3b14c3b1baedb95a61d2e9d933342604a5f..98ea550c4c4071172f5efb35d28215c5e4b11ef8 100644 (file)
--- a/queue-4.2/xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch
+++ b/queue-4.2/xen-events-always-allocate-legacy-interrupts-on-pv-guests.patch
@@ -28,8 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/arch/arm/include/asm/irq.h
 +++ b/arch/arm/include/asm/irq.h
-@@ -37,5 +37,10 @@ extern void set_handle_irq(void (*handle
- 
+@@ -35,6 +35,11 @@ extern void (*handle_arch_irq)(struct pt
+ extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
  #endif
  
 +static inline int nr_legacy_irqs(void)
@@ -39,6 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +
  #endif
  
+ #endif
 --- a/arch/arm64/include/asm/irq.h
 +++ b/arch/arm64/include/asm/irq.h
 @@ -21,4 +21,9 @@ static inline void acpi_irq_init(void)