diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-09 23:45:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-09 23:45:26 +0300 |
| commit | d6c338a741295c04ed84679153448b2fffd2c9cf (patch) | |
| tree | c5711758bb97fb010157396815ab1dbc105d7247 /arch/x86/um/stub_segv.c | |
| parent | 35776f10513c0d523c5dd2f1b415f642497779e2 (diff) | |
| parent | adf9ae0d159d3dc94f58d788fc4757c8749ac0df (diff) | |
| download | linux-d6c338a741295c04ed84679153448b2fffd2c9cf.tar.xz | |
Merge tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- Support for VMAP_STACK
- Support for splice_write in hostfs
- Fixes for virt-pci
- Fixes for virtio_uml
- Various fixes
* tag 'for-linus-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: fix stub location calculation
um: virt-pci: fix uapi documentation
um: enable VMAP_STACK
um: virt-pci: don't do DMA from stack
hostfs: support splice_write
um: virtio_uml: fix memory leak on init failures
um: virtio_uml: include linux/virtio-uml.h
lib/logic_iomem: fix sparse warnings
um: make PCI emulation driver init/exit static
Diffstat (limited to 'arch/x86/um/stub_segv.c')
| -rw-r--r-- | arch/x86/um/stub_segv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/um/stub_segv.c b/arch/x86/um/stub_segv.c index 21836eaf1725..f7eefba034f9 100644 --- a/arch/x86/um/stub_segv.c +++ b/arch/x86/um/stub_segv.c @@ -11,9 +11,8 @@ void __attribute__ ((__section__ (".__syscall_stub"))) stub_segv_handler(int sig, siginfo_t *info, void *p) { - int stack; + struct faultinfo *f = get_stub_page(); ucontext_t *uc = p; - struct faultinfo *f = (void *)(((unsigned long)&stack) & ~(UM_KERN_PAGE_SIZE - 1)); GET_FAULTINFO_FROM_MC(*f, &uc->uc_mcontext); trap_myself(); |