Changeset c47e1a8 in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

kernel/generic/src/syscall/syscall.c

@@ -60 +60 @@
 {
         unative_t rc;
+        ipl_t ipl;
+
+        /* Do userpace accounting */
+        ipl = interrupts_disable();
+        spinlock_lock(&THREAD->lock);
+        thread_update_accounting(true);
+        spinlock_unlock(&THREAD->lock);
+        interrupts_restore(ipl);
 
 #ifdef CONFIG_UDEBUG
@@ -95 +103 @@
         }
 #endif
+
+        /* Do kernel accounting */
+        (void) interrupts_disable();
+        spinlock_lock(&THREAD->lock);
+        thread_update_accounting(false);
+        spinlock_unlock(&THREAD->lock);
+        interrupts_restore(ipl);
         
         return rc;
@@ -138 +153 @@
         (syshandler_t) sys_ipc_register_irq,
         (syshandler_t) sys_ipc_unregister_irq,
-
+        
         /* Event notification syscalls. */
         (syshandler_t) sys_event_subscribe,
@@ -154 +169 @@
         
         /* Sysinfo syscalls */
-        (syshandler_t) sys_sysinfo_valid,
-        (syshandler_t) sys_sysinfo_value,
+        (syshandler_t) sys_sysinfo_get_tag,
+        (syshandler_t) sys_sysinfo_get_value,
+        (syshandler_t) sys_sysinfo_get_data_size,
+        (syshandler_t) sys_sysinfo_get_data,
         
         /* Debug calls */