Skip to contentSkip to conversation

Patch "ARM: 8584/1: floppy: avoid gcc-6 warning" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Nov 9, 2016

Subsystems (3)
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

    ARM: 8584/1: floppy: avoid gcc-6 warning

to the 4.4-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:

     arm-8584-1-floppy-avoid-gcc-6-warning.patch

and it can be found in the queue-4.4 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 dd665be0e243873343a28e18f9f345927b658daf Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Fri, 1 Jul 2016 18:02:22 +0100
Subject: ARM: 8584/1: floppy: avoid gcc-6 warning

From: Arnd Bergmann <[email protected]>

commit dd665be0e243873343a28e18f9f345927b658daf upstream.

gcc-6.0 warns about comparisons between two identical expressions, which is what we get in the floppy driver when writing to the FD_DOR register:

drivers/block/floppy.c: In function 'set_dor':
drivers/block/floppy.c:810:44: error: self-comparison always evaluates to true [-Werror=tautological-compare]
fd_outb(newdor, FD_DOR);

It would be nice to use a static inline function instead of the macro, to avoid the warning, but we cannot do that because the FD_DOR definition is incomplete at this point.

Adding a cast to (u32) is a harmless way to shut up the warning, just not very nice.

---
 arch/arm/include/asm/floppy.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/floppy.h +1 -1
@@ -17,7 +17,7 @@
 
 #define fd_outb(val,port)			\
 	do {					\
-		if ((port) == FD_DOR)		\
+		if ((port) == (u32)FD_DOR)	\
 			fd_setdor((val));	\
 		else				\
 			outb((val),(port));	\

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

queue-4.4/drm-exynos-fix-error-handling-in-exynos_drm_subdrv_open.patch queue-4.4/arm-8584-1-floppy-avoid-gcc-6-warning.patch queue-4.4/powerpc-ptrace-fix-out-of-bounds-array-access-warning.patch queue-4.4/cgroup-avoid-false-positive-gcc-6-warning.patch queue-4.4/smc91x-avoid-self-comparison-warning.patch