Changeset 0b9ac3c in mainline for kernel/test/fpu/fpu1_ia64.c

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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.

File:

• kernel/test/fpu/fpu1_ia64.c (modified) (2 diffs)

kernel/test/fpu/fpu1_ia64.c

@@ -128 +128 @@
 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);