lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next

Browse Source
This commit is contained in:
Russell King
2011-07-22 23:08:48 +01:00
parent 4348810a24 022ae537b2 30891c90d8 e7d59db91a e2f81844ef 4cde7e0dca 7f294e4983 29cb3cd208 19dad35fe0
commit 06f365acef
934 changed files with 33903 additions and 6663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mm/fault.c
View File

@@ -94,7 +94,7 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
pud = pud_offset(pgd, addr);
if (PTRS_PER_PUD != 1)
printk(", *pud=%08lx", pud_val(*pud));
printk(", *pud=%08llx", (long long)pud_val(*pud));
if (pud_none(*pud))
break;
@@ -285,6 +285,10 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
tsk = current;
mm = tsk->mm;
/* Enable interrupts if they were enabled in the parent context. */
if (interrupts_enabled(regs))
local_irq_enable();
/*
* If we're in an interrupt or have no user
* context, we must not take the fault..