mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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
This commit is contained in:
commit
673b864fd7
7 changed files with 26 additions and 25 deletions
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Reference in a new issue