Messages in this thread Patch in this message | | | Date | Fri, 5 Nov 2021 16:51:40 +0000 | From | Matthew Wilcox <> | Subject | Re: [PATCH v4 1/1] mm/highmem: Remove deprecated kmap_atomic |
| |
On Fri, Nov 05, 2021 at 01:50:37PM +0000, Matthew Wilcox wrote: > On Thu, Feb 11, 2021 at 03:56:25PM -0800, Andrew Morton wrote: > > On Wed, 10 Feb 2021 16:33:07 -0800 Ira Weiny <ira.weiny@intel.com> wrote: > > > > > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > > > > > > This already has my signed off by so I'm not going to 'review'. With Prathu's > > > testing information I hope this can land. > > > > > > Andrew did you see this patch? > > > > I did now ;) > > > > Tossed onto the post-rc1 pile, thanks, > > This patch seems to have slipped through the gaps for a couple of cycles > now? I found a missed spot in it for CONFIG_HIGHMEM:
Ugh, sorry, wrong version of the patch.
--- mm/highmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/highmem.c b/mm/highmem.c index 471d9779a7f4..88f65f155845 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -382,7 +382,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned this_end = min_t(unsigned, end1, PAGE_SIZE); if (end1 > start1) { - kaddr = kmap_atomic(page + i); + kaddr = kmap_local_page(page + i); memset(kaddr + start1, 0, this_end - start1); } end1 -= this_end; @@ -397,7 +397,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1, if (end2 > start2) { if (!kaddr) - kaddr = kmap_atomic(page + i); + kaddr = kmap_local_page(page + i); memset(kaddr + start2, 0, this_end - start2); } end2 -= this_end; @@ -405,7 +405,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1, } if (kaddr) { - kunmap_atomic(kaddr); + kunmap_local(kaddr); flush_dcache_page(page + i); } -- 2.33.0
| |