Changeset 84b14e2 in mainline for kernel/arch

Timestamp:

2009-12-02T23:33:48Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4924675

Parents:

089d746 (diff), 8d04f709 (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 simplified futexes (ticket #154) and fix for arm32 kernel atomic
operations (ticket #153).

Location:

kernel/arch

Files:

• amd64/src/amd64.c (modified) (1 diff)
• arm32/include/atomic.h (modified) (2 diffs)
• arm32/src/mm/as.c (modified) (1 diff)
• ia32/src/ia32.c (modified) (1 diff)
• ia64/src/cpu/cpu.c (modified) (1 diff)
• ppc32/src/mm/as.c (modified) (1 diff)
• ppc32/src/mm/tlb.c (modified) (1 diff)
• ppc32/src/ppc32.c (modified) (1 diff)
• sparc64/src/mm/tlb.c (modified) (1 diff)

kernel/arch/amd64/src/amd64.c

@@ -67 +67 @@
 #include <ddi/irq.h>
 #include <sysinfo/sysinfo.h>
+#include <memstr.h>
 
 /** Disable I/O on non-privileged levels

kernel/arch/arm32/include/atomic.h

@@ -37 +37 @@
 #define KERN_arm32_ATOMIC_H_
 
+#include <arch/asm.h>
+
 /** Atomic addition.
  *
@@ -47 +49 @@
 static inline long atomic_add(atomic_t *val, int i)
 {
-        int ret;
-        volatile long *mem = &(val->count);
-        
-        asm volatile (
-                "1:\n"
-                        "ldr r2, [%[mem]]\n"
-                        "add r3, r2, %[i]\n"
-                        "str r3, %[ret]\n"
-                        "swp r3, r3, [%[mem]]\n"
-                        "cmp r3, r2\n"
-                        "bne 1b\n"
-                : [ret] "=m" (ret)
-                : [mem] "r" (mem), [i] "r" (i)
-                : "r3", "r2"
-        );
+        long ret;
+
+        /*
+         * This implementation is for UP pre-ARMv6 systems where we do not have
+         * the LDREX and STREX instructions.
+         */
+        ipl_t ipl = interrupts_disable();
+        val->count += i;
+        ret = val->count;
+        interrupts_restore(ipl);
         
         return ret;

kernel/arch/arm32/src/mm/as.c

@@ -36 +36 @@
 #include <arch/mm/as.h>
 #include <genarch/mm/as_pt.h>
+#include <genarch/mm/page_pt.h>
 #include <genarch/mm/asid_fifo.h>
 #include <mm/as.h>

kernel/arch/ia32/src/ia32.c

@@ -68 +68 @@
 #include <sysinfo/sysinfo.h>
 #include <arch/boot/boot.h>
+#include <memstr.h>
 
 #ifdef CONFIG_SMP

kernel/arch/ia64/src/cpu/cpu.c

@@ -37 +37 @@
 #include <arch/register.h>
 #include <print.h>
+#include <memstr.h>
 
 void cpu_arch_init(void)

kernel/arch/ppc32/src/mm/as.c

@@ -35 +35 @@
 #include <arch/mm/as.h>
 #include <genarch/mm/as_pt.h>
+#include <genarch/mm/page_pt.h>
 #include <genarch/mm/asid_fifo.h>
 #include <arch.h>

kernel/arch/ppc32/src/mm/tlb.c

@@ -38 +38 @@
 #include <interrupt.h>
 #include <mm/as.h>
+#include <mm/page.h>
 #include <arch.h>
 #include <print.h>

kernel/arch/ppc32/src/ppc32.c

@@ -44 +44 @@
 #include <genarch/ofw/pci.h>
 #include <userspace.h>
+#include <mm/page.h>
 #include <proc/uarg.h>
 #include <console/console.h>

kernel/arch/sparc64/src/mm/tlb.c

@@ -37 +37 @@
 #include <mm/as.h>
 #include <mm/asid.h>
+#include <genarch/mm/page_ht.h>
 #include <arch/mm/frame.h>
 #include <arch/mm/page.h>