summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarc Gauthier <marc@tensilica.com>2012-10-15 03:55:36 +0400
committerChris Zankel <chris@zankel.net>2012-10-16 08:42:52 +0400
commit1bbedc3a7bf2a72b9b58ce1d171811db757b1940 (patch)
tree23dcbb45645adb765ab62b2ffa8c29910dd61a6e /arch
parent84ed30538b5d9a29a9612b93dd0a45d561624f82 (diff)
downloadlinux-1bbedc3a7bf2a72b9b58ce1d171811db757b1940.tar.xz
xtensa: fix missing return in do_page_fault for SIGBUS case
Signed-off-by: Marc Gauthier <marc@tensilica.com> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/xtensa/mm/fault.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 2c2f710ed1dc..245b08f7eaf4 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -6,7 +6,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2010 Tensilica Inc.
*
* Chris Zankel <chris@zankel.net>
* Joe Taylor <joe@tensilica.com, joetylr@yahoo.com>
@@ -186,6 +186,7 @@ do_sigbus:
/* Kernel mode? Handle exceptions or die */
if (!user_mode(regs))
bad_page_fault(regs, address, SIGBUS);
+ return;
vmalloc_fault:
{