diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-10 11:44:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-10 11:44:15 +0100 |
| commit | cf210428987682af02e47df255012a21fb779657 (patch) | |
| tree | 604e5f8d5be27f127ab76ee8fb18c5ce8f2223a0 /mm | |
| parent | c6ee9e74b237b01d0a4988de41acbf569fdb8974 (diff) | |
| parent | 11abaca7d5b923f1a14c578746d4232bc4ca7d72 (diff) | |
Merge tag 'v4.4.160' into linux-linaro-lsk-v4.4
This is the 4.4.160 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/madvise.c | 2 | ||||
| -rw-r--r-- | mm/slub.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 2a0f9a4504f1..f548c66154ee 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -76,7 +76,7 @@ static long madvise_behavior(struct vm_area_struct *vma, new_flags |= VM_DONTDUMP; break; case MADV_DODUMP: - if (new_flags & VM_SPECIAL) { + if (!is_vm_hugetlb_page(vma) && new_flags & VM_SPECIAL) { error = -EINVAL; goto out; } diff --git a/mm/slub.c b/mm/slub.c index 490825fd931a..ca0c1f8a9f33 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1698,7 +1698,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, { struct page *page, *page2; void *object = NULL; - int available = 0; + unsigned int available = 0; int objects; /* @@ -4756,10 +4756,10 @@ static ssize_t cpu_partial_show(struct kmem_cache *s, char *buf) static ssize_t cpu_partial_store(struct kmem_cache *s, const char *buf, size_t length) { - unsigned long objects; + unsigned int objects; int err; - err = kstrtoul(buf, 10, &objects); + err = kstrtouint(buf, 10, &objects); if (err) return err; if (objects && !kmem_cache_has_cpu_partial(s)) |