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

Merge branches 'fixes', 'pgt-next' and 'versatile' into devel

Browse Source
This commit is contained in:
Russell King
2011-03-20 09:32:12 +00:00
parent 6d7ed21d17 7d85d61f6a 516295e5ab 3de4ade3d6
commit 196f020fbb
65 changed files with 1044 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mm/dma-mapping.c
View File

@@ -149,6 +149,7 @@ static int __init consistent_init(void)
{
int ret = 0;
pgd_t *pgd;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;
int i = 0;
@@ -156,7 +157,15 @@ static int __init consistent_init(void)
do {
pgd = pgd_offset(&init_mm, base);
pmd = pmd_alloc(&init_mm, pgd, base);
pud = pud_alloc(&init_mm, pgd, base);
if (!pud) {
printk(KERN_ERR "%s: no pud tables\n", __func__);
ret = -ENOMEM;
break;
}
pmd = pmd_alloc(&init_mm, pud, base);
if (!pmd) {
printk(KERN_ERR "%s: no pmd tables\n", __func__);
ret = -ENOMEM;