# git rev-parse -q --verify 4525c8781ec0701ce824e8bd379ae1b129e26568^{commit} 4525c8781ec0701ce824e8bd379ae1b129e26568 already have revision, skipping fetch # git checkout -q -f -B kisskb 4525c8781ec0701ce824e8bd379ae1b129e26568 # git clean -qxdf # < git log -1 # commit 4525c8781ec0701ce824e8bd379ae1b129e26568 # Author: Linus Torvalds # Date: Mon Oct 26 15:45:22 2020 -0700 # # scsi: qla2xxx: remove incorrect sparse #ifdef # # The code to try to shut up sparse warnings about questionable locking # didn't shut up sparse: it made the result not parse as valid C at all, # since the end result now has a label with no statement. # # The proper fix is to just always lock the hardware, the same way Bart # did in commit 8ae178760b23 ("scsi: qla2xxx: Simplify the functions for # dumping firmware"). That avoids the whole problem with having locking # that is not statically obvious. # # But in the meantime, just remove the incorrect attempt at trying to # avoid a sparse warning that just made things worse. # # This was exposed by commit 3e6efab865ac ("scsi: qla2xxx: Fix reset of # MPI firmware"), very similarly to how commit cbb01c2f2f63 ("scsi: # qla2xxx: Fix MPI failure AEN (8200) handling") exposed the same problem # in another place, and caused that commit 8ae178760b23. # # Please don't add code to just shut up sparse without actually fixing # what sparse complains about. # # Reported-by: Luc Van Oostenryck # Cc: Bart Van Assche # Cc: Arun Easi # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 4525c8781ec0701ce824e8bd379ae1b129e26568 # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7724_generic_defconfig # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:283: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:117: scripts/mod/devicetable-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1199: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7724_generic_defconfig_sh4-gcc4.9 # Build took: 0:00:05.822868