diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-09-05 11:11:41 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-09-05 11:11:41 -0400 |
| commit | fe0c80ccc4a3ada249c6263520f320a96941ad68 (patch) | |
| tree | 723a3226490f128ab40e070ee2d4d3d83d0423d5 /mm | |
| parent | 25ae5a4448bcf9f808e8f020882531287b492ec2 (diff) | |
| parent | 0eed54bdbd1b922004fe05dc8bf3815f2e5723d7 (diff) | |
Merge tag 'v4.9.46' into v4.9-rt
This is the 4.9.46 stable release
Conflicts:
kernel/time/timer.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/madvise.c | 2 | ||||
| -rw-r--r-- | mm/memblock.c | 2 | ||||
| -rw-r--r-- | mm/shmem.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 253b1533fba5..63a12162f4c6 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -331,8 +331,8 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, pte_offset_map_lock(mm, pmd, addr, &ptl); goto out; } - put_page(page); unlock_page(page); + put_page(page); pte = pte_offset_map_lock(mm, pmd, addr, &ptl); pte--; addr -= PAGE_SIZE; diff --git a/mm/memblock.c b/mm/memblock.c index ccec42c12ba8..42b98af6a415 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -311,7 +311,7 @@ void __init memblock_discard(void) __memblock_free_late(addr, size); } - if (memblock.memory.regions == memblock_memory_init_regions) { + if (memblock.memory.regions != memblock_memory_init_regions) { addr = __pa(memblock.memory.regions); size = PAGE_ALIGN(sizeof(struct memblock_region) * memblock.memory.max); diff --git a/mm/shmem.c b/mm/shmem.c index 7ee5444ffb6d..004e0f87e8a8 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3810,7 +3810,7 @@ int __init shmem_init(void) } #ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE - if (has_transparent_hugepage() && shmem_huge < SHMEM_HUGE_DENY) + if (has_transparent_hugepage() && shmem_huge > SHMEM_HUGE_DENY) SHMEM_SB(shm_mnt->mnt_sb)->huge = shmem_huge; else shmem_huge = 0; /* just in case it was patched */ @@ -3871,7 +3871,7 @@ static ssize_t shmem_enabled_store(struct kobject *kobj, return -EINVAL; shmem_huge = huge; - if (shmem_huge < SHMEM_HUGE_DENY) + if (shmem_huge > SHMEM_HUGE_DENY) SHMEM_SB(shm_mnt->mnt_sb)->huge = shmem_huge; return count; } |