From 9ba59279e8eeb63bcec06fc8591f9ef8cfb64172 Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@de.ibm.com>
Date: Fri, 1 Aug 2008 16:39:14 +0200
Subject: [PATCH] --- yaml --- r: 107175 b: refs/heads/master c:
 883e512c99fc398d1b2b5e8e92b6bacff2551756 h: refs/heads/master i:   107173:
 27f09b0705c4a2b34e4063510aedf81ea68d8263   107171:
 5134bbf09e562a9d7e97fb6816ea39eadba72218   107167:
 be96e6c8296c684a6c4fecb28c312a2b341050e5 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/s390/cio/idset.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index eccb01cdf5b8..7d4235a9b0fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 683d718a893575a88c551ad71ea2c382eedbf67e
+refs/heads/master: 883e512c99fc398d1b2b5e8e92b6bacff2551756
diff --git a/trunk/drivers/s390/cio/idset.c b/trunk/drivers/s390/cio/idset.c
index ef7bc0a125ef..cf8f24a4b5eb 100644
--- a/trunk/drivers/s390/cio/idset.c
+++ b/trunk/drivers/s390/cio/idset.c
@@ -5,7 +5,7 @@
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
-#include <linux/slab.h>
+#include <linux/vmalloc.h>
 #include <linux/bitops.h>
 #include "idset.h"
 #include "css.h"
@@ -25,18 +25,18 @@ static struct idset *idset_new(int num_ssid, int num_id)
 {
 	struct idset *set;
 
-	set = kzalloc(sizeof(struct idset) + bitmap_size(num_ssid, num_id),
-		      GFP_KERNEL);
+	set = vmalloc(sizeof(struct idset) + bitmap_size(num_ssid, num_id));
 	if (set) {
 		set->num_ssid = num_ssid;
 		set->num_id = num_id;
+		memset(set->bitmap, 0, bitmap_size(num_ssid, num_id));
 	}
 	return set;
 }
 
 void idset_free(struct idset *set)
 {
-	kfree(set);
+	vfree(set);
 }
 
 void idset_clear(struct idset *set)