diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-27 20:30:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-27 20:30:47 +0300 |
| commit | 864af0d40cdc82b705e3ca79cf2a57be900954b1 (patch) | |
| tree | 6d051c30ba9734e7e6dea684a4df1f8bfc24a373 /arch/x86/um/mem_32.c | |
| parent | 1a3d8691fd2ae95f5443b2d57f91f28f6ff4700d (diff) | |
| parent | d97e5e6160c0e0a23963ec198c7cb1c69e6bf9e8 (diff) | |
| download | linux-864af0d40cdc82b705e3ca79cf2a57be900954b1.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"11 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
kvm, mm: account shadow page tables to kmemcg
zswap: re-check zswap_is_full() after do zswap_shrink()
include/linux/eventfd.h: include linux/errno.h
mm: fix vma_is_anonymous() false-positives
mm: use vma_init() to initialize VMAs on stack and data segments
mm: introduce vma_init()
mm: fix exports that inadvertently make put_page() EXPORT_SYMBOL_GPL
ipc/sem.c: prevent queue.status tearing in semop
mm: disallow mappings that conflict for devm_memremap_pages()
kasan: only select SLUB_DEBUG with SYSFS=y
delayacct: fix crash in delayacct_blkio_end() after delayacct init failure
Diffstat (limited to 'arch/x86/um/mem_32.c')
| -rw-r--r-- | arch/x86/um/mem_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c index 744afdc18cf3..56c44d865f7b 100644 --- a/arch/x86/um/mem_32.c +++ b/arch/x86/um/mem_32.c @@ -16,7 +16,7 @@ static int __init gate_vma_init(void) if (!FIXADDR_USER_START) return 0; - gate_vma.vm_mm = NULL; + vma_init(&gate_vma, NULL); gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; |