Changeset aa85487 in mainline for kernel/test/fpu

Timestamp:

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

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/test/fpu

Files:

• fpu1_ia64.c (modified) (2 diffs)
• fpu1_skip.c (modified) (1 diff)
• fpu1_x86.c (modified) (2 diffs)
• mips2.c (modified) (2 diffs)
• mips2_skip.c (modified) (1 diff)
• sse1.c (modified) (2 diffs)
• sse1_skip.c (modified) (1 diff)

kernel/test/fpu/fpu1_ia64.c

@@ -126 +126 @@
 }
 
-char *test_fpu1(void)
+const char *test_fpu1(void)
 {
-        unsigned int i, total = 0;
+        unsigned int i;
+        atomic_count_t total = 0;
         
         waitq_initialize(&can_start);
@@ -159 +160 @@
         waitq_wakeup(&can_start, WAKEUP_ALL);
         
-        while (atomic_get(&threads_ok) != (long) total) {
+        while (atomic_get(&threads_ok) != total) {
                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);

kernel/test/fpu/fpu1_skip.c

@@ -29 +29 @@
 #include <test.h>
 
-char *test_fpu1(void)
+const char *test_fpu1(void)
 {
         return NULL;

kernel/test/fpu/fpu1_x86.c

@@ -123 +123 @@
 }
 
-char *test_fpu1(void)
+const char *test_fpu1(void)
 {
-        unsigned int i, total = 0;
+        unsigned int i;
+        atomic_count_t total = 0;
         
         waitq_initialize(&can_start);
@@ -156 +157 @@
         waitq_wakeup(&can_start, WAKEUP_ALL);
         
-        while (atomic_get(&threads_ok) != (long) total) {
+        while (atomic_get(&threads_ok) != total) {
                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);

kernel/test/fpu/mips2.c

@@ -109 +109 @@
 
 
-char *test_mips2(void)
+const char *test_mips2(void)
 {
-        unsigned int i, total = 0;
+        unsigned int i;
+        atomic_count_t total = 0;
         
         waitq_initialize(&can_start);
@@ -138 +139 @@
         
         TPRINTF("ok\n");
-                
+        
         thread_sleep(1);
         waitq_wakeup(&can_start, WAKEUP_ALL);
         
-        while (atomic_get(&threads_ok) != (long) total) {
+        while (atomic_get(&threads_ok) != total) {
                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);

kernel/test/fpu/mips2_skip.c

@@ -29 +29 @@
 #include <test.h>
 
-char *test_mips2(void)
+const char *test_mips2(void)
 {
         return NULL;

kernel/test/fpu/sse1.c

@@ -107 +107 @@
 }
 
-char *test_sse1(void)
+const char *test_sse1(void)
 {
-        unsigned int i, total = 0;
+        unsigned int i;
+        atomic_count_t total = 0;
         
         waitq_initialize(&can_start);
@@ -140 +141 @@
         waitq_wakeup(&can_start, WAKEUP_ALL);
         
-        while (atomic_get(&threads_ok) != (long) total) {
+        while (atomic_get(&threads_ok) != total) {
                 TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);

kernel/test/fpu/sse1_skip.c

@@ -29 +29 @@
 #include <test.h>
 
-char *test_sse1(void)
+const char *test_sse1(void)
 {
         return NULL;