Module Name: src
Committed By: christos
Date: Thu Apr 19 21:50:10 UTC 2018
Modified Files:
src/sys/altq: altq_classq.h
src/sys/arch/alpha/include: alpha.h
src/sys/arch/evbcf/include: intr.h
src/sys/arch/mips/cavium: octeonvar.h
src/sys/arch/mips/cavium/dev: octeon_fpavar.h octeon_gmxvar.h
octeon_pkovar.h octeon_powvar.h
src/sys/arch/mmeye/include: intr.h
src/sys/arch/mvme68k/include: intr.h
src/sys/arch/news68k/include: intr.h
src/sys/arch/next68k/include: intr.h
src/sys/arch/or1k/include: cpu.h db_machdep.h intr.h
src/sys/arch/pmax/include: float.h pcb.h proc.h profile.h reg.h
setjmp.h
src/sys/arch/powerpc/include: altivec.h fenv.h fpu.h intr.h
pci_machdep.h spr.h
src/sys/arch/powerpc/include/booke: cpuvar.h intr.h pmap.h pte.h
src/sys/arch/powerpc/include/ibm4xx: cpu.h pmap.h tlb.h
src/sys/arch/powerpc/include/oea: pmap.h
src/sys/arch/powerpc/pic: ipivar.h
src/sys/coda: coda.h
src/sys/compat/netbsd32: netbsd32_conv.h
src/sys/compat/netinet6: in6_var.h
src/sys/compat/sys: ipc.h
src/sys/crypto/nist_ctr_drbg: nist_ctr_aes_rijndael.h nist_ctr_drbg.h
src/sys/dev: clock_subr.h
src/sys/dev/acpi/acpica: acpi_func.h
src/sys/dev/dtv: dtvif.h
src/sys/dev/flash: flash.h
src/sys/dev/hdaudio: hdaudiovar.h
src/sys/dev/ic: aic7xxx_inline.h atwvar.h dm9000var.h nvmeio.h
nvmevar.h rtwvar.h
src/sys/dev/marvell: if_mvxpevar.h
src/sys/dev/nand: nand.h
src/sys/dev/nor: cfi.h nor.h
src/sys/dev/pci: if_iwmreg.h pciidevar.h pcivar.h voyagervar.h
src/sys/dev/pci/cxgb: cxgb_adapter.h cxgb_common.h cxgb_jhash.h
cxgb_l2t.h cxgb_mvec.h cxgb_offload.h cxgb_osdep.h cxgb_toedev.h
src/sys/dev/pci/ixgbe: ixgbe.h
src/sys/dev/raidframe: raidframevar.h
src/sys/dev/sdmmc: sdmmcreg.h
src/sys/dev/usb: usbdivar.h
src/sys/fs/tmpfs: tmpfs.h
src/sys/lib/libkern: milieu.h
src/sys/net/npf: npf.h
src/sys/net80211: ieee80211_node.h
src/sys/netatalk: at_var.h
src/sys/netipsec: ipsec.h
src/sys/rump/include/machine: intr.h
src/sys/rump/include/rump: rumperr.h rumperrno2host.h
src/sys/rump/librump/rumpkern: rump_curlwp___thread.h
rump_curlwp_hypercall.h
src/sys/ufs/chfs: chfs.h
src/sys/ufs/lfs: ulfs_bswap.h
src/sys/ufs/ufs: ufs_bswap.h
src/sys/uvm: uvm_fault_i.h
src/sys/uvm/pmap: vmpagemd.h
Log Message:
s/static inline/static __inline/g for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/altq/altq_classq.h
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/include/alpha.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbcf/include/intr.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/cavium/octeonvar.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/cavium/dev/octeon_fpavar.h \
src/sys/arch/mips/cavium/dev/octeon_gmxvar.h \
src/sys/arch/mips/cavium/dev/octeon_pkovar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/cavium/dev/octeon_powvar.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mmeye/include/intr.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mvme68k/include/intr.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/news68k/include/intr.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/next68k/include/intr.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/include/cpu.h \
src/sys/arch/or1k/include/db_machdep.h src/sys/arch/or1k/include/intr.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/pmax/include/float.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/pmax/include/pcb.h \
src/sys/arch/pmax/include/profile.h src/sys/arch/pmax/include/reg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/pmax/include/proc.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/pmax/include/setjmp.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/altivec.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/fenv.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/fpu.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/include/intr.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/include/pci_machdep.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/include/spr.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/booke/cpuvar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/booke/intr.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/booke/pmap.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/include/booke/pte.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/ibm4xx/cpu.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/ibm4xx/pmap.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/ibm4xx/tlb.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/include/oea/pmap.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pic/ipivar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/coda/coda.h
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/netinet6/in6_var.h
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/ipc.h
cvs rdiff -u -r1.1 -r1.2 src/sys/crypto/nist_ctr_drbg/nist_ctr_aes_rijndael.h
cvs rdiff -u -r1.2 -r1.3 src/sys/crypto/nist_ctr_drbg/nist_ctr_drbg.h
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/clock_subr.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpica/acpi_func.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/dtv/dtvif.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/flash/flash.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/hdaudio/hdaudiovar.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/aic7xxx_inline.h
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ic/atwvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/dm9000var.h src/sys/dev/ic/nvmeio.h
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/nvmevar.h
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ic/rtwvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/if_mvxpevar.h
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/nand/nand.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/nor/cfi.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/nor/nor.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_iwmreg.h
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/pciidevar.h
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/pci/pcivar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/voyagervar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/cxgb/cxgb_adapter.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/cxgb/cxgb_common.h \
src/sys/dev/pci/cxgb/cxgb_mvec.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/cxgb/cxgb_jhash.h \
src/sys/dev/pci/cxgb/cxgb_l2t.h src/sys/dev/pci/cxgb/cxgb_offload.h \
src/sys/dev/pci/cxgb/cxgb_toedev.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/cxgb/cxgb_osdep.h
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/raidframe/raidframevar.h
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/sdmmc/sdmmcreg.h
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/usb/usbdivar.h
cvs rdiff -u -r1.54 -r1.55 src/sys/fs/tmpfs/tmpfs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libkern/milieu.h
cvs rdiff -u -r1.56 -r1.57 src/sys/net/npf/npf.h
cvs rdiff -u -r1.29 -r1.30 src/sys/net80211/ieee80211_node.h
cvs rdiff -u -r1.7 -r1.8 src/sys/netatalk/at_var.h
cvs rdiff -u -r1.73 -r1.74 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/include/machine/intr.h
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/include/rump/rumperr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/include/rump/rumperrno2host.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpkern/rump_curlwp___thread.h \
src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/lfs/ulfs_bswap.h
cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/ufs/ufs_bswap.h
cvs rdiff -u -r1.28 -r1.29 src/sys/uvm/uvm_fault_i.h
cvs rdiff -u -r1.7 -r1.8 src/sys/uvm/pmap/vmpagemd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/altq/altq_classq.h
diff -u src/sys/altq/altq_classq.h:1.7 src/sys/altq/altq_classq.h:1.8
--- src/sys/altq/altq_classq.h:1.7 Thu Oct 12 15:59:08 2006
+++ src/sys/altq/altq_classq.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_classq.h,v 1.7 2006/10/12 19:59:08 peter Exp $ */
+/* $NetBSD: altq_classq.h,v 1.8 2018/04/19 21:50:06 christos Exp $ */
/* $KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $ */
/*
@@ -89,7 +89,7 @@ extern void _flushq(class_queue_t *);
/*
* inlined versions
*/
-static inline void
+static __inline void
_addq(class_queue_t *q, struct mbuf *m)
{
struct mbuf *m0;
@@ -103,7 +103,7 @@ _addq(class_queue_t *q, struct mbuf *m)
qlen(q)++;
}
-static inline struct mbuf *
+static __inline struct mbuf *
_getq(class_queue_t *q)
{
struct mbuf *m, *m0;
@@ -120,7 +120,7 @@ _getq(class_queue_t *q)
}
/* drop a packet at the tail of the queue */
-static inline struct mbuf *
+static __inline struct mbuf *
_getq_tail(class_queue_t *q)
{
struct mbuf *m, *m0, *prev;
@@ -142,7 +142,7 @@ _getq_tail(class_queue_t *q)
}
/* randomly select a packet in the queue */
-static inline struct mbuf *
+static __inline struct mbuf *
_getq_random(class_queue_t *q)
{
struct mbuf *m;
@@ -169,7 +169,7 @@ _getq_random(class_queue_t *q)
return (m);
}
-static inline void
+static __inline void
_removeq(class_queue_t *q, struct mbuf *m)
{
struct mbuf *m0, *prev;
@@ -187,7 +187,7 @@ _removeq(class_queue_t *q, struct mbuf *
qlen(q)--;
}
-static inline void
+static __inline void
_flushq(class_queue_t *q)
{
struct mbuf *m;
Index: src/sys/arch/alpha/include/alpha.h
diff -u src/sys/arch/alpha/include/alpha.h:1.36 src/sys/arch/alpha/include/alpha.h:1.37
--- src/sys/arch/alpha/include/alpha.h:1.36 Fri Jun 16 14:17:41 2017
+++ src/sys/arch/alpha/include/alpha.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha.h,v 1.36 2017/06/16 18:17:41 jdolecek Exp $ */
+/* $NetBSD: alpha.h,v 1.37 2018/04/19 21:50:06 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -112,25 +112,25 @@ void fpu_state_load(struct lwp *, u_i
void fpu_state_save(struct lwp *);
void fpu_state_release(struct lwp *);
-static inline bool
+static __inline bool
fpu_valid_p(struct lwp *l)
{
return pcu_valid_p(&fpu_ops, l);
}
-static inline void
+static __inline void
fpu_load(void)
{
pcu_load(&fpu_ops);
}
-static inline void
+static __inline void
fpu_save(lwp_t *l)
{
pcu_save(&fpu_ops, l);
}
-static inline void
+static __inline void
fpu_discard(lwp_t *l, bool valid_p)
{
pcu_discard(&fpu_ops, l, valid_p);
Index: src/sys/arch/evbcf/include/intr.h
diff -u src/sys/arch/evbcf/include/intr.h:1.2 src/sys/arch/evbcf/include/intr.h:1.3
--- src/sys/arch/evbcf/include/intr.h:1.2 Tue Mar 18 14:20:41 2014
+++ src/sys/arch/evbcf/include/intr.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.2 2014/03/18 18:20:41 riastradh Exp $ */
+/* $NetBSD: intr.h,v 1.3 2018/04/19 21:50:06 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,14 +63,14 @@ typedef struct {
uint16_t _psl;
} ipl_cookie_t;
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
return (ipl_cookie_t){._psl = ipl2psl_table[ipl]};
}
-static inline int
+static __inline int
splraiseipl(ipl_cookie_t icookie)
{
Index: src/sys/arch/mips/cavium/octeonvar.h
diff -u src/sys/arch/mips/cavium/octeonvar.h:1.5 src/sys/arch/mips/cavium/octeonvar.h:1.6
--- src/sys/arch/mips/cavium/octeonvar.h:1.5 Mon Jul 11 12:15:35 2016
+++ src/sys/arch/mips/cavium/octeonvar.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: octeonvar.h,v 1.5 2016/07/11 16:15:35 matt Exp $ */
+/* $NetBSD: octeonvar.h,v 1.6 2018/04/19 21:50:06 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -308,13 +308,13 @@ void mips_cp0_cvmctl_write(uint64_t);
/* octeon core does not use cca to determine cacheability */
#define OCTEON_CCA_NONE UINT64_C(0)
-static inline uint64_t
+static __inline uint64_t
octeon_xkphys_read_8(paddr_t address)
{
return mips3_ld(MIPS_PHYS_TO_XKPHYS(OCTEON_CCA_NONE, address));
}
-static inline void
+static __inline void
octeon_xkphys_write_8(paddr_t address, uint64_t value)
{
mips3_sd(MIPS_PHYS_TO_XKPHYS(OCTEON_CCA_NONE, address), value);
@@ -328,7 +328,7 @@ octeon_xkphys_write_8(paddr_t address, u
octeon_xkphys_write_8(address, value)
#endif
-static inline void
+static __inline void
octeon_iobdma_write_8(uint64_t value)
{
uint64_t addr = UINT64_C(0xffffffffffffa200);
@@ -336,20 +336,20 @@ octeon_iobdma_write_8(uint64_t value)
octeon_xkphys_write_8(addr, value);
}
-static inline uint64_t
+static __inline uint64_t
octeon_cvmseg_read_8(size_t offset)
{
return octeon_xkphys_read_8(UINT64_C(0xffffffffffff8000) + offset);
}
-static inline void
+static __inline void
octeon_cvmseg_write_8(size_t offset, uint64_t value)
{
octeon_xkphys_write_8(UINT64_C(0xffffffffffff8000) + offset, value);
}
/* XXX */
-static inline uint32_t
+static __inline uint32_t
octeon_disable_interrupt(uint32_t *new)
{
uint32_t s, tmp;
@@ -367,7 +367,7 @@ octeon_disable_interrupt(uint32_t *new)
}
/* XXX */
-static inline void
+static __inline void
octeon_restore_status(uint32_t s)
{
__asm __volatile (
@@ -377,7 +377,7 @@ octeon_restore_status(uint32_t s)
:: [s]"r"(s));
}
-static inline uint64_t
+static __inline uint64_t
octeon_get_cycles(void)
{
#if defined(__mips_o32)
Index: src/sys/arch/mips/cavium/dev/octeon_fpavar.h
diff -u src/sys/arch/mips/cavium/dev/octeon_fpavar.h:1.1 src/sys/arch/mips/cavium/dev/octeon_fpavar.h:1.2
--- src/sys/arch/mips/cavium/dev/octeon_fpavar.h:1.1 Wed Apr 29 04:32:01 2015
+++ src/sys/arch/mips/cavium/dev/octeon_fpavar.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_fpavar.h,v 1.1 2015/04/29 08:32:01 hikaru Exp $ */
+/* $NetBSD: octeon_fpavar.h,v 1.2 2018/04/19 21:50:06 christos Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -92,7 +92,7 @@ void octeon_fpa_dump(void);
* operations
*/
-static inline uint64_t
+static __inline uint64_t
octeon_fpa_load(uint64_t fpapool)
{
uint64_t addr;
@@ -106,7 +106,7 @@ octeon_fpa_load(uint64_t fpapool)
}
#ifdef notyet
-static inline uint64_t
+static __inline uint64_t
octeon_fpa_iobdma(struct octeon_fpa_softc *sc, int srcaddr, int len)
{
/* XXX */
@@ -114,7 +114,7 @@ octeon_fpa_iobdma(struct octeon_fpa_soft
}
#endif
-static inline void
+static __inline void
octeon_fpa_store(uint64_t addr, uint64_t fpapool, uint64_t dwbcount)
{
uint64_t ptr;
@@ -129,13 +129,13 @@ octeon_fpa_store(uint64_t addr, uint64_t
octeon_write_csr(ptr, (dwbcount & 0x0ffULL));
}
-static inline paddr_t
+static __inline paddr_t
octeon_fpa_buf_get_paddr(struct octeon_fpa_buf *fb)
{
return octeon_fpa_load(fb->fb_poolno);
}
-static inline void
+static __inline void
octeon_fpa_buf_put_paddr(struct octeon_fpa_buf *fb, paddr_t paddr)
{
KASSERT(paddr >= fb->fb_paddr);
@@ -143,7 +143,7 @@ octeon_fpa_buf_put_paddr(struct octeon_f
octeon_fpa_store(paddr, fb->fb_poolno, fb->fb_size / 128);
}
-static inline void
+static __inline void
octeon_fpa_buf_put(struct octeon_fpa_buf *fb, void *addr)
{
paddr_t paddr;
Index: src/sys/arch/mips/cavium/dev/octeon_gmxvar.h
diff -u src/sys/arch/mips/cavium/dev/octeon_gmxvar.h:1.1 src/sys/arch/mips/cavium/dev/octeon_gmxvar.h:1.2
--- src/sys/arch/mips/cavium/dev/octeon_gmxvar.h:1.1 Wed Apr 29 04:32:01 2015
+++ src/sys/arch/mips/cavium/dev/octeon_gmxvar.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmxvar.h,v 1.1 2015/04/29 08:32:01 hikaru Exp $ */
+/* $NetBSD: octeon_gmxvar.h,v 1.2 2018/04/19 21:50:06 christos Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -163,10 +163,10 @@ int octeon_gmx_reset_board(struct octeo
void octeon_gmx_stats(struct octeon_gmx_port_softc *);
uint64_t octeon_gmx_get_rx_int_reg(struct octeon_gmx_port_softc *sc);
uint64_t octeon_gmx_get_tx_int_reg(struct octeon_gmx_port_softc *sc);
-static inline int octeon_gmx_link_status(struct octeon_gmx_port_softc *);
+static __inline int octeon_gmx_link_status(struct octeon_gmx_port_softc *);
/* XXX RGMII specific */
-static inline int
+static __inline int
octeon_gmx_link_status(struct octeon_gmx_port_softc *sc)
{
return (sc->sc_link & RXN_RX_INBND_STATUS) ? 1 : 0;
Index: src/sys/arch/mips/cavium/dev/octeon_pkovar.h
diff -u src/sys/arch/mips/cavium/dev/octeon_pkovar.h:1.1 src/sys/arch/mips/cavium/dev/octeon_pkovar.h:1.2
--- src/sys/arch/mips/cavium/dev/octeon_pkovar.h:1.1 Wed Apr 29 04:32:01 2015
+++ src/sys/arch/mips/cavium/dev/octeon_pkovar.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_pkovar.h,v 1.1 2015/04/29 08:32:01 hikaru Exp $ */
+/* $NetBSD: octeon_pkovar.h,v 1.2 2018/04/19 21:50:06 christos Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -87,12 +87,12 @@ int octeon_pko_port_enable(struct octe
int octeon_pko_port_config(struct octeon_pko_softc *);
void octeon_pko_int_enable(struct octeon_pko_softc *, int);
uint64_t octeon_pko_int_summary(struct octeon_pko_softc *);
-static inline uint64_t octeon_pko_cmd_word0(int, int, int, int, int, int,
+static __inline uint64_t octeon_pko_cmd_word0(int, int, int, int, int, int,
int, int, int, int, int, int, int, int, int, int);
-static inline uint64_t octeon_pko_cmd_word1(int, int, int, int, paddr_t);
+static __inline uint64_t octeon_pko_cmd_word1(int, int, int, int, paddr_t);
-static inline uint64_t
+static __inline uint64_t
octeon_pko_cmd_word0(int sz1, int sz0, int s1, int reg1, int s0, int reg0,
int le, int n2, int q, int r, int g, int ipoffp1, int ii, int df, int segs,
int totalbytes)
@@ -118,7 +118,7 @@ octeon_pko_cmd_word0(int sz1, int sz0, i
return cmd;
}
-static inline uint64_t
+static __inline uint64_t
octeon_pko_cmd_word1(int i, int back, int pool, int size, paddr_t addr)
{
uint64_t cmd = 0;
@@ -135,7 +135,7 @@ octeon_pko_cmd_word1(int i, int back, in
/* Store Operations */
-static inline void
+static __inline void
octeon_pko_op_store(uint64_t args, uint64_t value)
{
paddr_t addr;
@@ -150,7 +150,7 @@ octeon_pko_op_store(uint64_t args, uint6
octeon_write_csr(addr, value);
}
-static inline void
+static __inline void
octeon_pko_op_doorbell_write(int pid, int qid, int wdc)
{
uint64_t args, value;
Index: src/sys/arch/mips/cavium/dev/octeon_powvar.h
diff -u src/sys/arch/mips/cavium/dev/octeon_powvar.h:1.2 src/sys/arch/mips/cavium/dev/octeon_powvar.h:1.3
--- src/sys/arch/mips/cavium/dev/octeon_powvar.h:1.2 Mon Jul 11 12:15:35 2016
+++ src/sys/arch/mips/cavium/dev/octeon_powvar.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_powvar.h,v 1.2 2016/07/11 16:15:35 matt Exp $ */
+/* $NetBSD: octeon_powvar.h,v 1.3 2018/04/19 21:50:06 christos Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -113,7 +113,7 @@ extern struct octeon_pow_softc octeon_po
/* GET_WORK Loads */
-static inline uint64_t
+static __inline uint64_t
octeon_pow_ops_get_work_load(
int wait) /* 0-1 */
{
@@ -137,7 +137,7 @@ octeon_pow_ops_get_work_load(
* f) get_cur == 1, get_wqp == 1, get_rev == 1 (cur_wqp_prev)
*/
-static inline uint64_t
+static __inline uint64_t
octeon_pow_ops_pow_status(
int coreid, /* 0-15 */
int get_rev, /* 0-1 */
@@ -164,7 +164,7 @@ octeon_pow_ops_pow_status(
* c) get_des == 1 (desched)
*/
-static inline uint64_t
+static __inline uint64_t
octeon_pow_ops_pow_memory(
int index, /* 0-2047 */
int get_des, /* 0-1 */
@@ -190,7 +190,7 @@ octeon_pow_ops_pow_memory(
* d) get_rmt == 1, get_des_get_tail == 1
*/
-static inline uint64_t
+static __inline uint64_t
octeon_pow_ops_pow_idxptr(
int qosgrp, /* 0-7 */
int get_des_get_tail, /* 0-1 */
@@ -209,7 +209,7 @@ octeon_pow_ops_pow_idxptr(
/* NULL_RD Loads */
-static inline uint64_t
+static __inline uint64_t
octeon_pow_ops_null_rd_load(void)
{
uint64_t ptr =
@@ -228,7 +228,7 @@ octeon_pow_ops_null_rd_load(void)
/* GET_WORK IOBDMAs */
-static inline void
+static __inline void
octeon_pow_ops_get_work_iobdma(
int scraddr, /* 0-2047 */
int wait) /* 0-1 */
@@ -250,7 +250,7 @@ octeon_pow_ops_get_work_iobdma(
/* NULL_RD IOBDMAs */
-static inline void
+static __inline void
octeon_pow_ops_null_rd_iobdma(
int scraddr) /* 0-2047 */
{
@@ -269,7 +269,7 @@ octeon_pow_ops_null_rd_iobdma(
/* Store Operations */
-static inline void
+static __inline void
octeon_pow_store(
int subdid, /* 0, 1, 3 */
uint64_t addr, /* 0-0x0000.000f.ffff.ffff */
@@ -303,7 +303,7 @@ octeon_pow_store(
/* SWTAG */
-static inline void
+static __inline void
octeon_pow_ops_swtag(int type, uint32_t tag)
{
octeon_pow_store(
@@ -321,7 +321,7 @@ octeon_pow_ops_swtag(int type, uint32_t
/* SWTAG_FULL */
-static inline void
+static __inline void
octeon_pow_ops_swtag_full(paddr_t addr, int grp, int type, uint32_t tag)
{
octeon_pow_store(
@@ -338,7 +338,7 @@ octeon_pow_ops_swtag_full(paddr_t addr,
/* SWTAG_DESCHED */
-static inline void
+static __inline void
octeon_pow_ops_swtag_desched(int no_sched, int grp, int type, uint32_t tag)
{
octeon_pow_store(
@@ -355,7 +355,7 @@ octeon_pow_ops_swtag_desched(int no_sche
/* DESCHED */
-static inline void
+static __inline void
octeon_pow_ops_desched(int no_sched)
{
octeon_pow_store(
@@ -372,7 +372,7 @@ octeon_pow_ops_desched(int no_sched)
/* ADDWQ */
-static inline void
+static __inline void
octeon_pow_ops_addwq(paddr_t addr, int qos, int grp, int type, uint32_t tag)
{
octeon_pow_store(
@@ -389,7 +389,7 @@ octeon_pow_ops_addwq(paddr_t addr, int q
/* UPD_WQP_GRP */
-static inline void
+static __inline void
octeon_pow_ops_upd_wqp_grp(paddr_t addr, int grp)
{
octeon_pow_store(
@@ -406,7 +406,7 @@ octeon_pow_ops_upd_wqp_grp(paddr_t addr,
/* CLR_NSCHED */
-static inline void
+static __inline void
octeon_pow_ops_clr_nsched(paddr_t addr, int index)
{
octeon_pow_store(
@@ -423,7 +423,7 @@ octeon_pow_ops_clr_nsched(paddr_t addr,
/* NOP */
-static inline void
+static __inline void
octeon_pow_ops_nop(void)
{
octeon_pow_store(
@@ -443,13 +443,13 @@ octeon_pow_ops_nop(void)
/*
* global functions
*/
-static inline void
+static __inline void
octeon_pow_work_request_async(uint64_t scraddr, uint64_t wait)
{
octeon_pow_ops_get_work_iobdma(scraddr, wait);
}
-static inline uint64_t *
+static __inline uint64_t *
octeon_pow_work_response_async(uint64_t scraddr)
{
uint64_t result;
@@ -470,7 +470,7 @@ octeon_pow_work_response_async(uint64_t
#endif
}
-static inline void
+static __inline void
octeon_pow_config_int_pc(struct octeon_pow_softc *sc, int unit)
{
uint64_t wq_int_pc;
@@ -487,14 +487,14 @@ octeon_pow_config_int_pc(struct octeon_p
_POW_WR8(sc, POW_WQ_INT_PC_OFFSET, wq_int_pc);
}
-static inline void
+static __inline void
octeon_pow_config_int_pc_rate(struct octeon_pow_softc *sc, int rate)
{
octeon_pow_config_int_pc(sc, sc->sc_int_pc_base / rate);
}
/* wait until ready */
-static inline void
+static __inline void
octeon_pow_tag_sw_wait(void)
{
__asm __volatile (
Index: src/sys/arch/mmeye/include/intr.h
diff -u src/sys/arch/mmeye/include/intr.h:1.11 src/sys/arch/mmeye/include/intr.h:1.12
--- src/sys/arch/mmeye/include/intr.h:1.11 Sat Feb 19 05:46:28 2011
+++ src/sys/arch/mmeye/include/intr.h Thu Apr 19 17:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.11 2011/02/19 10:46:28 kiyohara Exp $ */
+/* $NetBSD: intr.h,v 1.12 2018/04/19 21:50:06 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -49,14 +49,14 @@ typedef struct {
ipl_t _ipl;
} ipl_cookie_t;
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
return (ipl_cookie_t){._ipl = ipl << 4};
}
-static inline int
+static __inline int
splraiseipl(ipl_cookie_t icookie)
{
Index: src/sys/arch/mvme68k/include/intr.h
diff -u src/sys/arch/mvme68k/include/intr.h:1.20 src/sys/arch/mvme68k/include/intr.h:1.21
--- src/sys/arch/mvme68k/include/intr.h:1.20 Fri May 22 04:08:36 2009
+++ src/sys/arch/mvme68k/include/intr.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.20 2009/05/22 08:08:36 he Exp $ */
+/* $NetBSD: intr.h,v 1.21 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,14 +63,14 @@ typedef struct {
uint16_t _psl;
} ipl_cookie_t;
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
return (ipl_cookie_t){._psl = ipl2psl_table[ipl]};
}
-static inline int
+static __inline int
splraiseipl(ipl_cookie_t icookie)
{
Index: src/sys/arch/news68k/include/intr.h
diff -u src/sys/arch/news68k/include/intr.h:1.26 src/sys/arch/news68k/include/intr.h:1.27
--- src/sys/arch/news68k/include/intr.h:1.26 Sun Mar 6 09:54:47 2011
+++ src/sys/arch/news68k/include/intr.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.26 2011/03/06 14:54:47 tsutsui Exp $ */
+/* $NetBSD: intr.h,v 1.27 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
extern int idepth;
-static inline bool
+static __inline bool
cpu_intr_p(void)
{
@@ -63,21 +63,21 @@ typedef struct {
uint16_t _psl;
} ipl_cookie_t;
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
return (ipl_cookie_t){._psl = ipl2psl_table[ipl]};
}
-static inline int
+static __inline int
splraiseipl(ipl_cookie_t icookie)
{
return _splraise(icookie._psl);
}
-static inline void
+static __inline void
splx(int sr)
{
Index: src/sys/arch/next68k/include/intr.h
diff -u src/sys/arch/next68k/include/intr.h:1.21 src/sys/arch/next68k/include/intr.h:1.22
--- src/sys/arch/next68k/include/intr.h:1.21 Wed Jun 25 22:52:03 2008
+++ src/sys/arch/next68k/include/intr.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.21 2008/06/26 02:52:03 isaki Exp $ */
+/* $NetBSD: intr.h,v 1.22 2018/04/19 21:50:07 christos Exp $ */
/*
* Copyright (C) 1997 Scott Reynolds
@@ -71,14 +71,14 @@ typedef struct {
uint16_t _psl;
} ipl_cookie_t;
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
return (ipl_cookie_t){._psl = ipl2psl_table[ipl]};
}
-static inline int
+static __inline int
splraiseipl(ipl_cookie_t icookie)
{
Index: src/sys/arch/or1k/include/cpu.h
diff -u src/sys/arch/or1k/include/cpu.h:1.1 src/sys/arch/or1k/include/cpu.h:1.2
--- src/sys/arch/or1k/include/cpu.h:1.1 Wed Sep 3 15:34:26 2014
+++ src/sys/arch/or1k/include/cpu.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.2 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -68,13 +68,13 @@ struct cpu_info {
register struct lwp *or1k_curlwp __asm("r10");
#define curlwp or1k_curlwp
-static inline struct cpu_info *
+static __inline struct cpu_info *
curcpu(void)
{
return curlwp->l_cpu;
}
-static inline cpuid_t
+static __inline cpuid_t
cpu_number(void)
{
#ifdef MULTIPROCESSOR
@@ -99,7 +99,7 @@ void cpu_boot_secondary_processors(void)
(cii) = 0; (cii) == 0 && (ci) = curcpu(); (cii)++
#endif
-static inline void
+static __inline void
cpu_dosoftints(void)
{
extern void dosoftints(void);
@@ -109,7 +109,7 @@ cpu_dosoftints(void)
dosoftints();
}
-static inline bool
+static __inline bool
cpu_intr_p(void)
{
return curcpu()->ci_intr_depth > 0;
Index: src/sys/arch/or1k/include/db_machdep.h
diff -u src/sys/arch/or1k/include/db_machdep.h:1.1 src/sys/arch/or1k/include/db_machdep.h:1.2
--- src/sys/arch/or1k/include/db_machdep.h:1.1 Wed Sep 3 15:34:26 2014
+++ src/sys/arch/or1k/include/db_machdep.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.2 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -59,14 +59,14 @@ extern db_regs_t ddb_regs;
#define IS_WATCHPOINT_TRAP(type, code) \
((type) == DB_TRAP_WATCHPOINT)
-static inline bool
+static __inline bool
inst_call(db_expr_t insn)
{
return (insn & 0xfc000000) == 0x04000000 /* l.jal */
|| (insn & 0xffff07ff) == 0x48000000; /* l.jalr */
}
-static inline bool
+static __inline bool
inst_load(db_expr_t insn)
{
const unsigned int opcode = isns >> 26;
@@ -75,13 +75,13 @@ inst_load(db_expr_t insn)
return opcode == 0x1b || (opcode >= 0x20 && opcode <= 0x26);
}
-static inline bool
+static __inline bool
inst_return(db_expr_t insn)
{
return insn == 0x44004800; /* l.jr r9 */
}
-static inline bool
+static __inline bool
inst_store(db_expr_t insn)
{
const unsigned int opcode = isns >> 26;
@@ -89,7 +89,7 @@ inst_store(db_expr_t insn)
return opcode >= 0x33 && opcode <= 0x37;
}
-static inline bool
+static __inline bool
inst_trap_return(db_expr_t insn)
{
return insn == 0x24000000; /* l.rfe */
Index: src/sys/arch/or1k/include/intr.h
diff -u src/sys/arch/or1k/include/intr.h:1.1 src/sys/arch/or1k/include/intr.h:1.2
--- src/sys/arch/or1k/include/intr.h:1.1 Wed Sep 3 15:34:26 2014
+++ src/sys/arch/or1k/include/intr.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.1 2014/09/03 19:34:26 matt Exp $ */
+/* $NetBSD: intr.h,v 1.2 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -73,49 +73,49 @@
#include <or1k/pic/picvar.h>
-static inline void
+static __inline void
spl0(void)
{
(void)_spllower(IPL_NONE);
}
-static inline int
+static __inline int
splsoftclock(void)
{
return _splraise(IPL_SOFTCLOCK);
}
-static inline int
+static __inline int
splsoftbio(void)
{
return _splraise(IPL_SOFTBIO);
}
-static inline int
+static __inline int
splsoftnet(void)
{
return _splraise(IPL_SOFTNET);
}
-static inline int
+static __inline int
splsoftserial(void)
{
return _splraise(IPL_SOFTSERIAL);
}
-static inline int
+static __inline int
splvm(void)
{
return _splraise(IPL_VM);
}
-static inline int
+static __inline int
splsched(void)
{
return _splraise(IPL_SCHED);
}
-static inline int
+static __inline int
splhigh(void)
{
return _splraise(IPL_HIGH);
@@ -126,14 +126,14 @@ typedef struct {
ipl_t _ipl;
} ipl_cookie_t;
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
return (ipl_cookie_t){._ipl = ipl};
}
-static inline int
+static __inline int
splraiseipl(ipl_cookie_t icookie)
{
Index: src/sys/arch/pmax/include/float.h
diff -u src/sys/arch/pmax/include/float.h:1.9 src/sys/arch/pmax/include/float.h:1.10
--- src/sys/arch/pmax/include/float.h:1.9 Mon Mar 18 22:06:28 1996
+++ src/sys/arch/pmax/include/float.h Thu Apr 19 17:50:07 2018
@@ -1,3 +1,3 @@
-/* $NetBSD: float.h,v 1.9 1996/03/19 03:06:28 jonathan Exp $ */
+/* $NetBSD: float.h,v 1.10 2018/04/19 21:50:07 christos Exp $ */
#include <mips/float.h>
Index: src/sys/arch/pmax/include/pcb.h
diff -u src/sys/arch/pmax/include/pcb.h:1.7 src/sys/arch/pmax/include/pcb.h:1.8
--- src/sys/arch/pmax/include/pcb.h:1.7 Mon Mar 18 22:06:28 1996
+++ src/sys/arch/pmax/include/pcb.h Thu Apr 19 17:50:07 2018
@@ -1,3 +1,3 @@
-/* $NetBSD: pcb.h,v 1.7 1996/03/19 03:06:28 jonathan Exp $ */
+/* $NetBSD: pcb.h,v 1.8 2018/04/19 21:50:07 christos Exp $ */
#include <mips/pcb.h>
Index: src/sys/arch/pmax/include/profile.h
diff -u src/sys/arch/pmax/include/profile.h:1.7 src/sys/arch/pmax/include/profile.h:1.8
--- src/sys/arch/pmax/include/profile.h:1.7 Mon Mar 18 22:06:28 1996
+++ src/sys/arch/pmax/include/profile.h Thu Apr 19 17:50:07 2018
@@ -1,3 +1,3 @@
-/* $NetBSD: profile.h,v 1.7 1996/03/19 03:06:28 jonathan Exp $ */
+/* $NetBSD: profile.h,v 1.8 2018/04/19 21:50:07 christos Exp $ */
#include <mips/profile.h>
Index: src/sys/arch/pmax/include/reg.h
diff -u src/sys/arch/pmax/include/reg.h:1.7 src/sys/arch/pmax/include/reg.h:1.8
--- src/sys/arch/pmax/include/reg.h:1.7 Mon Mar 18 22:06:28 1996
+++ src/sys/arch/pmax/include/reg.h Thu Apr 19 17:50:07 2018
@@ -1,3 +1,3 @@
-/* $NetBSD: reg.h,v 1.7 1996/03/19 03:06:28 jonathan Exp $ */
+/* $NetBSD: reg.h,v 1.8 2018/04/19 21:50:07 christos Exp $ */
#include <mips/reg.h>
Index: src/sys/arch/pmax/include/proc.h
diff -u src/sys/arch/pmax/include/proc.h:1.5 src/sys/arch/pmax/include/proc.h:1.6
--- src/sys/arch/pmax/include/proc.h:1.5 Mon Mar 18 22:06:28 1996
+++ src/sys/arch/pmax/include/proc.h Thu Apr 19 17:50:07 2018
@@ -1,3 +1,3 @@
-/* $NetBSD: proc.h,v 1.5 1996/03/19 03:06:28 jonathan Exp $ */
+/* $NetBSD: proc.h,v 1.6 2018/04/19 21:50:07 christos Exp $ */
#include <mips/proc.h>
Index: src/sys/arch/pmax/include/setjmp.h
diff -u src/sys/arch/pmax/include/setjmp.h:1.2 src/sys/arch/pmax/include/setjmp.h:1.3
--- src/sys/arch/pmax/include/setjmp.h:1.2 Mon Mar 18 22:06:28 1996
+++ src/sys/arch/pmax/include/setjmp.h Thu Apr 19 17:50:07 2018
@@ -1,3 +1,3 @@
-/* $NetBSD: setjmp.h,v 1.2 1996/03/19 03:06:28 jonathan Exp $ */
+/* $NetBSD: setjmp.h,v 1.3 2018/04/19 21:50:07 christos Exp $ */
#include <mips/setjmp.h>
Index: src/sys/arch/powerpc/include/altivec.h
diff -u src/sys/arch/powerpc/include/altivec.h:1.17 src/sys/arch/powerpc/include/altivec.h:1.18
--- src/sys/arch/powerpc/include/altivec.h:1.17 Thu Mar 16 12:13:20 2017
+++ src/sys/arch/powerpc/include/altivec.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: altivec.h,v 1.17 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: altivec.h,v 1.18 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -53,19 +53,19 @@ bool vec_save_to_mcontext(struct lwp *,
int vec_siginfo_code(const struct trapframe *);
-static inline void
+static __inline void
vec_load(void)
{
pcu_load(&vec_ops);
}
-static inline void
+static __inline void
vec_save(lwp_t *l)
{
pcu_save(&vec_ops, l);
}
-static inline void
+static __inline void
vec_discard(lwp_t *l)
{
pcu_discard(&vec_ops, l, false);
Index: src/sys/arch/powerpc/include/fenv.h
diff -u src/sys/arch/powerpc/include/fenv.h:1.4 src/sys/arch/powerpc/include/fenv.h:1.5
--- src/sys/arch/powerpc/include/fenv.h:1.4 Mon Sep 18 19:21:15 2017
+++ src/sys/arch/powerpc/include/fenv.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.h,v 1.4 2017/09/18 23:21:15 phx Exp $ */
+/* $NetBSD: fenv.h,v 1.5 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2004-2005 David Schultz <d...@freebsd.org>
@@ -95,7 +95,7 @@ extern const fenv_t __fe_dfl_env;
#define __mffs(__env) __asm __volatile("mffs %0" : "=f" (*(__env)))
#define __mtfsf(__env) __asm __volatile("mtfsf 255,%0" : : "f" (__env))
-static inline uint32_t
+static __inline uint32_t
__mfmsr(void)
{
uint32_t __msr;
@@ -104,7 +104,7 @@ __mfmsr(void)
return __msr;
}
-static inline void
+static __inline void
__mtmsr(uint32_t __msr)
{
@@ -115,7 +115,7 @@ __mtmsr(uint32_t __msr)
#define __MSR_FE_DIS (0)
#define __MSR_FE_PREC (0x00000800 | 0x00000100)
-static inline void
+static __inline void
__updatemsr(uint32_t __reg)
{
uint32_t __msr;
@@ -143,7 +143,7 @@ union __fpscr {
} __bits;
};
-__fenv_static inline int
+__fenv_static __inline int
feclearexcept(int __excepts)
{
union __fpscr __r;
@@ -156,7 +156,7 @@ feclearexcept(int __excepts)
return (0);
}
-__fenv_static inline int
+__fenv_static __inline int
fegetexceptflag(fexcept_t *__flagp, int __excepts)
{
union __fpscr __r;
@@ -166,7 +166,7 @@ fegetexceptflag(fexcept_t *__flagp, int
return (0);
}
-__fenv_static inline int
+__fenv_static __inline int
fesetexceptflag(const fexcept_t *__flagp, int __excepts)
{
union __fpscr __r;
@@ -180,7 +180,7 @@ fesetexceptflag(const fexcept_t *__flagp
return (0);
}
-__fenv_static inline int
+__fenv_static __inline int
feraiseexcept(int __excepts)
{
union __fpscr __r;
@@ -193,7 +193,7 @@ feraiseexcept(int __excepts)
return (0);
}
-__fenv_static inline int
+__fenv_static __inline int
fetestexcept(int __excepts)
{
union __fpscr __r;
@@ -202,7 +202,7 @@ fetestexcept(int __excepts)
return (__r.__bits.__reg & __excepts);
}
-__fenv_static inline int
+__fenv_static __inline int
fegetround(void)
{
union __fpscr __r;
@@ -211,7 +211,7 @@ fegetround(void)
return (__r.__bits.__reg & _ROUND_MASK);
}
-__fenv_static inline int
+__fenv_static __inline int
fesetround(int __round)
{
union __fpscr __r;
@@ -225,7 +225,7 @@ fesetround(int __round)
return (0);
}
-__fenv_static inline int
+__fenv_static __inline int
fegetenv(fenv_t *__envp)
{
union __fpscr __r;
@@ -235,7 +235,7 @@ fegetenv(fenv_t *__envp)
return (0);
}
-__fenv_static inline int
+__fenv_static __inline int
feholdexcept(fenv_t *__envp)
{
union __fpscr __r;
@@ -249,7 +249,7 @@ feholdexcept(fenv_t *__envp)
return (0);
}
-__fenv_static inline int
+__fenv_static __inline int
fesetenv(const fenv_t *__envp)
{
union __fpscr __r;
@@ -260,7 +260,7 @@ fesetenv(const fenv_t *__envp)
return (0);
}
-__fenv_static inline int
+__fenv_static __inline int
feupdateenv(const fenv_t *__envp)
{
union __fpscr __r;
@@ -275,7 +275,7 @@ feupdateenv(const fenv_t *__envp)
#if defined(_NETBSD_SOURCE) || defined(_GNU_SOURCE)
-__fenv_static inline int
+__fenv_static __inline int
feenableexcept(int __mask)
{
union __fpscr __r;
@@ -289,7 +289,7 @@ feenableexcept(int __mask)
return ((__oldmask & _ENABLE_MASK) << _FPUSW_SHIFT);
}
-__fenv_static inline int
+__fenv_static __inline int
fedisableexcept(int __mask)
{
union __fpscr __r;
@@ -303,7 +303,7 @@ fedisableexcept(int __mask)
return ((__oldmask & _ENABLE_MASK) << _FPUSW_SHIFT);
}
-__fenv_static inline int
+__fenv_static __inline int
fegetexcept(void)
{
union __fpscr __r;
Index: src/sys/arch/powerpc/include/fpu.h
diff -u src/sys/arch/powerpc/include/fpu.h:1.21 src/sys/arch/powerpc/include/fpu.h:1.22
--- src/sys/arch/powerpc/include/fpu.h:1.21 Thu Mar 16 12:13:20 2017
+++ src/sys/arch/powerpc/include/fpu.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.h,v 1.21 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: fpu.h,v 1.22 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -91,19 +91,19 @@ extern const pcu_ops_t fpu_ops;
struct fpreg;
-static inline void
+static __inline void
fpu_load(void)
{
pcu_load(&fpu_ops);
}
-static inline void
+static __inline void
fpu_save(lwp_t *l)
{
pcu_save(&fpu_ops, l);
}
-static inline void
+static __inline void
fpu_discard(lwp_t *l)
{
pcu_discard(&fpu_ops, l, false);
Index: src/sys/arch/powerpc/include/intr.h
diff -u src/sys/arch/powerpc/include/intr.h:1.12 src/sys/arch/powerpc/include/intr.h:1.13
--- src/sys/arch/powerpc/include/intr.h:1.12 Tue Oct 18 20:08:42 2016
+++ src/sys/arch/powerpc/include/intr.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.12 2016/10/19 00:08:42 nonaka Exp $ */
+/* $NetBSD: intr.h,v 1.13 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -28,7 +28,7 @@
#ifndef _LOCORE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.12 2016/10/19 00:08:42 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.13 2018/04/19 21:50:07 christos Exp $");
#endif
#ifndef _POWERPC_INTR_MACHDEP_H_
@@ -123,14 +123,14 @@ typedef struct {
ipl_t _ipl;
} ipl_cookie_t;
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
return (ipl_cookie_t){._ipl = ipl};
}
-static inline int
+static __inline int
splraiseipl(ipl_cookie_t icookie)
{
Index: src/sys/arch/powerpc/include/pci_machdep.h
diff -u src/sys/arch/powerpc/include/pci_machdep.h:1.14 src/sys/arch/powerpc/include/pci_machdep.h:1.15
--- src/sys/arch/powerpc/include/pci_machdep.h:1.14 Tue Oct 18 20:08:42 2016
+++ src/sys/arch/powerpc/include/pci_machdep.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.14 2016/10/19 00:08:42 nonaka Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.15 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2002,2007 The NetBSD Foundation, Inc.
@@ -54,9 +54,9 @@ typedef int pci_intr_handle_t;
struct pci_attach_args;
struct pcibus_attach_args;
-static inline pci_chipset_tag_t pcibus_attach_args_pc(
+static __inline pci_chipset_tag_t pcibus_attach_args_pc(
struct pcibus_attach_args *);
-static inline pci_chipset_tag_t pci_attach_args_pc(
+static __inline pci_chipset_tag_t pci_attach_args_pc(
const struct pci_attach_args *);
#include <dev/pci/pcireg.h>
@@ -194,7 +194,7 @@ struct genppc_pci_chipset {
#ifdef __PCI_NOINLINE
#define __pci_inline
#else
-#define __pci_inline static inline
+#define __pci_inline static __inline
#endif
/*
Index: src/sys/arch/powerpc/include/spr.h
diff -u src/sys/arch/powerpc/include/spr.h:1.51 src/sys/arch/powerpc/include/spr.h:1.52
--- src/sys/arch/powerpc/include/spr.h:1.51 Thu Mar 22 11:18:05 2018
+++ src/sys/arch/powerpc/include/spr.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: spr.h,v 1.51 2018/03/22 15:18:05 macallan Exp $ */
+/* $NetBSD: spr.h,v 1.52 2018/04/19 21:50:07 christos Exp $ */
/*
* Copyright (c) 2001, The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <powerpc/oea/cpufeat.h>
#if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
-static inline uint64_t
+static __inline uint64_t
mfspr64(int reg)
{
uint64_t ret;
@@ -68,7 +68,7 @@ mfspr64(int reg)
} )
#endif /* PPC_OEA64_BRIDGE || _ARCH_PPC64 */
-static inline uint64_t
+static __inline uint64_t
mfspr32(int reg)
{
register_t val;
@@ -77,7 +77,7 @@ mfspr32(int reg)
return val;
}
-static inline void
+static __inline void
mtspr32(int reg, uint32_t val)
{
@@ -85,7 +85,7 @@ mtspr32(int reg, uint32_t val)
}
#if (defined(PPC_OEA) + defined(PPC_OEA64) + defined(PPC_OEA64_BRIDGE)) > 1
-static inline uint64_t
+static __inline uint64_t
mfspr(int reg)
{
if ((oeacpufeat & (OEACPU_64_BRIDGE|OEACPU_64)) != 0)
Index: src/sys/arch/powerpc/include/booke/cpuvar.h
diff -u src/sys/arch/powerpc/include/booke/cpuvar.h:1.18 src/sys/arch/powerpc/include/booke/cpuvar.h:1.19
--- src/sys/arch/powerpc/include/booke/cpuvar.h:1.18 Tue Jun 16 02:51:16 2015
+++ src/sys/arch/powerpc/include/booke/cpuvar.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.18 2015/06/16 06:51:16 matt Exp $ */
+/* $NetBSD: cpuvar.h,v 1.19 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -140,7 +140,7 @@ struct cpu_md_ops {
#ifdef _KERNEL
-static inline register_t
+static __inline register_t
wrtee(register_t msr)
{
register_t old_msr;
Index: src/sys/arch/powerpc/include/booke/intr.h
diff -u src/sys/arch/powerpc/include/booke/intr.h:1.10 src/sys/arch/powerpc/include/booke/intr.h:1.11
--- src/sys/arch/powerpc/include/booke/intr.h:1.10 Tue Oct 18 20:08:42 2016
+++ src/sys/arch/powerpc/include/booke/intr.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.10 2016/10/19 00:08:42 nonaka Exp $ */
+/* $NetBSD: intr.h,v 1.11 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -148,63 +148,63 @@ void softint_fast_dispatch(struct lwp *,
#endif /* __INTR_PRIVATE */
#ifndef __INTR_NOINLINE
-static inline int
+static __inline int
splhigh(void)
{
return splraise(IPL_HIGH);
}
-static inline int
+static __inline int
splsched(void)
{
return splraise(IPL_SCHED);
}
-static inline int
+static __inline int
splvm(void)
{
return splraise(IPL_VM);
}
-static inline int
+static __inline int
splsoftserial(void)
{
return splraise(IPL_SOFTSERIAL);
}
-static inline int
+static __inline int
splsoftnet(void)
{
return splraise(IPL_SOFTNET);
}
-static inline int
+static __inline int
splsoftbio(void)
{
return splraise(IPL_SOFTBIO);
}
-static inline int
+static __inline int
splsoftclock(void)
{
return splraise(IPL_SOFTCLOCK);
}
-static inline int
+static __inline int
splraiseipl(ipl_cookie_t icookie)
{
return splraise(icookie._ipl);
}
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
Index: src/sys/arch/powerpc/include/booke/pmap.h
diff -u src/sys/arch/powerpc/include/booke/pmap.h:1.17 src/sys/arch/powerpc/include/booke/pmap.h:1.18
--- src/sys/arch/powerpc/include/booke/pmap.h:1.17 Sat Dec 24 13:34:31 2016
+++ src/sys/arch/powerpc/include/booke/pmap.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.17 2016/12/24 18:34:31 cherry Exp $ */
+/* $NetBSD: pmap.h,v 1.18 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -108,9 +108,9 @@ void pmap_md_page_syncicache(struct vm_p
vaddr_t pmap_bootstrap(vaddr_t, vaddr_t, phys_ram_seg_t *, size_t);
bool pmap_extract(struct pmap *, vaddr_t, paddr_t *);
-static inline paddr_t vtophys(vaddr_t);
+static __inline paddr_t vtophys(vaddr_t);
-static inline paddr_t
+static __inline paddr_t
vtophys(vaddr_t va)
{
paddr_t pa;
@@ -125,33 +125,33 @@ vtophys(vaddr_t va)
/*
* Virtual Cache Alias helper routines. Not a problem for Booke CPUs.
*/
-static inline bool
+static __inline bool
pmap_md_vca_add(struct vm_page *pg, vaddr_t va, pt_entry_t *nptep)
{
return false;
}
-static inline void
+static __inline void
pmap_md_vca_remove(struct vm_page *pg, vaddr_t va, bool dirty)
{
}
-static inline void
+static __inline void
pmap_md_vca_clean(struct vm_page *pg, vaddr_t va, int op)
{
}
#endif
#ifdef __PMAP_PRIVATE
-static inline size_t
+static __inline size_t
pmap_md_tlb_asid_max(void)
{
return PMAP_TLB_NUM_PIDS - 1;
}
struct vm_physseg;
-static inline bool
+static __inline bool
pmap_md_ok_to_steal_p(const uvm_physseg_t bank, size_t npgs)
{
return true;
Index: src/sys/arch/powerpc/include/booke/pte.h
diff -u src/sys/arch/powerpc/include/booke/pte.h:1.9 src/sys/arch/powerpc/include/booke/pte.h:1.10
--- src/sys/arch/powerpc/include/booke/pte.h:1.9 Sat Jun 24 03:19:59 2017
+++ src/sys/arch/powerpc/include/booke/pte.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.9 2017/06/24 07:19:59 skrll Exp $ */
+/* $NetBSD: pte.h,v 1.10 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -77,122 +77,122 @@ typedef __BSD_PT_ENTRY_T pt_entry_t;
#ifndef _LOCORE
#ifdef _KERNEL
-static inline uint32_t
+static __inline uint32_t
pte_value(pt_entry_t pt_entry)
{
return pt_entry;
}
-static inline bool
+static __inline bool
pte_cached_p(pt_entry_t pt_entry)
{
return (pt_entry & PTE_I) == 0;
}
-static inline bool
+static __inline bool
pte_modified_p(pt_entry_t pt_entry)
{
return (pt_entry & (PTE_UNMODIFIED|PTE_xW)) == PTE_xW;
}
-static inline bool
+static __inline bool
pte_valid_p(pt_entry_t pt_entry)
{
return pt_entry != 0;
}
-static inline bool
+static __inline bool
pte_zero_p(pt_entry_t pt_entry)
{
return pt_entry == 0;
}
-static inline bool
+static __inline bool
pte_exec_p(pt_entry_t pt_entry)
{
return (pt_entry & PTE_xX) != 0;
}
-static inline bool
+static __inline bool
pte_readonly_p(pt_entry_t pt_entry)
{
return (pt_entry & PTE_xW) == 0;
}
-static inline bool
+static __inline bool
pte_deferred_exec_p(pt_entry_t pt_entry)
{
//return (pt_entry & (PTE_xX|PTE_UNSYNCED)) == (PTE_xX|PTE_UNSYNCED);
return (pt_entry & PTE_UNSYNCED) == PTE_UNSYNCED;
}
-static inline bool
+static __inline bool
pte_wired_p(pt_entry_t pt_entry)
{
return (pt_entry & PTE_WIRED) != 0;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_nv_entry(bool kernel)
{
return 0;
}
-static inline paddr_t
+static __inline paddr_t
pte_to_paddr(pt_entry_t pt_entry)
{
return (paddr_t)(pt_entry & PTE_RPN_MASK);
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_ionocached_bits(void)
{
return PTE_I|PTE_G;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_iocached_bits(void)
{
return PTE_G;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_nocached_bits(void)
{
return PTE_M|PTE_I;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_cached_bits(void)
{
return PTE_M;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_cached_change(pt_entry_t pt_entry, bool cached)
{
return (pt_entry & ~PTE_I) | (cached ? 0 : PTE_I);
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_wire_entry(pt_entry_t pt_entry)
{
return pt_entry | PTE_WIRED;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_unwire_entry(pt_entry_t pt_entry)
{
return pt_entry & ~PTE_WIRED;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_prot_nowrite(pt_entry_t pt_entry)
{
return pt_entry & ~(PTE_xW|PTE_UNMODIFIED);
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_prot_downgrade(pt_entry_t pt_entry, vm_prot_t newprot)
{
pt_entry &= ~(PTE_xW|PTE_UNMODIFIED);
@@ -201,7 +201,7 @@ pte_prot_downgrade(pt_entry_t pt_entry,
return pt_entry;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_prot_bits(struct vm_page_md *mdpg, vm_prot_t prot)
{
KASSERT(prot & VM_PROT_READ);
@@ -228,7 +228,7 @@ pte_prot_bits(struct vm_page_md *mdpg, v
return pt_entry;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_flag_bits(struct vm_page_md *mdpg, int flags)
{
if (__predict_false(flags & PMAP_NOCACHE)) {
@@ -246,7 +246,7 @@ pte_flag_bits(struct vm_page_md *mdpg, i
}
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_make_enter(paddr_t pa, struct vm_page_md *mdpg, vm_prot_t prot,
int flags, bool kernel)
{
@@ -258,7 +258,7 @@ pte_make_enter(paddr_t pa, struct vm_pag
return pt_entry;
}
-static inline pt_entry_t
+static __inline pt_entry_t
pte_make_kenter_pa(paddr_t pa, struct vm_page_md *mdpg, vm_prot_t prot,
int flags)
{
@@ -271,7 +271,7 @@ pte_make_kenter_pa(paddr_t pa, struct vm
return pt_entry;
}
-static inline void
+static __inline void
pte_set(pt_entry_t *ptep, pt_entry_t pte)
{
*ptep = pte;
Index: src/sys/arch/powerpc/include/ibm4xx/cpu.h
diff -u src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.21 src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.22
--- src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.21 Fri Jul 27 18:13:58 2012
+++ src/sys/arch/powerpc/include/ibm4xx/cpu.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.21 2012/07/27 22:13:58 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.22 2018/04/19 21:50:07 christos Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -88,13 +88,13 @@ extern void intr_init(void);
* macros because register address is encoded as immediate
* operand.
*/
-static inline void
+static __inline void
mtdcr(int reg, uint32_t val)
{
__asm volatile("mtdcr %0,%1" : : "K"(reg), "r"(val));
}
-static inline uint32_t
+static __inline uint32_t
mfdcr(int reg)
{
uint32_t val;
@@ -103,14 +103,14 @@ mfdcr(int reg)
return val;
}
-static inline void
+static __inline void
mtcpr(int reg, uint32_t val)
{
mtdcr(DCR_CPR0_CFGADDR, reg);
mtdcr(DCR_CPR0_CFGDATA, val);
}
-static inline uint32_t
+static __inline uint32_t
mfcpr(int reg)
{
mtdcr(DCR_CPR0_CFGADDR, reg);
@@ -124,7 +124,7 @@ mtsdr(int reg, uint32_t val)
mtdcr(DCR_SDR0_CFGDATA, val);
}
-static inline uint32_t
+static __inline uint32_t
mfsdr(int reg)
{
mtdcr(DCR_SDR0_CFGADDR, reg);
Index: src/sys/arch/powerpc/include/ibm4xx/pmap.h
diff -u src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.17 src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.18
--- src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.17 Wed Jun 29 20:52:59 2011
+++ src/sys/arch/powerpc/include/ibm4xx/pmap.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.17 2011/06/30 00:52:59 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.18 2018/04/19 21:50:07 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -172,7 +172,7 @@ bool pmap_check_attr(struct vm_page *, u
void pmap_real_memory(paddr_t *, psize_t *);
int pmap_tlbmiss(vaddr_t va, int ctx);
-static inline void
+static __inline void
pmap_remove_all(struct pmap *pmap)
{
/* Nothing. */
@@ -194,9 +194,9 @@ void pmap_procwr(struct proc *, vaddr_t,
#define PMAP_MAP_POOLPAGE(pa) (pa)
#define PMAP_UNMAP_POOLPAGE(pa) (pa)
-static inline paddr_t vtophys(vaddr_t);
+static __inline paddr_t vtophys(vaddr_t);
-static inline paddr_t
+static __inline paddr_t
vtophys(vaddr_t va)
{
paddr_t pa;
Index: src/sys/arch/powerpc/include/ibm4xx/tlb.h
diff -u src/sys/arch/powerpc/include/ibm4xx/tlb.h:1.4 src/sys/arch/powerpc/include/ibm4xx/tlb.h:1.5
--- src/sys/arch/powerpc/include/ibm4xx/tlb.h:1.4 Mon Oct 16 14:14:38 2006
+++ src/sys/arch/powerpc/include/ibm4xx/tlb.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tlb.h,v 1.4 2006/10/16 18:14:38 kiyohara Exp $ */
+/* $NetBSD: tlb.h,v 1.5 2018/04/19 21:50:07 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
Index: src/sys/arch/powerpc/include/oea/pmap.h
diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.28 src/sys/arch/powerpc/include/oea/pmap.h:1.29
--- src/sys/arch/powerpc/include/oea/pmap.h:1.28 Fri Feb 28 00:32:01 2014
+++ src/sys/arch/powerpc/include/oea/pmap.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.28 2014/02/28 05:32:01 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.29 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -128,7 +128,7 @@ extern int pmap_use_altivec;
#define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count)
/* ARGSUSED */
-static inline void
+static __inline void
pmap_remove_all(struct pmap *pmap)
{
/* Nothing. */
@@ -160,7 +160,7 @@ u_int powerpc_mmap_flags(paddr_t);
#define pmap_phys_address(ppn) (ppn & ~POWERPC_MMAP_FLAG_MASK)
#define pmap_mmap_flags(ppn) powerpc_mmap_flags(ppn)
-static inline paddr_t vtophys (vaddr_t);
+static __inline paddr_t vtophys (vaddr_t);
/*
* Alternate mapping hooks for pool pages. Avoids thrashing the TLB.
@@ -175,7 +175,7 @@ static inline paddr_t vtophys (vaddr_t);
#define POOL_VTOPHYS(va) vtophys((vaddr_t) va)
#endif
-static inline paddr_t
+static __inline paddr_t
vtophys(vaddr_t va)
{
paddr_t pa;
@@ -193,19 +193,19 @@ extern const struct pmap_ops pmap32_ops;
extern const struct pmap_ops pmap64_ops;
extern const struct pmap_ops pmap64bridge_ops;
-static inline void
+static __inline void
pmap_setup32(void)
{
pmapops = &pmap32_ops;
}
-static inline void
+static __inline void
pmap_setup64(void)
{
pmapops = &pmap64_ops;
}
-static inline void
+static __inline void
pmap_setup64bridge(void)
{
pmapops = &pmap64bridge_ops;
Index: src/sys/arch/powerpc/pic/ipivar.h
diff -u src/sys/arch/powerpc/pic/ipivar.h:1.8 src/sys/arch/powerpc/pic/ipivar.h:1.9
--- src/sys/arch/powerpc/pic/ipivar.h:1.8 Fri Jan 23 02:27:05 2015
+++ src/sys/arch/powerpc/pic/ipivar.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipivar.h,v 1.8 2015/01/23 07:27:05 nonaka Exp $ */
+/* $NetBSD: ipivar.h,v 1.9 2018/04/19 21:50:07 christos Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipivar.h,v 1.8 2015/01/23 07:27:05 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipivar.h,v 1.9 2018/04/19 21:50:07 christos Exp $");
#ifndef _IPI_VAR_H_
#define _IPI_VAR_H_
@@ -66,7 +66,7 @@ int ipi_intr(void *);
/* convenience */
extern struct ipi_ops ipiops;
-static inline void
+static __inline void
cpu_send_ipi(cpuid_t cpuid, uint32_t msg)
{
(*ipiops.ppc_send_ipi)(cpuid, msg);
Index: src/sys/coda/coda.h
diff -u src/sys/coda/coda.h:1.19 src/sys/coda/coda.h:1.20
--- src/sys/coda/coda.h:1.19 Sun Sep 6 02:00:59 2015
+++ src/sys/coda/coda.h Thu Apr 19 17:50:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: coda.h,v 1.19 2015/09/06 06:00:59 dholland Exp $ */
+/* $NetBSD: coda.h,v 1.20 2018/04/19 21:50:07 christos Exp $ */
/*
@@ -208,13 +208,13 @@ typedef struct {
u_long Unique;
} CodaFid;
-static inline ino_t coda_f2i(CodaFid *fid)
+static __inline ino_t coda_f2i(CodaFid *fid)
{
if (!fid) return 0;
return (fid->Unique + (fid->Vnode<<10) + (fid->Volume<<20));
}
-static inline char * coda_f2s(CodaFid *fid)
+static __inline char * coda_f2s(CodaFid *fid)
{
static char fid_str [35];
snprintf (fid_str, 35, "[%lx.%lx.%lx]", fid->Volume,
@@ -222,7 +222,7 @@ static inline char * coda_f2s(CodaFid *f
return fid_str;
}
-static inline int coda_fid_eq (CodaFid *fid1, CodaFid *fid2)
+static __inline int coda_fid_eq (CodaFid *fid1, CodaFid *fid2)
{
return (fid1->Volume == fid2->Volume &&
fid1->Vnode == fid2->Vnode &&
@@ -241,13 +241,13 @@ typedef struct {
} CodaFid;
-static inline ino_t coda_f2i(CodaFid *fid)
+static __inline ino_t coda_f2i(CodaFid *fid)
{
if (!fid) return 0;
return (fid->opaque[1] + (fid->opaque[2]<<10) + (fid->opaque[3]<<20));
}
-static inline char * coda_f2s(CodaFid *fid)
+static __inline char * coda_f2s(CodaFid *fid)
{
static char fid_str [35];
snprintf (fid_str, 35, "[%x.%x.%x.%x]", fid->opaque[0],
@@ -255,7 +255,7 @@ static inline char * coda_f2s(CodaFid *f
return fid_str;
}
-static inline int coda_fid_eq (CodaFid *fid1, CodaFid *fid2)
+static __inline int coda_fid_eq (CodaFid *fid1, CodaFid *fid2)
{
return (fid1->opaque[0] == fid2->opaque[0] &&
fid1->opaque[1] == fid2->opaque[1] &&
Index: src/sys/compat/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.33 src/sys/compat/netbsd32/netbsd32_conv.h:1.34
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.33 Tue Oct 31 08:43:56 2017
+++ src/sys/compat/netbsd32/netbsd32_conv.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_conv.h,v 1.33 2017/10/31 12:43:56 martin Exp $ */
+/* $NetBSD: netbsd32_conv.h,v 1.34 2018/04/19 21:50:08 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -754,7 +754,7 @@ netbsd32_to_dirent12(char *buf, int nbyt
return ((char *)(void *)odp) - buf;
}
-static inline int
+static __inline int
netbsd32_copyin_plistref(netbsd32_pointer_t n32p, struct plistref *p)
{
struct netbsd32_plistref n32plist;
@@ -769,7 +769,7 @@ netbsd32_copyin_plistref(netbsd32_pointe
return 0;
}
-static inline int
+static __inline int
netbsd32_copyout_plistref(netbsd32_pointer_t n32p, struct plistref *p)
{
struct netbsd32_plistref n32plist;
Index: src/sys/compat/netinet6/in6_var.h
diff -u src/sys/compat/netinet6/in6_var.h:1.3 src/sys/compat/netinet6/in6_var.h:1.4
--- src/sys/compat/netinet6/in6_var.h:1.3 Sun Sep 6 02:00:59 2015
+++ src/sys/compat/netinet6/in6_var.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.3 2015/09/06 06:00:59 dholland Exp $ */
+/* $NetBSD: in6_var.h,v 1.4 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@ struct in6_aliasreq50 {
#define OSIOCAIFADDR_IN6 _IOW('i', 26, struct in6_aliasreq50)
#define OSIOCSIFPHYADDR_IN6 _IOW('i', 70, struct in6_aliasreq50)
-static inline void in6_addrlifetime_to_in6_addrlifetime50(
+static __inline void in6_addrlifetime_to_in6_addrlifetime50(
struct in6_addrlifetime *al)
{
struct in6_addrlifetime cp;
@@ -73,7 +73,7 @@ static inline void in6_addrlifetime_to_i
oal->ia6t_pltime = cp.ia6t_pltime;
}
-static inline void in6_aliasreq50_to_in6_aliasreq(
+static __inline void in6_aliasreq50_to_in6_aliasreq(
struct in6_aliasreq *ar)
{
struct in6_aliasreq50 *oar =
Index: src/sys/compat/sys/ipc.h
diff -u src/sys/compat/sys/ipc.h:1.4 src/sys/compat/sys/ipc.h:1.5
--- src/sys/compat/sys/ipc.h:1.4 Tue May 24 14:29:23 2011
+++ src/sys/compat/sys/ipc.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipc.h,v 1.4 2011/05/24 18:29:23 joerg Exp $ */
+/* $NetBSD: ipc.h,v 1.5 2018/04/19 21:50:08 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -77,7 +77,7 @@ __ipc_perm14_to_native(const struct ipc_
#undef CVT
}
-static inline void
+static __inline void
__native_to_ipc_perm14(const struct ipc_perm *perm, struct ipc_perm14 *operm)
{
Index: src/sys/crypto/nist_ctr_drbg/nist_ctr_aes_rijndael.h
diff -u src/sys/crypto/nist_ctr_drbg/nist_ctr_aes_rijndael.h:1.1 src/sys/crypto/nist_ctr_drbg/nist_ctr_aes_rijndael.h:1.2
--- src/sys/crypto/nist_ctr_drbg/nist_ctr_aes_rijndael.h:1.1 Sat Nov 19 17:51:22 2011
+++ src/sys/crypto/nist_ctr_drbg/nist_ctr_aes_rijndael.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nist_ctr_aes_rijndael.h,v 1.1 2011/11/19 22:51:22 tls Exp $ */
+/* $NetBSD: nist_ctr_aes_rijndael.h,v 1.2 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -64,14 +64,14 @@
typedef rijndael_ctx NIST_AES_ENCRYPT_CTX;
-static inline void
+static __inline void
NIST_AES_ECB_Encrypt(const NIST_AES_ENCRYPT_CTX *ctx,
const void *src, void* dst)
{
rijndael_encrypt(ctx, src, dst);
}
-static inline int
+static __inline int
NIST_AES_Schedule_Encryption(NIST_AES_ENCRYPT_CTX *ctx,
const void *key, int bits)
{
Index: src/sys/crypto/nist_ctr_drbg/nist_ctr_drbg.h
diff -u src/sys/crypto/nist_ctr_drbg/nist_ctr_drbg.h:1.2 src/sys/crypto/nist_ctr_drbg/nist_ctr_drbg.h:1.3
--- src/sys/crypto/nist_ctr_drbg/nist_ctr_drbg.h:1.2 Mon Nov 21 18:48:52 2011
+++ src/sys/crypto/nist_ctr_drbg/nist_ctr_drbg.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nist_ctr_drbg.h,v 1.2 2011/11/21 23:48:52 macallan Exp $ */
+/* $NetBSD: nist_ctr_drbg.h,v 1.3 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@ int nist_ctr_drbg_destroy(NIST_CTR_DRBG
#define NIST_HTONL(x) (x)
#define NIST_NTOHL(x) (x)
#else
-static inline unsigned long
+static __inline unsigned long
NIST_HTONL(unsigned long x)
{
switch(sizeof(long)) {
@@ -92,7 +92,7 @@ NIST_HTONL(unsigned long x)
return be64toh(x);
{
}
-static inline unsigned long
+static __inline unsigned long
NIST_NTOHL(unsigned long x)
{
switch(sizeof(long)) {
Index: src/sys/dev/clock_subr.h
diff -u src/sys/dev/clock_subr.h:1.25 src/sys/dev/clock_subr.h:1.26
--- src/sys/dev/clock_subr.h:1.25 Thu Nov 20 11:26:34 2014
+++ src/sys/dev/clock_subr.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_subr.h,v 1.25 2014/11/20 16:26:34 christos Exp $ */
+/* $NetBSD: clock_subr.h,v 1.26 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -53,13 +53,13 @@ int clock_secs_to_ymdhms(time_t, struct
/*
* BCD to binary and binary to BCD.
*/
-static inline unsigned int
+static __inline unsigned int
bcdtobin(unsigned int bcd)
{
return ((bcd >> 4) & 0x0f) * 10 + (bcd & 0x0f);
}
-static inline unsigned int
+static __inline unsigned int
bintobcd(unsigned int bin)
{
return (((bin / 10) << 4) & 0xf0) | (bin % 10);
Index: src/sys/dev/acpi/acpica/acpi_func.h
diff -u src/sys/dev/acpi/acpica/acpi_func.h:1.4 src/sys/dev/acpi/acpica/acpi_func.h:1.5
--- src/sys/dev/acpi/acpica/acpi_func.h:1.4 Sat Jul 24 17:53:54 2010
+++ src/sys/dev/acpi/acpica/acpi_func.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_func.h,v 1.4 2010/07/24 21:53:54 jruoho Exp $ */
+/* $NetBSD: acpi_func.h,v 1.5 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -51,7 +51,7 @@ do { \
(Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock)); \
} while (0)
-static inline int
+static __inline int
acpi_acquire_global_lock(uint32_t *lock)
{
uint32_t new, old, val;
@@ -66,7 +66,7 @@ acpi_acquire_global_lock(uint32_t *lock)
return ((new < GL_BIT_MASK) ? GL_ACQUIRED : GL_BUSY);
}
-static inline int
+static __inline int
acpi_release_global_lock(uint32_t *lock)
{
uint32_t new, old, val;
Index: src/sys/dev/dtv/dtvif.h
diff -u src/sys/dev/dtv/dtvif.h:1.3 src/sys/dev/dtv/dtvif.h:1.4
--- src/sys/dev/dtv/dtvif.h:1.3 Mon Aug 8 21:42:24 2011
+++ src/sys/dev/dtv/dtvif.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dtvif.h,v 1.3 2011/08/09 01:42:24 jmcneill Exp $ */
+/* $NetBSD: dtvif.h,v 1.4 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -79,7 +79,7 @@ struct dtv_payload {
size_t size;
};
-static inline int
+static __inline int
dtv_print(void *priv, const char *pnp)
{
if (pnp)
Index: src/sys/dev/flash/flash.h
diff -u src/sys/dev/flash/flash.h:1.8 src/sys/dev/flash/flash.h:1.9
--- src/sys/dev/flash/flash.h:1.8 Mon Nov 13 12:35:58 2017
+++ src/sys/dev/flash/flash.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.h,v 1.8 2017/11/13 17:35:58 jmcneill Exp $ */
+/* $NetBSD: flash.h,v 1.9 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -141,7 +141,7 @@ int flash_sync(device_t);
* This functions checks if the buffer only contains a specified byte pattern.
* Returns %0 if found something else, %1 otherwise.
*/
-static inline int
+static __inline int
check_pattern(const void *buf, uint8_t patt, size_t offset, size_t size)
{
size_t i;
Index: src/sys/dev/hdaudio/hdaudiovar.h
diff -u src/sys/dev/hdaudio/hdaudiovar.h:1.5 src/sys/dev/hdaudio/hdaudiovar.h:1.6
--- src/sys/dev/hdaudio/hdaudiovar.h:1.5 Wed Dec 23 07:45:06 2015
+++ src/sys/dev/hdaudio/hdaudiovar.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudiovar.h,v 1.5 2015/12/23 12:45:06 jmcneill Exp $ */
+/* $NetBSD: hdaudiovar.h,v 1.6 2018/04/19 21:50:08 christos Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -185,13 +185,13 @@ int hdaudio_stream_tag(struct hdaudio_st
uint16_t hdaudio_stream_param(struct hdaudio_stream *, const audio_params_t *);
#ifdef HDAUDIO_32BIT_ACCESS
-static inline uint8_t
+static __inline uint8_t
_hda_read1(struct hdaudio_softc *sc, bus_size_t off)
{
return bus_space_read_4(sc->sc_memt, sc->sc_memh, off & -4) >>
(8 * (off & 3));
}
-static inline uint16_t
+static __inline uint16_t
_hda_read2(struct hdaudio_softc *sc, bus_size_t off)
{
return bus_space_read_4(sc->sc_memt, sc->sc_memh, off & -4) >>
@@ -201,7 +201,7 @@ _hda_read2(struct hdaudio_softc *sc, bus
#define hda_read2 _hda_read2
#define hda_read4(sc, off) \
bus_space_read_4((sc)->sc_memt, (sc)->sc_memh, (off))
-static inline void
+static __inline void
_hda_write1(struct hdaudio_softc *sc, bus_size_t off, uint8_t val)
{
const size_t shift = 8 * (off & 3);
@@ -210,7 +210,7 @@ _hda_write1(struct hdaudio_softc *sc, bu
tmp = (val << shift) | (tmp & ~(0xff << shift));
bus_space_write_4(sc->sc_memt, sc->sc_memh, off, tmp);
}
-static inline void
+static __inline void
_hda_write2(struct hdaudio_softc *sc, bus_size_t off, uint16_t val)
{
const size_t shift = 8 * (off & 2);
Index: src/sys/dev/ic/aic7xxx_inline.h
diff -u src/sys/dev/ic/aic7xxx_inline.h:1.14 src/sys/dev/ic/aic7xxx_inline.h:1.15
--- src/sys/dev/ic/aic7xxx_inline.h:1.14 Sun Mar 15 11:52:12 2009
+++ src/sys/dev/ic/aic7xxx_inline.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_inline.h,v 1.14 2009/03/15 15:52:12 cegger Exp $ */
+/* $NetBSD: aic7xxx_inline.h,v 1.15 2018/04/19 21:50:08 christos Exp $ */
/*
* Inline routines shareable across OS platforms.
@@ -226,9 +226,9 @@ ahc_targetcmd_offset(struct ahc_softc *a
}
/******************************** Debugging ***********************************/
-static inline const char *ahc_name(struct ahc_softc *ahc);
+static __inline const char *ahc_name(struct ahc_softc *ahc);
-static inline const char *
+static __inline const char *
ahc_name(struct ahc_softc *ahc)
{
return (ahc->name);
Index: src/sys/dev/ic/atwvar.h
diff -u src/sys/dev/ic/atwvar.h:1.38 src/sys/dev/ic/atwvar.h:1.39
--- src/sys/dev/ic/atwvar.h:1.38 Thu Feb 2 05:05:35 2017
+++ src/sys/dev/ic/atwvar.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: atwvar.h,v 1.38 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: atwvar.h,v 1.39 2018/04/19 21:50:08 christos Exp $ */
/*
* Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. All rights reserved.
@@ -397,7 +397,7 @@ do { \
* field is only 11 bits, we must subtract 1 from the length to avoid
* having it truncated to 0!
*/
-static inline void
+static __inline void
atw_init_rxdesc(struct atw_softc *sc, int x)
{
struct atw_rxsoft *rxs = &sc->sc_rxsoft[x];
Index: src/sys/dev/ic/dm9000var.h
diff -u src/sys/dev/ic/dm9000var.h:1.2 src/sys/dev/ic/dm9000var.h:1.3
--- src/sys/dev/ic/dm9000var.h:1.2 Sat Jan 28 03:29:55 2012
+++ src/sys/dev/ic/dm9000var.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000var.h,v 1.2 2012/01/28 08:29:55 nisimura Exp $ */
+/* $NetBSD: dm9000var.h,v 1.3 2018/04/19 21:50:08 christos Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -118,28 +118,28 @@ int dme_intr(void *);
struct mbuf* dme_alloc_receive_buffer(struct ifnet *, unsigned int);
/* Inline memory access methods */
-static inline uint8_t
+static __inline uint8_t
dme_read(struct dme_softc *sc, int reg)
{
bus_space_write_1(sc->sc_iot, sc->sc_ioh, sc->dme_io, reg);
return (bus_space_read_1(sc->sc_iot, sc->sc_ioh, sc->dme_data));
}
-static inline void
+static __inline void
dme_write(struct dme_softc *sc, int reg, uint8_t value)
{
bus_space_write_1(sc->sc_iot, sc->sc_ioh, sc->dme_io, reg);
bus_space_write_1(sc->sc_iot, sc->sc_ioh, sc->dme_data, value);
}
-static inline void
+static __inline void
dme_write2(struct dme_softc *sc, int reg, uint16_t value)
{
bus_space_write_1(sc->sc_iot, sc->sc_ioh, sc->dme_io, reg);
bus_space_write_2(sc->sc_iot, sc->sc_ioh, sc->dme_data, value);
}
-static inline void
+static __inline void
dme_write_c(struct dme_softc *sc, int reg, uint8_t value[], uint count)
{
for(int i=0; i<count; i++) {
@@ -147,7 +147,7 @@ dme_write_c(struct dme_softc *sc, int re
}
}
-static inline void
+static __inline void
dme_read_c(struct dme_softc *sc, int reg, uint8_t *value, uint count)
{
for(int i=0; i<count; i++) {
Index: src/sys/dev/ic/nvmeio.h
diff -u src/sys/dev/ic/nvmeio.h:1.2 src/sys/dev/ic/nvmeio.h:1.3
--- src/sys/dev/ic/nvmeio.h:1.2 Wed Apr 18 06:11:45 2018
+++ src/sys/dev/ic/nvmeio.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmeio.h,v 1.2 2018/04/18 10:11:45 nonaka Exp $ */
+/* $NetBSD: nvmeio.h,v 1.3 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (C) 2012-2013 Intel Corporation
@@ -96,7 +96,7 @@ struct nvme_pt_command {
};
/* Endianess conversion functions for NVMe structs */
-static inline void
+static __inline void
nvme_le128toh(uint64_t v[2])
{
#if _BYTE_ORDER != _LITTLE_ENDIAN
@@ -108,7 +108,7 @@ nvme_le128toh(uint64_t v[2])
#endif
}
-static inline void
+static __inline void
nvme_namespace_format_swapbytes(struct nvm_namespace_format *format)
{
@@ -117,7 +117,7 @@ nvme_namespace_format_swapbytes(struct n
#endif
}
-static inline void
+static __inline void
nvme_identify_namespace_swapbytes(struct nvm_identify_namespace *identify)
{
#if _BYTE_ORDER != _LITTLE_ENDIAN
@@ -138,7 +138,7 @@ nvme_identify_namespace_swapbytes(struct
#endif
}
-static inline void
+static __inline void
nvme_identify_psd_swapbytes(struct nvm_identify_psd *psd)
{
@@ -152,7 +152,7 @@ nvme_identify_psd_swapbytes(struct nvm_i
#endif
}
-static inline void
+static __inline void
nvme_identify_controller_swapbytes(struct nvm_identify_controller *identify)
{
#if _BYTE_ORDER != _LITTLE_ENDIAN
Index: src/sys/dev/ic/nvmevar.h
diff -u src/sys/dev/ic/nvmevar.h:1.16 src/sys/dev/ic/nvmevar.h:1.17
--- src/sys/dev/ic/nvmevar.h:1.16 Wed Apr 18 06:05:59 2018
+++ src/sys/dev/ic/nvmevar.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmevar.h,v 1.16 2018/04/18 10:05:59 nonaka Exp $ */
+/* $NetBSD: nvmevar.h,v 1.17 2018/04/19 21:50:08 christos Exp $ */
/* $OpenBSD: nvmevar.h,v 1.8 2016/04/14 11:18:32 dlg Exp $ */
/*
@@ -163,7 +163,7 @@ void nvme_softintr_intx(void *);
int nvme_intr_msi(void *);
void nvme_softintr_msi(void *);
-static inline struct nvme_queue *
+static __inline struct nvme_queue *
nvme_get_q(struct nvme_softc *sc)
{
return sc->sc_q[cpu_index(curcpu()) % sc->sc_nq];
@@ -172,7 +172,7 @@ nvme_get_q(struct nvme_softc *sc)
/*
* namespace
*/
-static inline struct nvme_namespace *
+static __inline struct nvme_namespace *
nvme_ns_get(struct nvme_softc *sc, uint16_t nsid)
{
if (nsid == 0 || nsid - 1 >= sc->sc_nn)
Index: src/sys/dev/ic/rtwvar.h
diff -u src/sys/dev/ic/rtwvar.h:1.46 src/sys/dev/ic/rtwvar.h:1.47
--- src/sys/dev/ic/rtwvar.h:1.46 Mon Oct 23 05:31:17 2017
+++ src/sys/dev/ic/rtwvar.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwvar.h,v 1.46 2017/10/23 09:31:17 msaitoh Exp $ */
+/* $NetBSD: rtwvar.h,v 1.47 2018/04/19 21:50:08 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -119,7 +119,7 @@ struct rtw_regs {
* ([reg1, reg0]) before starting new ops on the same region. See
* acceptable bus_space_barrier(9) for the flag definitions.
*/
-static inline void
+static __inline void
rtw_barrier(const struct rtw_regs *r, int reg0, int reg1, int flags)
{
bus_space_barrier(r->r_bt, r->r_bh, MIN(reg0, reg1),
Index: src/sys/dev/marvell/if_mvxpevar.h
diff -u src/sys/dev/marvell/if_mvxpevar.h:1.3 src/sys/dev/marvell/if_mvxpevar.h:1.4
--- src/sys/dev/marvell/if_mvxpevar.h:1.3 Sat Feb 13 03:05:06 2016
+++ src/sys/dev/marvell/if_mvxpevar.h Thu Apr 19 17:50:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvxpevar.h,v 1.3 2016/02/13 08:05:06 hikaru Exp $ */
+/* $NetBSD: if_mvxpevar.h,v 1.4 2018/04/19 21:50:08 christos Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
* All rights reserved.
@@ -164,7 +164,7 @@ struct mvxpe_tx_ring {
int tx_queue_th_free;
};
-static inline int
+static __inline int
tx_counter_adv(int ctr, int n)
{
/* XXX: lock or atomic */
@@ -175,7 +175,7 @@ tx_counter_adv(int ctr, int n)
return ctr;
}
-static inline int
+static __inline int
rx_counter_adv(int ctr, int n)
{
/* XXX: lock or atomic */
Index: src/sys/dev/nand/nand.h
diff -u src/sys/dev/nand/nand.h:1.18 src/sys/dev/nand/nand.h:1.19
--- src/sys/dev/nand/nand.h:1.18 Mon Nov 13 12:36:39 2017
+++ src/sys/dev/nand/nand.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nand.h,v 1.18 2017/11/13 17:36:39 jmcneill Exp $ */
+/* $NetBSD: nand.h,v 1.19 2018/04/19 21:50:09 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -197,7 +197,7 @@ struct nand_attach_args {
struct nand_interface *naa_nand_if;
};
-static inline void
+static __inline void
nand_busy(device_t device)
{
struct nand_softc * const sc = device_private(device);
@@ -214,7 +214,7 @@ nand_busy(device_t device)
sc->nand_if->select(sc->controller_dev, false);
}
-static inline void
+static __inline void
nand_select(device_t self, bool enable)
{
struct nand_softc * const sc = device_private(self);
@@ -225,7 +225,7 @@ nand_select(device_t self, bool enable)
sc->nand_if->select(sc->controller_dev, enable);
}
-static inline void
+static __inline void
nand_address(device_t self, uint32_t address)
{
struct nand_softc * const sc = device_private(self);
@@ -236,7 +236,7 @@ nand_address(device_t self, uint32_t add
sc->nand_if->address(sc->controller_dev, address);
}
-static inline void
+static __inline void
nand_command(device_t self, uint8_t command)
{
struct nand_softc * const sc = device_private(self);
@@ -247,7 +247,7 @@ nand_command(device_t self, uint8_t comm
sc->nand_if->command(sc->controller_dev, command);
}
-static inline void
+static __inline void
nand_read_1(device_t self, uint8_t *data)
{
struct nand_softc * const sc = device_private(self);
@@ -258,7 +258,7 @@ nand_read_1(device_t self, uint8_t *data
sc->nand_if->read_1(sc->controller_dev, data);
}
-static inline void
+static __inline void
nand_write_1(device_t self, uint8_t data)
{
struct nand_softc * const sc = device_private(self);
@@ -269,7 +269,7 @@ nand_write_1(device_t self, uint8_t data
sc->nand_if->write_1(sc->controller_dev, data);
}
-static inline void
+static __inline void
nand_read_2(device_t self, uint16_t *data)
{
struct nand_softc * const sc = device_private(self);
@@ -280,7 +280,7 @@ nand_read_2(device_t self, uint16_t *dat
sc->nand_if->read_2(sc->controller_dev, data);
}
-static inline void
+static __inline void
nand_write_2(device_t self, uint16_t data)
{
struct nand_softc * const sc = device_private(self);
@@ -291,7 +291,7 @@ nand_write_2(device_t self, uint16_t dat
sc->nand_if->write_2(sc->controller_dev, data);
}
-static inline void
+static __inline void
nand_read_buf_1(device_t self, void *buf, size_t size)
{
struct nand_softc * const sc = device_private(self);
@@ -302,7 +302,7 @@ nand_read_buf_1(device_t self, void *buf
sc->nand_if->read_buf_1(sc->controller_dev, buf, size);
}
-static inline void
+static __inline void
nand_read_buf_2(device_t self, void *buf, size_t size)
{
struct nand_softc * const sc = device_private(self);
@@ -313,7 +313,7 @@ nand_read_buf_2(device_t self, void *buf
sc->nand_if->read_buf_2(sc->controller_dev, buf, size);
}
-static inline void
+static __inline void
nand_write_buf_1(device_t self, const void *buf, size_t size)
{
struct nand_softc * const sc = device_private(self);
@@ -324,7 +324,7 @@ nand_write_buf_1(device_t self, const vo
sc->nand_if->write_buf_1(sc->controller_dev, buf, size);
}
-static inline void
+static __inline void
nand_write_buf_2(device_t self, const void *buf, size_t size)
{
struct nand_softc * const sc = device_private(self);
@@ -335,7 +335,7 @@ nand_write_buf_2(device_t self, const vo
sc->nand_if->write_buf_2(sc->controller_dev, buf, size);
}
-static inline int
+static __inline int
nand_ecc_correct(device_t self, uint8_t *data, const uint8_t *oldcode,
const uint8_t *newcode)
{
@@ -347,7 +347,7 @@ nand_ecc_correct(device_t self, uint8_t
return sc->nand_if->ecc_correct(sc->controller_dev, data, oldcode, newcode);
}
-static inline void
+static __inline void
nand_ecc_compute(device_t self, const uint8_t *data, uint8_t *code)
{
struct nand_softc * const sc = device_private(self);
@@ -358,7 +358,7 @@ nand_ecc_compute(device_t self, const ui
sc->nand_if->ecc_compute(sc->controller_dev, data, code);
}
-static inline void
+static __inline void
nand_ecc_prepare(device_t self, int mode)
{
struct nand_softc * const sc = device_private(self);
@@ -369,7 +369,7 @@ nand_ecc_prepare(device_t self, int mode
sc->nand_if->ecc_prepare(sc->controller_dev, mode);
}
-static inline int
+static __inline int
nand_program_page(device_t self, size_t offset, const uint8_t *data)
{
struct nand_softc * const sc = device_private(self);
@@ -379,7 +379,7 @@ nand_program_page(device_t self, size_t
return sc->nand_if->program_page(self, offset, data);
}
-static inline int
+static __inline int
nand_read_page(device_t self, size_t offset, uint8_t *data)
{
struct nand_softc * const sc = device_private(self);
@@ -390,7 +390,7 @@ nand_read_page(device_t self, size_t off
}
#if 0
-static inline bool
+static __inline bool
nand_block_isbad(device_t self, flash_off_t block)
{
struct nand_softc * const sc = device_private(self);
@@ -432,7 +432,7 @@ int nand_read_parameters_toshiba(device_
/* debug inlines */
-static inline void
+static __inline void
nand_dump_data(const char *name, void *data, size_t len)
{
uint8_t *dump = data;
@@ -484,17 +484,17 @@ int nand_default_ecc_correct(device_t, u
int nand_default_read_page(device_t, size_t, uint8_t *);
int nand_default_program_page(device_t, size_t, const uint8_t *);
-static inline void nand_busy(device_t);
-static inline void nand_select(device_t, bool);
-static inline void nand_command(device_t, uint8_t);
-static inline void nand_address(device_t, uint32_t);
-static inline void nand_read_buf_1(device_t, void *, size_t);
-static inline void nand_read_buf_2(device_t, void *, size_t);
-static inline void nand_read_1(device_t, uint8_t *);
-static inline void nand_write_buf_1(device_t, const void *, size_t);
-static inline void nand_write_buf_2(device_t, const void *, size_t);
-//static inline bool nand_block_isbad(device_t, off_t);
-//static inline void nand_block_markbad(device_t, off_t);
-//static inline bool nand_isbusy(device_t);
+static __inline void nand_busy(device_t);
+static __inline void nand_select(device_t, bool);
+static __inline void nand_command(device_t, uint8_t);
+static __inline void nand_address(device_t, uint32_t);
+static __inline void nand_read_buf_1(device_t, void *, size_t);
+static __inline void nand_read_buf_2(device_t, void *, size_t);
+static __inline void nand_read_1(device_t, uint8_t *);
+static __inline void nand_write_buf_1(device_t, const void *, size_t);
+static __inline void nand_write_buf_2(device_t, const void *, size_t);
+//static __inline bool nand_block_isbad(device_t, off_t);
+//static __inline void nand_block_markbad(device_t, off_t);
+//static __inline bool nand_isbusy(device_t);
#endif /* _NAND_H_ */
Index: src/sys/dev/nor/cfi.h
diff -u src/sys/dev/nor/cfi.h:1.6 src/sys/dev/nor/cfi.h:1.7
--- src/sys/dev/nor/cfi.h:1.6 Sat Dec 17 14:42:41 2011
+++ src/sys/dev/nor/cfi.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cfi.h,v 1.6 2011/12/17 19:42:41 phx Exp $ */
+/* $NetBSD: cfi.h,v 1.7 2018/04/19 21:50:09 christos Exp $ */
#ifndef _CFI_H_
#define _CFI_H_
@@ -75,7 +75,7 @@ struct cfi_query_data {
#define CFI_IFCODE_X8 0
#define CFI_IFCODE_X16 1
#define CFI_IFCODE_X8X16 2
-static inline const char *
+static __inline const char *
cfi_interface_desc_str(uint16_t icd)
{
switch(icd) {
@@ -233,21 +233,21 @@ enum {
CFI_AMD_UNLOCK_ADDR2 = 0x555*4,
};
-static inline void
+static __inline void
cfi_reset(struct cfi * const cfi)
{
KASSERT(cfi->cfi_ops.cfi_reset != NULL);
cfi->cfi_ops.cfi_reset(cfi);
}
-static inline int
+static __inline int
cfi_erase_sector(struct cfi * const cfi, flash_off_t offset)
{
KASSERT(cfi->cfi_ops.cfi_erase_sector != NULL);
return cfi->cfi_ops.cfi_erase_sector(cfi, offset);
}
-static inline int
+static __inline int
cfi_program_word(struct cfi * const cfi, flash_off_t offset)
{
KASSERT(cfi->cfi_ops.cfi_program_word != NULL);
Index: src/sys/dev/nor/nor.h
diff -u src/sys/dev/nor/nor.h:1.4 src/sys/dev/nor/nor.h:1.5
--- src/sys/dev/nor/nor.h:1.4 Tue Aug 2 16:44:09 2011
+++ src/sys/dev/nor/nor.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nor.h,v 1.4 2011/08/02 20:44:09 cliff Exp $ */
+/* $NetBSD: nor.h,v 1.5 2018/04/19 21:50:09 christos Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -136,7 +136,7 @@ struct nor_attach_args {
struct nor_interface *naa_nor_if;
};
-static inline bool
+static __inline bool
nor_busy(device_t device, flash_off_t offset, u_long usec)
{
struct nor_softc *sc = device_private(device);
@@ -159,7 +159,7 @@ nor_busy(device_t device, flash_off_t of
return rv;
}
-static inline void
+static __inline void
nor_select(device_t self, bool enable)
{
struct nor_softc *sc = device_private(self);
@@ -170,7 +170,7 @@ nor_select(device_t self, bool enable)
sc->sc_nor_if->select(sc->sc_controller_dev, enable);
}
-static inline void
+static __inline void
nor_read_1(device_t self, flash_off_t offset, uint8_t *data)
{
struct nor_softc *sc = device_private(self);
@@ -181,7 +181,7 @@ nor_read_1(device_t self, flash_off_t of
sc->sc_nor_if->read_1(sc->sc_controller_dev, offset, data);
}
-static inline void
+static __inline void
nor_read_2(device_t self, flash_off_t offset, uint16_t *data)
{
struct nor_softc *sc = device_private(self);
@@ -192,7 +192,7 @@ nor_read_2(device_t self, flash_off_t of
sc->sc_nor_if->read_2(sc->sc_controller_dev, offset, data);
}
-static inline void
+static __inline void
nor_read_4(device_t self, flash_off_t offset, uint32_t *data)
{
struct nor_softc *sc = device_private(self);
@@ -203,7 +203,7 @@ nor_read_4(device_t self, flash_off_t of
sc->sc_nor_if->read_4(sc->sc_controller_dev, offset, data);
}
-static inline void
+static __inline void
nor_write_1(device_t self, flash_off_t offset, uint8_t data)
{
struct nor_softc *sc = device_private(self);
@@ -214,7 +214,7 @@ nor_write_1(device_t self, flash_off_t o
sc->sc_nor_if->write_1(sc->sc_controller_dev, offset, data);
}
-static inline void
+static __inline void
nor_write_2(device_t self, flash_off_t offset, uint16_t data)
{
struct nor_softc *sc = device_private(self);
@@ -225,7 +225,7 @@ nor_write_2(device_t self, flash_off_t o
sc->sc_nor_if->write_2(sc->sc_controller_dev, offset, data);
}
-static inline void
+static __inline void
nor_write_4(device_t self, flash_off_t offset, uint16_t data)
{
struct nor_softc *sc = device_private(self);
@@ -236,7 +236,7 @@ nor_write_4(device_t self, flash_off_t o
sc->sc_nor_if->write_4(sc->sc_controller_dev, offset, data);
}
-static inline void
+static __inline void
nor_read_buf_1(device_t self, flash_off_t offset, void *buf, size_t size)
{
struct nor_softc *sc = device_private(self);
@@ -247,7 +247,7 @@ nor_read_buf_1(device_t self, flash_off_
sc->sc_nor_if->read_buf_1(sc->sc_controller_dev, offset, buf, size);
}
-static inline void
+static __inline void
nor_read_buf_2(device_t self, flash_off_t offset, void *buf, size_t size)
{
struct nor_softc *sc = device_private(self);
@@ -258,7 +258,7 @@ nor_read_buf_2(device_t self, flash_off_
sc->sc_nor_if->read_buf_2(sc->sc_controller_dev, offset, buf, size);
}
-static inline void
+static __inline void
nor_read_buf_4(device_t self, flash_off_t offset, void *buf, size_t size)
{
struct nor_softc *sc = device_private(self);
@@ -269,7 +269,7 @@ nor_read_buf_4(device_t self, flash_off_
sc->sc_nor_if->read_buf_4(sc->sc_controller_dev, offset, buf, size);
}
-static inline void
+static __inline void
nor_write_buf_1(device_t self, flash_off_t offset, const void *buf, size_t size)
{
struct nor_softc *sc = device_private(self);
@@ -280,7 +280,7 @@ nor_write_buf_1(device_t self, flash_off
sc->sc_nor_if->write_buf_1(sc->sc_controller_dev, offset, buf, size);
}
-static inline void
+static __inline void
nor_write_buf_2(device_t self, flash_off_t offset, const void *buf, size_t size)
{
struct nor_softc *sc = device_private(self);
@@ -291,7 +291,7 @@ nor_write_buf_2(device_t self, flash_off
sc->sc_nor_if->write_buf_2(sc->sc_controller_dev, offset, buf, size);
}
-static inline void
+static __inline void
nor_write_buf_4(device_t self, flash_off_t offset, const void *buf, size_t size)
{
struct nor_softc *sc = device_private(self);
@@ -302,7 +302,7 @@ nor_write_buf_4(device_t self, flash_off
sc->sc_nor_if->write_buf_4(sc->sc_controller_dev, offset, buf, size);
}
-static inline int
+static __inline int
nor_read_page(device_t self, flash_off_t offset, uint8_t *data)
{
struct nor_softc *sc = device_private(self);
@@ -312,7 +312,7 @@ nor_read_page(device_t self, flash_off_t
return sc->sc_nor_if->read_page(self, offset, data);
}
-static inline int
+static __inline int
nor_program_page(device_t self, flash_off_t offset, const uint8_t *data)
{
struct nor_softc *sc = device_private(self);
@@ -322,7 +322,7 @@ nor_program_page(device_t self, flash_of
return sc->sc_nor_if->program_page(self, offset, data);
}
-static inline int
+static __inline int
nor_erase_all(device_t self)
{
struct nor_softc *sc = device_private(self);
@@ -332,7 +332,7 @@ nor_erase_all(device_t self)
return sc->sc_nor_if->erase_all(self);
}
-static inline int
+static __inline int
nor_erase_block(device_t self, flash_off_t offset)
{
struct nor_softc *sc = device_private(self);
Index: src/sys/dev/pci/if_iwmreg.h
diff -u src/sys/dev/pci/if_iwmreg.h:1.6 src/sys/dev/pci/if_iwmreg.h:1.7
--- src/sys/dev/pci/if_iwmreg.h:1.6 Tue Mar 14 19:59:26 2017
+++ src/sys/dev/pci/if_iwmreg.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwmreg.h,v 1.6 2017/03/14 23:59:26 nonaka Exp $ */
+/* $NetBSD: if_iwmreg.h,v 1.7 2018/04/19 21:50:09 christos Exp $ */
/* OpenBSD: if_iwmreg.h,v 1.19 2016/09/20 11:46:09 stsp Exp */
/*-
@@ -1200,21 +1200,21 @@ struct iwm_tlv_ucode_header {
#define IWM_SCD_GP_CTRL (IWM_SCD_BASE + 0x1a8)
#define IWM_SCD_EN_CTRL (IWM_SCD_BASE + 0x254)
-static inline unsigned int IWM_SCD_QUEUE_WRPTR(unsigned int chnl)
+static __inline unsigned int IWM_SCD_QUEUE_WRPTR(unsigned int chnl)
{
if (chnl < 20)
return IWM_SCD_BASE + 0x18 + chnl * 4;
return IWM_SCD_BASE + 0x284 + (chnl - 20) * 4;
}
-static inline unsigned int IWM_SCD_QUEUE_RDPTR(unsigned int chnl)
+static __inline unsigned int IWM_SCD_QUEUE_RDPTR(unsigned int chnl)
{
if (chnl < 20)
return IWM_SCD_BASE + 0x68 + chnl * 4;
return IWM_SCD_BASE + 0x2B4 + (chnl - 20) * 4;
}
-static inline unsigned int IWM_SCD_QUEUE_STATUS_BITS(unsigned int chnl)
+static __inline unsigned int IWM_SCD_QUEUE_STATUS_BITS(unsigned int chnl)
{
if (chnl < 20)
return IWM_SCD_BASE + 0x10c + chnl * 4;
@@ -1280,7 +1280,7 @@ static inline unsigned int IWM_SCD_QUEUE
#define IWM_FH_MEM_CBBC_20_31_UPPER_BOUND (IWM_FH_MEM_LOWER_BOUND + 0xB80)
/* Find TFD CB base pointer for given queue */
-static inline unsigned int IWM_FH_MEM_CBBC_QUEUE(unsigned int chnl)
+static __inline unsigned int IWM_FH_MEM_CBBC_QUEUE(unsigned int chnl)
{
if (chnl < 16)
return IWM_FH_MEM_CBBC_0_15_LOWER_BOUND + 4 * chnl;
@@ -1631,7 +1631,7 @@ struct iwm_rb_status {
#define IWM_TX_DMA_MASK DMA_BIT_MASK(36)
#define IWM_NUM_OF_TBS 20
-static inline uint8_t iwm_get_dma_hi_addr(bus_addr_t addr)
+static __inline uint8_t iwm_get_dma_hi_addr(bus_addr_t addr)
{
return (sizeof(addr) > sizeof(uint32_t) ? (addr >> 16) >> 16 : 0) & 0xF;
}
@@ -3696,7 +3696,7 @@ struct iwm_mac_ctx_cmd {
};
} __packed; /* IWM_MAC_CONTEXT_CMD_API_S_VER_1 */
-static inline uint32_t iwm_reciprocal(uint32_t v)
+static __inline uint32_t iwm_reciprocal(uint32_t v)
{
if (!v)
return 0;
@@ -4836,7 +4836,7 @@ struct iwm_tx_path_flush_cmd {
* whole struct at a variable offset. This function knows how to cope with the
* variable offset and returns the SSN of the SCD.
*/
-static inline uint32_t iwm_get_scd_ssn(struct iwm_tx_resp *tx_resp)
+static __inline uint32_t iwm_get_scd_ssn(struct iwm_tx_resp *tx_resp)
{
return le32_to_cpup((uint32_t *)&tx_resp->status +
tx_resp->frame_count) & 0xfff;
@@ -6435,25 +6435,25 @@ struct iwm_dts_measurement_notif_v2 {
* the iwm_host_cmd struct which contains the command id, the group id,
* and the version of the command.
*/
-static inline uint8_t
+static __inline uint8_t
iwm_cmd_opcode(uint32_t cmdid)
{
return cmdid & 0xff;
}
-static inline uint8_t
+static __inline uint8_t
iwm_cmd_groupid(uint32_t cmdid)
{
return ((cmdid & 0Xff00) >> 8);
}
-static inline uint8_t
+static __inline uint8_t
iwm_cmd_version(uint32_t cmdid)
{
return ((cmdid & 0xff0000) >> 16);
}
-static inline uint32_t
+static __inline uint32_t
iwm_cmd_id(uint8_t opcode, uint8_t groupid, uint8_t ver)
{
return opcode + (groupid << 8) + (ver << 16);
Index: src/sys/dev/pci/pciidevar.h
diff -u src/sys/dev/pci/pciidevar.h:1.49 src/sys/dev/pci/pciidevar.h:1.50
--- src/sys/dev/pci/pciidevar.h:1.49 Sun Oct 22 09:13:55 2017
+++ src/sys/dev/pci/pciidevar.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pciidevar.h,v 1.49 2017/10/22 13:13:55 jdolecek Exp $ */
+/* $NetBSD: pciidevar.h,v 1.50 2018/04/19 21:50:09 christos Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -183,11 +183,11 @@ struct pciide_product_desc {
/* inlines for reading/writing 8-bit PCI registers */
-static inline u_int8_t pciide_pci_read(pci_chipset_tag_t, pcitag_t, int);
-static inline void pciide_pci_write(pci_chipset_tag_t, pcitag_t,
+static __inline u_int8_t pciide_pci_read(pci_chipset_tag_t, pcitag_t, int);
+static __inline void pciide_pci_write(pci_chipset_tag_t, pcitag_t,
int, u_int8_t);
-static inline u_int8_t
+static __inline u_int8_t
pciide_pci_read(pci_chipset_tag_t pc, pcitag_t pa, int reg)
{
@@ -195,7 +195,7 @@ pciide_pci_read(pci_chipset_tag_t pc, pc
((reg & 0x03) * 8) & 0xff);
}
-static inline void
+static __inline void
pciide_pci_write(pci_chipset_tag_t pc, pcitag_t pa, int reg, uint8_t val)
{
pcireg_t pcival;
Index: src/sys/dev/pci/pcivar.h
diff -u src/sys/dev/pci/pcivar.h:1.110 src/sys/dev/pci/pcivar.h:1.111
--- src/sys/dev/pci/pcivar.h:1.110 Wed Feb 28 00:50:06 2018
+++ src/sys/dev/pci/pcivar.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcivar.h,v 1.110 2018/02/28 05:50:06 msaitoh Exp $ */
+/* $NetBSD: pcivar.h,v 1.111 2018/04/19 21:50:09 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -131,7 +131,7 @@ struct pcibus_attach_args {
* This is used by <machine/pci_machdep.h> to access the pba_pc member. It
* can't use it directly since pcibus_attach_args has yet to be defined.
*/
-static inline pci_chipset_tag_t
+static __inline pci_chipset_tag_t
pcibus_attach_args_pc(struct pcibus_attach_args *pba)
{
return pba->pba_pc;
@@ -173,7 +173,7 @@ struct pci_attach_args {
* This is used by <machine/pci_machdep.h> to access the pa_pc member. It
* can't use it directly since pci_attach_args has yet to be defined.
*/
-static inline pci_chipset_tag_t
+static __inline pci_chipset_tag_t
pci_attach_args_pc(const struct pci_attach_args *pa)
{
return pa->pa_pc;
Index: src/sys/dev/pci/voyagervar.h
diff -u src/sys/dev/pci/voyagervar.h:1.4 src/sys/dev/pci/voyagervar.h:1.5
--- src/sys/dev/pci/voyagervar.h:1.4 Wed Dec 7 04:08:00 2011
+++ src/sys/dev/pci/voyagervar.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: voyagervar.h,v 1.4 2011/12/07 09:08:00 macallan Exp $ */
+/* $NetBSD: voyagervar.h,v 1.5 2018/04/19 21:50:09 christos Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voyagervar.h,v 1.4 2011/12/07 09:08:00 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyagervar.h,v 1.5 2018/04/19 21:50:09 christos Exp $");
#ifndef VOYAGERVAR_H
#define VOYAGERVAR_H
@@ -65,4 +65,4 @@ void voyager_disestablish_intr(device_t
/* frequency in Hz, duty cycle in 1000ths */
uint32_t voyager_set_pwm(int, int);
-#endif
\ No newline at end of file
+#endif
Index: src/sys/dev/pci/cxgb/cxgb_adapter.h
diff -u src/sys/dev/pci/cxgb/cxgb_adapter.h:1.3 src/sys/dev/pci/cxgb/cxgb_adapter.h:1.4
--- src/sys/dev/pci/cxgb/cxgb_adapter.h:1.3 Sat Oct 27 13:18:36 2012
+++ src/sys/dev/pci/cxgb/cxgb_adapter.h Thu Apr 19 17:50:09 2018
@@ -571,7 +571,7 @@ tdev2adap(struct toedev *d)
#undef container_of
#define OFFLOAD_DEVMAP_BIT 15
-static inline int offload_running(adapter_t *adapter)
+static __inline int offload_running(adapter_t *adapter)
{
return isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT);
}
Index: src/sys/dev/pci/cxgb/cxgb_common.h
diff -u src/sys/dev/pci/cxgb/cxgb_common.h:1.2 src/sys/dev/pci/cxgb/cxgb_common.h:1.3
--- src/sys/dev/pci/cxgb/cxgb_common.h:1.2 Wed Jan 23 18:31:26 2013
+++ src/sys/dev/pci/cxgb/cxgb_common.h Thu Apr 19 17:50:09 2018
@@ -441,7 +441,7 @@ struct mc5 {
struct mc5_stats stats;
};
-static inline unsigned int t3_mc5_size(const struct mc5 *p)
+static __inline unsigned int t3_mc5_size(const struct mc5 *p)
{
return p->tcam_size;
}
@@ -455,7 +455,7 @@ struct mc7 {
struct mc7_stats stats; /* MC7 statistics */
};
-static inline unsigned int t3_mc7_size(const struct mc7 *p)
+static __inline unsigned int t3_mc7_size(const struct mc7 *p)
{
return p->size;
}
@@ -539,20 +539,20 @@ struct cphy {
};
/* Convenience MDIO read/write wrappers */
-static inline int mdio_read(struct cphy *phy, int mmd, int reg,
+static __inline int mdio_read(struct cphy *phy, int mmd, int reg,
unsigned int *valp)
{
return phy->mdio_read(phy->adapter, phy->addr, mmd, reg, valp);
}
-static inline int mdio_write(struct cphy *phy, int mmd, int reg,
+static __inline int mdio_write(struct cphy *phy, int mmd, int reg,
unsigned int val)
{
return phy->mdio_write(phy->adapter, phy->addr, mmd, reg, val);
}
/* Convenience initializer */
-static inline void cphy_init(struct cphy *phy, adapter_t *adapter,
+static __inline void cphy_init(struct cphy *phy, adapter_t *adapter,
int phy_addr, struct cphy_ops *phy_ops,
const struct mdio_ops *mdio_ops)
{
@@ -594,17 +594,17 @@ struct addr_val_pair {
#define adapter_info(adap) ((adap)->params.info)
-static inline int uses_xaui(const adapter_t *adap)
+static __inline int uses_xaui(const adapter_t *adap)
{
return adapter_info(adap)->caps & SUPPORTED_AUI;
}
-static inline int is_10G(const adapter_t *adap)
+static __inline int is_10G(const adapter_t *adap)
{
return adapter_info(adap)->caps & SUPPORTED_10000baseT_Full;
}
-static inline int is_offload(const adapter_t *adap)
+static __inline int is_offload(const adapter_t *adap)
{
#ifdef CONFIG_CHELSIO_T3_CORE
return adap->params.offload;
@@ -613,18 +613,18 @@ static inline int is_offload(const adapt
#endif
}
-static inline unsigned int core_ticks_per_usec(const adapter_t *adap)
+static __inline unsigned int core_ticks_per_usec(const adapter_t *adap)
{
return adap->params.vpd.cclk / 1000;
}
-static inline unsigned int dack_ticks_to_usec(const adapter_t *adap,
+static __inline unsigned int dack_ticks_to_usec(const adapter_t *adap,
unsigned int ticks)
{
return (ticks << adap->params.tp.dack_re) / core_ticks_per_usec(adap);
}
-static inline unsigned int is_pcie(const adapter_t *adap)
+static __inline unsigned int is_pcie(const adapter_t *adap)
{
return adap->params.pci.variant == PCI_VARIANT_PCIE;
}
@@ -635,7 +635,7 @@ void t3_write_regs(adapter_t *adapter, c
int t3_wait_op_done_val(adapter_t *adapter, int reg, u32 mask, int polarity,
int attempts, int delay, u32 *valp);
-static inline int t3_wait_op_done(adapter_t *adapter, int reg, u32 mask,
+static __inline int t3_wait_op_done(adapter_t *adapter, int reg, u32 mask,
int polarity, int attempts, int delay)
{
return t3_wait_op_done_val(adapter, reg, mask, polarity, attempts,
Index: src/sys/dev/pci/cxgb/cxgb_mvec.h
diff -u src/sys/dev/pci/cxgb/cxgb_mvec.h:1.2 src/sys/dev/pci/cxgb/cxgb_mvec.h:1.3
--- src/sys/dev/pci/cxgb/cxgb_mvec.h:1.2 Sun Oct 2 10:16:03 2016
+++ src/sys/dev/pci/cxgb/cxgb_mvec.h Thu Apr 19 17:50:09 2018
@@ -67,7 +67,7 @@ int _m_explode(struct mbuf *);
int _m_collapse(struct mbuf *, int maxbufs, struct mbuf **);
void mb_free_vec(struct mbuf *m);
-static inline void
+static __inline void
m_iovinit(struct mbuf *m)
{
struct mbuf_vec *mv = mtomv(m);
@@ -77,7 +77,7 @@ m_iovinit(struct mbuf *m)
m->m_flags |= M_IOVEC;
}
-static inline void
+static __inline void
m_iovappend(struct mbuf *m, uint8_t *cl, int size, int len, int offset)
{
struct mbuf_vec *mv = mtomv(m);
@@ -99,7 +99,7 @@ m_iovappend(struct mbuf *m, uint8_t *cl,
mv->mv_count++;
}
-static inline int
+static __inline int
m_explode(struct mbuf *m)
{
if ((m->m_flags & M_IOVEC) == 0)
@@ -108,7 +108,7 @@ m_explode(struct mbuf *m)
return _m_explode(m);
}
-static inline int
+static __inline int
m_collapse(struct mbuf *m, int maxbufs, struct mbuf **mnew)
{
#if (!defined(__sparc64__) && !defined(__sun4v__))
@@ -121,13 +121,13 @@ m_collapse(struct mbuf *m, int maxbufs,
return _m_collapse(m, maxbufs, mnew);
}
-static inline struct mbuf *
+static __inline struct mbuf *
m_free_vec(struct mbuf *m)
{
return m_free(m);
}
-static inline void
+static __inline void
m_freem_vec(struct mbuf *m)
{
while (m != NULL)
Index: src/sys/dev/pci/cxgb/cxgb_jhash.h
diff -u src/sys/dev/pci/cxgb/cxgb_jhash.h:1.1 src/sys/dev/pci/cxgb/cxgb_jhash.h:1.2
--- src/sys/dev/pci/cxgb/cxgb_jhash.h:1.1 Sun Mar 21 17:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_jhash.h Thu Apr 19 17:50:09 2018
@@ -36,7 +36,7 @@
* of bytes. No alignment or length assumptions are made about
* the input key.
*/
-static inline u32 jhash(const void *key, u32 length, u32 initval)
+static __inline u32 jhash(const void *key, u32 length, u32 initval)
{
u32 a, b, c, len;
const u8 *k = key;
@@ -79,7 +79,7 @@ static inline u32 jhash(const void *key,
/* A special optimized version that handles 1 or more of u32s.
* The length parameter here is the number of u32s in the key.
*/
-static inline u32 jhash2(u32 *k, u32 length, u32 initval)
+static __inline u32 jhash2(u32 *k, u32 length, u32 initval)
{
u32 a, b, c, len;
@@ -114,7 +114,7 @@ static inline u32 jhash2(u32 *k, u32 len
* NOTE: In partilar the "c += length; __jhash_mix(a,b,c);" normally
* done at the end is not done here.
*/
-static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
+static __inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
{
a += JHASH_GOLDEN_RATIO;
b += JHASH_GOLDEN_RATIO;
@@ -125,12 +125,12 @@ static inline u32 jhash_3words(u32 a, u3
return c;
}
-static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
+static __inline u32 jhash_2words(u32 a, u32 b, u32 initval)
{
return jhash_3words(a, b, 0, initval);
}
-static inline u32 jhash_1word(u32 a, u32 initval)
+static __inline u32 jhash_1word(u32 a, u32 initval)
{
return jhash_3words(a, 0, 0, initval);
}
Index: src/sys/dev/pci/cxgb/cxgb_l2t.h
diff -u src/sys/dev/pci/cxgb/cxgb_l2t.h:1.1 src/sys/dev/pci/cxgb/cxgb_l2t.h:1.2
--- src/sys/dev/pci/cxgb/cxgb_l2t.h:1.1 Sun Mar 21 17:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_l2t.h Thu Apr 19 17:50:09 2018
@@ -134,7 +134,7 @@ void t3_l2t_proc_free(struct proc_dir_en
int cxgb_ofld_send(struct toedev *dev, struct mbuf *m);
-static inline int l2t_send(struct toedev *dev, struct mbuf *m,
+static __inline int l2t_send(struct toedev *dev, struct mbuf *m,
struct l2t_entry *e)
{
if (__predict_true(e->state == L2T_STATE_VALID))
@@ -142,13 +142,13 @@ static inline int l2t_send(struct toedev
return t3_l2t_send_slow(dev, m, e);
}
-static inline void l2t_release(struct l2t_data *d, struct l2t_entry *e)
+static __inline void l2t_release(struct l2t_data *d, struct l2t_entry *e)
{
if (atomic_fetchadd_int(&e->refcnt, -1) == 1)
t3_l2e_free(d, e);
}
-static inline void l2t_hold(struct l2t_data *d, struct l2t_entry *e)
+static __inline void l2t_hold(struct l2t_data *d, struct l2t_entry *e)
{
if (atomic_fetchadd_int(&e->refcnt, 1) == 1) /* 0 -> 1 transition */
atomic_add_int(&d->nfree, 1);
Index: src/sys/dev/pci/cxgb/cxgb_offload.h
diff -u src/sys/dev/pci/cxgb/cxgb_offload.h:1.1 src/sys/dev/pci/cxgb/cxgb_offload.h:1.2
--- src/sys/dev/pci/cxgb/cxgb_offload.h:1.1 Sun Mar 21 17:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_offload.h Thu Apr 19 17:50:09 2018
@@ -127,7 +127,7 @@ typedef int (*cpl_handler_func)(struct t
* Returns a pointer to the first byte of the CPL header in an sk_buff that
* contains a CPL message.
*/
-static inline void *cplhdr(struct mbuf *m)
+static __inline void *cplhdr(struct mbuf *m)
{
return mtod(m, uint8_t *);
}
@@ -203,14 +203,14 @@ struct toe_data {
/*
* Map an ATID or STID to their entries in the corresponding TID tables.
*/
-static inline union active_open_entry *atid2entry(const struct tid_info *t,
+static __inline union active_open_entry *atid2entry(const struct tid_info *t,
unsigned int atid)
{
return &t->atid_tab[atid - t->atid_base];
}
-static inline union listen_entry *stid2entry(const struct tid_info *t,
+static __inline union listen_entry *stid2entry(const struct tid_info *t,
unsigned int stid)
{
return &t->stid_tab[stid - t->stid_base];
@@ -219,7 +219,7 @@ static inline union listen_entry *stid2e
/*
* Find the connection corresponding to a TID.
*/
-static inline struct toe_tid_entry *lookup_tid(const struct tid_info *t,
+static __inline struct toe_tid_entry *lookup_tid(const struct tid_info *t,
unsigned int tid)
{
return tid < t->ntids ? &(t->tid_tab[tid]) : NULL;
@@ -228,7 +228,7 @@ static inline struct toe_tid_entry *look
/*
* Find the connection corresponding to a server TID.
*/
-static inline struct toe_tid_entry *lookup_stid(const struct tid_info *t,
+static __inline struct toe_tid_entry *lookup_stid(const struct tid_info *t,
unsigned int tid)
{
if (tid < t->stid_base || tid >= t->stid_base + t->nstids)
@@ -239,7 +239,7 @@ static inline struct toe_tid_entry *look
/*
* Find the connection corresponding to an active-open TID.
*/
-static inline struct toe_tid_entry *lookup_atid(const struct tid_info *t,
+static __inline struct toe_tid_entry *lookup_atid(const struct tid_info *t,
unsigned int tid)
{
if (tid < t->atid_base || tid >= t->atid_base + t->natids)
Index: src/sys/dev/pci/cxgb/cxgb_toedev.h
diff -u src/sys/dev/pci/cxgb/cxgb_toedev.h:1.1 src/sys/dev/pci/cxgb/cxgb_toedev.h:1.2
--- src/sys/dev/pci/cxgb/cxgb_toedev.h:1.1 Sun Mar 21 17:11:13 2010
+++ src/sys/dev/pci/cxgb/cxgb_toedev.h Thu Apr 19 17:50:09 2018
@@ -121,7 +121,7 @@ struct tom_info {
TAILQ_ENTRY(tom_info) entry;
};
-static inline void init_offload_dev(struct toedev *dev)
+static __inline void init_offload_dev(struct toedev *dev)
{
}
@@ -137,7 +137,7 @@ extern struct ifnet *offload_get_phys_eg
int context);
#if defined(CONFIG_TCP_OFFLOAD_MODULE)
-static inline int toe_receive_mbuf(struct toedev *dev, struct mbuf **m,
+static __inline int toe_receive_mbuf(struct toedev *dev, struct mbuf **m,
int n)
{
return dev->recv(dev, m, n);
@@ -157,11 +157,11 @@ extern void toe_failover(struct ifnet *b
extern int toe_enslave(struct ifnet *bond_ifp,
struct ifnet *slave_ifp);
#else
-static inline void toe_neigh_update(struct ifnet *neigh) {}
-static inline void toe_failover(struct ifnet *bond_ifp,
+static __inline void toe_neigh_update(struct ifnet *neigh) {}
+static __inline void toe_failover(struct ifnet *bond_ifp,
struct ifnet *fail_ifp, int event)
{}
-static inline int toe_enslave(struct ifnet *bond_ifp,
+static __inline int toe_enslave(struct ifnet *bond_ifp,
struct ifnet *slave_ifp)
{
return 0;
Index: src/sys/dev/pci/cxgb/cxgb_osdep.h
diff -u src/sys/dev/pci/cxgb/cxgb_osdep.h:1.5 src/sys/dev/pci/cxgb/cxgb_osdep.h:1.6
--- src/sys/dev/pci/cxgb/cxgb_osdep.h:1.5 Wed May 25 06:15:01 2016
+++ src/sys/dev/pci/cxgb/cxgb_osdep.h Thu Apr 19 17:50:09 2018
@@ -106,11 +106,11 @@ void m_cljset(struct mbuf *m, void *cl,
#define EVL_VLID_MASK 0x0FFF
-static inline void critical_enter(void)
+static __inline void critical_enter(void)
{
}
-static inline void critical_exit(void)
+static __inline void critical_exit(void)
{
}
@@ -139,7 +139,7 @@ u_short in_cksum_hdr(struct ip *ih);
#define callout_drain(x) callout_stop(x)
-static inline int atomic_cmpset_ptr(volatile long *dst, long exp, long src)
+static __inline int atomic_cmpset_ptr(volatile long *dst, long exp, long src)
{
if (*dst == exp)
{
@@ -150,14 +150,14 @@ static inline int atomic_cmpset_ptr(vola
}
#define atomic_cmpset_int(a, b, c) atomic_cmpset_ptr((volatile long *)a, (long)b, (long)c)
-static inline int atomic_set_int(volatile int *dst, int val)
+static __inline int atomic_set_int(volatile int *dst, int val)
{
*dst = val;
return (val);
}
-static inline void log(int x, ...)
+static __inline void log(int x, ...)
{
}
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.44 src/sys/dev/pci/ixgbe/ixgbe.h:1.45
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.44 Thu Apr 19 02:04:31 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.44 2018/04/19 06:04:31 msaitoh Exp $ */
+/* $NetBSD: ixgbe.h,v 1.45 2018/04/19 21:50:09 christos Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -690,7 +690,7 @@ drbr_needs_enqueue(struct ifnet *ifp, st
/*
* Find the number of unrefreshed RX descriptors
*/
-static inline u16
+static __inline u16
ixgbe_rx_unrefreshed(struct rx_ring *rxr)
{
if (rxr->next_to_check > rxr->next_to_refresh)
@@ -700,7 +700,7 @@ ixgbe_rx_unrefreshed(struct rx_ring *rxr
rxr->next_to_refresh - 1);
}
-static inline int
+static __inline int
ixgbe_legacy_ring_empty(struct ifnet *ifp, pcq_t *dummy)
{
UNREFERENCED_1PARAMETER(dummy);
@@ -708,7 +708,7 @@ ixgbe_legacy_ring_empty(struct ifnet *if
return IFQ_IS_EMPTY(&ifp->if_snd);
}
-static inline int
+static __inline int
ixgbe_mq_ring_empty(struct ifnet *dummy, pcq_t *interq)
{
UNREFERENCED_1PARAMETER(dummy);
@@ -720,7 +720,7 @@ ixgbe_mq_ring_empty(struct ifnet *dummy,
* This checks for a zero mac addr, something that will be likely
* unless the Admin on the Host has created one.
*/
-static inline bool
+static __inline bool
ixv_check_ether_addr(u8 *addr)
{
bool status = TRUE;
Index: src/sys/dev/raidframe/raidframevar.h
diff -u src/sys/dev/raidframe/raidframevar.h:1.18 src/sys/dev/raidframe/raidframevar.h:1.19
--- src/sys/dev/raidframe/raidframevar.h:1.18 Wed Jan 17 19:32:49 2018
+++ src/sys/dev/raidframe/raidframevar.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.18 2018/01/18 00:32:49 mrg Exp $ */
+/* $NetBSD: raidframevar.h,v 1.19 2018/04/19 21:50:09 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -475,7 +475,7 @@ typedef struct RF_ComponentLabel_s {
* Following four functions are access macros for the number of blocks
* and partition size in component label.
*/
-static inline RF_SectorCount_t
+static __inline RF_SectorCount_t
rf_component_label_numblocks(const RF_ComponentLabel_t *cl)
{
@@ -483,7 +483,7 @@ rf_component_label_numblocks(const RF_Co
cl->__numBlocks;
}
-static inline void
+static __inline void
rf_component_label_set_numblocks(RF_ComponentLabel_t *cl, RF_SectorCount_t siz)
{
@@ -491,7 +491,7 @@ rf_component_label_set_numblocks(RF_Comp
cl->__numBlocks = siz;
}
-static inline RF_SectorCount_t
+static __inline RF_SectorCount_t
rf_component_label_partitionsize(const RF_ComponentLabel_t *cl)
{
@@ -499,7 +499,7 @@ rf_component_label_partitionsize(const R
cl->__partitionSize;
}
-static inline void
+static __inline void
rf_component_label_set_partitionsize(RF_ComponentLabel_t *cl,
RF_SectorCount_t siz)
{
Index: src/sys/dev/sdmmc/sdmmcreg.h
diff -u src/sys/dev/sdmmc/sdmmcreg.h:1.33 src/sys/dev/sdmmc/sdmmcreg.h:1.34
--- src/sys/dev/sdmmc/sdmmcreg.h:1.33 Tue Sep 12 09:43:37 2017
+++ src/sys/dev/sdmmc/sdmmcreg.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmcreg.h,v 1.33 2017/09/12 13:43:37 jmcneill Exp $ */
+/* $NetBSD: sdmmcreg.h,v 1.34 2018/04/19 21:50:09 christos Exp $ */
/* $OpenBSD: sdmmcreg.h,v 1.4 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -408,7 +408,7 @@
/* This assumes the response fields are in host byte order in 32-bit units. */
#define MMC_RSP_BITS(resp, start, len) __bitfield((resp), (start)-8, (len))
-static inline uint32_t
+static __inline uint32_t
__bitfield(const uint32_t *src, size_t start, size_t len)
{
if (start + len > 512 || len == 0 || len > 32)
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.114 src/sys/dev/usb/usbdivar.h:1.115
--- src/sys/dev/usb/usbdivar.h:1.114 Thu Jan 19 11:05:00 2017
+++ src/sys/dev/usb/usbdivar.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.114 2017/01/19 16:05:00 skrll Exp $ */
+/* $NetBSD: usbdivar.h,v 1.115 2018/04/19 21:50:09 christos Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -345,7 +345,7 @@ void usb_needs_explore(struct usbd_devi
void usb_needs_reattach(struct usbd_device *);
void usb_schedsoftintr(struct usbd_bus *);
-static inline int
+static __inline int
usbd_xfer_isread(struct usbd_xfer *xfer)
{
if (xfer->ux_rqflags & URQ_REQUEST)
@@ -355,7 +355,7 @@ usbd_xfer_isread(struct usbd_xfer *xfer)
UE_DIR_IN;
}
-static inline size_t
+static __inline size_t
usb_addr2dindex(int addr)
{
Index: src/sys/fs/tmpfs/tmpfs.h
diff -u src/sys/fs/tmpfs/tmpfs.h:1.54 src/sys/fs/tmpfs/tmpfs.h:1.55
--- src/sys/fs/tmpfs/tmpfs.h:1.54 Wed Mar 1 05:44:47 2017
+++ src/sys/fs/tmpfs/tmpfs.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs.h,v 1.54 2017/03/01 10:44:47 hannken Exp $ */
+/* $NetBSD: tmpfs.h,v 1.55 2018/04/19 21:50:09 christos Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -312,7 +312,7 @@ bool tmpfs_strname_neqlen(struct compon
* Routines to convert VFS structures to tmpfs internal ones.
*/
-static inline tmpfs_mount_t *
+static __inline tmpfs_mount_t *
VFS_TO_TMPFS(struct mount *mp)
{
tmpfs_mount_t *tmp = mp->mnt_data;
@@ -321,7 +321,7 @@ VFS_TO_TMPFS(struct mount *mp)
return tmp;
}
-static inline tmpfs_node_t *
+static __inline tmpfs_node_t *
VP_TO_TMPFS_DIR(vnode_t *vp)
{
tmpfs_node_t *node = vp->v_data;
Index: src/sys/lib/libkern/milieu.h
diff -u src/sys/lib/libkern/milieu.h:1.3 src/sys/lib/libkern/milieu.h:1.4
--- src/sys/lib/libkern/milieu.h:1.3 Mon Apr 28 16:24:06 2008
+++ src/sys/lib/libkern/milieu.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: milieu.h,v 1.3 2008/04/28 20:24:06 martin Exp $ */
+/* $NetBSD: milieu.h,v 1.4 2018/04/19 21:50:09 christos Exp $ */
/* This is a derivative work. */
@@ -142,6 +142,6 @@ a compiler does not support explicit inl
to be `static'.
-------------------------------------------------------------------------------
*/
-#define INLINE static inline
+#define INLINE static __inline
#endif
Index: src/sys/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.56 src/sys/net/npf/npf.h:1.57
--- src/sys/net/npf/npf.h:1.56 Thu Mar 8 02:06:13 2018
+++ src/sys/net/npf/npf.h Thu Apr 19 17:50:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.56 2018/03/08 07:06:13 maxv Exp $ */
+/* $NetBSD: npf.h,v 1.57 2018/04/19 21:50:09 christos Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -180,7 +180,7 @@ typedef struct {
} npc_l4;
} npf_cache_t;
-static inline bool
+static __inline bool
npf_iscached(const npf_cache_t *npc, const int inf)
{
KASSERT(npc->npc_nbuf != NULL);
Index: src/sys/net80211/ieee80211_node.h
diff -u src/sys/net80211/ieee80211_node.h:1.29 src/sys/net80211/ieee80211_node.h:1.30
--- src/sys/net80211/ieee80211_node.h:1.29 Sun Jan 21 09:18:21 2018
+++ src/sys/net80211/ieee80211_node.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_node.h,v 1.29 2018/01/21 14:18:21 maxv Exp $ */
+/* $NetBSD: ieee80211_node.h,v 1.30 2018/04/19 21:50:10 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -325,19 +325,19 @@ struct ieee80211_scanparams {
* ieee80211_node_refcnt reference count for printing (only)
*/
-static inline void
+static __inline void
ieee80211_node_initref(struct ieee80211_node *ni)
{
ni->ni_refcnt = 1;
}
-static inline void
+static __inline void
ieee80211_node_incref(struct ieee80211_node *ni)
{
atomic_inc_uint(&ni->ni_refcnt);
}
-static inline void
+static __inline void
ieee80211_node_decref(struct ieee80211_node *ni)
{
atomic_dec_uint(&ni->ni_refcnt);
@@ -345,7 +345,7 @@ ieee80211_node_decref(struct ieee80211_n
int ieee80211_node_dectestref(struct ieee80211_node *ni);
-static inline unsigned int
+static __inline unsigned int
ieee80211_node_refcnt(const struct ieee80211_node *ni)
{
return ni->ni_refcnt;
Index: src/sys/netatalk/at_var.h
diff -u src/sys/netatalk/at_var.h:1.7 src/sys/netatalk/at_var.h:1.8
--- src/sys/netatalk/at_var.h:1.7 Wed Aug 29 22:17:36 2007
+++ src/sys/netatalk/at_var.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: at_var.h,v 1.7 2007/08/30 02:17:36 dyoung Exp $ */
+/* $NetBSD: at_var.h,v 1.8 2018/04/19 21:50:10 christos Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -69,7 +69,7 @@ struct at_aliasreq {
#ifdef _KERNEL
int sockaddr_at_cmp(const struct sockaddr *, const struct sockaddr *);
-static inline void
+static __inline void
sockaddr_at_init1(struct sockaddr_at *sat, const struct at_addr *addr,
uint8_t port)
{
@@ -78,7 +78,7 @@ sockaddr_at_init1(struct sockaddr_at *sa
memset(&sat->sat_range, 0, sizeof(sat->sat_range));
}
-static inline void
+static __inline void
sockaddr_at_init(struct sockaddr_at *sat, const struct at_addr *addr,
uint8_t port)
{
@@ -87,7 +87,7 @@ sockaddr_at_init(struct sockaddr_at *sat
sockaddr_at_init1(sat, addr, port);
}
-static inline struct sockaddr *
+static __inline struct sockaddr *
sockaddr_at_alloc(const struct at_addr *addr, uint8_t port, int flags)
{
struct sockaddr *sa;
Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.73 src/sys/netipsec/ipsec.h:1.74
--- src/sys/netipsec/ipsec.h:1.73 Thu Apr 19 04:27:38 2018
+++ src/sys/netipsec/ipsec.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.73 2018/04/19 08:27:38 maxv Exp $ */
+/* $NetBSD: ipsec.h,v 1.74 2018/04/19 21:50:10 christos Exp $ */
/* $FreeBSD: ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -141,7 +141,7 @@ struct inpcbpolicy {
extern u_int ipsec_spdgen;
-static inline bool
+static __inline bool
ipsec_pcb_skip_ipsec(struct inpcbpolicy *pcbsp, int dir)
{
Index: src/sys/rump/include/machine/intr.h
diff -u src/sys/rump/include/machine/intr.h:1.21 src/sys/rump/include/machine/intr.h:1.22
--- src/sys/rump/include/machine/intr.h:1.21 Mon Apr 11 06:53:06 2016
+++ src/sys/rump/include/machine/intr.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.21 2016/04/11 10:53:06 martin Exp $ */
+/* $NetBSD: intr.h,v 1.22 2018/04/19 21:50:10 christos Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@ typedef struct {
ipl_t _ipl;
} ipl_cookie_t;
-static inline ipl_cookie_t
+static __inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
ipl_cookie_t c;
Index: src/sys/rump/include/rump/rumperr.h
diff -u src/sys/rump/include/rump/rumperr.h:1.6 src/sys/rump/include/rump/rumperr.h:1.7
--- src/sys/rump/include/rump/rumperr.h:1.6 Mon Feb 1 20:15:58 2016
+++ src/sys/rump/include/rump/rumperr.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rumperr.h,v 1.6 2016/02/02 01:15:58 pooka Exp $ */
+/* $NetBSD: rumperr.h,v 1.7 2018/04/19 21:50:10 christos Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -6,7 +6,7 @@
/* NetBSD: errno.h,v 1.40 2013/01/02 18:51:53 dsl Exp */
-static inline const char *
+static __inline const char *
rump_strerror(int error)
{
Index: src/sys/rump/include/rump/rumperrno2host.h
diff -u src/sys/rump/include/rump/rumperrno2host.h:1.3 src/sys/rump/include/rump/rumperrno2host.h:1.4
--- src/sys/rump/include/rump/rumperrno2host.h:1.3 Mon Feb 1 20:15:58 2016
+++ src/sys/rump/include/rump/rumperrno2host.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rumperrno2host.h,v 1.3 2016/02/02 01:15:58 pooka Exp $ */
+/* $NetBSD: rumperrno2host.h,v 1.4 2018/04/19 21:50:10 christos Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -10,7 +10,7 @@
#error include ISO C style errno.h first
#endif
-static inline int
+static __inline int
rump_errno2host(int rumperrno)
{
Index: src/sys/rump/librump/rumpkern/rump_curlwp___thread.h
diff -u src/sys/rump/librump/rumpkern/rump_curlwp___thread.h:1.2 src/sys/rump/librump/rumpkern/rump_curlwp___thread.h:1.3
--- src/sys/rump/librump/rumpkern/rump_curlwp___thread.h:1.2 Sun Mar 16 11:30:05 2014
+++ src/sys/rump/librump/rumpkern/rump_curlwp___thread.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_curlwp___thread.h,v 1.2 2014/03/16 15:30:05 pooka Exp $ */
+/* $NetBSD: rump_curlwp___thread.h,v 1.3 2018/04/19 21:50:10 christos Exp $ */
/*-
* Copyright (c) 2014 Antti Kantee. All Rights Reserved.
@@ -55,7 +55,7 @@ lwproc_curlwpop(enum rumplwpop op, struc
}
#endif
-static inline struct lwp * __attribute__((const))
+static __inline struct lwp * __attribute__((const))
rump_curlwp_fast(void)
{
Index: src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h
diff -u src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h:1.2 src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h:1.3
--- src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h:1.2 Sun Mar 16 11:30:05 2014
+++ src/sys/rump/librump/rumpkern/rump_curlwp_hypercall.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_curlwp_hypercall.h,v 1.2 2014/03/16 15:30:05 pooka Exp $ */
+/* $NetBSD: rump_curlwp_hypercall.h,v 1.3 2018/04/19 21:50:10 christos Exp $ */
/*-
* Copyright (c) 2014 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@ lwproc_curlwpop(enum rumplwpop op, struc
}
#endif
-static inline struct lwp *
+static __inline struct lwp *
rump_curlwp_fast(void)
{
Index: src/sys/ufs/chfs/chfs.h
diff -u src/sys/ufs/chfs/chfs.h:1.9 src/sys/ufs/chfs/chfs.h:1.10
--- src/sys/ufs/chfs/chfs.h:1.9 Sun Jan 11 12:29:57 2015
+++ src/sys/ufs/chfs/chfs.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs.h,v 1.9 2015/01/11 17:29:57 hannken Exp $ */
+/* $NetBSD: chfs.h,v 1.10 2018/04/19 21:50:10 christos Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -165,7 +165,7 @@ enum {
* Nrefs are allocated in blocks, get the (in-memory) next. Usually the next
* doesn't belongs to the same vnode.
*/
-static inline struct chfs_node_ref *
+static __inline struct chfs_node_ref *
node_next(struct chfs_node_ref *nref)
{
/* step to the next nref in the same block */
@@ -239,7 +239,7 @@ struct chfs_node_frag {
};
/* find the first fragment of a data node */
-static inline struct chfs_node_frag *
+static __inline struct chfs_node_frag *
frag_first(struct rb_tree *tree)
{
struct chfs_node_frag *frag;
@@ -250,7 +250,7 @@ frag_first(struct rb_tree *tree)
}
/* find the last fragment of a data node */
-static inline struct chfs_node_frag *
+static __inline struct chfs_node_frag *
frag_last(struct rb_tree *tree)
{
struct chfs_node_frag *frag;
@@ -507,7 +507,7 @@ void chfs_mark_node_obsolete(struct chfs
* Find out the corresponding vnode cache from an nref.
* Every last element of a linked list of nrefs is the vnode cache.
*/
-static inline struct chfs_vnode_cache *
+static __inline struct chfs_vnode_cache *
chfs_nref_to_vc(struct chfs_node_ref *nref)
{
/* iterate the whole list */
@@ -673,7 +673,7 @@ int chfs_update(struct vnode *, const st
/* Some inline functions temporarily placed here */
/* chfs_map_leb - corresponds to ebh_map_leb */
-static inline int
+static __inline int
chfs_map_leb(struct chfs_mount *chmp, int lnr)
{
int err;
@@ -687,7 +687,7 @@ chfs_map_leb(struct chfs_mount *chmp, in
}
/* chfs_unmap_leb - corresponds to ebh_unmap_leb */
-static inline int
+static __inline int
chfs_unmap_leb(struct chfs_mount *chmp, int lnr)
{
int err;
@@ -700,7 +700,7 @@ chfs_unmap_leb(struct chfs_mount *chmp,
}
/* chfs_read_leb - corresponds to ebh_read_leb */
-static inline int
+static __inline int
chfs_read_leb(struct chfs_mount *chmp, int lnr, char *buf,
int offset, int len, size_t *retlen)
{
@@ -715,7 +715,7 @@ chfs_read_leb(struct chfs_mount *chmp, i
}
/* chfs_write_leb - corresponds to ebh_write_leb */
-static inline int chfs_write_leb(struct chfs_mount *chmp, int lnr, char *buf,
+static __inline int chfs_write_leb(struct chfs_mount *chmp, int lnr, char *buf,
int offset, int len, size_t *retlen)
{
int err;
Index: src/sys/ufs/lfs/ulfs_bswap.h
diff -u src/sys/ufs/lfs/ulfs_bswap.h:1.8 src/sys/ufs/lfs/ulfs_bswap.h:1.9
--- src/sys/ufs/lfs/ulfs_bswap.h:1.8 Sun Jun 19 23:29:52 2016
+++ src/sys/ufs/lfs/ulfs_bswap.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_bswap.h,v 1.8 2016/06/20 03:29:52 dholland Exp $ */
+/* $NetBSD: ulfs_bswap.h,v 1.9 2018/04/19 21:50:10 christos Exp $ */
/* from NetBSD: ufs_bswap.h,v 1.21 2016/04/29 03:05:04 christos Exp */
/*
@@ -48,19 +48,19 @@
#if !defined(_KERNEL) || defined(LFS_EI)
/* inlines for access to swapped data */
-static inline uint16_t
+static __inline uint16_t
ulfs_rw16(uint16_t a, int ns)
{
return ((ns) ? bswap16(a) : (a));
}
-static inline uint32_t
+static __inline uint32_t
ulfs_rw32(uint32_t a, int ns)
{
return ((ns) ? bswap32(a) : (a));
}
-static inline uint64_t
+static __inline uint64_t
ulfs_rw64(uint64_t a, int ns)
{
return ((ns) ? bswap64(a) : (a));
Index: src/sys/ufs/ufs/ufs_bswap.h
diff -u src/sys/ufs/ufs/ufs_bswap.h:1.22 src/sys/ufs/ufs/ufs_bswap.h:1.23
--- src/sys/ufs/ufs/ufs_bswap.h:1.22 Wed Feb 8 11:11:40 2017
+++ src/sys/ufs/ufs/ufs_bswap.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_bswap.h,v 1.22 2017/02/08 16:11:40 rin Exp $ */
+/* $NetBSD: ufs_bswap.h,v 1.23 2018/04/19 21:50:10 christos Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -47,37 +47,37 @@
#if (!defined(_KERNEL) && !defined(NO_FFS_EI)) || defined(FFS_EI)
/* inlines for access to swapped data */
-static inline u_int16_t
+static __inline u_int16_t
ufs_rw16(uint16_t a, int ns)
{
return ((ns) ? bswap16(a) : (a));
}
-static inline u_int32_t
+static __inline u_int32_t
ufs_rw32(uint32_t a, int ns)
{
return ((ns) ? bswap32(a) : (a));
}
-static inline u_int64_t
+static __inline u_int64_t
ufs_rw64(uint64_t a, int ns)
{
return ((ns) ? bswap64(a) : (a));
}
#else
-static inline u_int16_t
+static __inline u_int16_t
ufs_rw16(uint16_t a, int ns)
{
return a;
}
-static inline u_int32_t
+static __inline u_int32_t
ufs_rw32(uint32_t a, int ns)
{
return a;
}
-static inline u_int64_t
+static __inline u_int64_t
ufs_rw64(uint64_t a, int ns)
{
return a;
Index: src/sys/uvm/uvm_fault_i.h
diff -u src/sys/uvm/uvm_fault_i.h:1.28 src/sys/uvm/uvm_fault_i.h:1.29
--- src/sys/uvm/uvm_fault_i.h:1.28 Sat Feb 18 19:05:56 2012
+++ src/sys/uvm/uvm_fault_i.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_fault_i.h,v 1.28 2012/02/19 00:05:56 rmind Exp $ */
+/* $NetBSD: uvm_fault_i.h,v 1.29 2018/04/19 21:50:10 christos Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -38,7 +38,7 @@
* uvmfault_unlockmaps: unlock the maps
*/
-static inline void
+static __inline void
uvmfault_unlockmaps(struct uvm_faultinfo *ufi, bool write_locked)
{
/*
@@ -63,7 +63,7 @@ uvmfault_unlockmaps(struct uvm_faultinfo
* => maps must be read-locked (not write-locked).
*/
-static inline void
+static __inline void
uvmfault_unlockall(struct uvm_faultinfo *ufi, struct vm_amap *amap,
struct uvm_object *uobj)
{
@@ -90,7 +90,7 @@ uvmfault_unlockall(struct uvm_faultinfo
* map and the submap is unnecessary).
*/
-static inline bool
+static __inline bool
uvmfault_lookup(struct uvm_faultinfo *ufi, bool write_lock)
{
struct vm_map *tmpmap;
@@ -166,7 +166,7 @@ uvmfault_lookup(struct uvm_faultinfo *uf
* => if a success (true) maps will be locked after call.
*/
-static inline bool
+static __inline bool
uvmfault_relock(struct uvm_faultinfo *ufi)
{
/*
Index: src/sys/uvm/pmap/vmpagemd.h
diff -u src/sys/uvm/pmap/vmpagemd.h:1.7 src/sys/uvm/pmap/vmpagemd.h:1.8
--- src/sys/uvm/pmap/vmpagemd.h:1.7 Sat Jun 24 01:39:53 2017
+++ src/sys/uvm/pmap/vmpagemd.h Thu Apr 19 17:50:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vmpagemd.h,v 1.7 2017/06/24 05:39:53 skrll Exp $ */
+/* $NetBSD: vmpagemd.h,v 1.8 2018/04/19 21:50:10 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -116,14 +116,14 @@ struct vm_page_md {
kmutex_t *pmap_pvlist_lock_addr(struct vm_page_md *);
#else
extern kmutex_t pmap_pvlist_mutex;
-static inline kmutex_t *
+static __inline kmutex_t *
pmap_pvlist_lock_addr(struct vm_page_md *mdpg)
{
return &pmap_pvlist_mutex;
}
#endif
-static inline uintptr_t
+static __inline uintptr_t
pmap_pvlist_lock(struct vm_page_md *mdpg, uintptr_t increment)
{
mutex_spin_enter(pmap_pvlist_lock_addr(mdpg));
@@ -132,7 +132,7 @@ pmap_pvlist_lock(struct vm_page_md *mdpg
return gen;
}
-static inline uintptr_t
+static __inline uintptr_t
pmap_pvlist_unlock(struct vm_page_md *mdpg)
{
const uintptr_t gen = VM_PAGEMD_PVLIST_GEN(mdpg);
@@ -140,7 +140,7 @@ pmap_pvlist_unlock(struct vm_page_md *md
return gen;
}
-static inline bool
+static __inline bool
pmap_pvlist_locked_p(struct vm_page_md *mdpg)
{
return mutex_owned(pmap_pvlist_lock_addr(mdpg));
