Skip to contentSkip to conversation

Patch "MIPS: ip22: Fix ip28 build for modern gcc" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Mar 15, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: ip22: Fix ip28 build for modern gcc

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     mips-ip22-fix-ip28-build-for-modern-gcc.patch

and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 23ca9b522383d3b9b7991d8586db30118992af4a Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Tue, 17 Jan 2017 16:18:46 +0100
Subject: MIPS: ip22: Fix ip28 build for modern gcc

From: Arnd Bergmann <[email protected]>

commit 23ca9b522383d3b9b7991d8586db30118992af4a upstream.

kernelci reports a failure of the ip28_defconfig build after upgrading its gcc version:

arch/mips/sgi-ip22/Platform:29: *** gcc doesn't support needed option -mr10k-cache-barrier=store. Stop.

The problem apparently is that the -mr10k-cache-barrier=store option is now rejected for CPUs other than r10k. Explicitly including the CPU in the check fixes this and is safe because both options were introduced in gcc-4.4.

Patchwork: https://patchwork.linux-mips.org/patch/15049/

---
 arch/mips/sgi-ip22/Platform |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/sgi-ip22/Platform +1 -1
@@ -25,7 +25,7 @@ endif
 # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys
 #
 ifdef CONFIG_SGI_IP28
-  ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)
+  ifeq ($(call cc-option-yn,-march=r10000 -mr10k-cache-barrier=store), n)
       $(error gcc doesn't support needed option -mr10k-cache-barrier=store)
   endif
 endif

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/mips-ip27-disable-qlge-driver-in-defconfig.patch queue-4.9/bcm63xx_enet-avoid-uninitialized-variable-warning.patch queue-4.9/mips-update-ip27_defconfig-for-scsi_dh-change.patch queue-4.9/mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch queue-4.9/cpmac-remove-hopeless-warning.patch queue-4.9/mips-vdso-avoid-duplicate-cac_base-definition.patch queue-4.9/mips-ip22-fix-ip28-build-for-modern-gcc.patch queue-4.9/mips-update-lemote2f_defconfig-for-cpu_freq_stat-change.patch queue-4.9/crypto-improve-gcc-optimization-flags-for-serpent-and-wp512.patch queue-4.9/mips-ralink-remove-unused-rt-_wdt_reset-functions.patch queue-4.9/mips-ralink-remove-unused-timer-functions.patch queue-4.9/mips-update-defconfigs-for-nf_ct_proto_dccp-udplite-change.patch