tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scripts: get_feat.pl: substitute s390x with s390

Both get_feat.pl and list-arch.sh use uname -m to get the machine hardware
name to figure out the current architecture if no architecture is specified
with a command line option.

This doesn't work for s390, since for 64 bit kernels the hardware name is
s390x, while the architecture name within the kernel, as well as in all
feature files is s390.

Therefore substitute s390x with s390 similar to what is already done for
x86_64 and i386.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/20250312155219.3597768-1-hca@linux.ibm.com

authored by

Heiko Carstens and committed by
Jonathan Corbet 78da89c6 19b100b0

+3 -3
+1 -1
Documentation/features/list-arch.sh
··· 6 6 # (If no arguments are given then it will print the host architecture's status.) 7 7 # 8 8 9 - ARCH=${1:-$(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/')} 9 + ARCH=${1:-$(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/' | sed 's/s390x/s390/')} 10 10 11 11 $(dirname $0)/../../scripts/get_feat.pl list --arch $ARCH
+2 -2
scripts/get_feat.pl
··· 512 512 # Handles the command 513 513 # 514 514 if ($cmd eq "current") { 515 - $arch = qx(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/'); 515 + $arch = qx(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/' | sed 's/s390x/s390/'); 516 516 $arch =~s/\s+$//; 517 517 } 518 518 519 519 if ($cmd eq "ls" or $cmd eq "list") { 520 520 if (!$arch) { 521 - $arch = qx(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/'); 521 + $arch = qx(uname -m | sed 's/x86_64/x86/' | sed 's/i386/x86/' | sed 's/s390x/s390/'); 522 522 $arch =~s/\s+$//; 523 523 } 524 524