diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /arch/arm/kernel/traps.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index f6de76e0a45d..baa09601a64e 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
| @@ -345,7 +345,9 @@ static int bad_syscall(int n, struct pt_regs *regs) | |||
| 345 | struct thread_info *thread = current_thread_info(); | 345 | struct thread_info *thread = current_thread_info(); |
| 346 | siginfo_t info; | 346 | siginfo_t info; |
| 347 | 347 | ||
| 348 | if (current->personality != PER_LINUX && thread->exec_domain->handler) { | 348 | if (current->personality != PER_LINUX && |
| 349 | current->personality != PER_LINUX_32BIT && | ||
| 350 | thread->exec_domain->handler) { | ||
| 349 | thread->exec_domain->handler(n, regs); | 351 | thread->exec_domain->handler(n, regs); |
| 350 | return regs->ARM_r0; | 352 | return regs->ARM_r0; |
| 351 | } | 353 | } |
