summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libc/stdlib/malloc.c6
-rw-r--r--libexec/rtld-elf/rtld_lock.c4
-rw-r--r--sys/boot/common/ufsread.c2
-rw-r--r--sys/dev/de/if_de.c2
-rw-r--r--sys/dev/de/if_devar.h4
-rw-r--r--sys/dev/hifn/hifn7751.c4
-rw-r--r--sys/dev/pcf/pcfvar.h8
-rw-r--r--sys/i386/linux/linux_ptrace.c2
-rw-r--r--sys/i386/pci/pci_cfgreg.c2
-rw-r--r--sys/kern/vfs_bio.c6
-rw-r--r--sys/netgraph/ng_async.c2
-rw-r--r--sys/netgraph/ng_eiface.c4
-rw-r--r--sys/netgraph/ng_fec.c4
-rw-r--r--sys/netgraph/ng_gif_demux.c8
-rw-r--r--sys/netgraph/ng_iface.c12
-rw-r--r--sys/netgraph/ng_sppp.c4
-rw-r--r--sys/pci/if_de.c2
-rw-r--r--sys/pci/if_devar.h4
-rw-r--r--usr.bin/systat/convtbl.c2
19 files changed, 41 insertions, 41 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 153c517df405..7b69863bbe6a 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -596,7 +596,7 @@ malloc_pages(size_t size)
* Allocate a page of fragments
*/
-static __inline__ int
+static __inline int
malloc_make_chunks(int bits)
{
struct pginfo *bp;
@@ -845,7 +845,7 @@ irealloc(void *ptr, size_t size)
* Free a sequence of pages
*/
-static __inline__ void
+static __inline void
free_pages(void *ptr, u_long index, struct pginfo const *info)
{
u_long i;
@@ -979,7 +979,7 @@ free_pages(void *ptr, u_long index, struct pginfo const *info)
* Free a chunk, and possibly the page it's on, if the page becomes empty.
*/
-static __inline__ void
+static __inline void
free_bytes(void *ptr, u_long index, struct pginfo *info)
{
int i;
diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c
index bdee69041b2e..77b16f602a1f 100644
--- a/libexec/rtld-elf/rtld_lock.c
+++ b/libexec/rtld-elf/rtld_lock.c
@@ -169,13 +169,13 @@ def_thread_clr_flag(int mask)
static struct RtldLockInfo lockinfo;
static struct RtldLockInfo deflockinfo;
-static __inline__ int
+static __inline int
thread_mask_set(int mask)
{
return lockinfo.thread_set_flag(mask);
}
-static __inline__ void
+static __inline void
thread_mask_clear(int mask)
{
lockinfo.thread_clr_flag(mask);
diff --git a/sys/boot/common/ufsread.c b/sys/boot/common/ufsread.c
index 0b7c3f47fc93..f5a71b335aed 100644
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@@ -68,7 +68,7 @@ static ssize_t fsread(ino_t, void *, size_t);
static int ls, dsk_meta;
static uint32_t fs_off;
-static __inline__ int
+static __inline int
fsfind(const char *name, ino_t * ino)
{
char buf[DEV_BSIZE];
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 6c3592eb2a75..0c39d7cdbd7a 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1514,7 +1514,7 @@ tulip_null_media_poll(
#endif
}
-__inline__ static void
+__inline static void
tulip_21140_mediainit(
tulip_softc_t * const sc,
tulip_media_info_t * const mip,
diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h
index 9b47ccad7952..10a43069a174 100644
--- a/sys/dev/de/if_devar.h
+++ b/sys/dev/de/if_devar.h
@@ -880,7 +880,7 @@ NETISR_SET(NETISR_DE, tulip_softintr);
} while (0)
#if defined(__i386__)
typedef u_quad_t tulip_cycle_t;
-static __inline__ tulip_cycle_t
+static __inline tulip_cycle_t
TULIP_PERFREAD(
void)
{
@@ -891,7 +891,7 @@ TULIP_PERFREAD(
#define TULIP_PERFDIFF(s, f) ((f) - (s))
#elif defined(__alpha__)
typedef unsigned long tulip_cycle_t;
-static __inline__ tulip_cycle_t
+static __inline tulip_cycle_t
TULIP_PERFREAD(
void)
{
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index 4116453237f2..c2b5fc979ac9 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -151,7 +151,7 @@ static void hifn_alloc_slot(struct hifn_softc *, int *, int *, int *, int *);
static void hifn_write_reg_0(struct hifn_softc *, bus_size_t, u_int32_t);
static void hifn_write_reg_1(struct hifn_softc *, bus_size_t, u_int32_t);
-static __inline__ u_int32_t
+static __inline u_int32_t
READ_REG_0(struct hifn_softc *sc, bus_size_t reg)
{
u_int32_t v = bus_space_read_4(sc->sc_st0, sc->sc_sh0, reg);
@@ -160,7 +160,7 @@ READ_REG_0(struct hifn_softc *sc, bus_size_t reg)
}
#define WRITE_REG_0(sc, reg, val) hifn_write_reg_0(sc, reg, val)
-static __inline__ u_int32_t
+static __inline u_int32_t
READ_REG_1(struct hifn_softc *sc, bus_size_t reg)
{
u_int32_t v = bus_space_read_4(sc->sc_st1, sc->sc_sh1, reg);
diff --git a/sys/dev/pcf/pcfvar.h b/sys/dev/pcf/pcfvar.h
index ce7e9a96cee1..258cfb76eda1 100644
--- a/sys/dev/pcf/pcfvar.h
+++ b/sys/dev/pcf/pcfvar.h
@@ -86,7 +86,7 @@ struct pcf_softc {
/*
* Specific register access to PCF8584
*/
-static __inline__ void
+static __inline void
pcf_set_S0(struct pcf_softc *sc, int data)
{
bus_space_write_1(sc->res_ioport->r_bustag,
@@ -95,7 +95,7 @@ pcf_set_S0(struct pcf_softc *sc, int data)
pcf_nops();
}
-static __inline__ void
+static __inline void
pcf_set_S1(struct pcf_softc *sc, int data)
{
bus_space_write_1(sc->res_ioport->r_bustag,
@@ -104,7 +104,7 @@ pcf_set_S1(struct pcf_softc *sc, int data)
pcf_nops();
}
-static __inline__ char
+static __inline char
pcf_get_S0(struct pcf_softc *sc)
{
char data;
@@ -116,7 +116,7 @@ pcf_get_S0(struct pcf_softc *sc)
return (data);
}
-static __inline__ char
+static __inline char
pcf_get_S1(struct pcf_softc *sc)
{
char data;
diff --git a/sys/i386/linux/linux_ptrace.c b/sys/i386/linux/linux_ptrace.c
index 88b5f3210e14..9cee4411a1f7 100644
--- a/sys/i386/linux/linux_ptrace.c
+++ b/sys/i386/linux/linux_ptrace.c
@@ -89,7 +89,7 @@ __FBSDID("$FreeBSD$");
#define LINUX_DBREG_OFFSET 252
#define LINUX_DBREG_SIZE (8*sizeof(l_int))
-static __inline__ int
+static __inline int
map_signum(int signum)
{
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 5cde7d266b8b..e22874c5c7d9 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -60,7 +60,7 @@ static struct mtx pcicfg_mtx;
* apparently undocumented anywhere. Assume these are completely bogus
* and map them to 255, which means "none".
*/
-static __inline__ int
+static __inline int
pci_i386_map_intline(int line)
{
if (line == 0 || line >= 128)
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index b6c1caa90bd5..6050c071e502 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -377,7 +377,7 @@ waitrunningbufspace(void)
* bit if the newly extended portion of the buffer does not contain
* valid data.
*/
-static __inline__
+static __inline
void
vfs_buf_test_cache(struct buf *bp,
vm_ooffset_t foff, vm_offset_t off, vm_offset_t size,
@@ -394,7 +394,7 @@ vfs_buf_test_cache(struct buf *bp,
}
/* Wake up the buffer deamon if necessary */
-static __inline__
+static __inline
void
bd_wakeup(int dirtybuflevel)
{
@@ -410,7 +410,7 @@ bd_wakeup(int dirtybuflevel)
* bd_speedup - speedup the buffer cache flushing code
*/
-static __inline__
+static __inline
void
bd_speedup(void)
{
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c
index ae0e278824ed..4c2f3f601e6b 100644
--- a/sys/netgraph/ng_async.c
+++ b/sys/netgraph/ng_async.c
@@ -390,7 +390,7 @@ nga_disconnect(hook_p hook)
/*
* Encode a byte into the async buffer
*/
-static __inline__ void
+static __inline void
nga_async_add(const sc_p sc, u_int16_t *fcs, u_int32_t accm, int *len, u_char x)
{
*fcs = PPP_FCS(*fcs, x);
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index aad13657b283..6a7d536b31a3 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -127,7 +127,7 @@ static int ng_units_in_use = 0;
* Find the first free unit number for a new interface.
* Increase the size of the unit bitmap as necessary.
*/
-static __inline__ int
+static __inline int
ng_eiface_get_unit(int *unit)
{
int index, bit;
@@ -163,7 +163,7 @@ ng_eiface_get_unit(int *unit)
/*
* Free a no longer needed unit number.
*/
-static __inline__ void
+static __inline void
ng_eiface_free_unit(int unit)
{
int index, bit;
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
index 59971624bd81..3e451f76f17d 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -261,7 +261,7 @@ static int ng_units_in_use = 0;
* Find the first free unit number for a new interface.
* Increase the size of the unit bitmap as necessary.
*/
-static __inline__ int
+static __inline int
ng_fec_get_unit(int *unit)
{
int index, bit;
@@ -297,7 +297,7 @@ ng_fec_get_unit(int *unit)
/*
* Free a no longer needed unit number.
*/
-static __inline__ void
+static __inline void
ng_fec_free_unit(int unit)
{
int index, bit;
diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c
index 3c4d3094a1a2..b1fbaffc8bbf 100644
--- a/sys/netgraph/ng_gif_demux.c
+++ b/sys/netgraph/ng_gif_demux.c
@@ -163,7 +163,7 @@ NETGRAPH_INIT(gif_demux, &ng_gif_demux_typestruct);
/*
* Get the family descriptor from the family ID
*/
-static __inline__ iffam_p
+static __inline iffam_p
get_iffam_from_af(sa_family_t family)
{
iffam_p iffam;
@@ -180,7 +180,7 @@ get_iffam_from_af(sa_family_t family)
/*
* Get the family descriptor from the hook
*/
-static __inline__ iffam_p
+static __inline iffam_p
get_iffam_from_hook(priv_p priv, hook_p hook)
{
int k;
@@ -195,7 +195,7 @@ get_iffam_from_hook(priv_p priv, hook_p hook)
* Get the hook from the iffam descriptor
*/
-static __inline__ hook_p *
+static __inline hook_p *
get_hook_from_iffam(priv_p priv, iffam_p iffam)
{
return (&priv->hooks[iffam - gFamilies]);
@@ -204,7 +204,7 @@ get_hook_from_iffam(priv_p priv, iffam_p iffam)
/*
* Get the iffam descriptor from the name
*/
-static __inline__ iffam_p
+static __inline iffam_p
get_iffam_from_name(const char *name)
{
iffam_p iffam;
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index c2001913b736..899bf22d86d7 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -225,7 +225,7 @@ static int ng_units_in_use = 0;
/*
* Get the family descriptor from the family ID
*/
-static __inline__ iffam_p
+static __inline iffam_p
get_iffam_from_af(sa_family_t family)
{
iffam_p iffam;
@@ -242,7 +242,7 @@ get_iffam_from_af(sa_family_t family)
/*
* Get the family descriptor from the hook
*/
-static __inline__ iffam_p
+static __inline iffam_p
get_iffam_from_hook(priv_p priv, hook_p hook)
{
int k;
@@ -257,7 +257,7 @@ get_iffam_from_hook(priv_p priv, hook_p hook)
* Get the hook from the iffam descriptor
*/
-static __inline__ hook_p *
+static __inline hook_p *
get_hook_from_iffam(priv_p priv, iffam_p iffam)
{
return (&priv->hooks[iffam - gFamilies]);
@@ -266,7 +266,7 @@ get_hook_from_iffam(priv_p priv, iffam_p iffam)
/*
* Get the iffam descriptor from the name
*/
-static __inline__ iffam_p
+static __inline iffam_p
get_iffam_from_name(const char *name)
{
iffam_p iffam;
@@ -284,7 +284,7 @@ get_iffam_from_name(const char *name)
* Find the first free unit number for a new interface.
* Increase the size of the unit bitmap as necessary.
*/
-static __inline__ int
+static __inline int
ng_iface_get_unit(int *unit)
{
int index, bit;
@@ -320,7 +320,7 @@ ng_iface_get_unit(int *unit)
/*
* Free a no longer needed unit number.
*/
-static __inline__ void
+static __inline void
ng_iface_free_unit(int unit)
{
int index, bit;
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index 3f3c97fe85a9..22fcbd7329d8 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -116,7 +116,7 @@ static unsigned char ng_units_in_use = 0;
* Find the first free unit number for a new interface.
* Increase the size of the unit bitmap as necessary.
*/
-static __inline__ int
+static __inline int
ng_sppp_get_unit (int *unit)
{
int index, bit;
@@ -156,7 +156,7 @@ ng_sppp_get_unit (int *unit)
/*
* Free a no longer needed unit number.
*/
-static __inline__ void
+static __inline void
ng_sppp_free_unit (int unit)
{
int index, bit;
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 6c3592eb2a75..0c39d7cdbd7a 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1514,7 +1514,7 @@ tulip_null_media_poll(
#endif
}
-__inline__ static void
+__inline static void
tulip_21140_mediainit(
tulip_softc_t * const sc,
tulip_media_info_t * const mip,
diff --git a/sys/pci/if_devar.h b/sys/pci/if_devar.h
index 9b47ccad7952..10a43069a174 100644
--- a/sys/pci/if_devar.h
+++ b/sys/pci/if_devar.h
@@ -880,7 +880,7 @@ NETISR_SET(NETISR_DE, tulip_softintr);
} while (0)
#if defined(__i386__)
typedef u_quad_t tulip_cycle_t;
-static __inline__ tulip_cycle_t
+static __inline tulip_cycle_t
TULIP_PERFREAD(
void)
{
@@ -891,7 +891,7 @@ TULIP_PERFREAD(
#define TULIP_PERFDIFF(s, f) ((f) - (s))
#elif defined(__alpha__)
typedef unsigned long tulip_cycle_t;
-static __inline__ tulip_cycle_t
+static __inline tulip_cycle_t
TULIP_PERFREAD(
void)
{
diff --git a/usr.bin/systat/convtbl.c b/usr.bin/systat/convtbl.c
index 833ab309fdea..56436132fbe4 100644
--- a/usr.bin/systat/convtbl.c
+++ b/usr.bin/systat/convtbl.c
@@ -49,7 +49,7 @@ struct convtbl convtbl[] = {
};
-static __inline__
+static __inline
struct convtbl *
get_tbl_ptr(const u_long size, const u_int scale)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 08:35:39 +0000