From 4bbde472438227d898b9a5ed771c8059f7b75fce Mon Sep 17 00:00:00 2001 From: Adam Lackorzynski Date: Sun, 4 Jan 2009 12:00:46 -0800 Subject: [PATCH] --- yaml --- r: 125729 b: refs/heads/master c: 2e4e27c7d082b2198b63041310609d7191185a9d h: refs/heads/master i: 125727: 9c2e49d07c59bb7b5dd4466aa94fbabacc6d54b0 v: v3 --- [refs] | 2 +- trunk/mm/vmalloc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 91ecaf25ddc7..2a982d1683bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b574b7b0124ed344911f5d581e9bc2d83bbeb19 +refs/heads/master: 2e4e27c7d082b2198b63041310609d7191185a9d diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 1ddb77ba3995..7465f22fec0c 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -151,11 +151,12 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr, * * Ie. pte at addr+N*PAGE_SIZE shall point to pfn corresponding to pages[N] */ -static int vmap_page_range(unsigned long addr, unsigned long end, +static int vmap_page_range(unsigned long start, unsigned long end, pgprot_t prot, struct page **pages) { pgd_t *pgd; unsigned long next; + unsigned long addr = start; int err = 0; int nr = 0; @@ -167,7 +168,7 @@ static int vmap_page_range(unsigned long addr, unsigned long end, if (err) break; } while (pgd++, addr = next, addr != end); - flush_cache_vmap(addr, end); + flush_cache_vmap(start, end); if (unlikely(err)) return err;