diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:01:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:01:09 +0100 |
| commit | 319e305ca469d9484678d2916590005b08cc3b4b (patch) | |
| tree | ffee522a28589e4ba78b616bcde76dac4cc3c667 /arch/x86/mm/fault.c | |
| parent | c0853867a10f9215132dccdb84c720a5f856f4d2 (diff) | |
| parent | b2f9d678e28ca71ce650eac82f26dd287b47e89a (diff) | |
Merge branch 'ras/core' into core/objtool, to pick up the new exception table format
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index e830c71a1323..03898aea6e0f 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -663,7 +663,7 @@ no_context(struct pt_regs *regs, unsigned long error_code, int sig; /* Are we prepared to handle this kernel fault? */ - if (fixup_exception(regs)) { + if (fixup_exception(regs, X86_TRAP_PF)) { /* * Any interrupt that takes a fault gets the fixup. This makes * the below recursive fault logic only apply to a faults from |