From f7d8c4fe435d99374c1a16f1418ad49962abb22e Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 2 Aug 2010 16:04:21 -0700
Subject: [PATCH] --- yaml --- r: 204627 b: refs/heads/master c:
 71cd03b0044183843318bfac0b6ce5868a96ef34 h: refs/heads/master i:   204625:
 b0d05c3b5a310a7162d310510a7c2730f1f47a20   204623:
 c6a4c2ea3d8562e79cb7c2ef54e8d541bb959067 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/sparc/mm/iommu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9281deb224e4..bc86609f078a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7765b8bbee863c8e388f6a2126280fa5edbfcdf2
+refs/heads/master: 71cd03b0044183843318bfac0b6ce5868a96ef34
diff --git a/trunk/arch/sparc/mm/iommu.c b/trunk/arch/sparc/mm/iommu.c
index b2e6e73888b5..0e8ae298b3c3 100644
--- a/trunk/arch/sparc/mm/iommu.c
+++ b/trunk/arch/sparc/mm/iommu.c
@@ -63,7 +63,7 @@ static void __init sbus_iommu_init(struct of_device *op)
 	unsigned long *bitmap;
 	unsigned long tmp;
 
-	iommu = kmalloc(sizeof(struct iommu_struct), GFP_ATOMIC);
+	iommu = kmalloc(sizeof(struct iommu_struct), GFP_KERNEL);
 	if (!iommu) {
 		prom_printf("Unable to allocate iommu structure\n");
 		prom_halt();