[ARM] Fixups for 2.5.48-bkcur

Fix compilation errors for do_fork() and print_symbol()

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index f15b99bf8a9e4b541c02daec87d0992ce15df743..b5bcb9e52755edd7cc37affc08cf3f0e4b0ae868 100644 (file)
--- 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 47f4ff685a190492a0743460f550fa6d7af0f68d..1dd757b7d29c3d9f16ef898ac4c5ac8584484ea1 100644 (file)
--- 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 1fa2cee997746d3b37274753fda6180f145e1dce..3d8f784ce8e47af7034f272109abc3da3e44a513 100644 (file)
--- 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>