diff options
author | 2016-09-20 23:20:32 +0200 | |
---|---|---|
committer | 2016-09-20 23:20:32 +0200 | |
commit | 464b5847e61085f81bb99ce48eb427a0dc7617dc (patch) | |
tree | 805c97855a9a13c06910687bbbbe3eb7bc371902 /tools | |
parent | Merge branch 'irq/for-block' into irq/core (diff) | |
parent | irqchip/mips-gic: Fix local interrupts (diff) | |
download | linux-dev-464b5847e61085f81bb99ce48eb427a0dc7617dc.tar.xz linux-dev-464b5847e61085f81bb99ce48eb427a0dc7617dc.zip |
Merge branch 'irq/urgent' into irq/core
Merge urgent fixes so pending patches for 4.9 can be applied.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lguest/lguest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c index d9836c5eb694..11c8d9bc762e 100644 --- a/tools/lguest/lguest.c +++ b/tools/lguest/lguest.c @@ -3266,6 +3266,9 @@ int main(int argc, char *argv[]) } } + /* If we exit via err(), this kills all the threads, restores tty. */ + atexit(cleanup_devices); + /* We always have a console device, and it's always device 1. */ setup_console(); @@ -3369,9 +3372,6 @@ int main(int argc, char *argv[]) /* Ensure that we terminate if a device-servicing child dies. */ signal(SIGCHLD, kill_launcher); - /* If we exit via err(), this kills all the threads, restores tty. */ - atexit(cleanup_devices); - /* If requested, chroot to a directory */ if (chroot_path) { if (chroot(chroot_path) != 0) |