projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
xen
/
xlate_mmu.c
diff --git
a/drivers/xen/xlate_mmu.c
b/drivers/xen/xlate_mmu.c
index 58a5389aec891932f18a81770a7d0a248d6c12c2..cff23872c5a965884b227655d08615ef905b91b6 100644
(file)
--- a/
drivers/xen/xlate_mmu.c
+++ b/
drivers/xen/xlate_mmu.c
@@
-38,8
+38,8
@@
#include <xen/interface/xen.h>
#include <xen/interface/memory.h>
#include <xen/interface/xen.h>
#include <xen/interface/memory.h>
-/* map fg
m
fn of domid to lpfn in the current domain */
-static int map_foreign_page(unsigned long lpfn, unsigned long fg
m
fn,
+/* map fgfn of domid to lpfn in the current domain */
+static int map_foreign_page(unsigned long lpfn, unsigned long fgfn,
unsigned int domid)
{
int rc;
unsigned int domid)
{
int rc;
@@
-49,7
+49,7
@@
static int map_foreign_page(unsigned long lpfn, unsigned long fgmfn,
.size = 1,
.space = XENMAPSPACE_gmfn_foreign,
};
.size = 1,
.space = XENMAPSPACE_gmfn_foreign,
};
- xen_ulong_t idx = fg
m
fn;
+ xen_ulong_t idx = fgfn;
xen_pfn_t gpfn = lpfn;
int err = 0;
xen_pfn_t gpfn = lpfn;
int err = 0;
@@
-62,13
+62,13
@@
static int map_foreign_page(unsigned long lpfn, unsigned long fgmfn,
}
struct remap_data {
}
struct remap_data {
- xen_pfn_t *fg
mfn; /* foreign domain's gm
fn */
+ xen_pfn_t *fg
fn; /* foreign domain's g
fn */
pgprot_t prot;
domid_t domid;
struct vm_area_struct *vma;
int index;
struct page **pages;
pgprot_t prot;
domid_t domid;
struct vm_area_struct *vma;
int index;
struct page **pages;
- struct xen_remap_
m
fn_info *info;
+ struct xen_remap_
g
fn_info *info;
int *err_ptr;
int mapped;
};
int *err_ptr;
int mapped;
};
@@
-82,20
+82,20
@@
static int remap_pte_fn(pte_t *ptep, pgtable_t token, unsigned long addr,
pte_t pte = pte_mkspecial(pfn_pte(pfn, info->prot));
int rc;
pte_t pte = pte_mkspecial(pfn_pte(pfn, info->prot));
int rc;
- rc = map_foreign_page(pfn, *info->fg
m
fn, info->domid);
+ rc = map_foreign_page(pfn, *info->fgfn, info->domid);
*info->err_ptr++ = rc;
if (!rc) {
set_pte_at(info->vma->vm_mm, addr, ptep, pte);
info->mapped++;
}
*info->err_ptr++ = rc;
if (!rc) {
set_pte_at(info->vma->vm_mm, addr, ptep, pte);
info->mapped++;
}
- info->fg
m
fn++;
+ info->fgfn++;
return 0;
}
int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
unsigned long addr,
return 0;
}
int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
unsigned long addr,
- xen_pfn_t *
m
fn, int nr,
+ xen_pfn_t *
g
fn, int nr,
int *err_ptr, pgprot_t prot,
unsigned domid,
struct page **pages)
int *err_ptr, pgprot_t prot,
unsigned domid,
struct page **pages)
@@
-108,7
+108,7
@@
int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
x86 PVOPS */
BUG_ON(!((vma->vm_flags & (VM_PFNMAP | VM_IO)) == (VM_PFNMAP | VM_IO)));
x86 PVOPS */
BUG_ON(!((vma->vm_flags & (VM_PFNMAP | VM_IO)) == (VM_PFNMAP | VM_IO)));
- data.fg
mfn = m
fn;
+ data.fg
fn = g
fn;
data.prot = prot;
data.domid = domid;
data.vma = vma;
data.prot = prot;
data.domid = domid;
data.vma = vma;