From 864f2f83ec4c08eb41848f403ee4e5dadd8f3951 Mon Sep 17 00:00:00 2001 From: visa Date: Mon, 20 Aug 2018 15:02:07 +0000 Subject: [PATCH] Remove unused spllock(). OK deraadt@ mpi@ --- sys/arch/alpha/include/intr.h | 4 +--- sys/arch/amd64/include/intr.h | 3 +-- sys/arch/arm64/include/intr.h | 3 +-- sys/arch/armv7/include/intr.h | 3 +-- sys/arch/i386/include/intr.h | 3 +-- sys/arch/landisk/include/intr.h | 3 +-- sys/arch/loongson/include/intr.h | 3 +-- sys/arch/m88k/include/intr.h | 4 +--- sys/arch/octeon/include/intr.h | 3 +-- sys/arch/powerpc/include/intr.h | 3 +-- sys/arch/sgi/include/intr.h | 3 +-- sys/arch/sparc64/include/intr.h | 4 +--- sys/arch/sparc64/include/psl.h | 3 +-- 13 files changed, 13 insertions(+), 29 deletions(-) diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index 4f7ab8356c6..64ce4ee5d76 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.47 2018/01/13 15:18:11 mpi Exp $ */ +/* $OpenBSD: intr.h,v 1.48 2018/08/20 15:02:07 visa Exp $ */ /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */ /*- @@ -189,8 +189,6 @@ int splraise(int); #define splipi() splraise(IPL_IPI) #define splhigh() splraise(IPL_HIGH) -#define spllock() splhigh() - /* * Interprocessor interrupts. In order how we want them processed. */ diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h index 5cf93934e3e..e9c498d11b9 100644 --- a/sys/arch/amd64/include/intr.h +++ b/sys/arch/amd64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.29 2015/09/13 11:48:17 kettenis Exp $ */ +/* $OpenBSD: intr.h,v 1.30 2018/08/20 15:02:07 visa Exp $ */ /* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -150,7 +150,6 @@ void softintr(int); #define splhigh() splraise(IPL_HIGH) #define spl0() spllower(IPL_NONE) #define splsched() splraise(IPL_SCHED) -#define spllock() splhigh() #define splx(x) spllower(x) /* SPL asserts */ diff --git a/sys/arch/arm64/include/intr.h b/sys/arch/arm64/include/intr.h index 0f702861965..58bee831742 100644 --- a/sys/arch/arm64/include/intr.h +++ b/sys/arch/arm64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.11 2018/08/08 11:06:33 patrick Exp $ */ +/* $OpenBSD: intr.h,v 1.12 2018/08/20 15:02:07 visa Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -118,7 +118,6 @@ extern struct arm_intr_func arm_intr_func; #define splstatclock() splraise(IPL_STATCLOCK) #define splhigh() splraise(IPL_HIGH) -#define spllock() splhigh() #define spl0() spllower(IPL_NONE) void intr_barrier(void *); diff --git a/sys/arch/armv7/include/intr.h b/sys/arch/armv7/include/intr.h index 96c17d84c78..a166a17493a 100644 --- a/sys/arch/armv7/include/intr.h +++ b/sys/arch/armv7/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.9 2018/08/08 11:06:33 patrick Exp $ */ +/* $OpenBSD: intr.h,v 1.10 2018/08/20 15:02:07 visa Exp $ */ /* $NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $ */ /* @@ -125,7 +125,6 @@ extern struct arm_intr_func arm_intr_func; #define spl0() spllower(IPL_NONE) #define splsched() splhigh() -#define spllock() splhigh() void intr_barrier(void *); diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h index f51b9da89cf..5b5e8e728d8 100644 --- a/sys/arch/i386/include/intr.h +++ b/sys/arch/i386/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.47 2015/09/13 12:28:31 kettenis Exp $ */ +/* $OpenBSD: intr.h,v 1.48 2018/08/20 15:02:07 visa Exp $ */ /* $NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $ */ /* @@ -123,7 +123,6 @@ void splassert_check(int, const char *); #define splvm() splraise(IPL_VM) #define splhigh() splraise(IPL_HIGH) #define splsched() splraise(IPL_SCHED) -#define spllock() splhigh() #define spl0() spllower(IPL_NONE) #include diff --git a/sys/arch/landisk/include/intr.h b/sys/arch/landisk/include/intr.h index 7e1d0300d38..3311970a349 100644 --- a/sys/arch/landisk/include/intr.h +++ b/sys/arch/landisk/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.13 2018/05/30 13:54:09 mpi Exp $ */ +/* $OpenBSD: intr.h,v 1.14 2018/08/20 15:02:07 visa Exp $ */ /* $NetBSD: intr.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -61,7 +61,6 @@ #define splstatclock() splclock() #define splsched() splraise(IPL_SCHED) #define splhigh() _cpu_intr_suspend() -#define spllock() splhigh() #define spl0() _cpu_intr_resume(IPL_NONE << 4) #define splx(x) _cpu_intr_resume(x) diff --git a/sys/arch/loongson/include/intr.h b/sys/arch/loongson/include/intr.h index 4291a626cd0..05e8f3c1c2b 100644 --- a/sys/arch/loongson/include/intr.h +++ b/sys/arch/loongson/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.15 2018/01/22 09:40:45 mpi Exp $ */ +/* $OpenBSD: intr.h,v 1.16 2018/08/20 15:02:07 visa Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -127,7 +127,6 @@ void softintr_schedule(void *); #define splstatclock() splhigh() #define splsched() splhigh() -#define spllock() splhigh() #define spl0() spllower(0) void splinit(void); diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h index ecfeb16906f..69c023f020a 100644 --- a/sys/arch/m88k/include/intr.h +++ b/sys/arch/m88k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.13 2016/06/13 23:51:59 dlg Exp $ */ +/* $OpenBSD: intr.h,v 1.14 2018/08/20 15:02:07 visa Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. * All rights reserved. @@ -103,8 +103,6 @@ void splassert_check(int, const char *); #define splvm() splraise(IPL_VM) #define splhigh() setipl(IPL_HIGH) -#define spllock() splhigh() - #define splx(x) ((x) ? setipl((x)) : spl0()) /* diff --git a/sys/arch/octeon/include/intr.h b/sys/arch/octeon/include/intr.h index 14ba896d7be..30217bf3440 100644 --- a/sys/arch/octeon/include/intr.h +++ b/sys/arch/octeon/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.17 2018/08/06 10:52:30 patrick Exp $ */ +/* $OpenBSD: intr.h,v 1.18 2018/08/20 15:02:07 visa Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -126,7 +126,6 @@ void softintr_schedule(void *); #define splsoftnet() splsoft() #define splstatclock() splhigh() -#define spllock() splhigh() #define spl0() spllower(0) void splinit(void); diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index 924945cddd5..db20e3675ff 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.55 2018/01/22 09:31:35 mpi Exp $ */ +/* $OpenBSD: intr.h,v 1.56 2018/08/20 15:02:07 visa Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -117,7 +117,6 @@ void splassert_check(int, const char *); #define splclock() splraise(IPL_CLOCK) #define splvm() splraise(IPL_VM) #define splsched() splhigh() -#define spllock() splhigh() #define splstatclock() splhigh() #define splsoftclock() splraise(IPL_SOFTCLOCK) #define splsoftnet() splraise(IPL_SOFTNET) diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h index de9b3168b13..6cd75e7c97e 100644 --- a/sys/arch/sgi/include/intr.h +++ b/sys/arch/sgi/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.50 2018/01/22 09:40:45 mpi Exp $ */ +/* $OpenBSD: intr.h,v 1.51 2018/08/20 15:02:07 visa Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -126,7 +126,6 @@ void softintr_schedule(void *); #define splsoftnet() splsoft() #define splstatclock() splhigh() -#define spllock() splhigh() #define spl0() spllower(0) void splinit(void); diff --git a/sys/arch/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h index 9bd7fb8fab4..c32e8e8785b 100644 --- a/sys/arch/sparc64/include/intr.h +++ b/sys/arch/sparc64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.21 2018/01/13 15:18:11 mpi Exp $ */ +/* $OpenBSD: intr.h,v 1.22 2018/08/20 15:02:07 visa Exp $ */ /* $NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */ /*- @@ -79,7 +79,6 @@ void intr_establish(int, struct intrhand *); #define IPL_CLOCK PIL_CLOCK /* clock */ #define IPL_SERIAL PIL_SER /* serial */ #define IPL_SCHED PIL_SCHED /* scheduler */ -#define IPL_LOCK PIL_LOCK /* locks */ #define IPL_STATCLOCK PIL_STATCLOCK /* statclock */ #define IPL_HIGH PIL_HIGH /* everything */ @@ -95,7 +94,6 @@ void intr_establish(int, struct intrhand *); #define splclock() _splraise(IPL_CLOCK) #define splserial() _splraise(IPL_SERIAL) #define splsched() _splraise(IPL_SCHED) -#define spllock() _splraise(IPL_LOCK) #define splstatclock() _splraise(IPL_STATCLOCK) #define splhigh() _splraise(IPL_HIGH) #define splx(_oldipl) _splx(_oldipl) diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h index b8c549a0251..f5f149e9eca 100644 --- a/sys/arch/sparc64/include/psl.h +++ b/sys/arch/sparc64/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.33 2017/10/24 17:06:51 kettenis Exp $ */ +/* $OpenBSD: psl.h,v 1.34 2018/08/20 15:02:07 visa Exp $ */ /* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */ /* @@ -58,7 +58,6 @@ #define PIL_STATCLOCK 14 #define PIL_HIGH 15 #define PIL_SCHED PIL_STATCLOCK -#define PIL_LOCK PIL_HIGH /* * SPARC V9 CCR register -- 2.20.1