aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/brd.c
diff options
context:
space:
mode:
authorJared Hulbert <jaredeh@gmail.com>2008-04-28 05:13:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:23 -0400
commit30afcb4bd2762fa4b87b17ada9500aa46dc10b1b (patch)
tree0920f491a37683a8784c146270b98f82a7e0aa2c /drivers/block/brd.c
parent423bad600443c590f34ed7ce357591f76f48f137 (diff)
return pfn from direct_access, for XIP
Alter the block device ->direct_access() API to work with the new get_xip_mem() API (that requires both kaddr and pfn are returned). Some architectures will not do the right thing in their virt_to_page() for use by XIP (to translate from the kernel virtual address returned by direct_access(), to a user mappable pfn in XIP's page fault handler. However, we can't switch it to just return the pfn and not the kaddr, because we have no good way to get a kva from a pfn, and XIP requires the kva for its read(2) and write(2) handlers. So we have to return both. Signed-off-by: Jared Hulbert <jaredeh@gmail.com> Signed-off-by: Nick Piggin <npiggin@suse.de> Cc: Carsten Otte <cotte@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: linux-mm@kvack.org Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block/brd.c')
-rw-r--r--drivers/block/brd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 7bd76639544c..e8e38faeafd8 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -319,7 +319,7 @@ out:
319 319
320#ifdef CONFIG_BLK_DEV_XIP 320#ifdef CONFIG_BLK_DEV_XIP
321static int brd_direct_access (struct block_device *bdev, sector_t sector, 321static int brd_direct_access (struct block_device *bdev, sector_t sector,
322 unsigned long *data) 322 void **kaddr, unsigned long *pfn)
323{ 323{
324 struct brd_device *brd = bdev->bd_disk->private_data; 324 struct brd_device *brd = bdev->bd_disk->private_data;
325 struct page *page; 325 struct page *page;
@@ -333,7 +333,8 @@ static int brd_direct_access (struct block_device *bdev, sector_t sector,
333 page = brd_insert_page(brd, sector); 333 page = brd_insert_page(brd, sector);
334 if (!page) 334 if (!page)
335 return -ENOMEM; 335 return -ENOMEM;
336 *data = (unsigned long)page_address(page); 336 *kaddr = page_address(page);
337 *pfn = page_to_pfn(page);
337 338
338 return 0; 339 return 0;
339} 340}