diff options
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/module.c | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/traps.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 1a85cfdad5ac..6055e1427ba3 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/moduleloader.h> | ||
| 14 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 15 | #include <linux/elf.h> | 16 | #include <linux/elf.h> |
| 16 | #include <linux/vmalloc.h> | 17 | #include <linux/vmalloc.h> |
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 | } |
