Changeset 89c57b6 in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/generic/src/main/kinit.c (modified) (5 diffs)

kernel/generic/src/main/kinit.c

@@ -129 +129 @@
                  * For each CPU, create its load balancing thread.
                  */
-                size_t i;
+                unsigned int i;
                 
                 for (i = 0; i < config.cpu_count; i++) {
@@ -139 +139 @@
                                 thread_ready(thread);
                         } else
-                                printf("Unable to create kcpulb thread for cpu" PRIs "\n", i);
+                                printf("Unable to create kcpulb thread for cpu%u\n", i);
                 }
         }
@@ -179 +179 @@
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].addr % FRAME_SIZE) {
-                        printf("init[%" PRIs "].addr is not frame aligned\n", i);
+                        printf("init[%zu].addr is not frame aligned\n", i);
                         programs[i].task = NULL;
                         continue;
@@ -208 +208 @@
                          */
                         cap_set(programs[i].task, CAP_CAP | CAP_MEM_MANAGER |
-                            CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
+                            CAP_IO_MANAGER | CAP_IRQ_REG);
                         
                         if (!ipc_phone_0)
@@ -219 +219 @@
                         
                         if (rd != RE_OK)
-                                printf("Init binary %" PRIs " not used (error %d)\n", i, rd);
+                                printf("Init binary %zu not used (error %d)\n", i, rd);
                 }
         }