diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
| commit | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (patch) | |
| tree | 7e23a0e3dde639236e019aa88309d919941958e5 /arch/um/os-Linux/main.c | |
| parent | 86d56134f1b67d0c18025ba5cade95c048ed528d (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'arch/um/os-Linux/main.c')
| -rw-r--r-- | arch/um/os-Linux/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index e1704ff600ff..df9191acd926 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c | |||
| @@ -151,6 +151,7 @@ int __init main(int argc, char **argv, char **envp) | |||
| 151 | #endif | 151 | #endif |
| 152 | 152 | ||
| 153 | do_uml_initcalls(); | 153 | do_uml_initcalls(); |
| 154 | change_sig(SIGPIPE, 0); | ||
| 154 | ret = linux_main(argc, argv); | 155 | ret = linux_main(argc, argv); |
| 155 | 156 | ||
| 156 | /* | 157 | /* |