metalefty/fedora-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Linux v4.11-13318-g09d79d1

Browse Source
This commit is contained in:
Justin M. Forbes 2017-05-12 08:36:46 -05:00
parent 7d7b795c39
commit bf590656f4
20 changed files with 88 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch Normal file
View File

@ -0,0 +1,65 @@
From patchwork Fri May 12 10:04:52 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: ARM: KVM: Fix tracepoint generation after move to virt/kvm/arm/
From: Marc Zyngier <Marc.Zyngier@arm.com>
X-Patchwork-Id: 9723825
Message-Id: <20170512100452.8245-1-marc.zyngier@arm.com>
To: Christoffer Dall <christoffer.dall@linaro.org>
Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org, arnd@arndb.de
Date: Fri, 12 May 2017 11:04:52 +0100
Moving most of the shared code to virt/kvm/arm had for consequence
that KVM/ARM doesn't build anymore, because the code that used to
define the tracepoints is now somewhere else.
Fix this by defining CREATE_TRACE_POINTS in coproc.c, and clean-up
trace.h as well.
Fixes: 35d2d5d490e2 ("KVM: arm/arm64: Move shared files to virt/kvm/arm")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/kvm/coproc.c | 1 +
arch/arm/kvm/trace.h | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 2c14b69511e9..ac8d36da4d08 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -32,6 +32,7 @@
#include <asm/vfp.h>
#include "../vfp/vfpinstr.h"
+#define CREATE_TRACE_POINTS
#include "trace.h"
#include "coproc.h"
diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h
index fc0943776db2..b0d10648c486 100644
--- a/arch/arm/kvm/trace.h
+++ b/arch/arm/kvm/trace.h
@@ -1,5 +1,5 @@
-#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_KVM_H
+#if !defined(_TRACE_ARM_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_ARM_KVM_H
#include <linux/tracepoint.h>
@@ -74,10 +74,10 @@ TRACE_EVENT(kvm_hvc,
__entry->vcpu_pc, __entry->r0, __entry->imm)
);
-#endif /* _TRACE_KVM_H */
+#endif /* _TRACE_ARM_KVM_H */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH arch/arm/kvm
+#define TRACE_INCLUDE_PATH .
#undef TRACE_INCLUDE_FILE
#define TRACE_INCLUDE_FILE trace

2
baseconfig/CONFIG_USB_PCI
View File

@ -1 +1 @@
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y

1
baseconfig/arm/CONFIG_USB_PCI
View File

@ -1 +0,0 @@
CONFIG_USB_PCI=y

2
gitrev
View File

@ -1 +1 @@
791a9a666d1afe2603bcb2c6a4852d684e879252
09d79d103371b1b7ea70ea7f9c05ac207ef22f5d

2
kernel-i686-PAE.config
View File

@ -5556,7 +5556,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-i686-PAEdebug.config
View File

@ -5578,7 +5578,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-i686-debug.config
View File

@ -5578,7 +5578,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-i686.config
View File

@ -5556,7 +5556,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-ppc64-debug.config
View File

@ -5373,7 +5373,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-ppc64.config
View File

@ -5349,7 +5349,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-ppc64le-debug.config
View File

@ -5302,7 +5302,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-ppc64le.config
View File

@ -5278,7 +5278,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-ppc64p7-debug.config
View File

@ -5301,7 +5301,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-ppc64p7.config
View File

@ -5277,7 +5277,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-s390x-debug.config
View File

@ -5192,7 +5192,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-s390x.config
View File

@ -5168,7 +5168,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-x86_64-debug.config
View File

@ -5609,7 +5609,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

2
kernel-x86_64.config
View File

@ -5587,7 +5587,7 @@ CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_PCI is not set
CONFIG_USB_PCI=y
CONFIG_USBPCWATCHDOG=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_PHY=y

7
kernel.spec
View File

@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
%define gitrev 8
%define gitrev 9
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@ -595,6 +595,8 @@ Patch668: CVE-2017-7477.patch
# Fix build on PPC
Patch669: powerpc-fix-distclean-with-Makefile.postlink.patch
Patch679: ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch
# END OF PATCH DEFINITIONS
%endif
@ -2167,6 +2169,9 @@ fi
#
#
%changelog
* Fri May 12 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git9.1
- Linux v4.11-13318-g09d79d1
* Thu May 11 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git8.1
- Linux v4.11-13167-g791a9a6

2
sources
View File

@ -1,3 +1,3 @@
SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
SHA512 (patch-4.11-git8.xz) = fd1a247a29f73ebd408cef1c41f923ac5a92062e9dae3e8fdffb964cd96936fac823273455a7c2669ffec0edecd4df6ebb9f379f693dfe8867b900b2c6a187f4
SHA512 (patch-4.11-git9.xz) = cae51497abd2aa7f5cb1f92b03a469515ceccf14dbd41112f28612b41c04792100fc916c0b2aa5241b83c2c113b133d5a1c39291483abc1be15b82ac1dad7634