diff --git a/[refs] b/[refs] index fcdd03c9627c..8e4fa71cb048 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f73832fd8fc42dd7cc73487147f5d5b8f8d2cf0 +refs/heads/master: 993fb38b1c0cd1a56d15aa99b337c780a538baa8 diff --git a/trunk/arch/x86_64/kernel/signal.c b/trunk/arch/x86_64/kernel/signal.c index 7760224cdfe3..d439ced150c6 100644 --- a/trunk/arch/x86_64/kernel/signal.c +++ b/trunk/arch/x86_64/kernel/signal.c @@ -83,7 +83,7 @@ sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, struct rt_sigframe { - char *pretcode; + char __user *pretcode; struct ucontext uc; struct siginfo info; };