diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-06-28 08:47:04 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-06-28 08:47:04 -0400 |
| commit | 41bd03ba0758a076671e5de35ed084535984143d (patch) | |
| tree | 9a669f9f1f52996b38acb077655e4b044bba67c7 /arch/arm/mm/fault.c | |
| parent | 090830b4c79cd5ac85430822a9b87c90848bedcf (diff) | |
| parent | dc75925d67950889b79df1cc1518c21ec678df6c (diff) | |
Merge branch 'for_2.6.35rc' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'arch/arm/mm/fault.c')
| -rw-r--r-- | arch/arm/mm/fault.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 92f5801f99c1..cbfb2edcf7d1 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c | |||
| @@ -393,6 +393,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr, | |||
| 393 | if (addr < TASK_SIZE) | 393 | if (addr < TASK_SIZE) |
| 394 | return do_page_fault(addr, fsr, regs); | 394 | return do_page_fault(addr, fsr, regs); |
| 395 | 395 | ||
| 396 | if (user_mode(regs)) | ||
| 397 | goto bad_area; | ||
| 398 | |||
| 396 | index = pgd_index(addr); | 399 | index = pgd_index(addr); |
| 397 | 400 | ||
| 398 | /* | 401 | /* |