Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (225 commits)
  [PATCH] Don't set calgary iommu as default y
  [PATCH] i386/x86-64: New Intel feature flags
  [PATCH] x86: Add a cumulative thermal throttle event counter.
  [PATCH] i386: Make the jiffies compares use the 64bit safe macros.
  [PATCH] x86: Refactor thermal throttle processing
  [PATCH] Add 64bit jiffies compares (for use with get_jiffies_64)
  [PATCH] Fix unwinder warning in traps.c
  [PATCH] x86: Allow disabling early pci scans with pci=noearly or disallowing conf1
  [PATCH] x86: Move direct PCI scanning functions out of line
  [PATCH] i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
  [PATCH] Don't leak NT bit into next task
  [PATCH] i386/x86-64: Work around gcc bug with noreturn functions in unwinder
  [PATCH] Fix some broken white space in ia32_signal.c
  [PATCH] Initialize argument registers for 32bit signal handlers.
  [PATCH] Remove all traces of signal number conversion
  [PATCH] Don't synchronize time reading on single core AMD systems
  [PATCH] Remove outdated comment in x86-64 mmconfig code
  [PATCH] Use string instructions for Core2 copy/clear
  [PATCH] x86: - restore i8259A eoi status on resume
  [PATCH] i386: Split multi-line printk in oops output.
  ...

1 files changed, 4 insertions, 12 deletions

diff --git a/include/asm-i386/mutex.h b/include/asm-i386/mutex.h
index 05a538531229..7a17d9e58ad6 100644
--- a/include/asm-i386/mutex.h
+++ b/include/asm-i386/mutex.h
@@ -30,14 +30,10 @@ do {									\
                                                                         \
         __asm__ __volatile__(                                           \
                 LOCK_PREFIX "   decl (%%eax)    \n"                     \
-                        "   js 2f               \n"                     \
+                        "   jns 1f              \n"                     \
+                        "   call "#fail_fn"     \n"                     \
                         "1:                     \n"                     \
                                                                         \
-                LOCK_SECTION_START("")                                  \
-                        "2: call "#fail_fn"     \n"                     \
-                        "   jmp 1b              \n"                     \
-                LOCK_SECTION_END                                        \
-                                                                        \
                 :"=a" (dummy)                                           \
                 : "a" (count)                                           \
                 : "memory", "ecx", "edx");                              \
@@ -86,14 +82,10 @@ do {									\
                                                                         \
         __asm__ __volatile__(                                           \
                 LOCK_PREFIX "   incl (%%eax)    \n"                     \
-                        "   jle 2f              \n"                     \
+                        "   jg  1f              \n"                     \
+                        "   call "#fail_fn"     \n"                     \
                         "1:                     \n"                     \
                                                                         \
-                LOCK_SECTION_START("")                                  \
-                        "2: call "#fail_fn"     \n"                     \
-                        "   jmp 1b              \n"                     \
-                LOCK_SECTION_END                                        \
-                                                                        \
                 :"=a" (dummy)                                           \
                 : "a" (count)                                           \
                 : "memory", "ecx", "edx");                              \