diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-18 12:57:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-18 12:57:18 -0800 |
| commit | d05d82f7110b08fd36178a641b69a1f206e1142b (patch) | |
| tree | a274bb136f5ed336fb7a12bb86ea24cc5daffdc9 /arch/tile/mm/fault.c | |
| parent | d90f351a9bec6af3e8e7cefbbff94072461c3c9a (diff) | |
| parent | 00d27c6336b00345724b2510f7c5b8cee3055f02 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile updates from Chris Metcalf:
"This is a grab bag of changes that includes some NOHZ and
context-tracking related changes, some debugging improvements,
JUMP_LABEL support, and some fixes for tilepro allmodconfig support.
We also remove the now-unused node_has_online_mem() definitions both
for tile's asm/topology.h as well as in linux/topology.h itself"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
numa: remove stale node_has_online_mem() define
arch/tile: move user_exit() to early kernel entry sequence
tile: fix bug in setting PT_FLAGS_DISABLE_IRQ on kernel entry
tile: fix tilepro casts for readl, writel, etc
tile: fix a -Wframe-larger-than warning
tile: include the syscall number in the backtrace
MAINTAINERS: add git URL for tile
arch/tile: adopt prepare_exit_to_usermode() model from x86
tile/jump_label: add jump label support for TILE-Gx
tile: define a macro ktext_writable_addr to get writable kernel text address
Diffstat (limited to 'arch/tile/mm/fault.c')
| -rw-r--r-- | arch/tile/mm/fault.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c index 13eac59bf16a..26734214818c 100644 --- a/arch/tile/mm/fault.c +++ b/arch/tile/mm/fault.c @@ -35,7 +35,6 @@ #include <linux/syscalls.h> #include <linux/uaccess.h> #include <linux/kdebug.h> -#include <linux/context_tracking.h> #include <asm/pgalloc.h> #include <asm/sections.h> @@ -845,9 +844,7 @@ static inline void __do_page_fault(struct pt_regs *regs, int fault_num, 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() |