From 99f612471f926a9a7f307768345d049d52ac6dd2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 26 Jul 2018 19:52:20 +0800 Subject: [PATCH] Update to 4.18-rc6 --- debian/changelog | 4 +- ...-assemble-with-me500-when-building-f.patch | 30 -------- .../features/all/aufs4/aufs4-mmap.patch | 73 ++++++------------- debian/patches/series | 1 - 4 files changed, 27 insertions(+), 81 deletions(-) delete mode 100644 debian/patches/bugfix/powerpc/powerpc-makefile-assemble-with-me500-when-building-f.patch diff --git a/debian/changelog b/debian/changelog index 28ecb0437..da6d24a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -linux (4.18~rc5-1~exp2) UNRELEASED; urgency=medium +linux (4.18~rc6-1~exp1) UNRELEASED; urgency=medium + + * New upstream release candidate [ Uwe Kleine-König ] * [arm64] enable RTC_DRV_PCF8563 for Odroid-C2 diff --git a/debian/patches/bugfix/powerpc/powerpc-makefile-assemble-with-me500-when-building-f.patch b/debian/patches/bugfix/powerpc/powerpc-makefile-assemble-with-me500-when-building-f.patch deleted file mode 100644 index fb49344a6..000000000 --- a/debian/patches/bugfix/powerpc/powerpc-makefile-assemble-with-me500-when-building-f.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: James Clarke -Subject: powerpc/Makefile: Assemble with -me500 when building for E500 -Date: Thu, 12 Jul 2018 22:41:49 +0100 -Origin: https://people.debian.org/~jrtc27/linux-ppc32/0001-powerpc-Makefile-Assemble-with-me500-when-building-f.patch - -Some of the assembly files use instructions specific to BookE or E500, -which are rejected with the now-default -mcpu=powerpc, so we must pass --me500 to the assembler just as we pass -me200 for E200. - -Fixes: 4bf4f42a2feb ("powerpc/kbuild: Set default generic machine type for 32-bit compile") -Signed-off-by: James Clarke ---- - arch/powerpc/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index 2ea575cb..fb96206d 100644 ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -243,6 +243,7 @@ endif - cpu-as-$(CONFIG_4xx) += -Wa,-m405 - cpu-as-$(CONFIG_ALTIVEC) += $(call as-option,-Wa$(comma)-maltivec) - cpu-as-$(CONFIG_E200) += -Wa,-me200 -+cpu-as-$(CONFIG_E500) += -Wa,-me500 - cpu-as-$(CONFIG_PPC_BOOK3S_64) += -Wa,-mpower4 - cpu-as-$(CONFIG_PPC_E500MC) += $(call as-option,-Wa$(comma)-me500mc) - --- -2.18.0 - diff --git a/debian/patches/features/all/aufs4/aufs4-mmap.patch b/debian/patches/features/all/aufs4/aufs4-mmap.patch index 0f3d9bee4..1eadb736a 100644 --- a/debian/patches/features/all/aufs4/aufs4-mmap.patch +++ b/debian/patches/features/all/aufs4/aufs4-mmap.patch @@ -9,11 +9,9 @@ Patch headers added by debian/patches/features/all/aufs4/gen-patch SPDX-License-Identifier: GPL-2.0 aufs4.x-rcN mmap patch -diff --git a/fs/proc/base.c b/fs/proc/base.c -index aaffc0c..ab72941 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c -@@ -2004,7 +2004,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) +@@ -2004,7 +2004,7 @@ static int map_files_get_link(struct den down_read(&mm->mmap_sem); vma = find_exact_vma(mm, vm_start, vm_end); if (vma && vma->vm_file) { @@ -22,11 +20,9 @@ index aaffc0c..ab72941 100644 path_get(path); rc = 0; } -diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c -index 3b63be6..fb9913b 100644 --- a/fs/proc/nommu.c +++ b/fs/proc/nommu.c -@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) +@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_ file = region->vm_file; if (file) { @@ -38,11 +34,9 @@ index 3b63be6..fb9913b 100644 dev = inode->i_sb->s_dev; ino = inode->i_ino; } -diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index e967901..f6b7286 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c -@@ -306,7 +306,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) +@@ -306,7 +306,10 @@ show_map_vma(struct seq_file *m, struct const char *name = NULL; if (file) { @@ -54,7 +48,7 @@ index e967901..f6b7286 100644 dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; -@@ -1733,7 +1736,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) +@@ -1734,7 +1737,7 @@ static int show_numa_map(struct seq_file struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct vm_area_struct *vma = v; struct numa_maps *md = &numa_priv->md; @@ -63,11 +57,9 @@ index e967901..f6b7286 100644 struct mm_struct *mm = vma->vm_mm; struct mm_walk walk = { .hugetlb_entry = gather_hugetlb_stats, -diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c -index 5b62f57..dfb4a3b 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c -@@ -156,7 +156,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma, +@@ -156,7 +156,10 @@ static int nommu_vma_show(struct seq_fil file = vma->vm_file; if (file) { @@ -79,11 +71,9 @@ index 5b62f57..dfb4a3b 100644 dev = inode->i_sb->s_dev; ino = inode->i_ino; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; -diff --git a/include/linux/mm.h b/include/linux/mm.h -index a0fbb9f..4d615af 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1429,6 +1429,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, +@@ -1431,6 +1431,28 @@ static inline void unmap_shared_mapping_ unmap_mapping_range(mapping, holebegin, holelen, 0); } @@ -112,8 +102,6 @@ index a0fbb9f..4d615af 100644 extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, unsigned int gup_flags); extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, -diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index 99ce070..8babe35 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -236,6 +236,7 @@ struct vm_region { @@ -132,11 +120,9 @@ index 99ce070..8babe35 100644 void * vm_private_data; /* was vm_pte (shared mem) */ atomic_long_t swap_readahead_info; -diff --git a/kernel/fork.c b/kernel/fork.c -index 9440d61..b966ed6 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -481,7 +481,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, +@@ -506,7 +506,7 @@ static __latent_entropy int dup_mmap(str struct inode *inode = file_inode(file); struct address_space *mapping = file->f_mapping; @@ -145,11 +131,9 @@ index 9440d61..b966ed6 100644 if (tmp->vm_flags & VM_DENYWRITE) atomic_dec(&inode->i_writecount); i_mmap_lock_write(mapping); -diff --git a/mm/Makefile b/mm/Makefile -index 8716bda..68afd6d 100644 --- a/mm/Makefile +++ b/mm/Makefile -@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o \ +@@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill. mm_init.o mmu_context.o percpu.o slab_common.o \ compaction.o vmacache.o \ interval_tree.o list_lru.o workingset.o \ @@ -158,11 +142,9 @@ index 8716bda..68afd6d 100644 obj-y += init-mm.o -diff --git a/mm/filemap.c b/mm/filemap.c -index 52517f2..250f675 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -2700,7 +2700,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) +@@ -2700,7 +2700,7 @@ vm_fault_t filemap_page_mkwrite(struct v vm_fault_t ret = VM_FAULT_LOCKED; sb_start_pagefault(inode->i_sb); @@ -171,20 +153,18 @@ index 52517f2..250f675 100644 lock_page(page); if (page->mapping != inode->i_mapping) { unlock_page(page); -diff --git a/mm/mmap.c b/mm/mmap.c -index d1eb87e..72bd98d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) +@@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) - fput(vma->vm_file); + vma_fput(vma); mpol_put(vma_policy(vma)); - kmem_cache_free(vm_area_cachep, vma); + vm_area_free(vma); return next; -@@ -905,7 +905,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, +@@ -905,7 +905,7 @@ again: if (remove_next) { if (file) { uprobe_munmap(next, next->vm_start, next->vm_end); @@ -193,7 +173,7 @@ index d1eb87e..72bd98d 100644 } if (next->anon_vma) anon_vma_merge(vma, next); -@@ -1820,8 +1820,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, +@@ -1818,8 +1818,8 @@ out: return addr; unmap_and_free_vma: @@ -203,7 +183,7 @@ index d1eb87e..72bd98d 100644 /* Undo any partial mapping done by a device driver. */ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); -@@ -2645,7 +2645,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2638,7 +2638,7 @@ int __split_vma(struct mm_struct *mm, st goto out_free_mpol; if (new->vm_file) @@ -212,7 +192,7 @@ index d1eb87e..72bd98d 100644 if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); -@@ -2664,7 +2664,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2657,7 +2657,7 @@ int __split_vma(struct mm_struct *mm, st if (new->vm_ops && new->vm_ops->close) new->vm_ops->close(new); if (new->vm_file) @@ -221,7 +201,7 @@ index d1eb87e..72bd98d 100644 unlink_anon_vmas(new); out_free_mpol: mpol_put(vma_policy(new)); -@@ -2826,7 +2826,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2819,7 +2819,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsign struct vm_area_struct *vma; unsigned long populate = 0; unsigned long ret = -EINVAL; @@ -230,7 +210,7 @@ index d1eb87e..72bd98d 100644 pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n", current->comm, current->pid); -@@ -2901,10 +2901,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, +@@ -2894,10 +2894,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsign } } @@ -259,7 +239,7 @@ index d1eb87e..72bd98d 100644 out: up_write(&mm->mmap_sem); if (populate) -@@ -3220,7 +3237,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -3204,7 +3221,7 @@ struct vm_area_struct *copy_vma(struct v if (anon_vma_clone(new_vma, vma)) goto out_free_mempol; if (new_vma->vm_file) @@ -268,11 +248,9 @@ index d1eb87e..72bd98d 100644 if (new_vma->vm_ops && new_vma->vm_ops->open) new_vma->vm_ops->open(new_vma); vma_link(mm, new_vma, prev, rb_link, rb_parent); -diff --git a/mm/nommu.c b/mm/nommu.c -index 4452d8b..d621193 100644 --- a/mm/nommu.c +++ b/mm/nommu.c -@@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm_region *region) +@@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm up_write(&nommu_region_sem); if (region->vm_file) @@ -281,16 +259,16 @@ index 4452d8b..d621193 100644 /* IO memory and memory shared directly out of the pagecache * from ramfs/tmpfs mustn't be released here */ -@@ -767,7 +767,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -767,7 +767,7 @@ static void delete_vma(struct mm_struct if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) - fput(vma->vm_file); + vma_fput(vma); put_nommu_region(vma->vm_region); - kmem_cache_free(vm_area_cachep, vma); + vm_area_free(vma); } -@@ -1289,7 +1289,7 @@ unsigned long do_mmap(struct file *file, +@@ -1288,7 +1288,7 @@ unsigned long do_mmap(struct file *file, goto error_just_free; } } @@ -299,7 +277,7 @@ index 4452d8b..d621193 100644 kmem_cache_free(vm_region_jar, region); region = pregion; result = start; -@@ -1364,10 +1364,10 @@ unsigned long do_mmap(struct file *file, +@@ -1363,10 +1363,10 @@ error_just_free: up_write(&nommu_region_sem); error: if (region->vm_file) @@ -309,12 +287,9 @@ index 4452d8b..d621193 100644 if (vma->vm_file) - fput(vma->vm_file); + vma_fput(vma); - kmem_cache_free(vm_area_cachep, vma); + vm_area_free(vma); return ret; -diff --git a/mm/prfile.c b/mm/prfile.c -new file mode 100644 -index 0000000..14efc4f --- /dev/null +++ b/mm/prfile.c @@ -0,0 +1,86 @@ diff --git a/debian/patches/series b/debian/patches/series index d99c1d5bb..4006f08a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -68,7 +68,6 @@ bugfix/x86/mmap-add-an-exception-to-the-stack-gap-for-hotspot-jvm.patch bugfix/powerpc/powerpc-lib-sstep-fix-building-for-powerpcspe.patch bugfix/powerpc/powerpc-lib-makefile-don-t-pull-in-quad.o-for-32-bit.patch bugfix/arm/arm-mm-export-__sync_icache_dcache-for-xen-privcmd.patch -bugfix/powerpc/powerpc-makefile-assemble-with-me500-when-building-f.patch # Arch features features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch