git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
s390
/
mm
/
fault.c
diff --git
a/arch/s390/mm/fault.c
b/arch/s390/mm/fault.c
index
8b2dda8
..
d6bd3d4
100644
(file)
--- a/
arch/s390/mm/fault.c
+++ b/
arch/s390/mm/fault.c
@@
-25,11
+25,11
@@
#include <linux/init.h>
#include <linux/console.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/module.h>
+#include <linux/hardirq.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-#include <asm/hardirq.h>
#ifndef CONFIG_ARCH_S390X
#define __FAIL_ADDR_MASK 0x7ffff000
#ifndef CONFIG_ARCH_S390X
#define __FAIL_ADDR_MASK 0x7ffff000
@@
-126,8
+126,8
@@
static inline int check_user_space(struct pt_regs *regs, int error_code)
* Send SIGSEGV to task. This is an external routine
* to keep the stack usage of do_page_fault small.
*/
* Send SIGSEGV to task. This is an external routine
* to keep the stack usage of do_page_fault small.
*/
-static void
force
_sigsegv(struct pt_regs *regs, unsigned long error_code,
-
int si_code, unsigned long address)
+static void
do
_sigsegv(struct pt_regs *regs, unsigned long error_code,
+ int si_code, unsigned long address)
{
struct siginfo si;
{
struct siginfo si;
@@
-282,7
+282,7
@@
bad_area:
if (regs->psw.mask & PSW_MASK_PSTATE) {
tsk->thread.prot_addr = address;
tsk->thread.trap_no = error_code;
if (regs->psw.mask & PSW_MASK_PSTATE) {
tsk->thread.prot_addr = address;
tsk->thread.trap_no = error_code;
-
force
_sigsegv(regs, error_code, si_code, address);
+
do
_sigsegv(regs, error_code, si_code, address);
return;
}
return;
}