mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
xen: MFN/GFN/BFN terminology changes for 4.3-rc0
- Use the correct GFN/BFN terms more consistently. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJV8VRMAAoJEFxbo/MsZsTRiGQH/i/jrAJUJfrFC2PINaA2gDwe O0dlrkCiSgAYChGmxxxXZQSPM5Po5+EbT/dLjZ/uvSooeorM9RYY/mFo7ut/qLep 4pyQUuwGtebWGBZTrj9sygUVXVhgJnyoZxskNUbhj9zvP7hb9++IiI78mzne6cpj lCh/7Z2dgpfRcKlNRu+qpzP79Uc7OqIfDK+IZLrQKlXa7IQDJTQYoRjbKpfCtmMV BEG3kN9ESx5tLzYiAfxvaxVXl9WQFEoktqe9V8IgOQlVRLgJ2DQWS6vmraGrokWM 3HDOCHtRCXlPhu1Vnrp0R9OgqWbz8FJnmVAndXT8r3Nsjjmd0aLwhJx7YAReO/4= =JDia -----END PGP SIGNATURE----- Merge tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip Pull xen terminology fixes from David Vrabel: "Use the correct GFN/BFN terms more consistently" * tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/xenbus: Rename the variable xen_store_mfn to xen_store_gfn xen/privcmd: Further s/MFN/GFN/ clean-up hvc/xen: Further s/MFN/GFN clean-up video/xen-fbfront: Further s/MFN/GFN clean-up xen/tmem: Use xen_page_to_gfn rather than pfn_to_gfn xen: Use correctly the Xen memory terminologies arm/xen: implement correctly pfn_to_mfn xen: Make clear that swiotlb and biomerge are dealing with DMA address
This commit is contained in:
commit
06ab838c20
29 changed files with 198 additions and 158 deletions
|
|
@ -377,7 +377,6 @@ static int map_data_for_request(struct vscsifrnt_info *info,
|
|||
unsigned int data_len = scsi_bufflen(sc);
|
||||
unsigned int data_grants = 0, seg_grants = 0;
|
||||
struct scatterlist *sg;
|
||||
unsigned long mfn;
|
||||
struct scsiif_request_segment *seg;
|
||||
|
||||
ring_req->nr_segments = 0;
|
||||
|
|
@ -420,9 +419,9 @@ static int map_data_for_request(struct vscsifrnt_info *info,
|
|||
ref = gnttab_claim_grant_reference(&gref_head);
|
||||
BUG_ON(ref == -ENOSPC);
|
||||
|
||||
mfn = pfn_to_mfn(page_to_pfn(page));
|
||||
gnttab_grant_foreign_access_ref(ref,
|
||||
info->dev->otherend_id, mfn, 1);
|
||||
info->dev->otherend_id,
|
||||
xen_page_to_gfn(page), 1);
|
||||
shadow->gref[ref_cnt] = ref;
|
||||
ring_req->seg[ref_cnt].gref = ref;
|
||||
ring_req->seg[ref_cnt].offset = (uint16_t)off;
|
||||
|
|
@ -454,9 +453,10 @@ static int map_data_for_request(struct vscsifrnt_info *info,
|
|||
ref = gnttab_claim_grant_reference(&gref_head);
|
||||
BUG_ON(ref == -ENOSPC);
|
||||
|
||||
mfn = pfn_to_mfn(page_to_pfn(page));
|
||||
gnttab_grant_foreign_access_ref(ref,
|
||||
info->dev->otherend_id, mfn, grant_ro);
|
||||
info->dev->otherend_id,
|
||||
xen_page_to_gfn(page),
|
||||
grant_ro);
|
||||
|
||||
shadow->gref[ref_cnt] = ref;
|
||||
seg->gref = ref;
|
||||
|
|
|
|||
Loading…
Reference in a new issue