diff options
Diffstat (limited to 'arch/sparc/kernel/unaligned_32.c')
-rw-r--r-- | arch/sparc/kernel/unaligned_32.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c index c2a28c5ad650..6b1e6cde6fff 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) | |||
97 | 97 | ||
98 | static inline unsigned long fetch_reg(unsigned int reg, struct pt_regs *regs) | 98 | static inline unsigned long fetch_reg(unsigned int reg, struct pt_regs *regs) |
99 | { | 99 | { |
100 | struct reg_window *win; | 100 | struct reg_window32 *win; |
101 | 101 | ||
102 | if(reg < 16) | 102 | if(reg < 16) |
103 | return (!reg ? 0 : regs->u_regs[reg]); | 103 | return (!reg ? 0 : regs->u_regs[reg]); |
104 | 104 | ||
105 | /* Ho hum, the slightly complicated case. */ | 105 | /* Ho hum, the slightly complicated case. */ |
106 | win = (struct reg_window *) regs->u_regs[UREG_FP]; | 106 | win = (struct reg_window32 *) regs->u_regs[UREG_FP]; |
107 | return win->locals[reg - 16]; /* yes, I know what this does... */ | 107 | return win->locals[reg - 16]; /* yes, I know what this does... */ |
108 | } | 108 | } |
109 | 109 | ||
110 | static inline unsigned long safe_fetch_reg(unsigned int reg, struct pt_regs *regs) | 110 | static inline unsigned long safe_fetch_reg(unsigned int reg, struct pt_regs *regs) |
111 | { | 111 | { |
112 | struct reg_window __user *win; | 112 | struct reg_window32 __user *win; |
113 | unsigned long ret; | 113 | unsigned long ret; |
114 | 114 | ||
115 | if (reg < 16) | 115 | if (reg < 16) |
116 | return (!reg ? 0 : regs->u_regs[reg]); | 116 | return (!reg ? 0 : regs->u_regs[reg]); |
117 | 117 | ||
118 | /* Ho hum, the slightly complicated case. */ | 118 | /* Ho hum, the slightly complicated case. */ |
119 | win = (struct reg_window __user *) regs->u_regs[UREG_FP]; | 119 | win = (struct reg_window32 __user *) regs->u_regs[UREG_FP]; |
120 | 120 | ||
121 | if ((unsigned long)win & 3) | 121 | if ((unsigned long)win & 3) |
122 | return -1; | 122 | return -1; |
@@ -129,11 +129,11 @@ static inline unsigned long safe_fetch_reg(unsigned int reg, struct pt_regs *reg | |||
129 | 129 | ||
130 | static inline unsigned long *fetch_reg_addr(unsigned int reg, struct pt_regs *regs) | 130 | static inline unsigned long *fetch_reg_addr(unsigned int reg, struct pt_regs *regs) |
131 | { | 131 | { |
132 | struct reg_window *win; | 132 | struct reg_window32 *win; |
133 | 133 | ||
134 | if(reg < 16) | 134 | if(reg < 16) |
135 | return ®s->u_regs[reg]; | 135 | return ®s->u_regs[reg]; |
136 | win = (struct reg_window *) regs->u_regs[UREG_FP]; | 136 | win = (struct reg_window32 *) regs->u_regs[UREG_FP]; |
137 | return &win->locals[reg - 16]; | 137 | return &win->locals[reg - 16]; |
138 | } | 138 | } |
139 | 139 | ||