diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-09 04:22:45 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-09 04:22:45 +0300 |
| commit | aa53685549a2cfb5f175b0c4a20bc9aa1e5a1b85 (patch) | |
| tree | 59c7255fa919a8b2e0e8cdbd7867ac12f2c3428d /scripts | |
| parent | 5406812e59761f6ba33ea0bf97e426666bdb0e28 (diff) | |
| parent | 887a9853092c09e20598f4a7f91ac1cfb762be50 (diff) | |
| download | linux-aa53685549a2cfb5f175b0c4a20bc9aa1e5a1b85.tar.xz | |
Merge branch 'for-linus-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull uml fixes from Richard Weinberger:
"This contains various bug fixes, most of them are fall out from the
merge window"
* 'for-linus-4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: fix returns without va_end
um: Fix fpstate handling
arch: um: fix error when linking vmlinux.
um: Fix get_signal() usage
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/link-vmlinux.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 1a10d8ac8162..dacf71a43ad4 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 ${1} + -lutil -lrt ${1} rm -f linux fi } |