From: Greg Kroah-Hartman Date: Wed, 4 Jan 2017 17:40:04 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.9.1~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8aa21eea4cdb78460cc0d99a464bf11d42c0e26;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: builddeb-fix-cross-building-to-arm64-producing-host-arch-debs.patch x86-kbuild-enable-modversions-for-symbols-exported-from-asm.patch --- diff --git a/queue-4.9/builddeb-fix-cross-building-to-arm64-producing-host-arch-debs.patch b/queue-4.9/builddeb-fix-cross-building-to-arm64-producing-host-arch-debs.patch new file mode 100644 index 00000000000..8c39f6cc649 --- /dev/null +++ b/queue-4.9/builddeb-fix-cross-building-to-arm64-producing-host-arch-debs.patch @@ -0,0 +1,36 @@ +From 152b695d74376bfe55cd2a6265ccc75b0d39dd19 Mon Sep 17 00:00:00 2001 +From: Adam Borowski +Date: Thu, 24 Nov 2016 02:27:03 +0100 +Subject: builddeb: fix cross-building to arm64 producing host-arch debs + +From: Adam Borowski + +commit 152b695d74376bfe55cd2a6265ccc75b0d39dd19 upstream. + +Both Debian and kernel archs are "arm64" but UTS_MACHINE and gcc say +"aarch64". Recognizing just the latter should be enough but let's +accept both in case something regresses again or an user sets +UTS_MACHINE=arm64. + +Regressed in cfa88c7: arm64: Set UTS_MACHINE in the Makefile. + +Signed-off-by: Adam Borowski +Acked-by: Riku Voipio +Signed-off-by: Michal Marek +Signed-off-by: Greg Kroah-Hartman + +--- + scripts/package/builddeb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/package/builddeb ++++ b/scripts/package/builddeb +@@ -51,7 +51,7 @@ set_debarch() { + debarch=hppa ;; + mips*) + debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;; +- arm64) ++ aarch64|arm64) + debarch=arm64 ;; + arm*) + if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then diff --git a/queue-4.9/series b/queue-4.9/series index 9372f6e9fb5..15a0050bb03 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -79,3 +79,5 @@ xen-gntdev-use-vm_mixedmap-instead-of-vm_io-to-avoid-numa-balancing.patch arm-xen-use-alloc_percpu-rather-than-__alloc_percpu.patch xfs-fix-up-xfs_swap_extent_forks-inline-extent-handling.patch xfs-set-agi-buffer-type-in-xlog_recover_clear_agi_bucket.patch +builddeb-fix-cross-building-to-arm64-producing-host-arch-debs.patch +x86-kbuild-enable-modversions-for-symbols-exported-from-asm.patch diff --git a/queue-4.9/x86-kbuild-enable-modversions-for-symbols-exported-from-asm.patch b/queue-4.9/x86-kbuild-enable-modversions-for-symbols-exported-from-asm.patch new file mode 100644 index 00000000000..06ee53cd6be --- /dev/null +++ b/queue-4.9/x86-kbuild-enable-modversions-for-symbols-exported-from-asm.patch @@ -0,0 +1,62 @@ +From 334bb773876403eae3457d81be0b8ea70f8e4ccc Mon Sep 17 00:00:00 2001 +From: Adam Borowski +Date: Sun, 11 Dec 2016 02:09:18 +0100 +Subject: x86/kbuild: enable modversions for symbols exported from asm + +From: Adam Borowski + +commit 334bb773876403eae3457d81be0b8ea70f8e4ccc upstream. + +Commit 4efca4ed ("kbuild: modversions for EXPORT_SYMBOL() for asm") adds +modversion support for symbols exported from asm files. Architectures +must include C-style declarations for those symbols in asm/asm-prototypes.h +in order for them to be versioned. + +Add these declarations for x86, and an architecture-independent file that +can be used for common symbols. + +With f27c2f6 reverting 8ab2ae6 ("default exported asm symbols to zero") we +produce a scary warning on x86, this commit fixes that. + +Signed-off-by: Adam Borowski +Tested-by: Kalle Valo +Acked-by: Nicholas Piggin +Tested-by: Peter Wu +Tested-by: Oliver Hartkopp +Signed-off-by: Michal Marek +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/include/asm/asm-prototypes.h | 16 ++++++++++++++++ + include/asm-generic/asm-prototypes.h | 7 +++++++ + 2 files changed, 23 insertions(+) + +--- /dev/null ++++ b/arch/x86/include/asm/asm-prototypes.h +@@ -0,0 +1,16 @@ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#ifndef CONFIG_X86_CMPXCHG64 ++extern void cmpxchg8b_emu(void); ++#endif +--- /dev/null ++++ b/include/asm-generic/asm-prototypes.h +@@ -0,0 +1,7 @@ ++#include ++extern void *__memset(void *, int, __kernel_size_t); ++extern void *__memcpy(void *, const void *, __kernel_size_t); ++extern void *__memmove(void *, const void *, __kernel_size_t); ++extern void *memset(void *, int, __kernel_size_t); ++extern void *memcpy(void *, const void *, __kernel_size_t); ++extern void *memmove(void *, const void *, __kernel_size_t);