diff options
| author | perry <perry@NetBSD.org> | 2005-12-24 19:01:28 +0000 |
|---|---|---|
| committer | perry <perry@NetBSD.org> | 2005-12-24 19:01:28 +0000 |
| commit | e14523e9437df221f7befdd807dec1d60740c4e1 (patch) | |
| tree | bfb43cf9e6f6514ddd89ca43c9254d4c2a8ac47a /sys | |
| parent | 1b26dc916062a2c951cc128a31600b5d2306c47f (diff) | |
Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/bufq_impl.h | 10 | ||||
| -rw-r--r-- | sys/sys/device.h | 4 | ||||
| -rw-r--r-- | sys/sys/endian.h | 26 | ||||
| -rw-r--r-- | sys/sys/hash.h | 8 | ||||
| -rw-r--r-- | sys/sys/lock.h | 32 | ||||
| -rw-r--r-- | sys/sys/lwp.h | 6 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 10 | ||||
| -rw-r--r-- | sys/sys/proc.h | 16 | ||||
| -rw-r--r-- | sys/sys/ras.h | 6 | ||||
| -rw-r--r-- | sys/sys/sched.h | 8 | ||||
| -rw-r--r-- | sys/sys/select.h | 4 | ||||
| -rw-r--r-- | sys/sys/spl.h | 4 | ||||
| -rw-r--r-- | sys/sys/sysctl.h | 4 | ||||
| -rw-r--r-- | sys/sys/timepps.h | 32 | ||||
| -rw-r--r-- | sys/sys/tree.h | 8 | ||||
| -rw-r--r-- | sys/sys/userret.h | 4 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 16 |
17 files changed, 99 insertions, 99 deletions
diff --git a/sys/sys/bufq_impl.h b/sys/sys/bufq_impl.h index b4f14d880b0..b7da21c30f4 100644 --- a/sys/sys/bufq_impl.h +++ b/sys/sys/bufq_impl.h @@ -1,4 +1,4 @@ -/* $NetBSD: bufq_impl.h,v 1.3 2005/12/11 12:25:20 christos Exp $ */ +/* $NetBSD: bufq_impl.h,v 1.4 2005/12/24 19:01:28 perry Exp $ */ /* NetBSD: bufq.h,v 1.3 2005/03/31 11:28:53 yamt Exp */ /* NetBSD: buf.h,v 1.75 2004/09/18 16:40:11 yamt Exp */ @@ -92,13 +92,13 @@ struct bufq_state { const struct bufq_strat *bq_strat; }; -static __inline void *bufq_private(const struct bufq_state *) __unused; -static __inline int buf_inorder(const struct buf *, const struct buf *, int) +static inline void *bufq_private(const struct bufq_state *) __unused; +static inline int buf_inorder(const struct buf *, const struct buf *, int) __unused; #include <sys/null.h> /* for NULL */ -static __inline void * +static inline void * bufq_private(const struct bufq_state *bufq) { @@ -108,7 +108,7 @@ bufq_private(const struct bufq_state *bufq) /* * Check if two buf's are in ascending order. */ -static __inline int +static inline int buf_inorder(const struct buf *bp, const struct buf *bq, int sortby) { diff --git a/sys/sys/device.h b/sys/sys/device.h index 0b304fa5577..d684879da65 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -1,4 +1,4 @@ -/* $NetBSD: device.h,v 1.83 2005/12/20 16:28:55 thorpej Exp $ */ +/* $NetBSD: device.h,v 1.84 2005/12/24 19:01:28 perry Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -301,7 +301,7 @@ extern device_t booted_device; /* the device we booted from */ extern device_t booted_wedge; /* the wedge on that device */ extern int booted_partition; /* or the partition on that device */ -extern __volatile int config_pending; /* semaphore for mountroot */ +extern volatile int config_pending; /* semaphore for mountroot */ extern propdb_t dev_propdb; /* device properties database */ diff --git a/sys/sys/endian.h b/sys/sys/endian.h index d6c0d414999..eff35552d39 100644 --- a/sys/sys/endian.h +++ b/sys/sys/endian.h @@ -1,4 +1,4 @@ -/* $NetBSD: endian.h,v 1.16 2005/12/11 12:25:20 christos Exp $ */ +/* $NetBSD: endian.h,v 1.17 2005/12/24 19:01:28 perry Exp $ */ /* * Copyright (c) 1987, 1991, 1993 @@ -185,7 +185,7 @@ __END_DECLS * to/from an octet stream. */ -static __inline void __unused +static inline void __unused be16enc(void *buf, uint16_t u) { uint8_t *p = (uint8_t *)buf; @@ -194,7 +194,7 @@ be16enc(void *buf, uint16_t u) p[1] = u & 0xff; } -static __inline void __unused +static inline void __unused le16enc(void *buf, uint16_t u) { uint8_t *p = (uint8_t *)buf; @@ -203,7 +203,7 @@ le16enc(void *buf, uint16_t u) p[1] = ((unsigned)u >> 8) & 0xff; } -static __inline uint16_t __unused +static inline uint16_t __unused be16dec(const void *buf) { const uint8_t *p = (const uint8_t *)buf; @@ -211,7 +211,7 @@ be16dec(const void *buf) return ((p[0] << 8) | p[1]); } -static __inline uint16_t __unused +static inline uint16_t __unused le16dec(const void *buf) { const uint8_t *p = (const uint8_t *)buf; @@ -219,7 +219,7 @@ le16dec(const void *buf) return ((p[1] << 8) | p[0]); } -static __inline void __unused +static inline void __unused be32enc(void *buf, uint32_t u) { uint8_t *p = (uint8_t *)buf; @@ -230,7 +230,7 @@ be32enc(void *buf, uint32_t u) p[3] = u & 0xff; } -static __inline void __unused +static inline void __unused le32enc(void *buf, uint32_t u) { uint8_t *p = (uint8_t *)buf; @@ -241,7 +241,7 @@ le32enc(void *buf, uint32_t u) p[3] = (u >> 24) & 0xff; } -static __inline uint32_t __unused +static inline uint32_t __unused be32dec(const void *buf) { const uint8_t *p = (const uint8_t *)buf; @@ -249,7 +249,7 @@ be32dec(const void *buf) return ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]); } -static __inline uint32_t __unused +static inline uint32_t __unused le32dec(const void *buf) { const uint8_t *p = (const uint8_t *)buf; @@ -257,7 +257,7 @@ le32dec(const void *buf) return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]); } -static __inline void __unused +static inline void __unused be64enc(void *buf, uint64_t u) { uint8_t *p = (uint8_t *)buf; @@ -266,7 +266,7 @@ be64enc(void *buf, uint64_t u) be32enc(p + 4, (uint32_t)(u & 0xffffffffULL)); } -static __inline void __unused +static inline void __unused le64enc(void *buf, uint64_t u) { uint8_t *p = (uint8_t *)buf; @@ -275,7 +275,7 @@ le64enc(void *buf, uint64_t u) le32enc(p + 4, (uint32_t)(u >> 32)); } -static __inline uint64_t __unused +static inline uint64_t __unused be64dec(const void *buf) { const uint8_t *p = (const uint8_t *)buf; @@ -283,7 +283,7 @@ be64dec(const void *buf) return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4)); } -static __inline uint64_t __unused +static inline uint64_t __unused le64dec(const void *buf) { const uint8_t *p = (const uint8_t *)buf; diff --git a/sys/sys/hash.h b/sys/sys/hash.h index 89552bb8ba6..1134b850e85 100644 --- a/sys/sys/hash.h +++ b/sys/sys/hash.h @@ -1,4 +1,4 @@ -/* $NetBSD: hash.h,v 1.3 2005/12/11 12:25:20 christos Exp $ */ +/* $NetBSD: hash.h,v 1.4 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ * return a 32 bit hash of the binary buffer buf (size len), * seeded with an initial hash value of hash (usually HASH32_BUF_INIT). */ -static __inline uint32_t +static inline uint32_t hash32_buf(const void *bf, size_t len, uint32_t hash) { const uint8_t *s = bf; @@ -76,7 +76,7 @@ hash32_buf(const void *bf, size_t len, uint32_t hash) * return a 32 bit hash of NUL terminated ASCII string buf, * seeded with an initial hash value of hash (usually HASH32_STR_INIT). */ -static __inline uint32_t +static inline uint32_t hash32_str(const void *bf, uint32_t hash) { const uint8_t *s = bf; @@ -94,7 +94,7 @@ hash32_str(const void *bf, uint32_t hash) * a maximum of len bytes, * seeded with an initial hash value of hash (usually HASH32_STR_INIT). */ -static __inline uint32_t +static inline uint32_t hash32_strn(const void *bf, size_t len, uint32_t hash) { const uint8_t *s = bf; diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 39c3e152dd6..ab953cddfaf 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.60 2005/12/11 12:25:20 christos Exp $ */ +/* $NetBSD: lock.h,v 1.61 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -98,7 +98,7 @@ struct simplelock { const char *unlock_file; short lock_line; short unlock_line; - _TAILQ_ENTRY(struct simplelock, __volatile) list; + _TAILQ_ENTRY(struct simplelock, volatile) list; cpuid_t lock_holder; /* CPU ID */ #endif }; @@ -148,7 +148,7 @@ struct lock { /* CPU ID of exclusive lock holder */ cpuid_t lk_spin_cpu; #if defined(LOCKDEBUG) - _TAILQ_ENTRY(struct lock, __volatile) lk_spin_list; + _TAILQ_ENTRY(struct lock, volatile) lk_spin_list; #endif } lk_un_spin; } lk_un; @@ -295,15 +295,15 @@ struct proc; void lockinit(struct lock *, int, const char *, int, int); #if defined(LOCKDEBUG) -int _lockmgr(__volatile struct lock *, u_int, struct simplelock *, +int _lockmgr(volatile struct lock *, u_int, struct simplelock *, const char *, int); #define lockmgr(l, f, i) _lockmgr((l), (f), (i), __FILE__, __LINE__) #else -int lockmgr(__volatile struct lock *, u_int flags, struct simplelock *); +int lockmgr(volatile struct lock *, u_int flags, struct simplelock *); #endif /* LOCKDEBUG */ void transferlockers(struct lock *, struct lock *); int lockstatus(struct lock *); -void lockmgr_printinfo(__volatile struct lock *); +void lockmgr_printinfo(volatile struct lock *); #if defined(LOCKDEBUG) || defined(DIAGNOSTIC) void spinlock_switchcheck(void); @@ -320,24 +320,24 @@ void spinlock_switchcheck(void); #endif #if defined(LOCKDEBUG) -int _spinlock_release_all(__volatile struct lock *, const char *, int); -void _spinlock_acquire_count(__volatile struct lock *, int, const char *, +int _spinlock_release_all(volatile struct lock *, const char *, int); +void _spinlock_acquire_count(volatile struct lock *, int, const char *, int); #define spinlock_release_all(l) _spinlock_release_all((l), __FILE__, __LINE__) #define spinlock_acquire_count(l, c) _spinlock_acquire_count((l), (c), \ __FILE__, __LINE__) #else -int spinlock_release_all(__volatile struct lock *); -void spinlock_acquire_count(__volatile struct lock *, int); +int spinlock_release_all(volatile struct lock *); +void spinlock_acquire_count(volatile struct lock *, int); #endif #if defined(LOCKDEBUG) -void _simple_lock(__volatile struct simplelock *, const char *, int); -int _simple_lock_try(__volatile struct simplelock *, const char *, int); -void _simple_unlock(__volatile struct simplelock *, const char *, int); -int _simple_lock_held(__volatile struct simplelock *); -void simple_lock_only_held(__volatile struct simplelock *, const char *); +void _simple_lock(volatile struct simplelock *, const char *, int); +int _simple_lock_try(volatile struct simplelock *, const char *, int); +void _simple_unlock(volatile struct simplelock *, const char *, int); +int _simple_lock_held(volatile struct simplelock *); +void simple_lock_only_held(volatile struct simplelock *, const char *); #define simple_lock(alp) _simple_lock((alp), __FILE__, __LINE__) #define simple_lock_try(alp) _simple_lock_try((alp), __FILE__, __LINE__) @@ -346,7 +346,7 @@ void simple_lock_only_held(__volatile struct simplelock *, const char *); #define LOCK_ASSERT(x) KASSERT(x) -void simple_lock_init(__volatile struct simplelock *); +void simple_lock_init(volatile struct simplelock *); void simple_lock_dump(void); void simple_lock_freecheck(void *, void *); void simple_lock_switchcheck(void); diff --git a/sys/sys/lwp.h b/sys/sys/lwp.h index 0b915f86d54..66ffd426e57 100644 --- a/sys/sys/lwp.h +++ b/sys/sys/lwp.h @@ -1,4 +1,4 @@ -/* $NetBSD: lwp.h,v 1.31 2005/12/03 17:10:46 christos Exp $ */ +/* $NetBSD: lwp.h,v 1.32 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ struct lwp { LIST_ENTRY(lwp) l_sibling; /* Entry on process's list of LWPs. */ - struct cpu_info * __volatile l_cpu; /* CPU we're running on if + struct cpu_info * volatile l_cpu; /* CPU we're running on if SONPROC */ int l_flag; int l_stat; @@ -66,7 +66,7 @@ struct lwp { u_int l_swtime; /* Time swapped in or out. */ u_int l_slptime; /* Time since last blocked. */ - __volatile const void *l_wchan; /* Sleep address. */ + volatile const void *l_wchan; /* Sleep address. */ struct callout l_tsleep_ch; /* callout for tsleep */ const char *l_wmesg; /* Reason for sleep. */ int l_holdcnt; /* If non-zero, don't swap. */ diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index f03e7f7ac06..78a08841e86 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1,4 +1,4 @@ -/* $NetBSD: mbuf.h,v 1.116 2005/12/04 20:21:33 christos Exp $ */ +/* $NetBSD: mbuf.h,v 1.117 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 1996, 1997, 1999, 2001 The NetBSD Foundation, Inc. @@ -861,8 +861,8 @@ void mbinit(void); void m_move_pkthdr(struct mbuf *to, struct mbuf *from); /* Inline routines. */ -static __inline u_int m_length(struct mbuf *) __unused; -static __inline void m_ext_free(struct mbuf *, boolean_t) __unused; +static inline u_int m_length(struct mbuf *) __unused; +static inline void m_ext_free(struct mbuf *, boolean_t) __unused; /* Packet tag routines */ struct m_tag *m_tag_get(int, int, int); @@ -906,7 +906,7 @@ struct m_tag *m_tag_next(struct mbuf *, struct m_tag *); /* * Return the number of bytes in the mbuf chain, m. */ -static __inline u_int +static inline u_int m_length(struct mbuf *m) { struct mbuf *m0; @@ -927,7 +927,7 @@ m_length(struct mbuf *m) * => if 'dofree', free the mbuf m itsself as well. * => called at splvm. */ -static __inline void +static inline void m_ext_free(struct mbuf *m, boolean_t dofree) { diff --git a/sys/sys/proc.h b/sys/sys/proc.h index b1a4ffa4af2..6428ec8dd24 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.210 2005/12/24 12:57:14 yamt Exp $ */ +/* $NetBSD: proc.h,v 1.211 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 1986, 1989, 1991, 1993 @@ -389,7 +389,7 @@ extern struct lwp *curlwp; /* Current running LWP */ static struct proc *__curproc(void); -static __inline struct proc * +static inline struct proc * __curproc() { struct lwp *l = curlwp; @@ -446,10 +446,10 @@ void pgdelete(struct pgrp *); void procinit(void); void resetprocpriority(struct proc *); void suspendsched(void); -int ltsleep(__volatile const void *, int, const char *, int, - __volatile struct simplelock *); -void wakeup(__volatile const void *); -void wakeup_one(__volatile const void *); +int ltsleep(volatile const void *, int, const char *, int, + volatile struct simplelock *); +void wakeup(volatile const void *); +void wakeup_one(volatile const void *); void exit1(struct lwp *, int); int find_stopped_child(struct proc *, pid_t, int, struct proc **); struct proc *proc_alloc(void); @@ -489,9 +489,9 @@ void p_sugid(struct proc *); int proclist_foreach_call(struct proclist *, int (*)(struct proc *, void *arg), void *); -static __inline struct proc *_proclist_skipmarker(struct proc *); +static inline struct proc *_proclist_skipmarker(struct proc *); -static __inline struct proc * +static inline struct proc * _proclist_skipmarker(struct proc *p0) { struct proc *p = p0; diff --git a/sys/sys/ras.h b/sys/sys/ras.h index 8e041e4b7ad..500d5c9ea6a 100644 --- a/sys/sys/ras.h +++ b/sys/sys/ras.h @@ -1,4 +1,4 @@ -/* $NetBSD: ras.h,v 1.6 2005/12/11 12:25:21 christos Exp $ */ +/* $NetBSD: ras.h,v 1.7 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc. @@ -79,12 +79,12 @@ extern void __CONCAT(name,_ras_start(void)), __CONCAT(name,_ras_end(void)) * barriers. See __insn_barrier() in <sys/cdefs.h>. */ #define RAS_START(name) \ - __asm __volatile(".globl " ___STRING(name) "_ras_start\n" \ + __asm volatile(".globl " ___STRING(name) "_ras_start\n" \ ___STRING(name) "_ras_start:" \ ::: "memory") #define RAS_END(name) \ - __asm __volatile(".globl " ___STRING(name) "_ras_end\n" \ + __asm volatile(".globl " ___STRING(name) "_ras_end\n" \ ___STRING(name) "_ras_end:" \ ::: "memory") diff --git a/sys/sys/sched.h b/sys/sys/sched.h index d563ab62695..017d02e7f4d 100644 --- a/sys/sys/sched.h +++ b/sys/sys/sched.h @@ -1,4 +1,4 @@ -/* $NetBSD: sched.h,v 1.24 2005/12/11 12:25:21 christos Exp $ */ +/* $NetBSD: sched.h,v 1.25 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc. @@ -139,7 +139,7 @@ struct prochd { */ struct schedstate_percpu { struct timeval spc_runtime; /* time curproc started running */ - __volatile int spc_flags; /* flags; see below */ + volatile int spc_flags; /* flags; see below */ u_int spc_schedticks; /* ticks for schedclock() */ u_int64_t spc_cp_time[CPUSTATES]; /* CPU state statistics */ u_char spc_curpriority; /* usrpri of curproc */ @@ -184,13 +184,13 @@ extern int rrticks; /* ticks per roundrobin() */ * in kern/kern_synch.c. */ extern struct prochd sched_qs[]; -extern __volatile u_int32_t sched_whichqs; +extern volatile u_int32_t sched_whichqs; struct proc; struct cpu_info; void schedclock(struct lwp *); -void sched_wakeup(__volatile const void *); +void sched_wakeup(volatile const void *); void roundrobin(struct cpu_info *); void scheduler_fork_hook(struct proc *, struct proc *); diff --git a/sys/sys/select.h b/sys/sys/select.h index 50dec6999cb..b8391fe317e 100644 --- a/sys/sys/select.h +++ b/sys/sys/select.h @@ -1,4 +1,4 @@ -/* $NetBSD: select.h,v 1.25 2005/12/11 12:25:21 christos Exp $ */ +/* $NetBSD: select.h,v 1.26 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -51,7 +51,7 @@ int selcommon(struct lwp *, register_t *, int, fd_set *, fd_set *, void selrecord(struct lwp *selector, struct selinfo *); void selwakeup(struct selinfo *); -static __inline void +static inline void selnotify(struct selinfo *sip, long knhint) { diff --git a/sys/sys/spl.h b/sys/sys/spl.h index 05014a905a3..5bd9ba5df19 100644 --- a/sys/sys/spl.h +++ b/sys/sys/spl.h @@ -1,4 +1,4 @@ -/* $NetBSD: spl.h,v 1.2 2005/12/11 12:25:21 christos Exp $ */ +/* $NetBSD: spl.h,v 1.3 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c)2005 YAMAMOTO Takashi, @@ -35,7 +35,7 @@ #endif /* !defined(_KERNEL) */ #define _SPL_DECL(x, X) \ - static __inline int spl##x(void) { return splraiseipl(IPL_##X); } + static inline int spl##x(void) { return splraiseipl(IPL_##X); } #if defined(IPL_SOFTCLOCK) _SPL_DECL(softclock, SOFTCLOCK) diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 52a653fc0c4..41e811c4b46 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $NetBSD: sysctl.h,v 1.142 2005/12/11 12:25:21 christos Exp $ */ +/* $NetBSD: sysctl.h,v 1.143 2005/12/24 19:01:28 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -1215,7 +1215,7 @@ struct sysctldesc { __sysc_desc_roundup(l))) #define NEXT_DESCR(d) __sysc_desc_adv((d), (d)->descr_len) -static __inline const struct sysctlnode * +static inline const struct sysctlnode * sysctl_rootof(const struct sysctlnode *n) { while (n->sysctl_parent != NULL) diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h index 1a664fa5dfa..fcfb5ce13ed 100644 --- a/sys/sys/timepps.h +++ b/sys/sys/timepps.h @@ -1,4 +1,4 @@ -/* $NetBSD: timepps.h,v 1.11 2005/12/11 12:25:21 christos Exp $ */ +/* $NetBSD: timepps.h,v 1.12 2005/12/24 19:01:28 perry Exp $ */ /* * Copyright (c) 1998 Jonathan Stone @@ -134,22 +134,22 @@ typedef struct { #include <sys/cdefs.h> #include <sys/ioctl.h> -static __inline int time_pps_create(int, pps_handle_t *); -static __inline int time_pps_destroy(pps_handle_t); -static __inline int time_pps_setparams(pps_handle_t, const pps_params_t *); -static __inline int time_pps_getparams(pps_handle_t, pps_params_t *); -static __inline int time_pps_getcap(pps_handle_t, int *); -static __inline int time_pps_fetch(pps_handle_t, const int, pps_info_t *, +static inline int time_pps_create(int, pps_handle_t *); +static inline int time_pps_destroy(pps_handle_t); +static inline int time_pps_setparams(pps_handle_t, const pps_params_t *); +static inline int time_pps_getparams(pps_handle_t, pps_params_t *); +static inline int time_pps_getcap(pps_handle_t, int *); +static inline int time_pps_fetch(pps_handle_t, const int, pps_info_t *, const struct timespec *); #if 0 -static __inline int time_pps_wait(pps_handle_t, const struct timespec *, +static inline int time_pps_wait(pps_handle_t, const struct timespec *, pps_info_t *); #endif -static __inline int time_pps_kcbind(pps_handle_t, const int, const int, +static inline int time_pps_kcbind(pps_handle_t, const int, const int, const int); -static __inline int +static inline int time_pps_create(filedes, handle) int filedes; pps_handle_t *handle; @@ -159,7 +159,7 @@ time_pps_create(filedes, handle) return (0); } -static __inline int +static inline int time_pps_destroy(handle) pps_handle_t handle; { @@ -167,7 +167,7 @@ time_pps_destroy(handle) return (0); } -static __inline int +static inline int time_pps_setparams(handle, ppsparams) pps_handle_t handle; const pps_params_t *ppsparams; @@ -176,7 +176,7 @@ time_pps_setparams(handle, ppsparams) return (ioctl(handle, PPS_IOC_SETPARAMS, __UNCONST(ppsparams))); } -static __inline int +static inline int time_pps_getparams(handle, ppsparams) pps_handle_t handle; pps_params_t *ppsparams; @@ -185,7 +185,7 @@ time_pps_getparams(handle, ppsparams) return (ioctl(handle, PPS_IOC_GETPARAMS, ppsparams)); } -static __inline int +static inline int time_pps_getcap(handle, mode) pps_handle_t handle; int *mode; @@ -194,7 +194,7 @@ time_pps_getcap(handle, mode) return (ioctl(handle, PPS_IOC_GETCAP, mode)); } -static __inline int +static inline int time_pps_fetch(handle, tsformat, ppsinfobuf, timeout) pps_handle_t handle; const int tsformat; @@ -205,7 +205,7 @@ time_pps_fetch(handle, tsformat, ppsinfobuf, timeout) return (ioctl(handle, PPS_IOC_FETCH, ppsinfobuf)); } -static __inline int +static inline int time_pps_kcbind(handle, kernel_consumer, edge, tsformat) pps_handle_t handle; const int kernel_consumer; diff --git a/sys/sys/tree.h b/sys/sys/tree.h index ea1e8f92a37..52fabd448dd 100644 --- a/sys/sys/tree.h +++ b/sys/sys/tree.h @@ -1,4 +1,4 @@ -/* $NetBSD: tree.h,v 1.10 2005/12/11 12:25:21 christos Exp $ */ +/* $NetBSD: tree.h,v 1.11 2005/12/24 19:01:28 perry Exp $ */ /* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> @@ -119,7 +119,7 @@ struct type *name##_SPLAY_INSERT(struct name *, struct type *); \ struct type *name##_SPLAY_REMOVE(struct name *, struct type *); \ \ /* Finds the node with the same key as elm */ \ -static __inline struct type * \ +static inline struct type * \ name##_SPLAY_FIND(struct name *head, struct type *elm) \ { \ if (SPLAY_EMPTY(head)) \ @@ -130,7 +130,7 @@ name##_SPLAY_FIND(struct name *head, struct type *elm) \ return (NULL); \ } \ \ -static __inline struct type * \ +static inline struct type * \ name##_SPLAY_NEXT(struct name *head, struct type *elm) \ { \ name##_SPLAY(head, elm); \ @@ -144,7 +144,7 @@ name##_SPLAY_NEXT(struct name *head, struct type *elm) \ return (elm); \ } \ \ -static __inline struct type * \ +static inline struct type * \ name##_SPLAY_MIN_MAX(struct name *head, int val) \ { \ name##_SPLAY_MINMAX(head, val); \ diff --git a/sys/sys/userret.h b/sys/sys/userret.h index d5bf4c0b4a3..fbb4e557260 100644 --- a/sys/sys/userret.h +++ b/sys/sys/userret.h @@ -1,4 +1,4 @@ -/* $NetBSD: userret.h,v 1.6 2005/12/11 12:25:21 christos Exp $ */ +/* $NetBSD: userret.h,v 1.7 2005/12/24 19:01:28 perry Exp $ */ /*- * Copyright (c) 1998, 2000, 2003 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ * XXX The following ports don't use this yet: * XXX pc532 vax */ -static __inline void +static inline void mi_userret(struct lwp *l) { struct proc *p = l->l_proc; diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 43f00c5fbe8..899ed080e1f 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1,4 +1,4 @@ -/* $NetBSD: vnode.h,v 1.148 2005/12/23 15:31:40 yamt Exp $ */ +/* $NetBSD: vnode.h,v 1.149 2005/12/24 19:01:28 perry Exp $ */ /* * Copyright (c) 1989, 1993 @@ -309,8 +309,8 @@ ilstatic void holdrelel(struct vnode *); ilstatic void vholdl(struct vnode *); ilstatic void vref(struct vnode *); -static __inline void holdrele(struct vnode *) __attribute__((__unused__)); -static __inline void vhold(struct vnode *) __attribute__((__unused__)); +static inline void holdrele(struct vnode *) __attribute__((__unused__)); +static inline void vhold(struct vnode *) __attribute__((__unused__)); #ifdef DIAGNOSTIC #define VATTR_NULL(vap) vattr_null(vap) @@ -322,7 +322,7 @@ static __inline void vhold(struct vnode *) __attribute__((__unused__)); * * called with v_interlock held */ -static __inline void +static inline void holdrelel(struct vnode *vp) { @@ -341,7 +341,7 @@ holdrelel(struct vnode *vp) * * called with v_interlock held */ -static __inline void +static inline void vholdl(struct vnode *vp) { @@ -358,7 +358,7 @@ vholdl(struct vnode *vp) /* * increase reference */ -static __inline void +static inline void vref(struct vnode *vp) { @@ -371,7 +371,7 @@ vref(struct vnode *vp) /* * decrease buf or page ref */ -static __inline void +static inline void holdrele(struct vnode *vp) { @@ -383,7 +383,7 @@ holdrele(struct vnode *vp) /* * increase buf or page ref */ -static __inline void +static inline void vhold(struct vnode *vp) { |
