diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/kernel.h | 1 | ||||
-rw-r--r-- | include/linux/six.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a0d3e467..d31b5f56 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -229,6 +229,7 @@ static inline int __must_check kstrtos32(const char *s, unsigned int base, s32 * } struct printbuf; +extern __printf(2, 0) void prt_vprintf(struct printbuf *out, const char *fmt, va_list args); extern __printf(2, 3) void prt_printf(struct printbuf *out, const char *fmt, ...); static const char hex_asc[] = "0123456789abcdef"; diff --git a/include/linux/six.h b/include/linux/six.h index f336ae04..362a577b 100644 --- a/include/linux/six.h +++ b/include/linux/six.h @@ -107,6 +107,7 @@ struct six_lock { struct task_struct *owner; unsigned __percpu *readers; unsigned intent_lock_recurse; + unsigned long ip; raw_spinlock_t wait_lock; struct list_head wait_list; #ifdef CONFIG_DEBUG_LOCK_ALLOC @@ -119,6 +120,7 @@ struct six_lock_waiter { struct task_struct *task; enum six_lock_type lock_want; bool lock_acquired; + u64 start_time; }; typedef int (*six_lock_should_sleep_fn)(struct six_lock *lock, void *); |