Changeset 95c675b in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/generic/src/main/kinit.c (modified) (5 diffs)

kernel/generic/src/main/kinit.c

@@ -42 +42 @@
  */
 
+#include <assert.h>
 #include <main/kinit.h>
 #include <config.h>
@@ -60 +61 @@
 #include <print.h>
 #include <log.h>
-#include <memstr.h>
+#include <mem.h>
 #include <console/console.h>
 #include <interrupt.h>
 #include <console/kconsole.h>
-#include <security/cap.h>
+#include <security/perm.h>
 #include <lib/rd.h>
 #include <ipc/ipc.h>
-#include <debug.h>
 #include <str.h>
 #include <sysinfo/stats.h>
@@ -240 +240 @@
                         name = "<unknown>";
                 
-                STATIC_ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
+                static_assert(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN, "");
                 str_cpy(namebuf, TASK_NAME_BUFLEN, INIT_PREFIX);
                 str_cpy(namebuf + INIT_PREFIX_LEN,
@@ -251 +251 @@
                     init.tasks[i].size,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                ASSERT(page);
+                assert(page);
                 
                 int rc = program_create_from_image((void *) page, namebuf,
@@ -259 +259 @@
                         if (programs[i].task != NULL) {
                                 /*
-                                 * Set capabilities to init userspace tasks.
+                                 * Set permissions to init userspace tasks.
                                  */
-                                cap_set(programs[i].task, CAP_CAP | CAP_MEM_MANAGER |
-                                    CAP_IO_MANAGER | CAP_IRQ_REG);
+                                perm_set(programs[i].task,
+                                    PERM_PERM | PERM_MEM_MANAGER |
+                                    PERM_IO_MANAGER | PERM_IRQ_REG);
                                 
                                 if (!ipc_phone_0) {