summaryrefslogtreecommitdiffstats
path: root/arch/s390/mm/fault.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-11 09:56:12 +0200
committerJeff Garzik <jeff@garzik.org>2006-10-11 09:56:12 +0200
commit24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch)
tree7147b206304b028c3cfd5de6317e5c8510098ca9 /arch/s390/mm/fault.c
parent[netdrvr] b44: handle excessive multicast groups (diff)
parentACPI: Allow setting SCI_EN bit in PM1_CONTROL register (diff)
downloadlinux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz
linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/s390/mm/fault.c')
-rw-r--r--arch/s390/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 9c3c19fe62fc..1c323bbfda91 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -451,7 +451,7 @@ void pfault_fini(void)
}
asmlinkage void
-pfault_interrupt(struct pt_regs *regs, __u16 error_code)
+pfault_interrupt(__u16 error_code)
{
struct task_struct *tsk;
__u16 subcode;