Changeset bc1089a in mainline

Timestamp:

2005-09-02T17:57:11Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

da7d770

Parents:

649d96b

Message:

Make atomic_dec() and atomic_inc() take (volatile int *) argument, not (volatile count_t *).

Files:

• arch/amd64/include/atomic.h (modified) (2 diffs)
• arch/ia32/include/atomic.h (modified) (2 diffs)
• src/proc/scheduler.c (modified) (1 diff)
• src/proc/thread.c (modified) (1 diff)

arch/amd64/include/atomic.h

@@ -31 +31 @@
 
 
-/* Count_t is 32-bits on AMD-64 */
-static inline void atomic_inc(volatile count_t *val) {
+static inline void atomic_inc(volatile int *val) {
 #ifdef __SMP__
         __asm__ volatile ("lock incl (%0)\n" : : "r" (val));
@@ -40 +39 @@
 }
 
-static inline void atomic_dec(volatile count_t *val) {
+static inline void atomic_dec(volatile int *val) {
 #ifdef __SMP__
         __asm__ volatile ("lock decl (%0)\n" : : "r" (val));

arch/ia32/include/atomic.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-static inline void atomic_inc(volatile count_t *val) {
+static inline void atomic_inc(volatile int *val) {
 #ifdef __SMP__
         __asm__ volatile ("lock incl (%0)\n" : : "r" (val));
@@ -40 +40 @@
 }
 
-static inline void atomic_dec(volatile count_t *val) {
+static inline void atomic_dec(volatile int *val) {
 #ifdef __SMP__
         __asm__ volatile ("lock decl (%0)\n" : : "r" (val));

src/proc/scheduler.c

@@ -150 +150 @@
                 spinlock_unlock(&CPU->lock);
 
-                atomic_dec(&nrdy);
+                atomic_dec((int *) &nrdy);
                 r->n--;
 

src/proc/thread.c

@@ -137 +137 @@
         spinlock_unlock(&r->lock);
 
-        atomic_inc(&nrdy);
+        atomic_inc((int *) &nrdy);
         avg = nrdy / config.cpu_active;