Changeset 36e7ee98 in mainline for arch

Timestamp:

2005-12-15T21:32:12Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

cddc1639

Parents:

49b6d32

Message:

Fixed cpu halting in debug panic mode.

Location:

arch

Files:

• ia32/include/atomic.h (modified) (2 diffs)
• mips32/src/debugger.c (modified) (1 diff)

arch/ia32/include/atomic.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-typedef struct { volatile __u32 count; } atomic_t;
+typedef struct { volatile __u64 count; } atomic_t;
 
-static inline void atomic_set(atomic_t *val, __u32 i)
+static inline void atomic_set(atomic_t *val, __u64 i)
 {
         val->count = i;
 }
 
-static inline __u32 atomic_get(atomic_t *val)
+static inline __u64 atomic_get(atomic_t *val)
 {
         return val->count;
@@ -80 +80 @@
                 "movl $-1, %0\n"
                 "lock xaddl %0, %1\n"
-                : "=r" (r), "=m" (*val)
+                : "=r" (r), "=m" (val->count)
         );
         

arch/mips32/src/debugger.c

@@ -257 +257 @@
         printf("***Type 'exit' to exit kconsole.\n");
         /* Umm..we should rather set some 'debugstate' here */
-        haltstate = 1;
+        atomic_set(&haltstate,1);
         kconsole("debug");
-        haltstate = 0;
-}
+        atomic_set(&haltstate,0);
+}