Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index eee69b9f52c9..fb2a97a75fb1 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -78,7 +78,7 @@ static void install_fatal_handler(int sig)
         }
 }
 
-#define UML_LIB_PATH    ":/usr/lib/uml"
+#define UML_LIB_PATH    ":" OS_LIB_PATH "/uml"
 
 static void setup_env_path(void)
 {
@@ -142,7 +142,6 @@ int __init main(int argc, char **argv, char **envp)
          */
         install_fatal_handler(SIGINT);
         install_fatal_handler(SIGTERM);
-        install_fatal_handler(SIGHUP);
 
         scan_elf_aux(envp);