m68k: correct setting of struct user.u_ar0
Geert Uytterhoeven
maintainerPATCH 1/1 m68k: correct setting of struct user.u_ar0
Commit 6e16d89bcd668a95eb22add24c02d80890232b66
Sanitize the type of struct user.u_ar0
struct user.u_ar0 is defined to contain a pointer offset on all architectures in which it is defined (all architectures which define an a.out format except SPARC.) However, it has a pointer type in the headers, which is pointless -- <asm/user.h> is not exported to userspace, and it just makes the code messy.
Redefine the field as "unsigned long" (which is the same size as a pointer on all Linux architectures) and change the setting code to user offsetof() instead of hand-coded arithmetic.
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
--- arch/m68k/kernel/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/kernel/process.c +1 -1
@@ -335,7 +335,7 @@ void dump_thread(struct pt_regs * regs,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;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds