]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
m68k: correct setting of struct user.u_ar0
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 7 Feb 2008 22:10:28 +0000 (23:10 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 7 Feb 2008 22:15:55 +0000 (14:15 -0800)
Commit 6e16d89bcd668a95eb22add24c02d80890232b66 ("Sanitize the type of
struct user.u_ar0") forgot to change the m68k setting code, causing the
following compiler warning:

    arch/m68k/kernel/process.c:338: warning: assignment makes integer from pointer without a cast

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/m68k/kernel/process.c

index 3ee918695215791b10f01ca19e9095b094cf35f5..f85b928ffac418080315ac0e6aa19038f388ae24 100644 (file)
@@ -335,7 +335,7 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
        if (dump->start_stack < TASK_SIZE)
                dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
 
-       dump->u_ar0 = (struct user_regs_struct *)((int)&dump->regs - (int)dump);
+       dump->u_ar0 = offsetof(struct user, regs);
        sw = ((struct switch_stack *)regs) - 1;
        dump->regs.d1 = regs->d1;
        dump->regs.d2 = regs->d2;