xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse Source 
* 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:
Linus Torvalds
2010-08-05 08:58:30 -07:00
parent 93b9e9a2d9 71cd03b004
commit 673b864fd7
7 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/mm/iommu.c
View File

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