sparc: add '32' suffix to reg_window, sigcontext, __siginfo_t

Renaming a few types to contain a 32 suffix makes the
type names compatible with sparc64 and thus makes sharing
between the two a lot easier.

Note: None of these definitions are expected part of the
stable ABI towards userspace.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c
index c2a28c5ad65..6b1e6cde6ff 100644
--- a/arch/sparc/kernel/unaligned_32.c
+++ b/arch/sparc/kernel/unaligned_32.c
@@ -97,26 +97,26 @@ static inline int sign_extend_imm13(int imm)
 
 static inline unsigned long fetch_reg(unsigned int reg, struct pt_regs *regs)
 {
-        struct reg_window *win;
+        struct reg_window32 *win;
 
         if(reg < 16)
                 return (!reg ? 0 : regs->u_regs[reg]);
 
         /* Ho hum, the slightly complicated case. */
-        win = (struct reg_window *) regs->u_regs[UREG_FP];
+        win = (struct reg_window32 *) regs->u_regs[UREG_FP];
         return win->locals[reg - 16]; /* yes, I know what this does... */
 }
 
 static inline unsigned long safe_fetch_reg(unsigned int reg, struct pt_regs *regs)
 {
-        struct reg_window __user *win;
+        struct reg_window32 __user *win;
         unsigned long ret;
 
         if (reg < 16)
                 return (!reg ? 0 : regs->u_regs[reg]);
 
         /* Ho hum, the slightly complicated case. */
-        win = (struct reg_window __user *) regs->u_regs[UREG_FP];
+        win = (struct reg_window32 __user *) regs->u_regs[UREG_FP];
 
         if ((unsigned long)win & 3)
                 return -1;
@@ -129,11 +129,11 @@ static inline unsigned long safe_fetch_reg(unsigned int reg, struct pt_regs *reg
 
 static inline unsigned long *fetch_reg_addr(unsigned int reg, struct pt_regs *regs)
 {
-        struct reg_window *win;
+        struct reg_window32 *win;
 
         if(reg < 16)
                 return &regs->u_regs[reg];
-        win = (struct reg_window *) regs->u_regs[UREG_FP];
+        win = (struct reg_window32 *) regs->u_regs[UREG_FP];
         return &win->locals[reg - 16];
 }