summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-05 08:58:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-05 08:58:30 -0700
commit673b864fd76a29031aa0b4b08fc80886d527b3b7 (patch)
treec9b3f01206e7d0dd5c801b504bfd7e82383470d6 /arch
parent93b9e9a2d91b8a6c93f14e98382694f83de9f02e (diff)
parent71cd03b0044183843318bfac0b6ce5868a96ef34 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: arch/sparc/mm: Use GFP_KERNEL MAINTAINERS: Add trailing slash to SBUS path. sbus: autoconvert trivial BKL users to private mutex
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/mm/iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index b2e6e73888b5..0e8ae298b3c3 100644
--- a/arch/sparc/mm/iommu.c
+++ b/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();