Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 49db516789e0..f2a8701e414d 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -172,7 +172,7 @@ int smp_call_function (void (*func) (void *info), void *info, int retry,
 
         spin_lock(&smp_call_lock);
         call_data = &data;
-        mb();
+        smp_mb();
 
         /* Send a message to all other CPUs and wait for them to respond */
         for_each_online_cpu(i)
@@ -204,7 +204,7 @@ void smp_call_function_interrupt(void)
          * Notify initiating CPU that I've grabbed the data and am
          * about to execute the function.
          */
-        mb();
+        smp_mb();
         atomic_inc(&call_data->started);
 
         /*
@@ -215,7 +215,7 @@ void smp_call_function_interrupt(void)
         irq_exit();
 
         if (wait) {
-                mb();
+                smp_mb();
                 atomic_inc(&call_data->finished);
         }
 }