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

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();