diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 06:50:51 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 06:50:51 +0900 |
commit | 8d1e5133bf260aabdf2cc6facd4a8e696414d16a (patch) | |
tree | 0e152a07b3892546879f55028b26b1701f7de8e6 /arch/um/os-Linux/main.c | |
parent | 6a4d4b3253c1341843ba473429cf76a0e54f053d (diff) | |
parent | 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c (diff) | |
download | lwn-8d1e5133bf260aabdf2cc6facd4a8e696414d16a.tar.gz lwn-8d1e5133bf260aabdf2cc6facd4a8e696414d16a.zip |
Merge branch 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull uml updates from Richard Weinberger:
"Minor updates for UML:
- fixes for our new vector network driver by Anton
- initcall cleanup by Alexander
- We have a new mailinglist, sourceforge.net sucks"
* 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix raw interface options
um: Fix initialization of vector queues
um: remove uml initcalls
um: Update mailing list address
Diffstat (limited to 'arch/um/os-Linux/main.c')
-rw-r--r-- | arch/um/os-Linux/main.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index 5f970ece5ac3..f1fee2b91239 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c @@ -40,17 +40,6 @@ static void set_stklim(void) } } -static __init void do_uml_initcalls(void) -{ - initcall_t *call; - - call = &__uml_initcall_start; - while (call < &__uml_initcall_end) { - (*call)(); - call++; - } -} - static void last_ditch_exit(int sig) { uml_cleanup(); @@ -151,7 +140,6 @@ int __init main(int argc, char **argv, char **envp) scan_elf_aux(envp); #endif - do_uml_initcalls(); change_sig(SIGPIPE, 0); ret = linux_main(argc, argv); |