Messages in this thread Patch in this message | | | Date | Wed, 5 Mar 2014 12:02:43 -0800 | From | Andrew Morton <> | Subject | Re: [PATCHv3 1/2] mm: introduce vm_ops->map_pages() |
| |
On Wed, 05 Mar 2014 10:34:15 +1030 Rusty Russell <rusty@rustcorp.com.au> wrote:
> Andrew Morton <akpm@linux-foundation.org> writes: > > On Thu, 27 Feb 2014 21:53:46 +0200 "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> wrote: > >> + > >> +void do_set_pte(struct vm_area_struct *vma, unsigned long address, > >> + struct page *page, pte_t *pte, bool write, bool anon); > >> #endif > >> > >> /* > > > > lguest made a dubious naming decision: > > > > drivers/lguest/page_tables.c:890: error: conflicting types for 'do_set_pte' > > include/linux/mm.h:593: note: previous declaration of 'do_set_pte' was here > > > > I'll rename lguest's do_set_pte() to do_guest_set_pte() as a > > preparatory patch. > > s/do_/ if you don't mind; if we're going to prefix it, we don't need the > extra verb.
drivers/lguest/page_tables.c already has a guest_set_pte(), which calls do_guest_set_pte().
How about we use the __ tradition, so __guest_set_pte() is a helper for guest_set_pte()?
--- a/drivers/lguest/page_tables.c~drivers-lguest-page_tablesc-rename-do_set_pte +++ a/drivers/lguest/page_tables.c @@ -887,7 +887,7 @@ void guest_new_pagetable(struct lg_cpu * * _PAGE_ACCESSED then we can put a read-only PTE entry in immediately, and if * they set _PAGE_DIRTY then we can put a writable PTE entry in immediately. */ -static void do_set_pte(struct lg_cpu *cpu, int idx, +static void __guest_set_pte(struct lg_cpu *cpu, int idx, unsigned long vaddr, pte_t gpte) { /* Look up the matching shadow page directory entry. */ @@ -960,13 +960,13 @@ void guest_set_pte(struct lg_cpu *cpu, unsigned int i; for (i = 0; i < ARRAY_SIZE(cpu->lg->pgdirs); i++) if (cpu->lg->pgdirs[i].pgdir) - do_set_pte(cpu, i, vaddr, gpte); + __guest_set_pte(cpu, i, vaddr, gpte); } else { /* Is this page table one we have a shadow for? */ int pgdir = find_pgdir(cpu->lg, gpgdir); if (pgdir != ARRAY_SIZE(cpu->lg->pgdirs)) /* If so, do the update. */ - do_set_pte(cpu, pgdir, vaddr, gpte); + __guest_set_pte(cpu, pgdir, vaddr, gpte); } } _
| |