Changeset e32e092 in mainline for kernel/test

Timestamp:

2008-06-06T07:34:21Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

eb1c0a3

Parents:

40257f5

Message:

Declare arguments for memstr.h operations as pointers instead of uintptr_t.

Location:

kernel/test/mm

Files:

• falloc2.c (modified) (2 diffs)
• slab1.c (modified) (3 diffs)
• slab2.c (modified) (3 diffs)

kernel/test/mm/falloc2.c

@@ -56 +56 @@
         index_t k;
         
-        uintptr_t * frames =  (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), FRAME_ATOMIC);
+        void **frames =  (void **) malloc(MAX_FRAMES * sizeof(void *), FRAME_ATOMIC);
         if (frames == NULL) {
                 if (!sh_quiet)
@@ -74 +74 @@
                         allocated = 0;
                         for (i = 0; i < (MAX_FRAMES >> order); i++) {
-                                frames[allocated] = (uintptr_t)frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+                                frames[allocated] = frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
                                 if (frames[allocated]) {
                                         memsetb(frames[allocated], FRAME_SIZE << order, val);

kernel/test/mm/slab1.c

@@ -54 +54 @@
         for (i = 0; i < count; i++) {
                 data[i] = slab_alloc(cache, 0);
-                memsetb((uintptr_t) data[i], size, 0);
+                memsetb(data[i], size, 0);
         }
         
@@ -72 +72 @@
         for (i = 0; i < count; i++) {
                 data[i] = slab_alloc(cache, 0);
-                memsetb((uintptr_t) data[i], size, 0);
+                memsetb(data[i], size, 0);
         }
         
@@ -90 +90 @@
         for (i = count / 2; i < count; i++) {
                 data[i] = slab_alloc(cache, 0);
-                memsetb((uintptr_t) data[i], size, 0);
+                memsetb(data[i], size, 0);
         }
         

kernel/test/mm/slab2.c

@@ -69 +69 @@
                         break;
                 }
-                memsetb((uintptr_t) data1, ITEM_SIZE, 0);
-                memsetb((uintptr_t) data2, ITEM_SIZE, 0);
+                memsetb(data1, ITEM_SIZE, 0);
+                memsetb(data2, ITEM_SIZE, 0);
                 *((void **) data1) = olddata1;
                 *((void **) data2) = olddata2;
@@ -101 +101 @@
                         return;
                 }
-                memsetb((uintptr_t) data1, ITEM_SIZE, 0);
+                memsetb(data1, ITEM_SIZE, 0);
                 *((void **) data1) = olddata1;
                 olddata1 = data1;
@@ -109 +109 @@
                 if (!data1)
                         break;
-                memsetb((uintptr_t) data1, ITEM_SIZE, 0);
+                memsetb(data1, ITEM_SIZE, 0);
                 *((void **) data1) = olddata1;
                 olddata1 = data1;