On Thu, Mar 23, 2023 at 02:55:10PM -0700, Andrew Morton wrote: > > The patch titled > Subject: mm-vmalloc-convert-vread-to-vread_iter-v8 > has been added to the -mm mm-unstable branch. Its filename is > mm-vmalloc-convert-vread-to-vread_iter-v8.patch > > This patch will shortly appear at > https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-vmalloc-convert-vread-to-vread_iter-v8.patch > > This patch will later appear in the mm-unstable branch at > git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > > Before you just go and hit "reply", please: > a) Consider who else should be cc'ed > b) Prefer to cc a suitable mailing list as well > c) Ideally: find the original patch on the mailing list and do a > reply-to-all to that, adding suitable additional cc's > > *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** > > The -mm tree is included into linux-next via the mm-everything > branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > and is updated there every 2-3 working days > > ------------------------------------------------------ > From: Lorenzo Stoakes <lstoakes@xxxxxxxxx> > Subject: mm-vmalloc-convert-vread-to-vread_iter-v8 > Date: Thu, 23 Mar 2023 10:15:19 +0000 > > make zero_iter() static, move uio.h inclusion to vmalloc.h > > Link: https://lkml.kernel.org/r/8506cbc667c39205e65a323f750ff9c11a463798.1679566220.git.lstoakes@xxxxxxxxx > Signed-off-by: Lorenzo Stoakes <lstoakes@xxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > include/linux/vmalloc.h | 2 +- > mm/vmalloc.c | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > --- a/include/linux/vmalloc.h~mm-vmalloc-convert-vread-to-vread_iter-v8 > +++ a/include/linux/vmalloc.h > @@ -9,12 +9,12 @@ > #include <asm/page.h> /* pgprot_t */ > #include <linux/rbtree.h> > #include <linux/overflow.h> > +#include <linux/uio.h> > > #include <asm/vmalloc.h> > > struct vm_area_struct; /* vma defining user mapping in mm_types.h */ > struct notifier_block; /* in notifier.h */ > -struct iov_iter; /* in uio.h */ > > /* bits in flags of vmalloc's vm_struct below */ > #define VM_IOREMAP 0x00000001 /* ioremap() and friends */ > --- a/mm/vmalloc.c~mm-vmalloc-convert-vread-to-vread_iter-v8 > +++ a/mm/vmalloc.c > @@ -33,7 +33,6 @@ > #include <linux/compiler.h> > #include <linux/memcontrol.h> > #include <linux/llist.h> > -#include <linux/uio.h> The above changes accidentally undoes the fix for sparc64 that Stephen Rothwell provided (I have incorporated that in my local repo so if there are any future respins they will include it going forward). Could we revert the above but keep the static declaration change below? Thanks! > #include <linux/bitops.h> > #include <linux/rbtree_augmented.h> > #include <linux/overflow.h> > @@ -3446,7 +3445,7 @@ EXPORT_SYMBOL(vmalloc_32_user); > * > * Returns the number of zeroed bytes. > */ > -size_t zero_iter(struct iov_iter *iter, size_t count) > +static size_t zero_iter(struct iov_iter *iter, size_t count) > { > size_t remains = count; > > _ > > Patches currently in -mm which might be from lstoakes@xxxxxxxxx are > > mm-prefer-xxx_page-alloc-free-functions-for-order-0-pages.patch > mm-refactor-do_fault_around.patch > mm-pefer-fault_around_pages-to-fault_around_bytes.patch > maintainers-add-myself-as-vmalloc-reviewer.patch > mm-remove-unused-vmf_insert_mixed_prot.patch > mm-remove-vmf_insert_pfn_xxx_prot-for-huge-page-table-entries.patch > drm-ttm-remove-comment-referencing-now-removed-vmf_insert_mixed_prot.patch > fs-proc-kcore-avoid-bounce-buffer-for-ktext-data.patch > fs-proc-kcore-convert-read_kcore-to-read_kcore_iter.patch > iov_iter-add-copy_page_to_iter_nofault.patch > mm-vmalloc-convert-vread-to-vread_iter.patch > mm-vmalloc-convert-vread-to-vread_iter-v8.patch > mm-mmap-vma_merge-further-improve-prev-next-vma-naming.patch > mm-mmap-vma_merge-fold-curr-next-assignment-logic.patch > mm-mmap-vma_merge-explicitly-assign-res-vma-extend-invariants.patch > mm-mmap-vma_merge-init-cleanup-be-explicit-about-the-non-mergeable-case.patch >
