Changeset 26e7d6d in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2011-09-19T16:31:00Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/syscall/syscall.c (modified) (1 diff)

kernel/generic/src/syscall/syscall.c

@@ -181 +181 @@
         
         /* Sysinfo syscalls. */
-        (syshandler_t) sys_sysinfo_get_tag,
+        (syshandler_t) sys_sysinfo_get_val_type,
         (syshandler_t) sys_sysinfo_get_value,
         (syshandler_t) sys_sysinfo_get_data_size,
         (syshandler_t) sys_sysinfo_get_data,
         
-        /* Debug calls */
-        (syshandler_t) sys_debug_enable_console,
-        (syshandler_t) sys_debug_disable_console
+        /* Kernel console syscalls. */
+        (syshandler_t) sys_debug_activate_console
 };