Changeset bbe7848 in mainline for kernel/test/fpu/fpu1_x86.c

Timestamp:

2010-11-26T14:19:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (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

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

• kernel/test/fpu/fpu1_x86.c (modified) (3 diffs)

kernel/test/fpu/fpu1_x86.c

@@ -82 +82 @@
                 
                 if ((int) (100000000 * e) != E_10e8) {
-                        TPRINTF("tid%" PRIu64 ": e*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
+                        TPRINTF("tid%" PRIu64 ": e*10e8=%" PRIun " should be %" PRIun "\n",
+                            THREAD->tid, (unative_t) (100000000 * e), (unative_t) E_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -115 +116 @@
                 
                 if ((int) (100000000 * pi) != PI_10e8) {
-                        TPRINTF("tid%" PRIu64 ": pi*10e8=%zd should be %" PRIun "\n", THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
+                        TPRINTF("tid%" PRIu64 ": pi*10e8=%" PRIun " should be %" PRIun "\n",
+                            THREAD->tid, (unative_t) (100000000 * pi), (unative_t) PI_10e8);
                         atomic_inc(&threads_fault);
                         break;
@@ -158 +160 @@
         
         while (atomic_get(&threads_ok) != total) {
-                TPRINTF("Threads left: %d\n", total - atomic_get(&threads_ok));
+                TPRINTF("Threads left: %" PRIua "\n", total - atomic_get(&threads_ok));
                 thread_sleep(1);
         }