Module Name: src Committed By: uebayasi Date: Sat Feb 6 12:10:59 UTC 2010
Modified Files: src/sys/kern: kern_tc.c vfs_wapbl.c src/sys/uvm: uvm_fault_i.h uvm_page.h uvm_stat.h Log Message: __inline -> inline To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/kern/kern_tc.c cvs rdiff -u -r1.29 -r1.30 src/sys/kern/vfs_wapbl.c cvs rdiff -u -r1.24 -r1.25 src/sys/uvm/uvm_fault_i.h cvs rdiff -u -r1.58 -r1.59 src/sys/uvm/uvm_page.h cvs rdiff -u -r1.45 -r1.46 src/sys/uvm/uvm_stat.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/kern/kern_tc.c diff -u src/sys/kern/kern_tc.c:1.40 src/sys/kern/kern_tc.c:1.41 --- src/sys/kern/kern_tc.c:1.40 Sun Jun 14 13:16:32 2009 +++ src/sys/kern/kern_tc.c Sat Feb 6 12:10:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_tc.c,v 1.40 2009/06/14 13:16:32 kardel Exp $ */ +/* $NetBSD: kern_tc.c,v 1.41 2010/02/06 12:10:59 uebayasi Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #include <sys/cdefs.h> /* __FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.166 2005/09/19 22:16:31 andre Exp $"); */ -__KERNEL_RCSID(0, "$NetBSD: kern_tc.c,v 1.40 2009/06/14 13:16:32 kardel Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_tc.c,v 1.41 2010/02/06 12:10:59 uebayasi Exp $"); #include "opt_ntp.h" @@ -297,7 +297,7 @@ * Return the difference between the timehands' counter value now and what * was when we copied it to the timehands' offset_count. */ -static __inline u_int +static inline u_int tc_delta(struct timehands *th) { struct timecounter *tc; Index: src/sys/kern/vfs_wapbl.c diff -u src/sys/kern/vfs_wapbl.c:1.29 src/sys/kern/vfs_wapbl.c:1.30 --- src/sys/kern/vfs_wapbl.c:1.29 Wed Nov 25 14:43:31 2009 +++ src/sys/kern/vfs_wapbl.c Sat Feb 6 12:10:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_wapbl.c,v 1.29 2009/11/25 14:43:31 pooka Exp $ */ +/* $NetBSD: vfs_wapbl.c,v 1.30 2010/02/06 12:10:59 uebayasi Exp $ */ /*- * Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #define WAPBL_INTERNAL #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.29 2009/11/25 14:43:31 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.30 2010/02/06 12:10:59 uebayasi Exp $"); #include <sys/param.h> @@ -205,9 +205,9 @@ static int wapbl_replay_process(struct wapbl_replay *wr, off_t, off_t); -static __inline size_t wapbl_space_free(size_t avail, off_t head, +static inline size_t wapbl_space_free(size_t avail, off_t head, off_t tail); -static __inline size_t wapbl_space_used(size_t avail, off_t head, +static inline size_t wapbl_space_used(size_t avail, off_t head, off_t tail); #ifdef _KERNEL @@ -226,7 +226,7 @@ static struct wapbl_ino *wapbl_inodetrk_get(struct wapbl *wl, ino_t ino); static size_t wapbl_transaction_len(struct wapbl *wl); -static __inline size_t wapbl_transaction_inodes_len(struct wapbl *wl); +static inline size_t wapbl_transaction_inodes_len(struct wapbl *wl); #if 0 int wapbl_replay_verify(struct wapbl_replay *, struct vnode *); @@ -958,7 +958,7 @@ /* Some utility inlines */ /* This is used to advance the pointer at old to new value at old+delta */ -static __inline off_t +static inline off_t wapbl_advance(size_t size, size_t off, off_t old, size_t delta) { off_t new; @@ -986,7 +986,7 @@ return new; } -static __inline size_t +static inline size_t wapbl_space_used(size_t avail, off_t head, off_t tail) { @@ -997,14 +997,14 @@ return ((head + (avail - 1) - tail) % avail) + 1; } -static __inline size_t +static inline size_t wapbl_space_free(size_t avail, off_t head, off_t tail) { return avail - wapbl_space_used(avail, head, tail); } -static __inline void +static inline void wapbl_advance_head(size_t size, size_t off, size_t delta, off_t *headp, off_t *tailp) { @@ -1019,7 +1019,7 @@ *tailp = tail; } -static __inline void +static inline void wapbl_advance_tail(size_t size, size_t off, size_t delta, off_t *headp, off_t *tailp) { @@ -1774,7 +1774,7 @@ /****************************************************************/ -static __inline size_t +static inline size_t wapbl_transaction_inodes_len(struct wapbl *wl) { int blocklen = 1<<wl->wl_log_dev_bshift; Index: src/sys/uvm/uvm_fault_i.h diff -u src/sys/uvm/uvm_fault_i.h:1.24 src/sys/uvm/uvm_fault_i.h:1.25 --- src/sys/uvm/uvm_fault_i.h:1.24 Wed Jan 2 11:49:16 2008 +++ src/sys/uvm/uvm_fault_i.h Sat Feb 6 12:10:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_fault_i.h,v 1.24 2008/01/02 11:49:16 ad Exp $ */ +/* $NetBSD: uvm_fault_i.h,v 1.25 2010/02/06 12:10:59 uebayasi Exp $ */ /* * @@ -45,7 +45,7 @@ * uvmfault_unlockmaps: unlock the maps */ -static __inline void +static inline void uvmfault_unlockmaps(struct uvm_faultinfo *ufi, bool write_locked) { /* @@ -70,7 +70,7 @@ * => 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, struct vm_anon *anon) { @@ -99,7 +99,7 @@ * 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; @@ -184,7 +184,7 @@ * => 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/uvm_page.h diff -u src/sys/uvm/uvm_page.h:1.58 src/sys/uvm/uvm_page.h:1.59 --- src/sys/uvm/uvm_page.h:1.58 Sat Feb 6 02:56:17 2010 +++ src/sys/uvm/uvm_page.h Sat Feb 6 12:10:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_page.h,v 1.58 2010/02/06 02:56:17 uebayasi Exp $ */ +/* $NetBSD: uvm_page.h,v 1.59 2010/02/06 12:10:59 uebayasi Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -311,17 +311,17 @@ */ #if VM_PHYSSEG_MAX == 1 -static __inline int vm_physseg_find_contig(struct vm_physseg *, int, paddr_t, int *); +static inline int vm_physseg_find_contig(struct vm_physseg *, int, paddr_t, int *); #elif (VM_PHYSSEG_STRAT == VM_PSTRAT_BSEARCH) -static __inline int vm_physseg_find_bsearch(struct vm_physseg *, int, paddr_t, int *); +static inline int vm_physseg_find_bsearch(struct vm_physseg *, int, paddr_t, int *); #else -static __inline int vm_physseg_find_linear(struct vm_physseg *, int, paddr_t, int *); +static inline int vm_physseg_find_linear(struct vm_physseg *, int, paddr_t, int *); #endif /* * vm_physseg_find: find vm_physseg structure that belongs to a PA */ -static __inline int +static inline int vm_physseg_find(paddr_t pframe, int *offp) { @@ -335,7 +335,7 @@ } #if VM_PHYSSEG_MAX == 1 -static __inline int +static inline int vm_physseg_find_contig(struct vm_physseg *segs, int nsegs, paddr_t pframe, int *offp) { @@ -350,7 +350,7 @@ #elif (VM_PHYSSEG_STRAT == VM_PSTRAT_BSEARCH) -static __inline int +static inline int vm_physseg_find_bsearch(struct vm_physseg *segs, int nsegs, paddr_t pframe, int *offp) { /* binary search for it */ @@ -394,7 +394,7 @@ #else -static __inline int +static inline int vm_physseg_find_linear(struct vm_physseg *segs, int nsegs, paddr_t pframe, int *offp) { /* linear search for it */ @@ -417,7 +417,7 @@ * PHYS_TO_VM_PAGE: find vm_page for a PA. used by MI code to get vm_pages * back from an I/O mapping (ugh!). used in some MD code as well. */ -static __inline struct vm_page * +static inline struct vm_page * PHYS_TO_VM_PAGE(paddr_t pa) { paddr_t pf = atop(pa); Index: src/sys/uvm/uvm_stat.h diff -u src/sys/uvm/uvm_stat.h:1.45 src/sys/uvm/uvm_stat.h:1.46 --- src/sys/uvm/uvm_stat.h:1.45 Sun Feb 1 14:25:11 2009 +++ src/sys/uvm/uvm_stat.h Sat Feb 6 12:10:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_stat.h,v 1.45 2009/02/01 14:25:11 skrll Exp $ */ +/* $NetBSD: uvm_stat.h,v 1.46 2010/02/06 12:10:59 uebayasi Exp $ */ /* * @@ -191,9 +191,9 @@ static const char *const _uvmhist_name = FNAME; \ int _uvmhist_call; -static __inline void uvmhist_entry_print(struct uvm_history_ent *); +static inline void uvmhist_entry_print(struct uvm_history_ent *); -static __inline void +static inline void uvmhist_entry_print(e) struct uvm_history_ent *e; {