diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-18 10:03:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-18 10:03:23 -0700 |
| commit | 9453b2d4694c2cb6c30d99e65d4a3deb09e94ac3 (patch) | |
| tree | c0d6728c3b7125260a78394423b909946b903896 /arch/um/Kconfig | |
| parent | 429731277dfd4b7940cff206dcde28b771b29210 (diff) | |
| parent | f06885b3f3e3884f98351d7b72a4fc8400911cde (diff) | |
Merge tag 'for-linus-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- Improve support for non-glibc systems
- Vector: Add support for scripting and dynamic tap devices
- Various fixes for the vector networking driver
- Various fixes for time travel mode
* tag 'for-linus-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: vector: Add dynamic tap interfaces and scripting
um: Clean up stacktrace dump
um: Fix incorrect assumptions about max pid length
um: Remove dead usage of TIF_IA32
um: Remove redundant NULL check
um: change sigio_spinlock to a mutex
um: time-travel: Return the sequence number in ACK messages
um: time-travel: Fix IRQ handling in time_travel_handle_message()
um: Allow static linking for non-glibc implementations
um: Some fixes to build UML with musl
um: vector: Use GFP_ATOMIC under spin lock
um: Fix null pointer dereference in vector_user_bpf
Diffstat (limited to 'arch/um/Kconfig')
| -rw-r--r-- | arch/um/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index d49f471b02e3..16187211d059 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -62,12 +62,12 @@ config NR_CPUS source "arch/$(HEADER_ARCH)/um/Kconfig" -config FORBID_STATIC_LINK - bool +config MAY_HAVE_RUNTIME_DEPS + bool config STATIC_LINK bool "Force a static link" - depends on !FORBID_STATIC_LINK + depends on CC_CAN_LINK_STATIC_NO_RUNTIME_DEPS || !MAY_HAVE_RUNTIME_DEPS help This option gives you the ability to force a static link of UML. Normally, UML is linked as a shared binary. This is inconvenient for |