Skip to content

Commit 644a9cf

Browse files
rddunlapglaubitz
authored andcommitted
sh: remove sh5/sh64 last fragments
A previous patch removed most of the sh5 (sh64) support from the kernel tree. Now remove the last stragglers. Fixes: 37744fe ("sh: remove sh5 support") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Rich Felker <dalias@libc.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: linux-sh@vger.kernel.org Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Link: https://lore.kernel.org/r/20230306040037.20350-6-rdunlap@infradead.org Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
1 parent 58a49ad commit 644a9cf

8 files changed

Lines changed: 2 additions & 21 deletions

File tree

Documentation/kbuild/kbuild.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ directory name found in the arch/ directory.
160160
But some architectures such as x86 and sparc have aliases.
161161

162162
- x86: i386 for 32 bit, x86_64 for 64 bit
163-
- sh: sh for 32 bit, sh64 for 64 bit
164163
- sparc: sparc32 for 32 bit, sparc64 for 64 bit
165164

166165
CROSS_COMPILE

Documentation/scheduler/sched-arch.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,5 @@ Possible arch problems I found (and either tried to fix or didn't):
7070

7171
ia64 - is safe_halt call racy vs interrupts? (does it sleep?) (See #4a)
7272

73-
sh64 - Is sleeping racy vs interrupts? (See #4a)
74-
7573
sparc - IRQs on at this point(?), change local_irq_save to _disable.
7674
- TODO: needs secondary CPUs to disable preempt (See #1)

Documentation/translations/zh_CN/scheduler/sched-arch.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,5 @@ arch/x86/kernel/process.c有轮询和睡眠空闲函数的例子。
7070

7171
ia64 - safe_halt的调用与中断相比,是否很荒谬? (它睡眠了吗) (参考 #4a)
7272

73-
sh64 - 睡眠与中断相比,是否很荒谬? (参考 #4a)
74-
7573
sparc - 在这一点上,IRQ是开着的(?),把local_irq_save改为_disable。
7674
- 待办事项: 需要第二个CPU来禁用抢占 (参考 #1)

scripts/checkstack.pl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
# Mips port by Juan Quintela <quintela@mandrakesoft.com>
1111
# IA64 port via Andreas Dilger
1212
# Arm port by Holger Schurig
13-
# sh64 port by Paul Mundt
1413
# Random bits by Matt Mackall <mpm@selenic.com>
1514
# M68k port by Geert Uytterhoeven and Andreas Schwab
1615
# AArch64, PARISC ports by Kyle McMartin
@@ -100,12 +99,6 @@
10099
# 100092: e3 f0 ff c8 ff 71 lay %r15,-56(%r15)
101100
$re = qr/.*(?:lay|ag?hi).*\%r15,-(([0-9]{2}|[3-9])[0-9]{2})
102101
(?:\(\%r15\))?$/ox;
103-
} elsif ($arch =~ /^sh64$/) {
104-
#XXX: we only check for the immediate case presently,
105-
# though we will want to check for the movi/sub
106-
# pair for larger users. -- PFM.
107-
#a00048e0: d4fc40f0 addi.l r15,-240,r15
108-
$re = qr/.*addi\.l.*r15,-(([0-9]{2}|[3-9])[0-9]{2}),r15/o;
109102
} elsif ($arch eq 'sparc' || $arch eq 'sparc64') {
110103
# f0019d10: 9d e3 bf 90 save %sp, -112, %sp
111104
$re = qr/.*save.*%sp, -(([0-9]{2}|[3-9])[0-9]{2}), %sp/o;

tools/perf/arch/common.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ const char *const s390_triplets[] = {
5151

5252
const char *const sh_triplets[] = {
5353
"sh-unknown-linux-gnu-",
54-
"sh64-unknown-linux-gnu-",
5554
"sh-linux-gnu-",
56-
"sh64-linux-gnu-",
5755
NULL
5856
};
5957

tools/scripts/Makefile.arch

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ ifeq ($(ARCH),sparc64)
2929
SRCARCH := sparc
3030
endif
3131

32-
# Additional ARCH settings for sh
33-
ifeq ($(ARCH),sh64)
34-
SRCARCH := sh
35-
endif
36-
3732
# Additional ARCH settings for loongarch
3833
ifeq ($(ARCH),loongarch32)
3934
SRCARCH := loongarch

tools/testing/selftests/mm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ endif
9090

9191
endif
9292

93-
ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))
93+
ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sparc64 x86_64))
9494
TEST_GEN_FILES += va_128TBswitch
9595
TEST_GEN_FILES += virtual_address_range
9696
TEST_GEN_FILES += write_to_hugetlbfs

tools/testing/selftests/mm/run_vmtests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ else
132132
fi
133133

134134
# filter 64bit architectures
135-
ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x86_64"
135+
ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sparc64 x86_64"
136136
if [ -z "$ARCH" ]; then
137137
ARCH=$(uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/')
138138
fi

0 commit comments

Comments
 (0)