Commit 5316a64c authored by Chris Metcalf's avatar Chris Metcalf

tile: avoid a "label not used" warning in do_page_fault()

There are two different ifdef cases where the label is used,
but if neither is true, the label is unused and the compiler
generates a warning.

Refactor the code the way x86 does so that there is a
do_page_fault() that just does exception handling for
context tracking, and make __do_page_fault() a static inline
so that various cases can just return instead of doing a
jump to "done".
Signed-off-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
parent 9ae4d6bf
......@@ -699,11 +699,10 @@ struct intvec_state do_page_fault_ics(struct pt_regs *regs, int fault_num,
* interrupt away appropriately and return immediately. We can't do
* page faults for user code while in kernel mode.
*/
void do_page_fault(struct pt_regs *regs, int fault_num,
unsigned long address, unsigned long write)
static inline void __do_page_fault(struct pt_regs *regs, int fault_num,
unsigned long address, unsigned long write)
{
int is_page_fault;
enum ctx_state prev_state = exception_enter();
#ifdef CONFIG_KPROBES
/*
......@@ -713,7 +712,7 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
*/
if (notify_die(DIE_PAGE_FAULT, "page fault", regs, -1,
regs->faultnum, SIGSEGV) == NOTIFY_STOP)
goto done;
return;
#endif
#ifdef __tilegx__
......@@ -835,18 +834,22 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
async->is_fault = is_page_fault;
async->is_write = write;
async->address = address;
goto done;
return;
}
}
#endif
handle_page_fault(regs, fault_num, is_page_fault, address, write);
}
done:
void do_page_fault(struct pt_regs *regs, int fault_num,
unsigned long address, unsigned long write)
{
enum ctx_state prev_state = exception_enter();
__do_page_fault(regs, fault_num, address, write);
exception_exit(prev_state);
}
#if CHIP_HAS_TILE_DMA()
/*
* This routine effectively re-issues asynchronous page faults
......
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