diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 07:35:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 07:35:41 -0700 |
| commit | 7c8d20d40f29e7c08332d406d7a65678dece4627 (patch) | |
| tree | 4543b2ee96158c2591b9a897b2d85a0241ad7d61 /arch/arm/mm/fault.c | |
| parent | 63a07cb64ccc3ceae619d3298545d602ab5ecd38 (diff) | |
| parent | 9a40ac86152c9cffd3dca482a15ddf9a8c5716b3 (diff) | |
| download | kernel_samsung_smdk4412-7c8d20d40f29e7c08332d406d7a65678dece4627.zip kernel_samsung_smdk4412-7c8d20d40f29e7c08332d406d7a65678dece4627.tar.gz kernel_samsung_smdk4412-7c8d20d40f29e7c08332d406d7a65678dece4627.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6164/1: Add kto and kfrom to input operands list.
ARM: 6166/1: Proper prefetch abort handling on pre-ARMv6
ARM: 6165/1: trap overflows on highmem pages from kmap_atomic when debugging
ARM: 6152/1: ux500 make it possible to disable localtimers
[ARM] pxa/spitz: Correctly register WM8750
[ARM] pxa/palmtc: storage class should be before const qualifier
ARM: 6146/1: sa1111: Prevent deadlock in resume path
ARM: 6145/1: ux500 MTU clockrate correction
ARM: 6144/1: TCM memory bug freeing bug
ARM: VFP: Fix vfp_put_double() for d16-d31
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 92f5801..cbfb2ed 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, if (addr < TASK_SIZE) return do_page_fault(addr, fsr, regs); + if (user_mode(regs)) + goto bad_area; + index = pgd_index(addr); /* |