diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /arch/arm/kernel/signal.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/kernel/signal.c')
| -rw-r--r-- | arch/arm/kernel/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index e27ee1f701d5..f7194e44d5a9 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c | |||
| @@ -98,7 +98,7 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, | |||
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | #ifdef CONFIG_CRUNCH | 100 | #ifdef CONFIG_CRUNCH |
| 101 | static int preserve_crunch_context(struct crunch_sigframe *frame) | 101 | static int preserve_crunch_context(struct crunch_sigframe __user *frame) |
| 102 | { | 102 | { |
| 103 | char kbuf[sizeof(*frame) + 8]; | 103 | char kbuf[sizeof(*frame) + 8]; |
| 104 | struct crunch_sigframe *kframe; | 104 | struct crunch_sigframe *kframe; |
| @@ -111,7 +111,7 @@ static int preserve_crunch_context(struct crunch_sigframe *frame) | |||
| 111 | return __copy_to_user(frame, kframe, sizeof(*frame)); | 111 | return __copy_to_user(frame, kframe, sizeof(*frame)); |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | static int restore_crunch_context(struct crunch_sigframe *frame) | 114 | static int restore_crunch_context(struct crunch_sigframe __user *frame) |
| 115 | { | 115 | { |
| 116 | char kbuf[sizeof(*frame) + 8]; | 116 | char kbuf[sizeof(*frame) + 8]; |
| 117 | struct crunch_sigframe *kframe; | 117 | struct crunch_sigframe *kframe; |