Changeset 6843a9c in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/generic/src/syscall/syscall.c (modified) (2 diffs)

kernel/generic/src/syscall/syscall.c

@@ -146 +146 @@
         (syshandler_t) sys_as_area_change_flags,
         (syshandler_t) sys_as_area_destroy,
-        (syshandler_t) sys_as_get_unmapped_area,
         
         /* Page mapping related syscalls. */
@@ -176 +175 @@
         (syshandler_t) sys_device_assign_devno,
         (syshandler_t) sys_physmem_map,
+        (syshandler_t) sys_physmem_unmap,
+        (syshandler_t) sys_dmamem_map,
+        (syshandler_t) sys_dmamem_unmap,
         (syshandler_t) sys_iospace_enable,
-        (syshandler_t) sys_register_irq,
-        (syshandler_t) sys_unregister_irq,
+        (syshandler_t) sys_iospace_disable,
+        (syshandler_t) sys_irq_register,
+        (syshandler_t) sys_irq_unregister,
         
         /* Sysinfo syscalls. */
+        (syshandler_t) sys_sysinfo_get_keys_size,
+        (syshandler_t) sys_sysinfo_get_keys,
         (syshandler_t) sys_sysinfo_get_val_type,
         (syshandler_t) sys_sysinfo_get_value,