Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (613 commits)
  x86: standalone trampoline code
  x86: move suspend wakeup code to C
  x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
  x86: setup_trampoline() - fix section mismatch warning
  x86: section mismatch fixes, #1
  x86: fix paranoia about using BIOS quickboot mechanism.
  x86: print out buggy mptable
  x86: use cpu_online()
  x86: use cpumask_of_cpu()
  x86: remove unnecessary tmp local variable
  x86: remove unnecessary memset()
  x86: use ioapic_read_entry() and ioapic_write_entry()
  x86: avoid redundant loop in io_apic_level_ack_pending()
  x86: remove superfluous initialisation in boot code.
  x86: merge mpparse_{32,64}.c
  x86: unify mp_register_gsi
  x86: unify mp_config_acpi_legacy_irqs
  x86: unify mp_register_ioapic
  x86: unify uniq_io_apic_id
  x86: unify smp_scan_config
  ...

1 files changed, 21 insertions, 19 deletions

diff --git a/include/asm-x86/bitops_32.h b/include/asm-x86/bitops_32.h
index e4d75fcf9c03..2513a81f82aa 100644
--- a/include/asm-x86/bitops_32.h
+++ b/include/asm-x86/bitops_32.h
@@ -20,20 +20,22 @@ static inline int find_first_zero_bit(const unsigned long *addr, unsigned size)
 
         if (!size)
                 return 0;
-        /* This looks at memory. Mark it volatile to tell gcc not to move it around */
-        __asm__ __volatile__(
-                "movl $-1,%%eax\n\t"
-                "xorl %%edx,%%edx\n\t"
-                "repe; scasl\n\t"
-                "je 1f\n\t"
-                "xorl -4(%%edi),%%eax\n\t"
-                "subl $4,%%edi\n\t"
-                "bsfl %%eax,%%edx\n"
-                "1:\tsubl %%ebx,%%edi\n\t"
-                "shll $3,%%edi\n\t"
-                "addl %%edi,%%edx"
-                :"=d" (res), "=&c" (d0), "=&D" (d1), "=&a" (d2)
-                :"1" ((size + 31) >> 5), "2" (addr), "b" (addr) : "memory");
+        /* This looks at memory.
+         * Mark it volatile to tell gcc not to move it around
+         */
+        asm volatile("movl $-1,%%eax\n\t"
+                     "xorl %%edx,%%edx\n\t"
+                     "repe; scasl\n\t"
+                     "je 1f\n\t"
+                     "xorl -4(%%edi),%%eax\n\t"
+                     "subl $4,%%edi\n\t"
+                     "bsfl %%eax,%%edx\n"
+                     "1:\tsubl %%ebx,%%edi\n\t"
+                     "shll $3,%%edi\n\t"
+                     "addl %%edi,%%edx"
+                     : "=d" (res), "=&c" (d0), "=&D" (d1), "=&a" (d2)
+                     : "1" ((size + 31) >> 5), "2" (addr),
+                       "b" (addr) : "memory");
         return res;
 }
 
@@ -75,7 +77,7 @@ static inline unsigned find_first_bit(const unsigned long *addr, unsigned size)
                 unsigned long val = *addr++;
                 if (val)
                         return __ffs(val) + x;
-                x += (sizeof(*addr)<<3);
+                x += sizeof(*addr) << 3;
         }
         return x;
 }
@@ -152,10 +154,10 @@ static inline int fls(int x)
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 
-#define ext2_set_bit_atomic(lock, nr, addr) \
-                test_and_set_bit((nr), (unsigned long *)addr)
-#define ext2_clear_bit_atomic(lock, nr, addr) \
-                test_and_clear_bit((nr), (unsigned long *)addr)
+#define ext2_set_bit_atomic(lock, nr, addr)                     \
+        test_and_set_bit((nr), (unsigned long *)(addr))
+#define ext2_clear_bit_atomic(lock, nr, addr)                   \
+        test_and_clear_bit((nr), (unsigned long *)(addr))
 
 #include <asm-generic/bitops/minix.h>