From a457613e5ad1da8ba9132d56ded5929329894d77 Mon Sep 17 00:00:00 2001
From: Stefan Haberland <stefan.haberland@de.ibm.com>
Date: Thu, 17 Apr 2008 07:46:04 +0200
Subject: [PATCH] --- yaml --- r: 88411 b: refs/heads/master c:
 00966c0a5b00bc0afdc0bd0446adec271f8b098b h: refs/heads/master i:   88409:
 14e3e43744ee55a9b6c9a46c2622a6a517623b3e   88407:
 b45418842cf6d5cc5299fc4fcea528328113534a v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/s390/block/dasd_fba.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1a5e140a27ef..aece00b800d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35b58b028dfc99dd390a09f66945947c4945fa64
+refs/heads/master: 00966c0a5b00bc0afdc0bd0446adec271f8b098b
diff --git a/trunk/drivers/s390/block/dasd_fba.c b/trunk/drivers/s390/block/dasd_fba.c
index d13ea05089a7..116611583df8 100644
--- a/trunk/drivers/s390/block/dasd_fba.c
+++ b/trunk/drivers/s390/block/dasd_fba.c
@@ -125,7 +125,8 @@ dasd_fba_check_characteristics(struct dasd_device *device)
 
 	private = (struct dasd_fba_private *) device->private;
 	if (private == NULL) {
-		private = kzalloc(sizeof(struct dasd_fba_private), GFP_KERNEL);
+		private = kzalloc(sizeof(struct dasd_fba_private),
+				  GFP_KERNEL | GFP_DMA);
 		if (private == NULL) {
 			DEV_MESSAGE(KERN_WARNING, device, "%s",
 				    "memory allocation failed for private "