Changeset 6843a9c in mainline for abi/include/syscall.h

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:

• abi/include/syscall.h (modified) (2 diffs)

abi/include/syscall.h

@@ -60 +60 @@
         SYS_AS_AREA_CHANGE_FLAGS,
         SYS_AS_AREA_DESTROY,
-        SYS_AS_GET_UNMAPPED_AREA,
         
         SYS_PAGE_FIND_MAPPING,
@@ -85 +84 @@
         SYS_DEVICE_ASSIGN_DEVNO,
         SYS_PHYSMEM_MAP,
+        SYS_PHYSMEM_UNMAP,
+        SYS_DMAMEM_MAP,
+        SYS_DMAMEM_UNMAP,
         SYS_IOSPACE_ENABLE,
-        SYS_REGISTER_IRQ,
-        SYS_UNREGISTER_IRQ,
+        SYS_IOSPACE_DISABLE,
+        SYS_IRQ_REGISTER,
+        SYS_IRQ_UNREGISTER,
         
+        SYS_SYSINFO_GET_KEYS_SIZE,
+        SYS_SYSINFO_GET_KEYS,
         SYS_SYSINFO_GET_VAL_TYPE,
         SYS_SYSINFO_GET_VALUE,