Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-11-21 19:50:00 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-11-21 19:50:00 -0800
commit1ca4ebb9fdc901de017fd2bd8e326cf1af0022d4 (patch)
tree46cdec34d94f935faae1b038df33346be92aba22
parent32ff6d014a0195cbca811a3ac9990a1f6820b681 (diff)
parent7ad26fa6b4d7f74b14b9fe6cfe6a044887ab2969 (diff)
Merge bk://bk.arm.linux.org.uk
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
-rw-r--r--arch/arm/kernel/process.c1
-rw-r--r--arch/arm/kernel/sys_arm.c8
-rw-r--r--arch/arm/kernel/traps.c1
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index f15b99bf8a9e..b5bcb9e52755 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -24,6 +24,7 @@
#include <linux/delay.h>
#include <linux/reboot.h>
#include <linux/interrupt.h>
+#include <linux/kallsyms.h>
#include <linux/init.h>
#include <asm/system.h>
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 47f4ff685a19..1dd757b7d29c 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -239,7 +239,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr,
asmlinkage int sys_fork(struct pt_regs *regs)
{
struct task_struct *p;
- p = do_fork(SIGCHLD, regs->ARM_sp, regs, 0, NULL);
+ p = do_fork(SIGCHLD, regs->ARM_sp, regs, 0, NULL, NULL);
return IS_ERR(p) ? PTR_ERR(p) : p->pid;
}
@@ -253,13 +253,13 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, struct
/*
* We don't support SETTID / CLEARTID
*/
- if (clone_flags & (CLONE_SETTID | CLONE_CLEARTID))
+ if (clone_flags & (CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID))
return -EINVAL;
if (!newsp)
newsp = regs->ARM_sp;
- p = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0, NULL);
+ p = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0, NULL, NULL);
return IS_ERR(p) ? PTR_ERR(p) : p->pid;
}
@@ -267,7 +267,7 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, struct
asmlinkage int sys_vfork(struct pt_regs *regs)
{
struct task_struct *p;
- p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->ARM_sp, regs, 0, NULL);
+ p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->ARM_sp, regs, 0, NULL, NULL);
return IS_ERR(p) ? PTR_ERR(p) : p->pid;
}
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 1fa2cee99774..3d8f784ce8e4 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -24,6 +24,7 @@
#include <linux/ptrace.h>
#include <linux/elf.h>
#include <linux/interrupt.h>
+#include <linux/kallsyms.h>
#include <linux/init.h>
#include <asm/atomic.h>