diff options
Diffstat (limited to 'arch/um/kernel/trap.c')
-rw-r--r-- | arch/um/kernel/trap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index eac63fb6183c..bd060551e619 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c | |||
@@ -149,7 +149,7 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, | |||
149 | struct uml_pt_regs *regs) | 149 | struct uml_pt_regs *regs) |
150 | { | 150 | { |
151 | struct siginfo si; | 151 | struct siginfo si; |
152 | void *catcher; | 152 | jmp_buf *catcher; |
153 | int err; | 153 | int err; |
154 | int is_write = FAULT_WRITE(fi); | 154 | int is_write = FAULT_WRITE(fi); |
155 | unsigned long address = FAULT_ADDRESS(fi); | 155 | unsigned long address = FAULT_ADDRESS(fi); |
@@ -181,7 +181,7 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, | |||
181 | return 0; | 181 | return 0; |
182 | else if (catcher != NULL) { | 182 | else if (catcher != NULL) { |
183 | current->thread.fault_addr = (void *) address; | 183 | current->thread.fault_addr = (void *) address; |
184 | do_longjmp(catcher, 1); | 184 | UML_LONGJMP(catcher, 1); |
185 | } | 185 | } |
186 | else if (current->thread.fault_addr != NULL) | 186 | else if (current->thread.fault_addr != NULL) |
187 | panic("fault_addr set but no fault catcher"); | 187 | panic("fault_addr set but no fault catcher"); |
@@ -233,7 +233,7 @@ void relay_signal(int sig, struct uml_pt_regs *regs) | |||
233 | static void bus_handler(int sig, struct 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 | UML_LONGJMP(current->thread.fault_catcher, 1); |
237 | else relay_signal(sig, regs); | 237 | else relay_signal(sig, regs); |
238 | } | 238 | } |
239 | 239 | ||