[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1439363150-8661-14-git-send-email-hch@lst.de>
Date: Wed, 12 Aug 2015 09:05:32 +0200
From: Christoph Hellwig <hch@....de>
To: torvalds@...ux-foundation.org, axboe@...nel.dk
Cc: dan.j.williams@...el.com, vgupta@...opsys.com,
hskinnemoen@...il.com, egtvedt@...fundet.no, realmz6@...il.com,
dhowells@...hat.com, monstr@...str.eu, x86@...nel.org,
dwmw2@...radead.org, alex.williamson@...hat.com,
grundler@...isc-linux.org, linux-kernel@...r.kernel.org,
linux-arch@...r.kernel.org, linux-alpha@...r.kernel.org,
linux-ia64@...r.kernel.org, linux-metag@...r.kernel.org,
linux-mips@...ux-mips.org, linux-parisc@...r.kernel.org,
linuxppc-dev@...ts.ozlabs.org, linux-s390@...r.kernel.org,
sparclinux@...r.kernel.org, linux-xtensa@...ux-xtensa.org,
linux-nvdimm@...1.01.org, linux-media@...r.kernel.org
Subject: [PATCH 13/31] sparc/ldc: handle page-less SG entries
Use
sg_phys(sg) & PAGE_MASK
instead of
page_to_pfn(sg_page(sg)) << PAGE_SHIFT
to get at the page-aligned physical address ofa SG entry, so that
we don't require a page backing for SG entries.
Signed-off-by: Christoph Hellwig <hch@....de>
---
arch/sparc/kernel/ldc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index 1ae5eb1..0a29974 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -2051,7 +2051,7 @@ static void fill_cookies(struct cookie_state *sp, unsigned long pa,
static int sg_count_one(struct scatterlist *sg)
{
- unsigned long base = page_to_pfn(sg_page(sg)) << PAGE_SHIFT;
+ unsigned long base = sg_phys(sg) & PAGE_MASK;
long len = sg->length;
if ((sg->offset | len) & (8UL - 1))
@@ -2114,7 +2114,7 @@ int ldc_map_sg(struct ldc_channel *lp,
state.nc = 0;
for_each_sg(sg, s, num_sg, i) {
- fill_cookies(&state, page_to_pfn(sg_page(s)) << PAGE_SHIFT,
+ fill_cookies(&state, sg_phys(s) & PAGE_MASK,
s->offset, s->length);
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists