diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-01-15 19:33:11 -0800 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2013-01-15 19:33:11 -0800 |
| commit | fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe (patch) | |
| tree | b7ed0216b986c7a0c8f7ab7f2b77191d9b070ead /arch/arm/kernel | |
| parent | 2627bab94940583e37f36ffa9f635e35a335c33d (diff) | |
| parent | 2a68fec1118107fbaa40c631d45641d40d88ad71 (diff) | |
| download | kernel_samsung_tuna-fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe.zip kernel_samsung_tuna-fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe.tar.gz kernel_samsung_tuna-fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe.tar.bz2 | |
Merge commit 'v3.0.58' into android-3.0
Change-Id: I05959ed26f71cf9197df59291e8e13f254b2115c
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/swp_emulate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c index 40ee7e5..0951a32 100644 --- a/arch/arm/kernel/swp_emulate.c +++ b/arch/arm/kernel/swp_emulate.c @@ -108,10 +108,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr) { siginfo_t info; + down_read(¤t->mm->mmap_sem); if (find_vma(current->mm, addr) == NULL) info.si_code = SEGV_MAPERR; else info.si_code = SEGV_ACCERR; + up_read(¤t->mm->mmap_sem); info.si_signo = SIGSEGV; info.si_errno = 0; |