diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-25 22:08:55 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-25 22:08:55 +0000 |
| commit | 0003cedfc577be9d679c16531f8720739e9637ed (patch) | |
| tree | 3b7a1e9087384706c8320f85f650ab96139e8c00 /arch/arm/kernel/sys_arm.c | |
| parent | 3ee357f0f38a5fddebab18500c290d3879a2d89c (diff) | |
| parent | c76b6b41d0ae29e1127d9f81cb687cabda57c14c (diff) | |
Merge nommu tree
Fix merge conflict in arch/arm/mm/proc-xscale.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/sys_arm.c')
| -rw-r--r-- | arch/arm/kernel/sys_arm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c index a491de2d902..8170af47143 100644 --- a/arch/arm/kernel/sys_arm.c +++ b/arch/arm/kernel/sys_arm.c @@ -234,7 +234,12 @@ asmlinkage int sys_ipc(uint call, int first, int second, int third, */ asmlinkage int sys_fork(struct pt_regs *regs) { +#ifdef CONFIG_MMU return do_fork(SIGCHLD, regs->ARM_sp, regs, 0, NULL, NULL); +#else + /* can not support in nommu mode */ + return(-EINVAL); +#endif } /* Clone a task - this clones the calling program thread. |