Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD

[firefly-linux-kernel-4.4.55.git] / include / linux / highmem.h

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index ef788b5b4a3504b069818e33145b2b3e578235fb..7fb31da45d03bbb40f1840159fc646736c187fb3 100644 (file)
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -219,12 +219,6 @@ static inline void zero_user(struct page *page,
        zero_user_segments(page, start, start + size, 0, 0);
 }
 
-static inline void __deprecated memclear_highpage_flush(struct page *page,
-                       unsigned int offset, unsigned int size)
-{
-       zero_user(page, offset, size);
-}
-
 #ifndef __HAVE_ARCH_COPY_USER_HIGHPAGE
 
 static inline void copy_user_highpage(struct page *to, struct page *from,