diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/mm/fault.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 3e3661462739..fe99af4b86d9 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -55,13 +55,14 @@ enum x86_pf_error_code { | |||
55 | PF_INSTR = 1 << 4, | 55 | PF_INSTR = 1 << 4, |
56 | }; | 56 | }; |
57 | 57 | ||
58 | /* | ||
59 | * (returns 0 if mmiotrace is disabled) | ||
60 | */ | ||
58 | static inline int kmmio_fault(struct pt_regs *regs, unsigned long addr) | 61 | static inline int kmmio_fault(struct pt_regs *regs, unsigned long addr) |
59 | { | 62 | { |
60 | #ifdef CONFIG_MMIOTRACE | ||
61 | if (unlikely(is_kmmio_active())) | 63 | if (unlikely(is_kmmio_active())) |
62 | if (kmmio_handler(regs, addr) == 1) | 64 | if (kmmio_handler(regs, addr) == 1) |
63 | return -1; | 65 | return -1; |
64 | #endif | ||
65 | return 0; | 66 | return 0; |
66 | } | 67 | } |
67 | 68 | ||