Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / drivers / scsi / scsi_transport_iscsi.c

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 2effa1c33fb242234f9c0625af0bea047c697ddb..e08462d50c97e885305b218761407a74911b8f71 100644 (file)
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -21,8 +21,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/mempool.h>
 #include <net/tcp.h>
+
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
@@ -97,7 +100,7 @@ static ssize_t
 show_transport_handle(struct class_device *cdev, char *buf)
 {
        struct iscsi_internal *priv = cdev_to_iscsi_internal(cdev);
-       return sprintf(buf, "%llu", iscsi_handle(priv->iscsi_transport));
+       return sprintf(buf, "%llu\n", (unsigned long long)iscsi_handle(priv->iscsi_transport));
 }
 static CLASS_DEVICE_ATTR(handle, S_IRUGO, show_transport_handle, NULL);
 
@@ -246,7 +249,7 @@ static inline struct list_head *skb_to_lh(struct sk_buff *skb)
 }
 
 static void*
-mempool_zone_alloc_skb(unsigned int gfp_mask, void *pool_data)
+mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)
 {
        struct mempool_zone *zone = pool_data;
 
@@ -1230,7 +1233,8 @@ static __init int iscsi_transport_init(void)
        if (err)
                goto unregister_session_class;
 
-       nls = netlink_kernel_create(NETLINK_ISCSI, iscsi_if_rx);
+       nls = netlink_kernel_create(NETLINK_ISCSI, 1, iscsi_if_rx,
+                                   THIS_MODULE);
        if (!nls) {
                err = -ENOBUFS;
                goto unregister_notifier;