Commit 08422cec authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by David Mosberger

[PATCH] ia64: fix name conflict with handle_exception()

I tried to build usb/gadget/file_storage.c (CONFIG_USB_FILE_STORAGE=y),
but it uses "handle_exception()" for its own purposes, which conflicts
with the ia64 definition.  ia64 only uses handle_exception() within
arch code, so it seems like we ought to rename it to be ia64-specific.
done_with_exception() looks similar, so I renamed it as well, although
there's no actual conflict.
parent a6a66e46
...@@ -488,7 +488,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa, ...@@ -488,7 +488,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
siginfo.si_isr = isr; siginfo.si_isr = isr;
force_sig_info(sig, &siginfo, current); force_sig_info(sig, &siginfo, current);
return; return;
} else if (done_with_exception(regs)) } else if (ia64_done_with_exception(regs))
return; return;
sprintf(buf, "NaT consumption"); sprintf(buf, "NaT consumption");
break; break;
......
...@@ -1486,7 +1486,7 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs) ...@@ -1486,7 +1486,7 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs)
/* something went wrong... */ /* something went wrong... */
if (!user_mode(regs)) { if (!user_mode(regs)) {
if (eh) { if (eh) {
handle_exception(regs, eh); ia64_handle_exception(regs, eh);
goto done; goto done;
} }
die_if_kernel("error during unaligned kernel access\n", regs, ret); die_if_kernel("error during unaligned kernel access\n", regs, ret);
......
...@@ -81,7 +81,7 @@ search_extable (const struct exception_table_entry *first, ...@@ -81,7 +81,7 @@ search_extable (const struct exception_table_entry *first,
} }
void void
handle_exception (struct pt_regs *regs, const struct exception_table_entry *e) ia64_handle_exception (struct pt_regs *regs, const struct exception_table_entry *e)
{ {
long fix = (u64) &e->cont + e->cont; long fix = (u64) &e->cont + e->cont;
......
...@@ -213,7 +213,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re ...@@ -213,7 +213,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
return; return;
} }
if (done_with_exception(regs)) if (ia64_done_with_exception(regs))
return; return;
/* /*
......
...@@ -292,16 +292,16 @@ struct exception_table_entry { ...@@ -292,16 +292,16 @@ struct exception_table_entry {
int cont; /* location-relative continuation addr.; if bit 2 is set, r9 is set to 0 */ int cont; /* location-relative continuation addr.; if bit 2 is set, r9 is set to 0 */
}; };
extern void handle_exception (struct pt_regs *regs, const struct exception_table_entry *e); extern void ia64_handle_exception (struct pt_regs *regs, const struct exception_table_entry *e);
extern const struct exception_table_entry *search_exception_tables (unsigned long addr); extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
static inline int static inline int
done_with_exception (struct pt_regs *regs) ia64_done_with_exception (struct pt_regs *regs)
{ {
const struct exception_table_entry *e; const struct exception_table_entry *e;
e = search_exception_tables(regs->cr_iip + ia64_psr(regs)->ri); e = search_exception_tables(regs->cr_iip + ia64_psr(regs)->ri);
if (e) { if (e) {
handle_exception(regs, e); ia64_handle_exception(regs, e);
return 1; return 1;
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment