Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys s/static inline/static __inline/g for consistency.
details: https://anonhg.NetBSD.org/src/rev/e60af558a6b3
branches: trunk
changeset: 322146:e60af558a6b3
user: christos <christos%NetBSD.org@localhost>
date: Thu Apr 19 21:50:06 2018 +0000
description:
s/static inline/static __inline/g for consistency.
diffstat:
sys/altq/altq_classq.h | 14 ++--
sys/arch/alpha/include/alpha.h | 10 +-
sys/arch/evbcf/include/intr.h | 6 +-
sys/arch/mips/cavium/dev/octeon_fpavar.h | 14 ++--
sys/arch/mips/cavium/dev/octeon_gmxvar.h | 6 +-
sys/arch/mips/cavium/dev/octeon_pkovar.h | 14 ++--
sys/arch/mips/cavium/dev/octeon_powvar.h | 44 +++++++-------
sys/arch/mips/cavium/octeonvar.h | 18 +++---
sys/arch/mmeye/include/intr.h | 6 +-
sys/arch/mvme68k/include/intr.h | 6 +-
sys/arch/news68k/include/intr.h | 10 +-
sys/arch/next68k/include/intr.h | 6 +-
sys/arch/or1k/include/cpu.h | 10 +-
sys/arch/or1k/include/db_machdep.h | 12 ++--
sys/arch/or1k/include/intr.h | 22 +++---
sys/arch/pmax/include/float.h | 2 +-
sys/arch/pmax/include/pcb.h | 2 +-
sys/arch/pmax/include/proc.h | 2 +-
sys/arch/pmax/include/profile.h | 2 +-
sys/arch/pmax/include/reg.h | 2 +-
sys/arch/pmax/include/setjmp.h | 2 +-
sys/arch/powerpc/include/altivec.h | 8 +-
sys/arch/powerpc/include/booke/cpuvar.h | 4 +-
sys/arch/powerpc/include/booke/intr.h | 20 +++---
sys/arch/powerpc/include/booke/pmap.h | 16 ++--
sys/arch/powerpc/include/booke/pte.h | 52 +++++++++---------
sys/arch/powerpc/include/fenv.h | 36 ++++++------
sys/arch/powerpc/include/fpu.h | 8 +-
sys/arch/powerpc/include/ibm4xx/cpu.h | 12 ++--
sys/arch/powerpc/include/ibm4xx/pmap.h | 8 +-
sys/arch/powerpc/include/ibm4xx/tlb.h | 2 +-
sys/arch/powerpc/include/intr.h | 8 +-
sys/arch/powerpc/include/oea/pmap.h | 14 ++--
sys/arch/powerpc/include/pci_machdep.h | 8 +-
sys/arch/powerpc/include/spr.h | 10 +-
sys/arch/powerpc/pic/ipivar.h | 6 +-
sys/coda/coda.h | 14 ++--
sys/compat/netbsd32/netbsd32_conv.h | 6 +-
sys/compat/netinet6/in6_var.h | 6 +-
sys/compat/sys/ipc.h | 4 +-
sys/crypto/nist_ctr_drbg/nist_ctr_aes_rijndael.h | 6 +-
sys/crypto/nist_ctr_drbg/nist_ctr_drbg.h | 6 +-
sys/dev/acpi/acpica/acpi_func.h | 6 +-
sys/dev/clock_subr.h | 6 +-
sys/dev/dtv/dtvif.h | 4 +-
sys/dev/flash/flash.h | 4 +-
sys/dev/hdaudio/hdaudiovar.h | 10 +-
sys/dev/ic/aic7xxx_inline.h | 6 +-
sys/dev/ic/atwvar.h | 4 +-
sys/dev/ic/dm9000var.h | 12 ++--
sys/dev/ic/nvmeio.h | 12 ++--
sys/dev/ic/nvmevar.h | 6 +-
sys/dev/ic/rtwvar.h | 4 +-
sys/dev/marvell/if_mvxpevar.h | 6 +-
sys/dev/nand/nand.h | 64 +++++++++++-----------
sys/dev/nor/cfi.h | 10 +-
sys/dev/nor/nor.h | 38 ++++++------
sys/dev/pci/cxgb/cxgb_adapter.h | 2 +-
sys/dev/pci/cxgb/cxgb_common.h | 24 ++++----
sys/dev/pci/cxgb/cxgb_jhash.h | 10 +-
sys/dev/pci/cxgb/cxgb_l2t.h | 6 +-
sys/dev/pci/cxgb/cxgb_mvec.h | 12 ++--
sys/dev/pci/cxgb/cxgb_offload.h | 12 ++--
sys/dev/pci/cxgb/cxgb_osdep.h | 10 +-
sys/dev/pci/cxgb/cxgb_toedev.h | 10 +-
sys/dev/pci/if_iwmreg.h | 24 ++++----
sys/dev/pci/ixgbe/ixgbe.h | 10 +-
sys/dev/pci/pciidevar.h | 10 +-
sys/dev/pci/pcivar.h | 6 +-
sys/dev/pci/voyagervar.h | 6 +-
sys/dev/raidframe/raidframevar.h | 10 +-
sys/dev/sdmmc/sdmmcreg.h | 4 +-
sys/dev/usb/usbdivar.h | 6 +-
sys/fs/tmpfs/tmpfs.h | 6 +-
sys/lib/libkern/milieu.h | 4 +-
sys/net/npf/npf.h | 4 +-
sys/net80211/ieee80211_node.h | 10 +-
sys/netatalk/at_var.h | 8 +-
sys/netipsec/ipsec.h | 4 +-
sys/rump/include/machine/intr.h | 4 +-
sys/rump/include/rump/rumperr.h | 4 +-
sys/rump/include/rump/rumperrno2host.h | 4 +-
sys/rump/librump/rumpkern/rump_curlwp___thread.h | 4 +-
sys/rump/librump/rumpkern/rump_curlwp_hypercall.h | 4 +-
sys/ufs/chfs/chfs.h | 18 +++---
sys/ufs/lfs/ulfs_bswap.h | 8 +-
sys/ufs/ufs/ufs_bswap.h | 14 ++--
sys/uvm/pmap/vmpagemd.h | 10 +-
sys/uvm/uvm_fault_i.h | 10 +-
89 files changed, 467 insertions(+), 467 deletions(-)
diffs (truncated from 3899 to 300 lines):
diff -r cfda28cde5bc -r e60af558a6b3 sys/altq/altq_classq.h
--- a/sys/altq/altq_classq.h Thu Apr 19 21:20:43 2018 +0000
+++ b/sys/altq/altq_classq.h Thu Apr 19 21:50:06 2018 +0000
@@ -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 @@
/*
* inlined versions
*/
-static inline void
+static __inline void
_addq(class_queue_t *q, struct mbuf *m)
{
struct mbuf *m0;
@@ -103,7 +103,7 @@
qlen(q)++;
}
-static inline struct mbuf *
+static __inline struct mbuf *
_getq(class_queue_t *q)
{
struct mbuf *m, *m0;
@@ -120,7 +120,7 @@
}
/* 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 @@
}
/* 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 @@
return (m);
}
-static inline void
+static __inline void
_removeq(class_queue_t *q, struct mbuf *m)
{
struct mbuf *m0, *prev;
@@ -187,7 +187,7 @@
qlen(q)--;
}
-static inline void
+static __inline void
_flushq(class_queue_t *q)
{
struct mbuf *m;
diff -r cfda28cde5bc -r e60af558a6b3 sys/arch/alpha/include/alpha.h
--- a/sys/arch/alpha/include/alpha.h Thu Apr 19 21:20:43 2018 +0000
+++ b/sys/arch/alpha/include/alpha.h Thu Apr 19 21:50:06 2018 +0000
@@ -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_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);
diff -r cfda28cde5bc -r e60af558a6b3 sys/arch/evbcf/include/intr.h
--- a/sys/arch/evbcf/include/intr.h Thu Apr 19 21:20:43 2018 +0000
+++ b/sys/arch/evbcf/include/intr.h Thu Apr 19 21:50:06 2018 +0000
@@ -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 @@
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)
{
diff -r cfda28cde5bc -r e60af558a6b3 sys/arch/mips/cavium/dev/octeon_fpavar.h
--- a/sys/arch/mips/cavium/dev/octeon_fpavar.h Thu Apr 19 21:20:43 2018 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_fpavar.h Thu Apr 19 21:50:06 2018 +0000
@@ -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 @@
* operations
*/
-static inline uint64_t
+static __inline uint64_t
octeon_fpa_load(uint64_t fpapool)
{
uint64_t addr;
@@ -106,7 +106,7 @@
}
#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 @@
}
#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_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_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;
diff -r cfda28cde5bc -r e60af558a6b3 sys/arch/mips/cavium/dev/octeon_gmxvar.h
--- a/sys/arch/mips/cavium/dev/octeon_gmxvar.h Thu Apr 19 21:20:43 2018 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_gmxvar.h Thu Apr 19 21:50:06 2018 +0000
@@ -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 @@
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;
diff -r cfda28cde5bc -r e60af558a6b3 sys/arch/mips/cavium/dev/octeon_pkovar.h
--- a/sys/arch/mips/cavium/dev/octeon_pkovar.h Thu Apr 19 21:20:43 2018 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_pkovar.h Thu Apr 19 21:50:06 2018 +0000
@@ -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_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 @@
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 @@
/* 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_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;
diff -r cfda28cde5bc -r e60af558a6b3 sys/arch/mips/cavium/dev/octeon_powvar.h
--- a/sys/arch/mips/cavium/dev/octeon_powvar.h Thu Apr 19 21:20:43 2018 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_powvar.h Thu Apr 19 21:50:06 2018 +0000
@@ -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 @@
/* 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 @@
* 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 @@
* 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 @@
Home |
Main Index |
Thread Index |
Old Index