]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
delete arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Jun 2013 15:41:41 +0000 (08:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Jun 2013 15:41:41 +0000 (08:41 -0700)
queue-3.0/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch [deleted file]
queue-3.0/series
queue-3.4/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch [deleted file]
queue-3.4/series
queue-3.9/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch [deleted file]
queue-3.9/series

diff --git a/queue-3.0/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch b/queue-3.0/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch
deleted file mode 100644 (file)
index 16b7843..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1bc39742aab09248169ef9d3727c9def3528b3f3 Mon Sep 17 00:00:00 2001
-From: Simon Baatz <gmbnomis@gmail.com>
-Date: Mon, 10 Jun 2013 21:10:12 +0100
-Subject: ARM: 7755/1: handle user space mapped pages in flush_kernel_dcache_page
-
-From: Simon Baatz <gmbnomis@gmail.com>
-
-commit 1bc39742aab09248169ef9d3727c9def3528b3f3 upstream.
-
-Commit f8b63c1 made flush_kernel_dcache_page a no-op assuming that
-the pages it needs to handle are kernel mapped only.  However, for
-example when doing direct I/O, pages with user space mappings may
-occur.
-
-Thus, continue to do lazy flushing if there are no user space
-mappings.  Otherwise, flush the kernel cache lines directly.
-
-Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
-Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/include/asm/cacheflush.h |    4 +---
- arch/arm/mm/flush.c               |   33 +++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
---- a/arch/arm/include/asm/cacheflush.h
-+++ b/arch/arm/include/asm/cacheflush.h
-@@ -305,9 +305,7 @@ static inline void flush_anon_page(struc
- }
- #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE
--static inline void flush_kernel_dcache_page(struct page *page)
--{
--}
-+extern void flush_kernel_dcache_page(struct page *);
- #define flush_dcache_mmap_lock(mapping) \
-       spin_lock_irq(&(mapping)->tree_lock)
---- a/arch/arm/mm/flush.c
-+++ b/arch/arm/mm/flush.c
-@@ -304,6 +304,39 @@ void flush_dcache_page(struct page *page
- EXPORT_SYMBOL(flush_dcache_page);
- /*
-+ * Ensure cache coherency for the kernel mapping of this page. We can
-+ * assume that the page is pinned via kmap.
-+ *
-+ * If the page only exists in the page cache and there are no user
-+ * space mappings, this is a no-op since the page was already marked
-+ * dirty at creation.  Otherwise, we need to flush the dirty kernel
-+ * cache lines directly.
-+ */
-+void flush_kernel_dcache_page(struct page *page)
-+{
-+      if (cache_is_vivt() || cache_is_vipt_aliasing()) {
-+              struct address_space *mapping;
-+
-+              mapping = page_mapping(page);
-+
-+              if (!mapping || mapping_mapped(mapping)) {
-+                      void *addr;
-+
-+                      addr = page_address(page);
-+                      /*
-+                       * kmap_atomic() doesn't set the page virtual
-+                       * address for highmem pages, and
-+                       * kunmap_atomic() takes care of cache
-+                       * flushing already.
-+                       */
-+                      if (!IS_ENABLED(CONFIG_HIGHMEM) || addr)
-+                              __cpuc_flush_dcache_area(addr, PAGE_SIZE);
-+              }
-+      }
-+}
-+EXPORT_SYMBOL(flush_kernel_dcache_page);
-+
-+/*
-  * Flush an anonymous page so that users of get_user_pages()
-  * can safely access the data.  The expected sequence is:
-  *
index 88625d55840731f14d4a6bb5f529b1d764455f92..94aab0145b7181a8e781955358ba5e7ad977a760 100644 (file)
@@ -1,3 +1,2 @@
-arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch
 alsa-usb-audio-work-around-android-accessory-firmware-bug.patch
 tilepro-work-around-module-link-error-with-gcc-4.7.patch
diff --git a/queue-3.4/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch b/queue-3.4/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch
deleted file mode 100644 (file)
index 08e1596..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1bc39742aab09248169ef9d3727c9def3528b3f3 Mon Sep 17 00:00:00 2001
-From: Simon Baatz <gmbnomis@gmail.com>
-Date: Mon, 10 Jun 2013 21:10:12 +0100
-Subject: ARM: 7755/1: handle user space mapped pages in flush_kernel_dcache_page
-
-From: Simon Baatz <gmbnomis@gmail.com>
-
-commit 1bc39742aab09248169ef9d3727c9def3528b3f3 upstream.
-
-Commit f8b63c1 made flush_kernel_dcache_page a no-op assuming that
-the pages it needs to handle are kernel mapped only.  However, for
-example when doing direct I/O, pages with user space mappings may
-occur.
-
-Thus, continue to do lazy flushing if there are no user space
-mappings.  Otherwise, flush the kernel cache lines directly.
-
-Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
-Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/include/asm/cacheflush.h |    4 +---
- arch/arm/mm/flush.c               |   33 +++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
---- a/arch/arm/include/asm/cacheflush.h
-+++ b/arch/arm/include/asm/cacheflush.h
-@@ -305,9 +305,7 @@ static inline void flush_anon_page(struc
- }
- #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE
--static inline void flush_kernel_dcache_page(struct page *page)
--{
--}
-+extern void flush_kernel_dcache_page(struct page *);
- #define flush_dcache_mmap_lock(mapping) \
-       spin_lock_irq(&(mapping)->tree_lock)
---- a/arch/arm/mm/flush.c
-+++ b/arch/arm/mm/flush.c
-@@ -299,6 +299,39 @@ void flush_dcache_page(struct page *page
- EXPORT_SYMBOL(flush_dcache_page);
- /*
-+ * Ensure cache coherency for the kernel mapping of this page. We can
-+ * assume that the page is pinned via kmap.
-+ *
-+ * If the page only exists in the page cache and there are no user
-+ * space mappings, this is a no-op since the page was already marked
-+ * dirty at creation.  Otherwise, we need to flush the dirty kernel
-+ * cache lines directly.
-+ */
-+void flush_kernel_dcache_page(struct page *page)
-+{
-+      if (cache_is_vivt() || cache_is_vipt_aliasing()) {
-+              struct address_space *mapping;
-+
-+              mapping = page_mapping(page);
-+
-+              if (!mapping || mapping_mapped(mapping)) {
-+                      void *addr;
-+
-+                      addr = page_address(page);
-+                      /*
-+                       * kmap_atomic() doesn't set the page virtual
-+                       * address for highmem pages, and
-+                       * kunmap_atomic() takes care of cache
-+                       * flushing already.
-+                       */
-+                      if (!IS_ENABLED(CONFIG_HIGHMEM) || addr)
-+                              __cpuc_flush_dcache_area(addr, PAGE_SIZE);
-+              }
-+      }
-+}
-+EXPORT_SYMBOL(flush_kernel_dcache_page);
-+
-+/*
-  * Flush an anonymous page so that users of get_user_pages()
-  * can safely access the data.  The expected sequence is:
-  *
index 2915a5daf0513b77640d9e0e33ff816b5a735b80..1c4e34debdb598286ce0f16b33fe705b537d8f6b 100644 (file)
@@ -1,4 +1,3 @@
-arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch
 alsa-usb-audio-fix-invalid-volume-resolution-for-logitech-hd-webcam-c310.patch
 alsa-usb-audio-work-around-android-accessory-firmware-bug.patch
 clk-remove-notifier-from-list-before-freeing-it.patch
diff --git a/queue-3.9/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch b/queue-3.9/arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch
deleted file mode 100644 (file)
index aa8d13d..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1bc39742aab09248169ef9d3727c9def3528b3f3 Mon Sep 17 00:00:00 2001
-From: Simon Baatz <gmbnomis@gmail.com>
-Date: Mon, 10 Jun 2013 21:10:12 +0100
-Subject: ARM: 7755/1: handle user space mapped pages in flush_kernel_dcache_page
-
-From: Simon Baatz <gmbnomis@gmail.com>
-
-commit 1bc39742aab09248169ef9d3727c9def3528b3f3 upstream.
-
-Commit f8b63c1 made flush_kernel_dcache_page a no-op assuming that
-the pages it needs to handle are kernel mapped only.  However, for
-example when doing direct I/O, pages with user space mappings may
-occur.
-
-Thus, continue to do lazy flushing if there are no user space
-mappings.  Otherwise, flush the kernel cache lines directly.
-
-Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
-Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/include/asm/cacheflush.h |    4 +---
- arch/arm/mm/flush.c               |   33 +++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
---- a/arch/arm/include/asm/cacheflush.h
-+++ b/arch/arm/include/asm/cacheflush.h
-@@ -320,9 +320,7 @@ static inline void flush_anon_page(struc
- }
- #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE
--static inline void flush_kernel_dcache_page(struct page *page)
--{
--}
-+extern void flush_kernel_dcache_page(struct page *);
- #define flush_dcache_mmap_lock(mapping) \
-       spin_lock_irq(&(mapping)->tree_lock)
---- a/arch/arm/mm/flush.c
-+++ b/arch/arm/mm/flush.c
-@@ -298,6 +298,39 @@ void flush_dcache_page(struct page *page
- EXPORT_SYMBOL(flush_dcache_page);
- /*
-+ * Ensure cache coherency for the kernel mapping of this page. We can
-+ * assume that the page is pinned via kmap.
-+ *
-+ * If the page only exists in the page cache and there are no user
-+ * space mappings, this is a no-op since the page was already marked
-+ * dirty at creation.  Otherwise, we need to flush the dirty kernel
-+ * cache lines directly.
-+ */
-+void flush_kernel_dcache_page(struct page *page)
-+{
-+      if (cache_is_vivt() || cache_is_vipt_aliasing()) {
-+              struct address_space *mapping;
-+
-+              mapping = page_mapping(page);
-+
-+              if (!mapping || mapping_mapped(mapping)) {
-+                      void *addr;
-+
-+                      addr = page_address(page);
-+                      /*
-+                       * kmap_atomic() doesn't set the page virtual
-+                       * address for highmem pages, and
-+                       * kunmap_atomic() takes care of cache
-+                       * flushing already.
-+                       */
-+                      if (!IS_ENABLED(CONFIG_HIGHMEM) || addr)
-+                              __cpuc_flush_dcache_area(addr, PAGE_SIZE);
-+              }
-+      }
-+}
-+EXPORT_SYMBOL(flush_kernel_dcache_page);
-+
-+/*
-  * Flush an anonymous page so that users of get_user_pages()
-  * can safely access the data.  The expected sequence is:
-  *
index 86c8aeb40618e09afc45569d43556facfdb56f59..86f0fc2d1fcb46e445250badf9b96370febfc36d 100644 (file)
@@ -1,6 +1,5 @@
 arm-7752-1-errata-louis-bit-field-in-clidr-register-is-incorrect.patch
 arm-7754-1-fix-the-cpu-id-and-the-mask-associated-to-the-pj4b.patch
-arm-7755-1-handle-user-space-mapped-pages-in-flush_kernel_dcache_page.patch
 perf-arm64-record-the-user-mode-pc-in-the-call-chain.patch
 alsa-usb-audio-fix-invalid-volume-resolution-for-logitech-hd-webcam-c310.patch
 alsa-hda-fix-pin-configurations-for-macbook-air-4-2.patch