Changeset efedee77 in mainline for uspace/app/trace/syscalls.c

Timestamp:

2010-11-02T22:38:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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:

• uspace/app/trace/syscalls.c (modified) (1 diff)

uspace/app/trace/syscalls.c

@@ -73 +73 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
-    [SYS_PREEMPT_CONTROL] = { "preempt_control",        1,      V_ERRNO },
+    [SYS_INTERRUPT_ENABLE] = { "interrupt_enable",      2,      V_ERRNO },
 
     [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },