Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
tile
/
mm
/
fault.c
diff --git
a/kernel/arch/tile/mm/fault.c
b/kernel/arch/tile/mm/fault.c
index
3f4f58d
..
13eac59
100644
(file)
--- a/
kernel/arch/tile/mm/fault.c
+++ b/
kernel/arch/tile/mm/fault.c
@@
-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.
*/
* 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;
{
int is_page_fault;
- enum ctx_state prev_state = exception_enter();
#ifdef CONFIG_KPROBES
/*
#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)
*/
if (notify_die(DIE_PAGE_FAULT, "page fault", regs, -1,
regs->faultnum, SIGSEGV) == NOTIFY_STOP)
-
goto done
;
+
return
;
#endif
#ifdef __tilegx__
#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;
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);
}
}
#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);
}
exception_exit(prev_state);
}
-
#if CHIP_HAS_TILE_DMA()
/*
* This routine effectively re-issues asynchronous page faults
#if CHIP_HAS_TILE_DMA()
/*
* This routine effectively re-issues asynchronous page faults