Changeset 357b5f5 in mainline for kernel/test/fpu/mips2.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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/mips2.c (modified) (4 diffs)

kernel/test/fpu/mips2.c

@@ -48 +48 @@
 {
         int i;
-        int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
+        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
         int after_arg __attribute__((aligned(16)));
         
@@ -80 +80 @@
 {
         int i;
-        int arg __attribute__((aligned(16))) = (int) ((unative_t) data);
+        int arg __attribute__((aligned(16))) = (int) ((sysarg_t) data);
         int after_arg __attribute__((aligned(16)));
         
@@ -123 +123 @@
                 thread_t *t;
                 
-                if (!(t = thread_create(testit1, (void *) ((unative_t) 2 * i), TASK, 0, "testit1", false))) {
+                if (!(t = thread_create(testit1, (void *) ((sysarg_t) 2 * i), TASK, 0, "testit1", false))) {
                         TPRINTF("could not create thread %u\n", 2 * i);
                         break;
@@ -130 +130 @@
                 total++;
                 
-                if (!(t = thread_create(testit2, (void *) ((unative_t) 2 * i + 1), TASK, 0, "testit2", false))) {
+                if (!(t = thread_create(testit2, (void *) ((sysarg_t) 2 * i + 1), TASK, 0, "testit2", false))) {
                         TPRINTF("could not create thread %u\n", 2 * i + 1);
                         break;