Changeset d2ab461 in mainline

Timestamp:

2006-03-22T22:25:28Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2802767

Parents:

d71007e

Message:

Small atomic #include and typedef changes.

Files:

• arch/ia64/include/atomic.h (modified) (1 diff)
• arch/mips32/include/atomic.h (modified) (1 diff)
• arch/ppc32/include/atomic.h (modified) (2 diffs)
• generic/include/atomic.h (modified) (1 diff)
• generic/include/typedefs.h (modified) (2 diffs)

arch/ia64/include/atomic.h

@@ -30 +30 @@
 #define __ia64_ATOMIC_H__
 
-#include <arch/types.h>
-#include <typedefs.h>
-
-
 /** Atomic addition.
  *

arch/mips32/include/atomic.h

@@ -29 +29 @@
 #ifndef __mips32_ATOMIC_H__
 #define __mips32_ATOMIC_H__
-
-#include <arch/types.h>
-#include <typedefs.h>
 
 #define atomic_inc(x)   ((void) atomic_add(x, 1))

arch/ppc32/include/atomic.h

@@ -30 +30 @@
 #define __ppc32_ATOMIC_H__
 
-#include <arch/types.h>
-#include <typedefs.h>
-
 static inline void atomic_inc(atomic_t *val)
 {
-        __u32 tmp;
+        long tmp;
 
         asm __volatile__ (
@@ -50 +47 @@
 static inline void atomic_dec(atomic_t *val)
 {
-        __u32 tmp;
+        long tmp;
 
         asm __volatile__(

generic/include/atomic.h

@@ -30 +30 @@
 #define __ATOMIC_H__
 
-struct atomic {
+typedef struct atomic {
         volatile long count;
-};
+} atomic_t;
 
 #include <arch/atomic.h>
-#include <typedefs.h>
 
 static inline void atomic_set(atomic_t *val, long i)

generic/include/typedefs.h

@@ -62 +62 @@
 typedef struct condvar condvar_t;
 typedef struct waitq waitq_t;
+typedef struct futex futex_t;
 
 typedef struct chunk chunk_t;
@@ -93 +94 @@
 typedef struct btree btree_t;
 
-typedef struct atomic atomic_t;
-
 #endif