Merge tag 'nios2-fixes-v4.0-rc5' of git://git.rocketboards.org/linux-socfpga-next (18eda522) · Commits · 戴 / test

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

arch/nios2/include/uapi/asm/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		include include/uapi/asm-generic/Kbuild.asm

		header-y += elf.h
		header-y += ucontext.h

		generic-y += ucontext.h

arch/nios2/mm/fault.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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();

Admin message