From 465cf6fc549c5fc8037a51906c720a4bd0dab4f5 Mon Sep 17 00:00:00 2001
From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
Date: Sat, 21 Jul 2012 00:54:59 +0530
Subject: [PATCH] --- yaml --- r: 321326 b: refs/heads/master c:
 a7e4786b937a3ae918a7520cfdba557a80915fa7 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hardirq.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a255443221fb..b282c92b287c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 014acbf0d5c8445e0ff88ae60edd676dd9cc461c
+refs/heads/master: a7e4786b937a3ae918a7520cfdba557a80915fa7
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index bb7f30971858..305f23cd7cff 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -22,7 +22,7 @@
  *
  * - bits 16-25 are the hardirq count (max # of nested hardirqs: 1024)
  * - bit 26 is the NMI_MASK
- * - bit 28 is the PREEMPT_ACTIVE flag
+ * - bit 27 is the PREEMPT_ACTIVE flag
  *
  * PREEMPT_MASK: 0x000000ff
  * SOFTIRQ_MASK: 0x0000ff00