git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
arch
/
sparc
/
mm
/
fault_64.c
diff --git
a/arch/sparc/mm/fault_64.c
b/arch/sparc/mm/fault_64.c
index
2c0b966
..
bfd7c02
100644
(file)
--- a/
arch/sparc/mm/fault_64.c
+++ b/
arch/sparc/mm/fault_64.c
@@
-435,6
+435,8
@@
good_area:
if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM)
goto out_of_memory;
+ else if (fault & VM_FAULT_SIGSEGV)
+ goto bad_area;
else if (fault & VM_FAULT_SIGBUS)
goto do_sigbus;
BUG();