| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: mm-vmalloc-convert-vread-to-vread_iter-v8-fix |
| Date: Thu Mar 23 03:28:43 PM PDT 2023 |
| |
| Cc: Lorenzo Stoakes <lstoakes@gmail.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| include/linux/vmalloc.h | 2 +- |
| mm/vmalloc.c | 1 + |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/include/linux/vmalloc.h~mm-vmalloc-convert-vread-to-vread_iter-v8-fix |
| +++ 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-fix |
| +++ a/mm/vmalloc.c |
| @@ -33,6 +33,7 @@ |
| #include <linux/compiler.h> |
| #include <linux/memcontrol.h> |
| #include <linux/llist.h> |
| +#include <linux/uio.h> |
| #include <linux/bitops.h> |
| #include <linux/rbtree_augmented.h> |
| #include <linux/overflow.h> |
| _ |