---

yaml --- r: 158653 b: refs/heads/master c: ab94fcf h: refs/heads/master i: 158651: 25549e1 v: v3
git-mirror · Aug 25, 2009 · 5a5fcdc · 5a5fcdc
1 parent 18b0fa6
commit 5a5fcdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c
+refs/heads/master: ab94fcf528d127fcb490175512a8910f37e5b346
diff --git a/trunk/arch/x86/include/asm/irqflags.h b/trunk/arch/x86/include/asm/irqflags.h
@@ -13,14 +13,13 @@ static inline unsigned long native_save_fl(void)
 	unsigned long flags;
 
 	/*
-	 * Note: this needs to be "=r" not "=rm", because we have the
-	 * stack offset from what gcc expects at the time the "pop" is
-	 * executed, and so a memory reference with respect to the stack
-	 * would end up using the wrong address.
+	 * "=rm" is safe here, because "pop" adjusts the stack before
+	 * it evaluates its effective address -- this is part of the
+	 * documented behavior of the "pop" instruction.
 	 */
 	asm volatile("# __raw_save_flags\n\t"
 		     "pushf ; pop %0"
-		     : "=r" (flags)
+		     : "=rm" (flags)
 		     : /* no input */
 		     : "memory");