static inline, not inline static

c99 6.11.5:
"The placement of a storage-class specifier other than at the beginning
of the declaration specifiers in a declaration is an obsolescent
feature."

ok guenther@

4 files changed, 15 insertions, 15 deletions

diff --git a/sys/arch/amd64/include/pmap.h b/sys/arch/amd64/include/pmap.h
index 04d3a3f3bde..d436258604f 100644
--- a/sys/arch/amd64/include/pmap.h
+++ b/sys/arch/amd64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.80 2022/06/01 17:47:18 dv Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.81 2022/08/29 02:58:13 jsg Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $	*/
 
 /*
@@ -434,7 +434,7 @@ pmap_remove_all(struct pmap *pmap)
  *	if hardware doesn't support one-page flushing)
  */
 
-inline static void
+static inline void
 pmap_update_pg(vaddr_t va)
 {
 	invlpg(va);
@@ -449,7 +449,7 @@ pmap_update_pg(vaddr_t va)
  *	unprotecting a page is done on-demand at fault time.
  */
 
-inline static void
+static inline void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
 {
 	if ((prot & PROT_WRITE) == 0) {
@@ -469,7 +469,7 @@ pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
  *	unprotecting a page is done on-demand at fault time.
  */
 
-inline static void
+static inline void
 pmap_protect(struct pmap *pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
 {
 	if ((prot & PROT_WRITE) == 0) {
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index d9a965dbdd0..68bc3542a0f 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.178 2022/08/25 17:25:25 cheloha Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.179 2022/08/29 02:58:13 jsg Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -217,7 +217,7 @@ extern struct cpu_info *cpu_info_list;
 
 static struct cpu_info *curcpu(void);
 
-__inline static struct cpu_info *
+static __inline struct cpu_info *
 curcpu(void)
 {
 	struct cpu_info *ci;
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index c79a2849223..7873bc79fd9 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.90 2022/06/01 17:16:00 dv Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.91 2022/08/29 02:58:13 jsg Exp $	*/
 /*	$NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $	*/
 
 /*
@@ -392,7 +392,7 @@ void pmap_flush_page_pae(paddr_t);
  *	Unprotecting a page is done on-demand at fault time.
  */
 
-__inline static void
+static __inline void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
 {
 	if ((prot & PROT_WRITE) == 0) {
@@ -412,7 +412,7 @@ pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
  *	Unprotecting a page is done on-demand at fault time.
  */
 
-__inline static void
+static __inline void
 pmap_protect(struct pmap *pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
 {
 	if ((prot & PROT_WRITE) == 0) {
@@ -429,25 +429,25 @@ pmap_protect(struct pmap *pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
  * modules from both uvm_pmap.h and pmap.h. Since uvm_pmap.h defines these
  * as functions, inline them here to suppress linker warnings.
  */
-__inline static vaddr_t
+static __inline vaddr_t
 pmap_growkernel(vaddr_t maxkvaddr)
 {
 	return (*pmap_growkernel_p)(maxkvaddr);
 }
 
-__inline static int
+static __inline int
 pmap_enter(struct pmap *pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
 {
 	return (*pmap_enter_p)(pmap, va, pa, prot, flags);
 }
 
-__inline static void
+static __inline void
 pmap_enter_special(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int32_t flags)
 {
 	(*pmap_enter_special_p)(va, pa, prot, flags);
 }
 
-__inline static int
+static __inline int
 pmap_extract(struct pmap *pmap, vaddr_t va, paddr_t *pa)
 {
 	return (*pmap_extract_p)(pmap, va, pa);
diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c
index 5e2f07fedd0..1ae676b0536 100644
--- a/sys/arch/luna88k/dev/mb89352.c
+++ b/sys/arch/luna88k/dev/mb89352.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: mb89352.c,v 1.33 2022/04/16 19:19:58 naddy Exp $	*/
+/*	$OpenBSD: mb89352.c,v 1.34 2022/08/29 02:58:13 jsg Exp $	*/
 /*	$NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $	*/
 /*	NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp	*/
 
 #ifdef DDB
 #define	integrate
 #else
-#define	integrate	__inline static
+#define	integrate	static __inline 
 #endif
 
 /*-