diff options
Diffstat (limited to 'arch/um/kernel/trap.c')
-rw-r--r-- | arch/um/kernel/trap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index 4b472ca53485..eac63fb6183c 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c | |||
@@ -128,7 +128,7 @@ static void bad_segv(struct faultinfo fi, unsigned long ip) | |||
128 | force_sig_info(SIGSEGV, &si, current); | 128 | force_sig_info(SIGSEGV, &si, current); |
129 | } | 129 | } |
130 | 130 | ||
131 | static void segv_handler(int sig, union uml_pt_regs *regs) | 131 | static void segv_handler(int sig, struct uml_pt_regs *regs) |
132 | { | 132 | { |
133 | struct faultinfo * fi = UPT_FAULTINFO(regs); | 133 | struct faultinfo * fi = UPT_FAULTINFO(regs); |
134 | 134 | ||
@@ -146,7 +146,7 @@ static void segv_handler(int sig, union uml_pt_regs *regs) | |||
146 | * give us bad data! | 146 | * give us bad data! |
147 | */ | 147 | */ |
148 | unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, | 148 | unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, |
149 | union uml_pt_regs *regs) | 149 | struct uml_pt_regs *regs) |
150 | { | 150 | { |
151 | struct siginfo si; | 151 | struct siginfo si; |
152 | void *catcher; | 152 | void *catcher; |
@@ -214,7 +214,7 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, | |||
214 | return 0; | 214 | return 0; |
215 | } | 215 | } |
216 | 216 | ||
217 | void relay_signal(int sig, union uml_pt_regs *regs) | 217 | void relay_signal(int sig, struct uml_pt_regs *regs) |
218 | { | 218 | { |
219 | if (arch_handle_signal(sig, regs)) | 219 | if (arch_handle_signal(sig, regs)) |
220 | return; | 220 | return; |
@@ -230,14 +230,14 @@ void relay_signal(int sig, union uml_pt_regs *regs) | |||
230 | force_sig(sig, current); | 230 | force_sig(sig, current); |
231 | } | 231 | } |
232 | 232 | ||
233 | static void bus_handler(int sig, union uml_pt_regs *regs) | 233 | static void bus_handler(int sig, struct uml_pt_regs *regs) |
234 | { | 234 | { |
235 | if (current->thread.fault_catcher != NULL) | 235 | if (current->thread.fault_catcher != NULL) |
236 | do_longjmp(current->thread.fault_catcher, 1); | 236 | do_longjmp(current->thread.fault_catcher, 1); |
237 | else relay_signal(sig, regs); | 237 | else relay_signal(sig, regs); |
238 | } | 238 | } |
239 | 239 | ||
240 | static void winch(int sig, union uml_pt_regs *regs) | 240 | static void winch(int sig, struct uml_pt_regs *regs) |
241 | { | 241 | { |
242 | do_IRQ(WINCH_IRQ, regs); | 242 | do_IRQ(WINCH_IRQ, regs); |
243 | } | 243 | } |