diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2008-02-07 23:10:28 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 14:15:55 -0800 |
| commit | 145e9230760e4db27cf5f00fd04b005c79ca1c12 (patch) | |
| tree | 4c247a81767ea5bb09878af2f39d9ebe19c6d8af /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 (diff) | |
| download | linux-dev-145e9230760e4db27cf5f00fd04b005c79ca1c12.tar.xz linux-dev-145e9230760e4db27cf5f00fd04b005c79ca1c12.zip | |
m68k: correct setting of struct user.u_ar0
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 3ee918695215..f85b928ffac4 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -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; |