Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=23464ffa47689e46985fb10ae9e34bbc9e83f387
Commit:     23464ffa47689e46985fb10ae9e34bbc9e83f387
Parent:     642f149031d70415d9318b919d50b71e4724adbd
Author:     WANG Cong <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 24 13:07:11 2007 +0200
Committer:  Jens Axboe <[EMAIL PROTECTED]>
CommitDate: Wed Oct 24 13:07:11 2007 +0200

    arch/um/drivers/ubd_kern.c: fix a building error
    
    Fix this uml building error:
    arch/um/drivers/ubd_kern.c: In function 'do_ubd_request':
    arch/um/drivers/ubd_kern.c:1118: error: implicit declaration of function
    'sg_page'
    arch/um/drivers/ubd_kern.c:1118: warning: passing argument 6 of
    'prepare_request' makes pointer from integer without a cast
    make[1]: *** [arch/um/drivers/ubd_kern.o] Error 1
    make: *** [arch/um/drivers] Error 2
    
    Signed-off-by: WANG Cong <[EMAIL PROTECTED]>
    
    Add sg_init_table() call as well.
    
    Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
---
 arch/um/drivers/ubd_kern.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 3a8cd3d..e184b44 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -35,6 +35,7 @@
 #include "linux/genhd.h"
 #include "linux/spinlock.h"
 #include "linux/platform_device.h"
+#include "linux/scatterlist.h"
 #include "asm/segment.h"
 #include "asm/uaccess.h"
 #include "asm/irq.h"
@@ -704,6 +705,7 @@ static int ubd_add(int n, char **error_out)
        ubd_dev->size = ROUND_BLOCK(ubd_dev->size);
 
        INIT_LIST_HEAD(&ubd_dev->restart);
+       sg_init_table(&ubd_dev->sg, MAX_SG);
 
        err = -ENOMEM;
        ubd_dev->queue = blk_init_queue(do_ubd_request, &ubd_dev->lock);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to