X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fblock%2Fbrd.c;h=e8e38faeafd8774d423366424ee60cf33c99338f;hb=77a50df2b14c8d3ee3c58c21c4a0e0157570df09;hp=7bd76639544c18d78d8b4ed87fb6befb7dcf685d;hpb=b24a31442e2ff66053ae4f76e9c69c557d59c7d1;p=linux-2.6

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 7bd7663954..e8e38faeaf 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -319,7 +319,7 @@ out:
 
 #ifdef CONFIG_BLK_DEV_XIP
 static int brd_direct_access (struct block_device *bdev, sector_t sector,
-			unsigned long *data)
+			void **kaddr, unsigned long *pfn)
 {
 	struct brd_device *brd = bdev->bd_disk->private_data;
 	struct page *page;
@@ -333,7 +333,8 @@ static int brd_direct_access (struct block_device *bdev, sector_t sector,
 	page = brd_insert_page(brd, sector);
 	if (!page)
 		return -ENOMEM;
-	*data = (unsigned long)page_address(page);
+	*kaddr = page_address(page);
+	*pfn = page_to_pfn(page);
 
 	return 0;
 }