Page MenuHomeFreeBSD
Files F115759007

D45708.id140129.diff
No OneTemporary
Actions

D45708.id140129.diff
View Options

diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -115,7 +115,7 @@
} \
} while (0)
-static bool __always_inline
+static __always_inline bool
LK_CAN_SHARE(uintptr_t x, int flags, bool fp)
{
@@ -180,9 +180,10 @@
int itimo;
};
-static bool __always_inline lockmgr_slock_try(struct lock *lk, uintptr_t *xp,
+static __always_inline bool lockmgr_slock_try(struct lock *lk, uintptr_t *xp,
int flags, bool fp);
-static bool __always_inline lockmgr_sunlock_try(struct lock *lk, uintptr_t *xp);
+static __always_inline bool lockmgr_sunlock_try(struct lock *lk,
+ uintptr_t *xp);
static void
lockmgr_exit(u_int flags, struct lock_object *ilk, int wakeup_swapper)
@@ -511,7 +512,7 @@
lock_destroy(&lk->lock_object);
}
-static bool __always_inline
+static __always_inline bool
lockmgr_slock_try(struct lock *lk, uintptr_t *xp, int flags, bool fp)
{
@@ -531,7 +532,7 @@
return (false);
}
-static bool __always_inline
+static __always_inline bool
lockmgr_sunlock_try(struct lock *lk, uintptr_t *xp)
{
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -384,7 +384,7 @@
* is unlocked and has no writer waiters or spinners. Failing otherwise
* prioritizes writers before readers.
*/
-static bool __always_inline
+static __always_inline bool
__rw_can_read(struct thread *td, uintptr_t v, bool fp)
{
@@ -396,7 +396,7 @@
return (false);
}
-static bool __always_inline
+static __always_inline bool
__rw_rlock_try(struct rwlock *rw, struct thread *td, uintptr_t *vp, bool fp
LOCK_FILE_LINE_ARG_DEF)
{
@@ -742,7 +742,7 @@
return (__rw_try_rlock_int(rw LOCK_FILE_LINE_ARG));
}
-static bool __always_inline
+static __always_inline bool
__rw_runlock_try(struct rwlock *rw, struct thread *td, uintptr_t *vp)
{
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c
--- a/sys/kern/kern_sx.c
+++ b/sys/kern/kern_sx.c
@@ -984,7 +984,7 @@
kick_proc0();
}
-static bool __always_inline
+static __always_inline bool
__sx_can_read(struct thread *td, uintptr_t x, bool fp)
{
@@ -996,7 +996,7 @@
return (false);
}
-static bool __always_inline
+static __always_inline bool
__sx_slock_try(struct sx *sx, struct thread *td, uintptr_t *xp, bool fp
LOCK_FILE_LINE_ARG_DEF)
{
@@ -1306,7 +1306,7 @@
return (_sx_slock_int(sx, opts LOCK_FILE_LINE_ARG));
}
-static bool __always_inline
+static __always_inline bool
_sx_sunlock_try(struct sx *sx, struct thread *td, uintptr_t *xp)
{

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 29, 6:25 AM (9 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17837694
Default Alt Text
D45708.id140129.diff (2 KB)

Event Timeline