aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-04-25 07:55:57 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-25 07:55:57 -0700
commit9090e001f28de4bccae232f1b78e78fad5132ecb (patch)
tree49a7ebcafb3dd05fea6ee8e4a1a88c17894c720e
parentAutomatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git (diff)
downloadlinux-dev-9090e001f28de4bccae232f1b78e78fad5132ecb.tar.xz
linux-dev-9090e001f28de4bccae232f1b78e78fad5132ecb.zip
[PATCH] ppc user annotations: sigcontext
sigcontext.regs is a userland pointer Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/ppc/kernel/signal.c2
-rw-r--r--include/asm-ppc/sigcontext.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c
index 645eae19805c..d500f5ebc29c 100644
--- a/arch/ppc/kernel/signal.c
+++ b/arch/ppc/kernel/signal.c
@@ -632,7 +632,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
if (__put_user((unsigned long) ka->sa.sa_handler, &sc->handler)
|| __put_user(oldset->sig[0], &sc->oldmask)
|| __put_user(oldset->sig[1], &sc->_unused[3])
- || __put_user((struct pt_regs *)frame, &sc->regs)
+ || __put_user((struct pt_regs __user *)frame, &sc->regs)
|| __put_user(sig, &sc->signal))
goto badframe;
diff --git a/include/asm-ppc/sigcontext.h b/include/asm-ppc/sigcontext.h
index fc5e358c65f1..f82dcccdee1e 100644
--- a/include/asm-ppc/sigcontext.h
+++ b/include/asm-ppc/sigcontext.h
@@ -9,7 +9,7 @@ struct sigcontext {
int signal;
unsigned long handler;
unsigned long oldmask;
- struct pt_regs *regs;
+ struct pt_regs __user *regs;
};
#endif