Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / include / asm-sh / user.h

diff --git a/include/asm-sh/user.h b/include/asm-sh/user.h
index d1b8511d9d9f8772729aeb302119367c27744c7b..8fd3cf6c58d4b31925ce72d2966906ba0456fab6 100644 (file)
--- a/include/asm-sh/user.h
+++ b/include/asm-sh/user.h
@@ -27,12 +27,19 @@
  *     to write an integer number of pages.
  */
 
+#if defined(__SH5__) || defined(CONFIG_CPU_SH5)
+struct user_fpu_struct {
+       unsigned long fp_regs[32];
+       unsigned int fpscr;
+};
+#else
 struct user_fpu_struct {
        unsigned long fp_regs[16];
        unsigned long xfp_regs[16];
        unsigned long fpscr;
        unsigned long fpul;
 };
+#endif
 
 struct user {
        struct pt_regs  regs;                   /* entire machine state */
@@ -45,7 +52,7 @@ struct user {
        unsigned long   start_data;             /* data starting address */
        unsigned long   start_stack;            /* stack starting address */
        long int        signal;                 /* signal causing core dump */
-       struct regs *   u_ar0;                  /* help gdb find registers */
+       unsigned long   u_ar0;                  /* help gdb find registers */
        struct user_fpu_struct* u_fpstate;      /* Math Co-processor pointer */
        unsigned long   magic;                  /* identifies a core file */
        char            u_comm[32];             /* user command name */