Changeset 969d88e in mainline for kernel/generic/src/main/main.c

Timestamp:

2011-04-09T11:04:11Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

534d08e8

Parents:

88ccd8b8 (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/main.c (modified) (2 diffs)

kernel/generic/src/main/main.c

@@ -58 +58 @@
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <proc/tasklet.h>
 #include <main/kinit.h>
 #include <main/version.h>
@@ -217 +216 @@
         tlb_init();
         ddi_init();
-        tasklet_init();
         arch_post_mm_init();
         arch_pre_smp_init();