diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2009-01-02 22:32:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-02 22:32:59 -0500 |
commit | 4d7b92ad572b4bd4d92fc80911641bb6cba3b99c (patch) | |
tree | 6257d1b4bad63a296f03abee8940222a979d8d2a /arch/sparc/kernel/muldiv.c | |
parent | ece93487c31607558f4b91f378fcee4b43956dbc (diff) |
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>
Diffstat (limited to 'arch/sparc/kernel/muldiv.c')
-rw-r--r-- | arch/sparc/kernel/muldiv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/muldiv.c b/arch/sparc/kernel/muldiv.c index ba960c02bb55..6ce1021d487c 100644 --- a/arch/sparc/kernel/muldiv.c +++ b/arch/sparc/kernel/muldiv.c | |||
@@ -60,7 +60,7 @@ static inline void maybe_flush_windows(unsigned int rs1, unsigned int rs2, | |||
60 | } | 60 | } |
61 | 61 | ||
62 | #define fetch_reg(reg, regs) ({ \ | 62 | #define fetch_reg(reg, regs) ({ \ |
63 | struct reg_window __user *win; \ | 63 | struct reg_window32 __user *win; \ |
64 | register unsigned long ret; \ | 64 | register unsigned long ret; \ |
65 | \ | 65 | \ |
66 | if (!(reg)) ret = 0; \ | 66 | if (!(reg)) ret = 0; \ |
@@ -68,7 +68,7 @@ static inline void maybe_flush_windows(unsigned int rs1, unsigned int rs2, | |||
68 | ret = regs->u_regs[(reg)]; \ | 68 | ret = regs->u_regs[(reg)]; \ |
69 | } else { \ | 69 | } else { \ |
70 | /* Ho hum, the slightly complicated case. */ \ | 70 | /* Ho hum, the slightly complicated case. */ \ |
71 | win = (struct reg_window __user *)regs->u_regs[UREG_FP];\ | 71 | win = (struct reg_window32 __user *)regs->u_regs[UREG_FP];\ |
72 | if (get_user (ret, &win->locals[(reg) - 16])) return -1;\ | 72 | if (get_user (ret, &win->locals[(reg) - 16])) return -1;\ |
73 | } \ | 73 | } \ |
74 | ret; \ | 74 | ret; \ |
@@ -77,7 +77,7 @@ static inline void maybe_flush_windows(unsigned int rs1, unsigned int rs2, | |||
77 | static inline int | 77 | static inline int |
78 | store_reg(unsigned int result, unsigned int reg, struct pt_regs *regs) | 78 | store_reg(unsigned int result, unsigned int reg, struct pt_regs *regs) |
79 | { | 79 | { |
80 | struct reg_window __user *win; | 80 | struct reg_window32 __user *win; |
81 | 81 | ||
82 | if (!reg) | 82 | if (!reg) |
83 | return 0; | 83 | return 0; |
@@ -86,7 +86,7 @@ store_reg(unsigned int result, unsigned int reg, struct pt_regs *regs) | |||
86 | return 0; | 86 | return 0; |
87 | } else { | 87 | } else { |
88 | /* need to use put_user() in this case: */ | 88 | /* need to use put_user() in this case: */ |
89 | win = (struct reg_window __user *) regs->u_regs[UREG_FP]; | 89 | win = (struct reg_window32 __user *) regs->u_regs[UREG_FP]; |
90 | return (put_user(result, &win->locals[reg - 16])); | 90 | return (put_user(result, &win->locals[reg - 16])); |
91 | } | 91 | } |
92 | } | 92 | } |