diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /kernel/exec_domain.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'kernel/exec_domain.c')
| -rw-r--r-- | kernel/exec_domain.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c index 3c5881ee2..4aa968ee1 100644 --- a/kernel/exec_domain.c +++ b/kernel/exec_domain.c @@ -2,7 +2,7 @@ #include <linux/smp_lock.h> #include <linux/module.h> -static asmlinkage void no_lcall7(struct pt_regs * regs); +static asmlinkage void no_lcall7(int segment, struct pt_regs * regs); static unsigned long ident_map[32] = { @@ -25,9 +25,8 @@ struct exec_domain default_exec_domain = { static struct exec_domain *exec_domains = &default_exec_domain; -static asmlinkage void no_lcall7(struct pt_regs * regs) +static asmlinkage void no_lcall7(int segment, struct pt_regs * regs) { - /* * This may have been a static linked SVr4 binary, so we would have the * personality set incorrectly. Check to see whether SVr4 is available, @@ -44,7 +43,7 @@ static asmlinkage void no_lcall7(struct pt_regs * regs) if (current->exec_domain && current->exec_domain->handler && current->exec_domain->handler != no_lcall7) { - current->exec_domain->handler(regs); + current->exec_domain->handler(segment, regs); return; } @@ -98,7 +97,7 @@ int unregister_exec_domain(struct exec_domain *it) return -EINVAL; } -asmlinkage int sys_personality(unsigned long personality) +asmlinkage long sys_personality(unsigned long personality) { struct exec_domain *it; unsigned long old_personality; |