Changeset ab936440 in mainline for kernel/generic/src/main/main.c

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

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

kernel/generic/src/main/main.c

@@ -83 +83 @@
 #include <ipc/ipc.h>
 #include <macros.h>
-#include <adt/btree.h>
 #include <smp/smp.h>
 #include <ddi/ddi.h>
@@ -161 +160 @@
  *
  */
-NO_TRACE void main_bsp(void)
+_NO_TRACE void main_bsp(void)
 {
         config.cpu_count = 1;
@@ -249 +248 @@
         ra_init();
         sysinfo_init();
-        btree_init();
         as_init();
         page_init();