This lets it get shared outside of proc/ and linked in only when needed.

[akpm@linux-foundation.org: build fix]
Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/proc/task_mmu.c |  117 -------------------------------------------
 include/linux/mm.h |   10 +++
 lib/Makefile       |    2
 lib/pagewalk.c     |  112 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 123 insertions(+), 118 deletions(-)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 0add187b60f21f8098b37289edcf6f506fe7ee27..f745a9b2255cdb8d7f4b7d789e1735cc0199ae01 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -304,123 +304,6 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
        return 0;
 }
 
-struct mm_walk {
-       int (*pgd_entry)(pgd_t *, unsigned long, unsigned long, void *);
-       int (*pud_entry)(pud_t *, unsigned long, unsigned long, void *);
-       int (*pmd_entry)(pmd_t *, unsigned long, unsigned long, void *);
-       int (*pte_entry)(pte_t *, unsigned long, unsigned long, void *);
-};
-
-static int walk_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
-                         struct mm_walk *walk, void *private)
-{
-       pte_t *pte;
-       int err;
-
-       for (pte = pte_offset_map(pmd, addr); addr != end;
-            addr += PAGE_SIZE, pte++) {
-               if (pte_none(*pte))
-                       continue;
-               err = walk->pte_entry(pte, addr, addr, private);
-               if (err) {
-                       pte_unmap(pte);
-                       return err;
-               }
-       }
-       pte_unmap(pte);
-       return 0;
-}
-
-static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end,
-                         struct mm_walk *walk, void *private)
-{
-       pmd_t *pmd;
-       unsigned long next;
-       int err;
-
-       for (pmd = pmd_offset(pud, addr); addr != end;
-            pmd++, addr = next) {
-               next = pmd_addr_end(addr, end);
-               if (pmd_none_or_clear_bad(pmd))
-                       continue;
-               if (walk->pmd_entry) {
-                       err = walk->pmd_entry(pmd, addr, next, private);
-                       if (err)
-                               return err;
-               }
-               if (walk->pte_entry) {
-                       err = walk_pte_range(pmd, addr, next, walk, private);
-                       if (err)
-                               return err;
-               }
-       }
-       return 0;
-}
-
-static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end,
-                         struct mm_walk *walk, void *private)
-{
-       pud_t *pud;
-       unsigned long next;
-       int err;
-
-       for (pud = pud_offset(pgd, addr); addr != end;
-            pud++, addr = next) {
-               next = pud_addr_end(addr, end);
-               if (pud_none_or_clear_bad(pud))
-                       continue;
-               if (walk->pud_entry) {
-                       err = walk->pud_entry(pud, addr, next, private);
-                       if (err)
-                               return err;
-               }
-               if (walk->pmd_entry || walk->pte_entry) {
-                       err = walk_pmd_range(pud, addr, next, walk, private);
-                       if (err)
-                               return err;
-               }
-       }
-       return 0;
-}
-
-/*
- * walk_page_range - walk a memory map's page tables with a callback
- * @mm - memory map to walk
- * @addr - starting address
- * @end - ending address
- * @action - callback invoked for every bottom-level (PTE) page table
- * @private - private data passed to the callback function
- *
- * Recursively walk the page table for the memory area in a VMA, calling
- * a callback for every bottom-level (PTE) page table.
- */
-static int walk_page_range(struct mm_struct *mm,
-                          unsigned long addr, unsigned long end,
-                          struct mm_walk *walk, void *private)
-{
-       pgd_t *pgd;
-       unsigned long next;
-       int err;
-
-       for (pgd = pgd_offset(mm, addr); addr != end;
-            pgd++, addr = next) {
-               next = pgd_addr_end(addr, end);
-               if (pgd_none_or_clear_bad(pgd))
-                       continue;
-               if (walk->pgd_entry) {
-                       err = walk->pgd_entry(pgd, addr, next, private);
-                       if (err)
-                               return err;
-               }
-               if (walk->pud_entry || walk->pmd_entry || walk->pte_entry) {
-                       err = walk_pud_range(pgd, addr, next, walk, private);
-                       if (err)
-                               return err;
-               }
-       }
-       return 0;
-}
-
 static struct mm_walk smaps_walk = { .pmd_entry = smaps_pte_range };
 
 static int show_smap(struct seq_file *m, void *v)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index f0c8c3ff79ade2388558e293aca274d711fb9ee9..35cdca5496cacd274a9e9db0e77bf7892b1277c8 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -781,6 +781,16 @@ unsigned long unmap_vmas(struct mmu_gather **tlb,
                struct vm_area_struct *start_vma, unsigned long start_addr,
                unsigned long end_addr, unsigned long *nr_accounted,
                struct zap_details *);
+
+struct mm_walk {
+       int (*pgd_entry)(pgd_t *, unsigned long, unsigned long, void *);
+       int (*pud_entry)(pud_t *, unsigned long, unsigned long, void *);
+       int (*pmd_entry)(pmd_t *, unsigned long, unsigned long, void *);
+       int (*pte_entry)(pte_t *, unsigned long, unsigned long, void *);
+};
+
+int walk_page_range(struct mm_struct *, unsigned long addr, unsigned long end,
+                   struct mm_walk *walk, void *private);
 void free_pgd_range(struct mmu_gather **tlb, unsigned long addr,
                unsigned long end, unsigned long floor, unsigned long ceiling);
 void free_pgtables(struct mmu_gather **tlb, struct vm_area_struct *start_vma,

diff --git a/lib/Makefile b/lib/Makefile
index 07eb3ccffb5209bc25d6fe9adf3b8aec4cc64971..1baafeafd08a8675c0f1344589efcf339e11dcdc 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,6 +8,7 @@ lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \
         sha1.o
 
 lib-$(CONFIG_MMU) += ioremap.o
+lib-$(CONFIG_MMU) += pagewalk.o
 lib-$(CONFIG_SMP) += cpumask.o
 
 lib-y  += kobject.o kref.o kobject_uevent.o klist.o

diff --git a/lib/pagewalk.c b/lib/pagewalk.c
new file mode 100644 (file)
index 0000000..51f1973
--- /dev/null
+++ b/lib/pagewalk.c
@@ -0,0 +1,112 @@
+#include <linux/mm.h>
+#include <linux/highmem.h>
+
+static int walk_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
+                         struct mm_walk *walk, void *private)
+{
+       pte_t *pte;
+       int err;
+
+       for (pte = pte_offset_map(pmd, addr); addr != end;
+            addr += PAGE_SIZE, pte++) {
+               if (pte_none(*pte))
+                       continue;
+               err = walk->pte_entry(pte, addr, addr, private);
+               if (err) {
+                       pte_unmap(pte);
+                       return err;
+               }
+       }
+       pte_unmap(pte);
+       return 0;
+}
+
+static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end,
+                         struct mm_walk *walk, void *private)
+{
+       pmd_t *pmd;
+       unsigned long next;
+       int err;
+
+       for (pmd = pmd_offset(pud, addr); addr != end;
+            pmd++, addr = next) {
+               next = pmd_addr_end(addr, end);
+               if (pmd_none_or_clear_bad(pmd))
+                       continue;
+               if (walk->pmd_entry) {
+                       err = walk->pmd_entry(pmd, addr, next, private);
+                       if (err)
+                               return err;
+               }
+               if (walk->pte_entry) {
+                       err = walk_pte_range(pmd, addr, next, walk, private);
+                       if (err)
+                               return err;
+               }
+       }
+       return 0;
+}
+
+static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end,
+                         struct mm_walk *walk, void *private)
+{
+       pud_t *pud;
+       unsigned long next;
+       int err;
+
+       for (pud = pud_offset(pgd, addr); addr != end;
+            pud++, addr = next) {
+               next = pud_addr_end(addr, end);
+               if (pud_none_or_clear_bad(pud))
+                       continue;
+               if (walk->pud_entry) {
+                       err = walk->pud_entry(pud, addr, next, private);
+                       if (err)
+                               return err;
+               }
+               if (walk->pmd_entry || walk->pte_entry) {
+                       err = walk_pmd_range(pud, addr, next, walk, private);
+                       if (err)
+                               return err;
+               }
+       }
+       return 0;
+}
+
+/*
+ * walk_page_range - walk a memory map's page tables with a callback
+ * @mm - memory map to walk
+ * @addr - starting address
+ * @end - ending address
+ * @walk - set of callbacks to invoke for each level of the tree
+ * @private - private data passed to the callback function
+ *
+ * Recursively walk the page table for the memory area in a VMA, calling
+ * a callback for every bottom-level (PTE) page table.
+ */
+int walk_page_range(struct mm_struct *mm,
+                   unsigned long addr, unsigned long end,
+                   struct mm_walk *walk, void *private)
+{
+       pgd_t *pgd;
+       unsigned long next;
+       int err;
+
+       for (pgd = pgd_offset(mm, addr); addr != end;
+            pgd++, addr = next) {
+               next = pgd_addr_end(addr, end);
+               if (pgd_none_or_clear_bad(pgd))
+                       continue;
+               if (walk->pgd_entry) {
+                       err = walk->pgd_entry(pgd, addr, next, private);
+                       if (err)
+                               return err;
+               }
+               if (walk->pud_entry || walk->pmd_entry || walk->pte_entry) {
+                       err = walk_pud_range(pgd, addr, next, walk, private);
+                       if (err)
+                               return err;
+               }
+       }
+       return 0;
+}