summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2007-10-24 08:46:01 +0200
committerJens Axboe <axboe@carl.home.kernel.dk>2007-10-24 08:46:01 +0200
commitd91c5e8839791b27672277e81451873499bc517e (patch)
treee3218c3aa6809b56249856c6879bdf88c675b5a5
parentsg: add missing sg_init_table calls to zfcp (diff)
downloadlinux-d91c5e8839791b27672277e81451873499bc517e.tar.xz
linux-d91c5e8839791b27672277e81451873499bc517e.zip
More SG build fixes
Signed-off-by: Jens Axboe <axboe@carl.home.kernel.dk>
-rw-r--r--arch/sparc64/kernel/ldc.c2
-rw-r--r--drivers/block/sunvdc.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/ldc.c b/arch/sparc64/kernel/ldc.c
index c8313cb60f0a..217478a94128 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 7276f7d207c2..fac4c6cd04f7 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>