diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-27 10:30:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-27 10:30:47 -0700 |
| commit | 864af0d40cdc82b705e3ca79cf2a57be900954b1 (patch) | |
| tree | 6d051c30ba9734e7e6dea684a4df1f8bfc24a373 /arch/arm | |
| parent | 1a3d8691fd2ae95f5443b2d57f91f28f6ff4700d (diff) | |
| parent | d97e5e6160c0e0a23963ec198c7cb1c69e6bf9e8 (diff) | |
| download | linux-864af0d40cdc82b705e3ca79cf2a57be900954b1.tar.gz linux-864af0d40cdc82b705e3ca79cf2a57be900954b1.tar.bz2 linux-864af0d40cdc82b705e3ca79cf2a57be900954b1.zip | |
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/arm')
| -rw-r--r-- | arch/arm/kernel/process.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-rpc/ecard.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 225d1c58d2de..d9c299133111 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -338,6 +338,7 @@ static struct vm_area_struct gate_vma = { static int __init gate_vma_init(void) { + vma_init(&gate_vma, NULL); gate_vma.vm_page_prot = PAGE_READONLY_EXEC; return 0; } diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c index 39aef4876ed4..8db62cc54a6a 100644 --- a/arch/arm/mach-rpc/ecard.c +++ b/arch/arm/mach-rpc/ecard.c @@ -237,8 +237,8 @@ static void ecard_init_pgtables(struct mm_struct *mm) memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE)); + vma_init(&vma, mm); vma.vm_flags = VM_EXEC; - vma.vm_mm = mm; flush_tlb_range(&vma, IO_START, IO_START + IO_SIZE); flush_tlb_range(&vma, EASI_START, EASI_START + EASI_SIZE); |