diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-16 12:03:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-16 12:03:25 -0700 |
| commit | 2896b80e002df4ab268577c1eb806d7f7ebaf95e (patch) | |
| tree | bb08d53768b9c45be82a6833e9b093e751690087 /arch/x86/um/os-Linux/tls.c | |
| parent | 48bddb143befb1dd93c0e5a66af62cfd60c86b04 (diff) | |
| parent | 6d20e6b235aad0be463b23588093b079362bb2e4 (diff) | |
Merge branch 'for-linus-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- minor improvements
- fixes for Debian's new gcc defaults (pie enabled by default)
- fixes for XSTATE/XSAVE to make UML work again on modern systems
* 'for-linus-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: return negative in tuntap_open_tramp()
um: remove a stray tab
um: Use relative modversions with LD_SCRIPT_DYN
um: link vmlinux with -no-pie
um: Fix CONFIG_GCOV for modules.
Fix minor typos and grammar in UML start_up help
um: defconfig: Cleanup from old Kconfig options
um: Fix FP register size for XSTATE/XSAVE
Diffstat (limited to 'arch/x86/um/os-Linux/tls.c')
| -rw-r--r-- | arch/x86/um/os-Linux/tls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/os-Linux/tls.c b/arch/x86/um/os-Linux/tls.c index 9d94b3b76c74..ed8ea90967dc 100644 --- a/arch/x86/um/os-Linux/tls.c +++ b/arch/x86/um/os-Linux/tls.c @@ -37,7 +37,7 @@ void check_host_supports_tls(int *supports_tls, int *tls_min) continue; else if (errno == ENOSYS) *supports_tls = 0; - return; + return; } } |