diff --git a/[refs] b/[refs]
index eda3a08483ad..9b60772c369f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd6414b50fa2b1cd247a8aa8f8bd42414b7453e1
+refs/heads/master: 20f33a03f0cf87e51165f7084f697acfb68e865b
diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c
index 9ca4973f736d..93bd2eb2bc53 100644
--- a/trunk/kernel/posix-timers.c
+++ b/trunk/kernel/posix-timers.c
@@ -145,7 +145,13 @@ static int common_timer_del(struct k_itimer *timer);
 
 static enum hrtimer_restart posix_timer_fn(struct hrtimer *data);
 
-static struct k_itimer *lock_timer(timer_t timer_id, unsigned long *flags);
+static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags);
+
+#define lock_timer(tid, flags)						   \
+({	struct k_itimer *__timr;					   \
+	__cond_lock(&__timr->it_lock, __timr = __lock_timer(tid, flags));  \
+	__timr;								   \
+})
 
 static inline void unlock_timer(struct k_itimer *timr, unsigned long flags)
 {
@@ -619,7 +625,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
  * the find to the timer lock.  To avoid a dead lock, the timer id MUST
  * be release with out holding the timer lock.
  */
-static struct k_itimer *lock_timer(timer_t timer_id, unsigned long *flags)
+static struct k_itimer *__lock_timer(timer_t timer_id, unsigned long *flags)
 {
 	struct k_itimer *timr;
 	/*