From: David Miller <davem@davemloft.net>
Date: Wed, 24 Oct 2007 06:46:01 +0000 (+0200)
Subject: More SG build fixes
X-Git-Tag: v2.6.24-rc2~141^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d91c5e8839791b27672277e81451873499bc517e;p=linux-2.6

More SG build fixes

Signed-off-by: Jens Axboe <axboe@carl.home.kernel.dk>
---

diff --git a/arch/sparc64/kernel/ldc.c b/arch/sparc64/kernel/ldc.c
index c8313cb60f..217478a941 100644
--- a/arch/sparc64/kernel/ldc.c
+++ b/arch/sparc64/kernel/ldc.c
@@ -2121,7 +2121,7 @@ int ldc_map_sg(struct ldc_channel *lp,
 	state.nc = 0;
 
 	for (i = 0; i < num_sg; i++)
-		fill_cookies(&state, page_to_pfn(sg[i].page) << PAGE_SHIFT,
+		fill_cookies(&state, page_to_pfn(sg_page(&sg[i])) << PAGE_SHIFT,
 			     sg[i].offset, sg[i].length);
 
 	return state.nc;
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 7276f7d207..fac4c6cd04 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/list.h>
+#include <linux/scatterlist.h>
 
 #include <asm/vio.h>
 #include <asm/ldc.h>