Changeset 0b9ac3c in mainline for kernel/arch/mips32/src/smp/dorder.c

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/mips32/src/smp/dorder.c (modified) (2 diffs)

kernel/arch/mips32/src/smp/dorder.c

@@ -33 +33 @@
  */
 
-#include <arch/smp/dorder.h>
+#include <smp/ipi.h>
+
+#ifdef CONFIG_SMP
 
 #define MSIM_DORDER_ADDRESS  0xB0000004
@@ -39 +41 @@
 void ipi_broadcast_arch(int ipi)
 {
-#ifdef CONFIG_SMP
         *((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF;
+}
+
 #endif
-}
 
 /** @}