Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision f773206d4e59480542f9fecae5c95c53bb888e6f)
+++ kernel/generic/include/proc/task.h	(revision 944f2cabb1486d36083818853bbff23141ff6e5e)
@@ -123,4 +123,6 @@
 	/** Accumulated accounting. */
 	uint64_t cycles;
+	uint64_t ucycles;
+	uint64_t kcycles;
 } task_t;
 
@@ -134,5 +136,5 @@
 extern task_t *task_find_by_id(task_id_t id);
 extern int task_kill(task_id_t id);
-extern uint64_t task_get_accounting(task_t *t);
+extern uint64_t task_get_accounting(task_t *t, uint64_t *ucycles, uint64_t *kcycles);
 extern void task_print_list(void);
 
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision f773206d4e59480542f9fecae5c95c53bb888e6f)
+++ kernel/generic/include/proc/thread.h	(revision 944f2cabb1486d36083818853bbff23141ff6e5e)
@@ -175,4 +175,6 @@
 	/** Thread accounting. */
 	uint64_t cycles;
+	uint64_t ucycles;
+	uint64_t kcycles;
 	/** Last sampled cycle. */
 	uint64_t last_cycle;
@@ -237,5 +239,5 @@
 extern void thread_print_list(void);
 extern void thread_destroy(thread_t *);
-extern void thread_update_accounting(void);
+extern void thread_update_accounting(bool);
 extern bool thread_exists(thread_t *);