From: Ben Hutchings <ben@decadent.org.uk>
To: David Airlie <airlied@linux.ie>, dri-devel@lists.freedesktop.org
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/8] drm: Do not include page offset in argument to virt_to_page()
Date: Wed, 21 Dec 2011 01:33:24 +0000 [thread overview]
Message-ID: <1324431204.2844.148.camel@deadeye> (raw)
In-Reply-To: <1324430940.2844.144.camel@deadeye>
By definition, the page offset will not affect the result.
Compile-tested only.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
drivers/gpu/drm/drm_vm.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 8c03eaf..98c3922 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -306,7 +306,7 @@ static int drm_do_vm_dma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
offset = (unsigned long)vmf->virtual_address - vma->vm_start; /* vm_[pg]off[set] should be 0 */
page_nr = offset >> PAGE_SHIFT; /* page_nr could just be vmf->pgoff */
- page = virt_to_page((dma->pagelist[page_nr] + (offset & (~PAGE_MASK))));
+ page = virt_to_page(dma->pagelist[page_nr]);
get_page(page);
vmf->page = page;
--
1.7.7.3
next prev parent reply other threads:[~2011-12-21 1:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-21 1:29 [PATCH 0/8] Fix virtual and physical address types Ben Hutchings
2011-12-21 1:32 ` [PATCH 1/8] IB/cxgb4: Fix formatting of physical address Ben Hutchings
2011-12-21 2:35 ` Joe Perches
2011-12-21 2:47 ` Ben Hutchings
2011-12-22 19:52 ` Valdis.Kletnieks
2011-12-21 14:12 ` Steve Wise
2011-12-21 1:32 ` [PATCH 2/8] farsync: Fix confusion about DMA address and buffer offset types Ben Hutchings
2011-12-21 4:46 ` David Miller
2011-12-21 5:41 ` Ben Hutchings
2011-12-21 8:33 ` Kevin Curtis
2011-12-21 1:33 ` Ben Hutchings [this message]
2011-12-21 1:33 ` [PATCH 4/8] drm: Pass pointers to virt_to_page() Ben Hutchings
2011-12-21 1:34 ` [PATCH 5/8] [SCSI] tgt: Pass pointers to virt_to_page(), not integers Ben Hutchings
2011-12-21 1:36 ` [PATCH 6/8] uio: " Ben Hutchings
2011-12-21 1:59 ` Hans J. Koch
2011-12-21 1:36 ` [PATCH 7/8] rds: " Ben Hutchings
2011-12-21 1:37 ` [PATCH 8/8] pmcraid: Pass pointers to access_ok(), " Ben Hutchings
-- strict thread matches above, loose matches on Subject: below --
2013-10-27 21:47 [PATCH 0/8] Fix minor address type errors Ben Hutchings
2013-10-27 21:52 ` [PATCH 3/8] drm: Do not include page offset in argument to virt_to_page() Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1324431204.2844.148.camel@deadeye \
--to=ben@decadent.org.uk \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox