summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-09-13 12:52:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-13 12:52:45 -0700
commit5924bbecd0267d87c24110cbe2041b5075173a25 (patch)
tree7a58d293d6e75e75efc769eb38d21b0ef48d2446 /tools
parentfda67514e444533b44106362baddca1cdbbba836 (diff)
parentc291b015158577be533dd5a959dfc09bab119eed (diff)
downloadlinux-stable-5924bbecd0267d87c24110cbe2041b5075173a25.tar.gz
linux-stable-5924bbecd0267d87c24110cbe2041b5075173a25.tar.bz2
linux-stable-5924bbecd0267d87c24110cbe2041b5075173a25.zip
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Three fixes: - AMD microcode loading fix with randomization - an lguest tooling fix - and an APIC enumeration boundary condition fix" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/apic: Fix num_processors value in case of failure tools/lguest: Don't bork the terminal in case of wrong args x86/microcode/AMD: Fix load of builtin microcode with randomized memory
Diffstat (limited to 'tools')
-rw-r--r--tools/lguest/lguest.c6
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)