From: Ingo Molnar <mingo@elte.hu>

Fix bug in hrtimer_is_queued(), introduced by a cleanup during
the recent refactoring.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/hrtimer.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/hrtimer.c~high-res-timers-core-hrtimers-add-state-tracking-fix kernel/hrtimer.c
--- a/kernel/hrtimer.c~high-res-timers-core-hrtimers-add-state-tracking-fix
+++ a/kernel/hrtimer.c
@@ -156,7 +156,7 @@ static void hrtimer_get_softirq_time(str
 static inline int hrtimer_is_queued(struct hrtimer *timer)
 {
 	return timer->state &
-		(HRTIMER_STATE_ENQUEUED || HRTIMER_STATE_PENDING);
+		(HRTIMER_STATE_ENQUEUED | HRTIMER_STATE_PENDING);
 }
 
 /*
_