Changeset af56e9b in mainline

Timestamp:

2010-02-22T19:40:17Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

f8f7dba

Parents:

95c4776 (diff), 721d4e85 (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:

Synchronize with head.

Files:

• kernel/arch/amd64/include/atomic.h (modified) (1 diff)
• kernel/arch/ia32/include/atomic.h (modified) (1 diff)
• kernel/generic/src/mm/as.c (modified) (1 diff)
• kernel/generic/src/proc/scheduler.c (modified) (1 diff)
• uspace/app/tester/fault/fault3.def (modified) (1 diff)

kernel/arch/amd64/include/atomic.h

@@ -101 +101 @@
 static inline atomic_count_t test_and_set(atomic_t *val)
 {
-        atomic_count_t v;
+        atomic_count_t v = 1;
         
         asm volatile (
-                "movq $1, %[v]\n"
                 "xchgq %[v], %[count]\n"
-                : [v] "=r" (v),
+                : [v] "+r" (v),
                   [count] "+m" (val->count)
         );

kernel/arch/ia32/include/atomic.h

@@ -101 +101 @@
 static inline atomic_count_t test_and_set(atomic_t *val)
 {
-        atomic_count_t v;
+        atomic_count_t v = 1;
         
         asm volatile (
-                "movl $1, %[v]\n"
                 "xchgl %[v], %[count]\n"
-                : [v] "=r" (v),
+                : [v] "+r" (v),
                   [count] "+m" (val->count)
         );

kernel/generic/src/mm/as.c

@@ -952 +952 @@
         if (!THREAD)
                 return AS_PF_FAULT;
-                
-        ASSERT(AS);
-
+        
+        if (!AS)
+                return AS_PF_FAULT;
+        
         mutex_lock(&AS->lock);
-        area = find_area_and_lock(AS, page);    
+        area = find_area_and_lock(AS, page);
         if (!area) {
                 /*

kernel/generic/src/proc/scheduler.c

@@ -201 +201 @@
                  * even though there is a runnable thread.
                  */
-
                  cpu_sleep();
                  goto loop;

uspace/app/tester/fault/fault3.def

@@ -3 +3 @@
         "Abort",
         &test_fault3,
-        true
+        false
 },