summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 13:27:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 13:27:18 -0800
commit4f31d774dd5239e563f22ffe1403292414e6f779 (patch)
tree5edfdcc2adf491f340510694b8718d09378fdd15 /scripts
parent1baa5efbeb6eb75de697f7b5931094be33f12005 (diff)
parent3e46b25376321db119bc8507ce8c8841c580e736 (diff)
downloadlinux-4f31d774dd5239e563f22ffe1403292414e6f779.tar.gz
linux-4f31d774dd5239e563f22ffe1403292414e6f779.tar.bz2
linux-4f31d774dd5239e563f22ffe1403292414e6f779.zip
Merge branch 'for-linus-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger: "This contains beside of random fixes/cleanups two bigger changes: - seccomp support by Mickaël Salaün - IRQ rework by Anton Ivanov" * 'for-linus-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: Use race-free temporary file creation um: Do not set unsecure permission for temporary file um: Fix build error and kconfig for i386 um: Add seccomp support um: Add full asm/syscall.h support selftests/seccomp: Remove the need for HAVE_ARCH_TRACEHOOK um: Fix ptrace GETREGS/SETREGS bugs um: link with -lpthread um: Update UBD to use pread/pwrite family of functions um: Do not change hard IRQ flags in soft IRQ processing um: Prevent IRQ handler reentrancy uml: flush stdout before forking uml: fix hostfs mknod()
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/link-vmlinux.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index dacf71a43ad4..ba6c34ea5429 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -62,7 +62,7 @@ vmlinux_link()
-Wl,--start-group \
${KBUILD_VMLINUX_MAIN} \
-Wl,--end-group \
- -lutil -lrt ${1}
+ -lutil -lrt -lpthread ${1}
rm -f linux
fi
}