diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2014-04-07 18:37:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 19:35:52 -0400 |
commit | 179e09637c1bb17c0b6fb347353c7c52e6931fa5 (patch) | |
tree | e73f6cbc63cb8f9d6ba7fc9a8a20ed42c7422c59 /drivers/lguest | |
parent | 65a6a4105f84f961fb219f5acaf05203f7114cf9 (diff) |
drivers/lguest/page_tables.c: rename do_set_pte()
"mm: introduce vm_ops->map_pages()" wants to export a do_set_pte() from core
kernel. Rename lguest's do_set_pte() to something more lguest-specific.
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/lguest')
-rw-r--r-- | drivers/lguest/page_tables.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index bfb39bb56ef1..e8b55c3a6170 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c | |||
@@ -887,7 +887,7 @@ void guest_new_pagetable(struct lg_cpu *cpu, unsigned long pgtable) | |||
887 | * _PAGE_ACCESSED then we can put a read-only PTE entry in immediately, and if | 887 | * _PAGE_ACCESSED then we can put a read-only PTE entry in immediately, and if |
888 | * they set _PAGE_DIRTY then we can put a writable PTE entry in immediately. | 888 | * they set _PAGE_DIRTY then we can put a writable PTE entry in immediately. |
889 | */ | 889 | */ |
890 | static void do_set_pte(struct lg_cpu *cpu, int idx, | 890 | static void __guest_set_pte(struct lg_cpu *cpu, int idx, |
891 | unsigned long vaddr, pte_t gpte) | 891 | unsigned long vaddr, pte_t gpte) |
892 | { | 892 | { |
893 | /* Look up the matching shadow page directory entry. */ | 893 | /* Look up the matching shadow page directory entry. */ |
@@ -960,13 +960,13 @@ void guest_set_pte(struct lg_cpu *cpu, | |||
960 | unsigned int i; | 960 | unsigned int i; |
961 | for (i = 0; i < ARRAY_SIZE(cpu->lg->pgdirs); i++) | 961 | for (i = 0; i < ARRAY_SIZE(cpu->lg->pgdirs); i++) |
962 | if (cpu->lg->pgdirs[i].pgdir) | 962 | if (cpu->lg->pgdirs[i].pgdir) |
963 | do_set_pte(cpu, i, vaddr, gpte); | 963 | __guest_set_pte(cpu, i, vaddr, gpte); |
964 | } else { | 964 | } else { |
965 | /* Is this page table one we have a shadow for? */ | 965 | /* Is this page table one we have a shadow for? */ |
966 | int pgdir = find_pgdir(cpu->lg, gpgdir); | 966 | int pgdir = find_pgdir(cpu->lg, gpgdir); |
967 | if (pgdir != ARRAY_SIZE(cpu->lg->pgdirs)) | 967 | if (pgdir != ARRAY_SIZE(cpu->lg->pgdirs)) |
968 | /* If so, do the update. */ | 968 | /* If so, do the update. */ |
969 | do_set_pte(cpu, pgdir, vaddr, gpte); | 969 | __guest_set_pte(cpu, pgdir, vaddr, gpte); |
970 | } | 970 | } |
971 | } | 971 | } |
972 | 972 | ||