Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
um
/
os-Linux
/
main.c
diff --git
a/kernel/arch/um/os-Linux/main.c
b/kernel/arch/um/os-Linux/main.c
index
df9191a
..
9d499de
100644
(file)
--- a/
kernel/arch/um/os-Linux/main.c
+++ b/
kernel/arch/um/os-Linux/main.c
@@
-1,4
+1,5
@@
/*
/*
+ * Copyright (C) 2015 Thomas Meyer (thomas@m3y3r.de)
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL
*/
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL
*/
@@
-163,13
+164,13
@@
int __init main(int argc, char **argv, char **envp)
/*
* This signal stuff used to be in the reboot case. However,
/*
* This signal stuff used to be in the reboot case. However,
- * sometimes a
SIGVTALRM
can come in when we're halting (reproducably
+ * sometimes a
timer signal
can come in when we're halting (reproducably
* when writing out gcov information, presumably because that takes
* some time) and cause a segfault.
*/
* when writing out gcov information, presumably because that takes
* some time) and cause a segfault.
*/
- /* stop timers and set
SIGVTALRM
to be ignored */
-
disable_timer
();
+ /* stop timers and set
timer signal
to be ignored */
+
os_timer_disable
();
/* disable SIGIO for the fds and set SIGIO to be ignored */
err = deactivate_all_fds();
/* disable SIGIO for the fds and set SIGIO to be ignored */
err = deactivate_all_fds();