Merge tag 'powerpc-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / include / linux / highmem.h

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 56d6a01..177b079 100644 (file)
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -243,6 +243,16 @@ static inline void clear_highpage(struct page *page)
        kunmap_local(kaddr);
 }
 
+static inline void clear_highpage_kasan_tagged(struct page *page)
+{
+       u8 tag;
+
+       tag = page_kasan_tag(page);
+       page_kasan_tag_reset(page);
+       clear_highpage(page);
+       page_kasan_tag_set(page, tag);
+}
+
 #ifndef __HAVE_ARCH_TAG_CLEAR_HIGHPAGE
 
 static inline void tag_clear_highpage(struct page *page)
@@ -336,19 +346,6 @@ static inline void memcpy_page(struct page *dst_page, size_t dst_off,
        kunmap_local(dst);
 }
 
-static inline void memmove_page(struct page *dst_page, size_t dst_off,
-                              struct page *src_page, size_t src_off,
-                              size_t len)
-{
-       char *dst = kmap_local_page(dst_page);
-       char *src = kmap_local_page(src_page);
-
-       VM_BUG_ON(dst_off + len > PAGE_SIZE || src_off + len > PAGE_SIZE);
-       memmove(dst + dst_off, src + src_off, len);
-       kunmap_local(src);
-       kunmap_local(dst);
-}
-
 static inline void memset_page(struct page *page, size_t offset, int val,
                               size_t len)
 {