diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 02:36:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 02:36:47 +0300 |
| commit | 375479c38689fbc403cf57b2999278615a4163f5 (patch) | |
| tree | da9565f449ab769802bce0f69cb41e74c4dfb605 /arch/x86/um | |
| parent | 45df60cd2cbe2a8c32fd34e474b62b2b41bacf69 (diff) | |
| parent | e40238dedb484c8a19f8257e4ef5d77d038f9ad8 (diff) | |
| download | linux-375479c38689fbc403cf57b2999278615a4163f5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- a new and faster epoll based IRQ controller and NIC driver
- misc fixes and janitorial updates
* git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
Fix vector raw inintialization logic
Migrate vector timers to new timer API
um: Compile with modern headers
um: vector: Fix an error handling path in 'vector_parse()'
um: vector: Fix a memory allocation check
um: vector: fix missing unlock on error in vector_net_open()
um: Add missing EXPORT for free_irq_by_fd()
High Performance UML Vector Network Driver
Epoll based IRQ controller
um: Use POSIX ucontext_t instead of struct ucontext
um: time: Use timespec64 for persistent clock
um: Restore symbol versions for __memcpy and memcpy
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/stub_segv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/um/stub_segv.c b/arch/x86/um/stub_segv.c index 1518d2805ae8..27361cbb7ca9 100644 --- a/arch/x86/um/stub_segv.c +++ b/arch/x86/um/stub_segv.c @@ -6,11 +6,12 @@ #include <sysdep/stub.h> #include <sysdep/faultinfo.h> #include <sysdep/mcontext.h> +#include <sys/ucontext.h> void __attribute__ ((__section__ (".__syscall_stub"))) stub_segv_handler(int sig, siginfo_t *info, void *p) { - struct ucontext *uc = p; + ucontext_t *uc = p; GET_FAULTINFO_FROM_MC(*((struct faultinfo *) STUB_DATA), &uc->uc_mcontext); |