# git rev-parse -q --verify df0219d11b6f04251d38e345db4f9780cb32e2e2^{commit} df0219d11b6f04251d38e345db4f9780cb32e2e2 already have revision, skipping fetch # git checkout -q -f -B kisskb df0219d11b6f04251d38e345db4f9780cb32e2e2 # git clean -qxdf # < git log -1 # commit df0219d11b6f04251d38e345db4f9780cb32e2e2 # Merge: 95607ad99b5a 591d2108f3ab # Author: Linus Torvalds # Date: Tue Aug 23 13:42:31 2022 -0700 # # Merge tag 'parisc-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux # # Pull parisc fixes from Helge Deller: # "Some interesting background to the current patchset: # # It turned out that the fldw instruction (which loads a 32-bit word # from memory into one half of a FP register) failed on unaligned # addresses and even trashed some other random FP register instead. It's # a trivial one-liner fix in the exception handler but this failure # dates back to the very beginnings of the parisc-port. It's strange # that it was never noticed before. # # Another patch fixes an annoyance noticed by Randy Dunlap. Running # "make ARCH=parisc64 randconfig" always returned a 32-bit config, # although one would expect a 64-bit config. Masahiro Yamada suggested # to mimik sparc Kconfig code, which fixed the issue nicely. This # allowed to drop some compiler build checks too. # # Third, it's possible to build an optimized 32-bit kernel for PA8X00 # (64-bit) CPUs, which then wouldn't start on 32-bit-only (PA1.x) # machines. I've added a bootup check which prevents that and which # prints a message to the console. This can be tested with qemu, which # currently only supports 32-bit emulation. # # The other patches are usual clean-up stuff like added return value # checks and typo fixes in comments. # # Summary: # # - Fix emulation of fldw instruction on unaligned addresses # # - Fix "make ARCH=parisc64 randconfig" to return a 64-bit config # # - Prevent boot if trying to boot a 32-bit kernel compiled for PA8X00 # CPUs on 32-bit only machines # # - ccio-dma: Handle kmalloc failure in ccio_init_resources()" # # * tag 'parisc-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: # parisc: Add runtime check to prevent PA2.0 kernels on PA1.x machines # parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources() # parisc: led: Move from strlcpy with unused retval to strscpy # parisc: ccio-dma: Fix typo in comment # Revert "parisc: Show error if wrong 32/64-bit compiler is being used" # parisc: Make CONFIG_64BIT available for ARCH=parisc64 only # parisc: Fix exception handler for fldw and fstw instructions # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 df0219d11b6f04251d38e345db4f9780cb32e2e2 # < make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:11, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/include/linux/mm_types_task.h:14, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:32: In function 'check586', inlined from 'sun3_82586_probe1' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:365:6, inlined from 'sun3_82586_probe' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:311:8: /kisskb/src/arch/m68k/include/asm/string.h:68:25: warning: '__builtin_memset' offset [0, 11] is out of the bounds [0, 0] [-Warray-bounds] 68 | #define memset(d, c, n) __builtin_memset(d, c, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:218:9: note: in expansion of macro 'memset' 218 | memset((char *)p->scp,0, sizeof(struct scp_struct)); | ^~~~~~ In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:548, from /kisskb/src/include/linux/bitops.h:67, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:122: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:19: note: in definition of macro '__swab16' 107 | __fswab16(x)) | ^ /kisskb/src/include/linux/printk.h:464:26: note: in expansion of macro 'printk_index_wrap' 464 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:17: note: in expansion of macro 'printk' 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ^~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:155:46: note: while referencing 'xmit_cmds' 155 | volatile struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS]; | ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:00:45.251299