Changeset aa85487 in mainline for kernel/arch/abs32le

Timestamp:

2010-03-07T15:11:56Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

Location:

kernel/arch/abs32le

Files:

• Makefile.inc (modified) (1 diff)
• include/atomic.h (modified) (5 diffs)
• include/types.h (modified) (1 diff)
• src/abs32le.c (modified) (1 diff)

kernel/arch/abs32le/Makefile.inc

@@ -50 +50 @@
 endif
 
+ifeq ($(COMPILER),clang)
+        CLANG_ARCH = i386
+endif
+
 BITS = 32
 ENDIANESS = LE

kernel/arch/abs32le/include/atomic.h

@@ -54 +54 @@
 }
 
-static inline long atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         /* On real hardware both the storing of the previous
@@ -60 +60 @@
            atomic action. */
         
-        long prev = val->count;
+        atomic_count_t prev = val->count;
         
         val->count++;
@@ -66 +66 @@
 }
 
-static inline long atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         /* On real hardware both the storing of the previous
@@ -72 +72 @@
            atomic action. */
         
-        long prev = val->count;
+        atomic_count_t prev = val->count;
         
         val->count--;
@@ -81 +81 @@
 #define atomic_predec(val)  (atomic_postdec(val) - 1)
 
-static inline uint32_t test_and_set(atomic_t *val)
+static inline atomic_count_t test_and_set(atomic_t *val)
 {
-        uint32_t prev = val->count;
+        atomic_count_t prev = val->count;
         val->count = 1;
         return prev;

kernel/arch/abs32le/include/types.h

@@ -55 +55 @@
 typedef uint32_t unative_t;
 typedef int32_t native_t;
+typedef uint32_t atomic_count_t;
 
 typedef struct {

kernel/arch/abs32le/src/abs32le.c

@@ -114 +114 @@
 }
 
-void panic_printf(char *fmt, ...)
+void panic_printf(const char *fmt, ...)
 {
         va_list args;