• Pratyush Anand's avatar
    arm64: fix error: conflicting types for 'kprobe_fault_handler' · 7b03b622
    Pratyush Anand authored
    When CONFIG_KPROBE is disabled but CONFIG_UPROBE_EVENT is enabled, we get
    following compilation error:
    
    In file included from
    .../arch/arm64/kernel/probes/decode-insn.c:20:0:
    .../arch/arm64/include/asm/kprobes.h:52:5: error:
    conflicting types for 'kprobe_fault_handler'
     int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);
         ^~~~~~~~~~~~~~~~~~~~
    In file included from
    .../arch/arm64/kernel/probes/decode-insn.c:17:0:
    .../include/linux/kprobes.h:398:90: note:
    previous definition of 'kprobe_fault_handler' was here
     static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
                                                                                              ^
    .../scripts/Makefile.build:290: recipe for target
    'arch/arm64/kernel/probes/decode-insn.o' failed
    
    <asm/kprobes.h> is already included from <linux/kprobes.h> under #ifdef
    CONFIG_KPROBE. So, this patch fixes the error by removing it from
    decode-insn.c.
    Reported-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: default avatarPratyush Anand <panand@redhat.com>
    Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
    7b03b622
decode-insn.c 5.22 KB