diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-02 17:14:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-02 17:14:02 -0800 |
| commit | fcaa0ad72d8a14736595bb48c49f9ebd62963d63 (patch) | |
| tree | 75e8456176a3ee1976467eb4f4466dcd245255ff /arch/um/os-Linux/main.c | |
| parent | e3a251e366e1a007c7ce7b2809b67f4dece6b17c (diff) | |
| parent | 9807019a62dc670c73ce8e59e09b41ae458c34b3 (diff) | |
Merge tag 'for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- Fixes for our new virtio code
- Fix for the irqflags tracer
- Kconfig coding style fixes
- Allow BPF firmware loading in our vector driver
* tag 'for-linus-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Loadable BPF "Firmware" for vector drivers
um: Fix Kconfig indentation
um: virtio_uml: Disallow modular build
um: virtio: Keep reading on -EAGAIN
um: virtio: Remove device on disconnect
um: Don't trace irqflags during shutdown
Diffstat (limited to 'arch/um/os-Linux/main.c')
| -rw-r--r-- | arch/um/os-Linux/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index 8014dfac644d..c8a42ecbd7a2 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c @@ -170,7 +170,7 @@ int __init main(int argc, char **argv, char **envp) * that they won't be delivered after the exec, when * they are definitely not expected. */ - unblock_signals_trace(); + unblock_signals(); os_info("\n"); /* Reboot */ |