diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-19 23:24:28 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-19 23:24:28 +0100 |
| commit | 18eda522c2eb0aaeb7fd0b4824f28d4d6c6f3363 (patch) | |
| tree | d56d83600dc52937197abe4719a69c9345557545 /arch | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide (diff) | |
| parent | nios2: mm: do not invoke OOM killer on kernel fault OOM (diff) | |
| download | linux-18eda522c2eb0aaeb7fd0b4824f28d4d6c6f3363.tar.xz linux-18eda522c2eb0aaeb7fd0b4824f28d4d6c6f3363.zip | |
Merge tag 'nios2-fixes-v4.0-rc5' of git://git.rocketboards.org/linux-socfpga-next
Pull two arch/nios2 fixes from Ley Foon Tan:
- Remove ucontext.h from exported arch headers
- nios2: mm: do not invoke OOM killer on kernel fault OOM
* tag 'nios2-fixes-v4.0-rc5' of git://git.rocketboards.org/linux-socfpga-next:
nios2: mm: do not invoke OOM killer on kernel fault OOM
nios2: Remove ucontext.h from exported arch headers
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nios2/include/uapi/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/nios2/mm/fault.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild index 376131194cc3..e0bb972a50d7 100644 --- a/arch/nios2/include/uapi/asm/Kbuild +++ b/arch/nios2/include/uapi/asm/Kbuild @@ -1,6 +1,5 @@ include include/uapi/asm-generic/Kbuild.asm header-y += elf.h -header-y += ucontext.h generic-y += ucontext.h diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c index 0d231adfe576..0c9b6afe69e9 100644 --- a/arch/nios2/mm/fault.c +++ b/arch/nios2/mm/fault.c @@ -126,7 +126,6 @@ good_area: break; } -survive: /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -220,11 +219,6 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(tsk)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } if (!user_mode(regs)) goto no_context; pagefault_out_of_memory(); |