From 30025dad84d62e3a7ec16fe912ad7b19cb6b3a11 Mon Sep 17 00:00:00 2001
From: patrick <patrick@openbsd.org>
Date: Mon, 6 Sep 2021 19:55:27 +0000
Subject: [PATCH] Accompany some functions wich are marked inline with the
 static keyword to make the arm64 kernel link when compiled with -fno-inline.

ok kettenis@ mpi@
---
 sys/arch/arm64/dev/apldart.c | 6 +++---
 sys/dev/fdt/axppmic.c        | 6 +++---
 sys/dev/fdt/mvsw.c           | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/arch/arm64/dev/apldart.c b/sys/arch/arm64/dev/apldart.c
index e662cc838bf..d8497d28576 100644
--- a/sys/arch/arm64/dev/apldart.c
+++ b/sys/arch/arm64/dev/apldart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apldart.c,v 1.5 2021/06/25 17:41:22 patrick Exp $	*/
+/*	$OpenBSD: apldart.c,v 1.6 2021/09/06 19:55:27 patrick Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -60,14 +60,14 @@
 #define DART_L2_INVAL		0x0
 #define DART_L2_PAGE		0x3
 
-inline paddr_t
+static inline paddr_t
 apldart_round_page(paddr_t pa)
 {
 	return ((pa + DART_PAGE_MASK) & ~DART_PAGE_MASK);
 }
 
 inline paddr_t
-apldart_trunc_page(paddr_t pa)
+static apldart_trunc_page(paddr_t pa)
 {
 	return (pa & ~DART_PAGE_MASK);
 }
diff --git a/sys/dev/fdt/axppmic.c b/sys/dev/fdt/axppmic.c
index d62f0b15ce5..f301c03e8c8 100644
--- a/sys/dev/fdt/axppmic.c
+++ b/sys/dev/fdt/axppmic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: axppmic.c,v 1.9 2020/01/23 10:01:41 kettenis Exp $	*/
+/*	$OpenBSD: axppmic.c,v 1.10 2021/09/06 19:55:27 patrick Exp $	*/
 /*
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -327,13 +327,13 @@ struct axppmic_softc {
 	uint8_t		sc_crit;
 };
 
-inline uint8_t
+static inline uint8_t
 axppmic_read_reg(struct axppmic_softc *sc, uint8_t reg)
 {
 	return sc->sc_read(sc, reg);
 }
 
-inline void
+static inline void
 axppmic_write_reg(struct axppmic_softc *sc, uint8_t reg, uint8_t value)
 {
 	sc->sc_write(sc, reg, value);
diff --git a/sys/dev/fdt/mvsw.c b/sys/dev/fdt/mvsw.c
index 559e370502b..b3f442fc705 100644
--- a/sys/dev/fdt/mvsw.c
+++ b/sys/dev/fdt/mvsw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvsw.c,v 1.3 2021/04/05 12:13:07 dtucker Exp $	*/
+/*	$OpenBSD: mvsw.c,v 1.4 2021/09/06 19:55:27 patrick Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -160,14 +160,14 @@ mvsw_attach(struct device *parent, struct device *self, void *aux)
 	}
 }
 
-inline int
+static inline int
 mvsw_read(struct mvsw_softc *sc, int reg)
 {
 	struct mii_bus *md = sc->sc_mdio;
 	return md->md_readreg(md->md_cookie, sc->sc_reg, reg);
 }
 
-inline void
+static inline void
 mvsw_write(struct mvsw_softc *sc, int reg, int val)
 {
 	struct mii_bus *md = sc->sc_mdio;
-- 
2.20.1