public
/
FUZIX.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa615e6
)
syscall_proc: note type punning we need to fix
author
Alan Cox
<alan@linux.intel.com>
Tue, 13 Sep 2016 22:41:43 +0000
(23:41 +0100)
committer
Alan Cox
<alan@linux.intel.com>
Tue, 13 Sep 2016 22:41:43 +0000
(23:41 +0100)
Kernel/syscall_proc.c
patch
|
blob
|
history
diff --git
a/Kernel/syscall_proc.c
b/Kernel/syscall_proc.c
index
8102800
..
135d721
100644
(file)
--- a/
Kernel/syscall_proc.c
+++ b/
Kernel/syscall_proc.c
@@
-314,6
+314,8
@@
arg_t _waitpid(void)
/* Add in child's time info. It was stored on top */
/* of p_priority in the childs process table entry. */
+ /* FIXME: make these a union so we don't do type
+ punning and break strict aliasing */
udata.u_cutime += ((clock_t *)&p->p_priority)[0];
udata.u_cstime += ((clock_t *)&p->p_priority)[1];
return retval;