From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 27 Apr 2018 08:54:01 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v3.18.107~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6c6d0e07a21597c07c0bc760eb6ddd6c1b087b5;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	revert-microblaze-fix-endian-handling.patch
---

diff --git a/queue-4.14/revert-microblaze-fix-endian-handling.patch b/queue-4.14/revert-microblaze-fix-endian-handling.patch
new file mode 100644
index 00000000000..e696b042d81
--- /dev/null
+++ b/queue-4.14/revert-microblaze-fix-endian-handling.patch
@@ -0,0 +1,52 @@
+From 0a9dff6c3d875c3af32683ac7d3f4cc92010852a Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 27 Apr 2018 10:51:41 +0200
+Subject: Revert "microblaze: fix endian handling"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit ac3d021048be9edb825f0794da5b42f04fefecef which is
+commit 71e7673dadfdae0605d4c1f66ecb4b045c79fe0f upstream.
+
+kbuild reports that this causes build regressions in 4.14.y, so drop it.
+
+Reported-by: kbuild test robot <lkp@intel.com>
+Reported-by: "Hao, Shun" <shun.hao@intel.com>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: Michal Simek <michal.simek@xilinx.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/microblaze/Makefile |   17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+--- a/arch/microblaze/Makefile
++++ b/arch/microblaze/Makefile
+@@ -36,21 +36,16 @@ endif
+ CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_DIV) += -mno-xl-soft-div
+ CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_BARREL) += -mxl-barrel-shift
+ CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare
+-
+-ifdef CONFIG_CPU_BIG_ENDIAN
+-KBUILD_CFLAGS += -mbig-endian
+-KBUILD_AFLAGS += -mbig-endian
+-LD += -EB
+-else
+-KBUILD_CFLAGS += -mlittle-endian
+-KBUILD_AFLAGS += -mlittle-endian
+-LD += -EL
+-endif
++CPUFLAGS-$(CONFIG_BIG_ENDIAN) += -mbig-endian
++CPUFLAGS-$(CONFIG_LITTLE_ENDIAN) += -mlittle-endian
+ 
+ CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER))
+ 
+ # r31 holds current when in kernel mode
+-KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2)
++KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)
++
++LDFLAGS		:=
++LDFLAGS_vmlinux	:=
+ 
+ head-y := arch/microblaze/kernel/head.o
+ libs-y += arch/microblaze/lib/
diff --git a/queue-4.14/series b/queue-4.14/series
index 1a4702b3ae7..29ff694a540 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -38,3 +38,4 @@ llc-fix-null-pointer-deref-for-sock_zapped.patch
 net-ethernet-ti-cpsw-fix-tx-vlan-priority-mapping.patch
 virtio_net-split-out-ctrl-buffer.patch
 virtio_net-fix-adding-vids-on-big-endian.patch
+revert-microblaze-fix-endian-handling.patch