Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / avr32 / kernel / process.c

diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index e7b61494c312e7a4683f11707b2a7ff8a32f6e3b..42a53e740a7ee1c93044a01742e93250dc919346 100644 (file)
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -289,7 +289,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
                memset(childregs, 0, sizeof(struct pt_regs));
                p->thread.cpu_context.r0 = arg;
                p->thread.cpu_context.r1 = usp; /* fn */
-               p->thread.cpu_context.r2 = syscall_return;
+               p->thread.cpu_context.r2 = (unsigned long)syscall_return;
                p->thread.cpu_context.pc = (unsigned long)ret_from_kernel_thread;
                childregs->sr = MODE_SUPERVISOR;
        } else {
@@ -341,7 +341,7 @@ unsigned long get_wchan(struct task_struct *p)
                 * is actually quite ugly. It might be possible to
                 * determine the frame size automatically at build
                 * time by doing this:
-                *   - compile sched.c
+                *   - compile sched/core.c
                 *   - disassemble the resulting sched.o
                 *   - look for 'sub sp,??' shortly after '<schedule>:'
                 */