diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-09 06:12:06 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-09 06:12:06 -0400 |
| commit | 2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92 (patch) | |
| tree | b2306840f227972a7c9d4a2b75e516fe81358ce8 /arch/blackfin/kernel/signal.c | |
| parent | 02539d71fa98d5737bb668b02286c76241e4bac9 (diff) | |
| parent | 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5 (diff) | |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/blackfin/kernel/signal.c')
| -rw-r--r-- | arch/blackfin/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c index d1fa24401dc6..cb9d883d493c 100644 --- a/arch/blackfin/kernel/signal.c +++ b/arch/blackfin/kernel/signal.c | |||
| @@ -212,7 +212,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info, | |||
| 212 | 212 | ||
| 213 | /* Set up registers for signal handler */ | 213 | /* Set up registers for signal handler */ |
| 214 | wrusp((unsigned long)frame); | 214 | wrusp((unsigned long)frame); |
| 215 | if (get_personality & FDPIC_FUNCPTRS) { | 215 | if (current->personality & FDPIC_FUNCPTRS) { |
| 216 | struct fdpic_func_descriptor __user *funcptr = | 216 | struct fdpic_func_descriptor __user *funcptr = |
| 217 | (struct fdpic_func_descriptor *) ka->sa.sa_handler; | 217 | (struct fdpic_func_descriptor *) ka->sa.sa_handler; |
| 218 | __get_user(regs->pc, &funcptr->text); | 218 | __get_user(regs->pc, &funcptr->text); |