Automatic merge of /spare/repo/netdev-2.6 branch starfire

[linux-2.6] / arch / um / sys-x86_64 / signal.c

diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c
index b740177066a06d92de743d204cb2a0aa7d47bfae..73a7926f73705d100809adc35b567cb0594cb712 100644 (file)
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
@@ -168,7 +168,7 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
 
        frame = (struct rt_sigframe __user *)
                round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8;
-       frame -= 128;
+       ((unsigned char *) frame) -= 128;
 
        if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate)))
                goto out;