[PATCH] rmap 23 empty flush_dcache_mmap_lock

From: Hugh Dickins <hugh@veritas.com>

Most architectures (like i386) do nothing in flush_dcache_page, or don't scan
i_mmap in flush_dcache_page, so don't need flush_dcache_mmap_lock to do
anything: define it and flush_dcache_mmap_unlock away.  Noticed arm26, cris,
h8300 still defining flush_page_to_ram: delete it again.

diff --git a/include/asm-alpha/cacheflush.h b/include/asm-alpha/cacheflush.h
index 68babfa193037ae45a24cd9073a30adbe5674fbf..40a11e4cfff3eef6ba2915ffaba9aeaccb4e9ffe 100644 (file)
--- a/include/asm-alpha/cacheflush.h
+++ b/include/asm-alpha/cacheflush.h
@@ -10,6 +10,8 @@
 #define flush_cache_range(vma, start, end)     do { } while (0)
 #define flush_cache_page(vma, vmaddr)          do { } while (0)
 #define flush_dcache_page(page)                        do { } while (0)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define flush_cache_vmap(start, end)           do { } while (0)
 #define flush_cache_vunmap(start, end)         do { } while (0)
 

diff --git a/include/asm-arm26/cacheflush.h b/include/asm-arm26/cacheflush.h
index 6829621986e59580fef07d040cf7782cab02f777..eb887710735a79744a7080360c03517fc738dc00 100644 (file)
--- a/include/asm-arm26/cacheflush.h
+++ b/include/asm-arm26/cacheflush.h
@@ -24,7 +24,6 @@
 #define flush_cache_mm(mm)                      do { } while (0)
 #define flush_cache_range(vma,start,end)        do { } while (0)
 #define flush_cache_page(vma,vmaddr)            do { } while (0)
-#define flush_page_to_ram(page)                 do { } while (0)
 #define flush_cache_vmap(start, end)           do { } while (0)
 #define flush_cache_vunmap(start, end)         do { } while (0)
 
@@ -32,6 +31,8 @@
 #define clean_dcache_range(start,end)           do { } while (0)
 #define flush_dcache_range(start,end)           do { } while (0)
 #define flush_dcache_page(page)                 do { } while (0)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define clean_dcache_entry(_s)                  do { } while (0)
 #define clean_cache_entry(_start)               do { } while (0)
 

diff --git a/include/asm-cris/cacheflush.h b/include/asm-cris/cacheflush.h
index 31602059890e4b8396e988ce7ca4fca4ab1d5444..793fea286006c749fdfa040ac12a9fd49b1d9ae4 100644 (file)
--- a/include/asm-cris/cacheflush.h
+++ b/include/asm-cris/cacheflush.h
@@ -11,8 +11,9 @@
 #define flush_cache_mm(mm)                     do { } while (0)
 #define flush_cache_range(vma, start, end)     do { } while (0)
 #define flush_cache_page(vma, vmaddr)          do { } while (0)
-#define flush_page_to_ram(page)                        do { } while (0)
 #define flush_dcache_page(page)                        do { } while (0)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define flush_icache_range(start, end)         do { } while (0)
 #define flush_icache_page(vma,pg)              do { } while (0)
 #define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)

diff --git a/include/asm-h8300/cacheflush.h b/include/asm-h8300/cacheflush.h
index 429eee0270fe02ff7031681d26a385a881423247..d9583676f5d59de10e0115e2c0e8e6666813d87f 100644 (file)
--- a/include/asm-h8300/cacheflush.h
+++ b/include/asm-h8300/cacheflush.h
@@ -14,8 +14,9 @@
 #define        flush_cache_mm(mm)
 #define        flush_cache_range(vma,a,b)
 #define        flush_cache_page(vma,p)
-#define        flush_page_to_ram(page)
 #define        flush_dcache_page(page)
+#define        flush_dcache_mmap_lock(mapping)
+#define        flush_dcache_mmap_unlock(mapping)
 #define        flush_icache()
 #define        flush_icache_page(vma,page)
 #define        flush_icache_range(start,len)

diff --git a/include/asm-ia64/cacheflush.h b/include/asm-ia64/cacheflush.h
index 8aefdd6b60b3618fa17975f9e736315f88fecc18..ef0e256f2355b0333bb089a376ad93e098d93a8a 100644 (file)
--- a/include/asm-ia64/cacheflush.h
+++ b/include/asm-ia64/cacheflush.h
@@ -29,6 +29,9 @@ do {                                          \
        clear_bit(PG_arch_1, &(page)->flags);   \
 } while (0)
 
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
+
 extern void flush_icache_range (unsigned long start, unsigned long end);
 
 #define flush_icache_user_range(vma, page, user_addr, len)                                     \

diff --git a/include/asm-m68k/cacheflush.h b/include/asm-m68k/cacheflush.h
index ce4a543aad52744961d6d1d5de5b690f261316fa..da83998556c69f6103d980a8f6c59d9c0cbde865 100644 (file)
--- a/include/asm-m68k/cacheflush.h
+++ b/include/asm-m68k/cacheflush.h
@@ -128,6 +128,8 @@ static inline void __flush_page_to_ram(void *vaddr)
 }
 
 #define flush_dcache_page(page)                __flush_page_to_ram(page_address(page))
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define flush_icache_page(vma, page)   __flush_page_to_ram(page_address(page))
 #define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)
 #define copy_to_user_page(vma, page, vaddr, dst, src, len) \

diff --git a/include/asm-m68knommu/cacheflush.h b/include/asm-m68knommu/cacheflush.h
index 4c2ae48f09bffab5aa13b2df0be5d585f401c1c1..f7182c4c876f70aa603f8ead294c76eb448408e1 100644 (file)
--- a/include/asm-m68knommu/cacheflush.h
+++ b/include/asm-m68knommu/cacheflush.h
@@ -12,6 +12,8 @@
 #define flush_cache_page(vma, vmaddr)          do { } while (0)
 #define flush_dcache_range(start,len)          do { } while (0)
 #define flush_dcache_page(page)                        do { } while (0)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define flush_icache_range(start,len)          __flush_cache_all()
 #define flush_icache_page(vma,pg)              do { } while (0)
 #define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)

diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h
index 0ab4f7d671b3a6329b1720613d32f76e88ffd926..c08c486a2f2a05b8b5b6886e0673683f888fdf5e 100644 (file)
--- a/include/asm-mips/cacheflush.h
+++ b/include/asm-mips/cacheflush.h
@@ -45,6 +45,9 @@ static inline void flush_dcache_page(struct page *page)
 
 }
 
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
+
 extern void (*flush_icache_page)(struct vm_area_struct *vma,
        struct page *page);
 extern void (*flush_icache_range)(unsigned long start, unsigned long end);

diff --git a/include/asm-ppc/cacheflush.h b/include/asm-ppc/cacheflush.h
index b5cca6751ccb2d48300933127477a3d06d73e4d9..7848d7130f33243efac8c421a8dd2115527c3b8e 100644 (file)
--- a/include/asm-ppc/cacheflush.h
+++ b/include/asm-ppc/cacheflush.h
@@ -28,6 +28,9 @@
 #define flush_cache_vunmap(start, end) do { } while (0)
 
 extern void flush_dcache_page(struct page *page);
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
+
 extern void flush_icache_range(unsigned long, unsigned long);
 extern void flush_icache_user_range(struct vm_area_struct *vma,
                struct page *page, unsigned long addr, int len);

diff --git a/include/asm-ppc64/cacheflush.h b/include/asm-ppc64/cacheflush.h
index d6f24f9a1fed0f1fc740445eeeec3133fd77ccfb..d0f0dfd263d67e6c06887b5531e61755ed34d58e 100644 (file)
--- a/include/asm-ppc64/cacheflush.h
+++ b/include/asm-ppc64/cacheflush.h
@@ -18,6 +18,9 @@
 #define flush_cache_vunmap(start, end)         do { } while (0)
 
 extern void flush_dcache_page(struct page *page);
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
+
 extern void __flush_icache_range(unsigned long, unsigned long);
 extern void flush_icache_user_range(struct vm_area_struct *vma,
                                    struct page *page, unsigned long addr,

diff --git a/include/asm-s390/cacheflush.h b/include/asm-s390/cacheflush.h
index d1ff292fd794f5b4ce5c169dcf7f9e3e1cb81ea0..3c613c8e6234070d8f0f1aa0bb796f72b26ff9fb 100644 (file)
--- a/include/asm-s390/cacheflush.h
+++ b/include/asm-s390/cacheflush.h
@@ -10,6 +10,8 @@
 #define flush_cache_range(vma, start, end)     do { } while (0)
 #define flush_cache_page(vma, vmaddr)          do { } while (0)
 #define flush_dcache_page(page)                        do { } while (0)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define flush_icache_range(start, end)         do { } while (0)
 #define flush_icache_page(vma,pg)              do { } while (0)
 #define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)

diff --git a/include/asm-sh/cpu-sh2/cacheflush.h b/include/asm-sh/cpu-sh2/cacheflush.h
index 547aebe313fca0383e4c5de5e879284ae2888034..98cb67f374812cc4789b923abaab849cf1f21933 100644 (file)
--- a/include/asm-sh/cpu-sh2/cacheflush.h
+++ b/include/asm-sh/cpu-sh2/cacheflush.h
@@ -30,6 +30,8 @@
 #define flush_cache_range(vma, start, end)     do { } while (0)
 #define flush_cache_page(vma, vmaddr)          do { } while (0)
 #define flush_dcache_page(page)                        do { } while (0)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define flush_icache_range(start, end)         do { } while (0)
 #define flush_icache_page(vma,pg)              do { } while (0)
 #define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)

diff --git a/include/asm-sh/cpu-sh3/cacheflush.h b/include/asm-sh/cpu-sh3/cacheflush.h
index 4f494d6558b91c57d5371e8860a1dce7d655c142..e4cbef283a24898eb126a49dc2ff1f623b4157a3 100644 (file)
--- a/include/asm-sh/cpu-sh3/cacheflush.h
+++ b/include/asm-sh/cpu-sh3/cacheflush.h
@@ -30,6 +30,8 @@
 #define flush_cache_range(vma, start, end)     do { } while (0)
 #define flush_cache_page(vma, vmaddr)          do { } while (0)
 #define flush_dcache_page(page)                        do { } while (0)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define flush_icache_range(start, end)         do { } while (0)
 #define flush_icache_page(vma,pg)              do { } while (0)
 #define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)

diff --git a/include/asm-sh/cpu-sh4/cacheflush.h b/include/asm-sh/cpu-sh4/cacheflush.h
index 6437884819b68f316feaa3ab10ad23f9776a1d2b..9910dfaed9430f84016fe7fd7aaec898a40246ff 100644 (file)
--- a/include/asm-sh/cpu-sh4/cacheflush.h
+++ b/include/asm-sh/cpu-sh4/cacheflush.h
@@ -30,6 +30,10 @@ extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
                              unsigned long end);
 extern void flush_cache_page(struct vm_area_struct *vma, unsigned long addr);
 extern void flush_dcache_page(struct page *pg);
+
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
+
 extern void flush_icache_range(unsigned long start, unsigned long end);
 extern void flush_cache_sigtramp(unsigned long addr);
 extern void flush_icache_user_range(struct vm_area_struct *vma,

diff --git a/include/asm-sparc/cacheflush.h b/include/asm-sparc/cacheflush.h
index ac9f8acde00d97a9bf0c5d76fe8d2f0bbf1a1d04..a5f7fc33bc9e1fdf555a19c4eaaf95c79ae5e47e 100644 (file)
--- a/include/asm-sparc/cacheflush.h
+++ b/include/asm-sparc/cacheflush.h
@@ -70,6 +70,8 @@ BTFIXUPDEF_CALL(void, flush_sig_insns, struct mm_struct *, unsigned long)
 extern void sparc_flush_page_to_ram(struct page *page);
 
 #define flush_dcache_page(page)                        sparc_flush_page_to_ram(page)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 
 #define flush_cache_vmap(start, end)           flush_cache_all()
 #define flush_cache_vunmap(start, end)         flush_cache_all()

diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h
index ab3c4ff767d0f3941eb7e6ea5dcfecf6a2c4b79e..fc1931681536221960b770e035b41745425d8530 100644 (file)
--- a/include/asm-sparc64/cacheflush.h
+++ b/include/asm-sparc64/cacheflush.h
@@ -42,6 +42,8 @@ extern void __flush_dcache_range(unsigned long start, unsigned long end);
        memcpy(dst, src, len)
 
 extern void flush_dcache_page(struct page *page);
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 
 #define flush_cache_vmap(start, end)           do { } while (0)
 #define flush_cache_vunmap(start, end)         do { } while (0)

diff --git a/include/asm-v850/cacheflush.h b/include/asm-v850/cacheflush.h
index 32fdf158a7e450dc093282120242e87d92631f1d..17d7d893424fbd3f8b33acdb584af34a2a387d75 100644 (file)
--- a/include/asm-v850/cacheflush.h
+++ b/include/asm-v850/cacheflush.h
@@ -27,6 +27,8 @@
 #define flush_cache_range(vma, start, end)     ((void)0)
 #define flush_cache_page(vma, vmaddr)          ((void)0)
 #define flush_dcache_page(page)                        ((void)0)
+#define flush_dcache_mmap_lock(mapping)                ((void)0)
+#define flush_dcache_mmap_unlock(mapping)      ((void)0)
 #define flush_cache_vmap(start, end)           ((void)0)
 #define flush_cache_vunmap(start, end)         ((void)0)
 

diff --git a/include/asm-x86_64/cacheflush.h b/include/asm-x86_64/cacheflush.h
index 5ab521e3dc70cef5362d0b3a1e85921d24536cf2..ddc75f71450624c5ef9100203b41f31e526b870f 100644 (file)
--- a/include/asm-x86_64/cacheflush.h
+++ b/include/asm-x86_64/cacheflush.h
@@ -10,6 +10,8 @@
 #define flush_cache_range(vma, start, end)     do { } while (0)
 #define flush_cache_page(vma, vmaddr)          do { } while (0)
 #define flush_dcache_page(page)                        do { } while (0)
+#define flush_dcache_mmap_lock(mapping)                do { } while (0)
+#define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 #define flush_icache_range(start, end)         do { } while (0)
 #define flush_icache_page(vma,pg)              do { } while (0)
 #define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)