The patch titled kprobes-fix-module-compilation-error-with-config_kprobes=n-fix-fix has been added to the -mm tree. Its filename is kprobes-fix-module-compilation-error-with-config_kprobes=n-fix-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kprobes-fix-module-compilation-error-with-config_kprobes=n-fix-fix From: Masami Hiramatsu <mhiramat@xxxxxxxxxx> Add dummy definitions of kprobe_opcode_t and arch_specific_insn when CONFIG_KPROBES=n. Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx> Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/kprobes.h | 4 ++++ 1 file changed, 4 insertions(+) diff -puN include/linux/kprobes.h~kprobes-fix-module-compilation-error-with-config_kprobes=n-fix-fix include/linux/kprobes.h --- a/include/linux/kprobes.h~kprobes-fix-module-compilation-error-with-config_kprobes=n-fix-fix +++ a/include/linux/kprobes.h @@ -50,6 +50,10 @@ /* Attach to insert probes on any functions which should be ignored*/ #define __kprobes __attribute__((__section__(".kprobes.text"))) notrace #else /* CONFIG_KPROBES */ +typedef int kprobe_opcode_t; +struct arch_specific_insn { + int dummy; +}; #define __kprobes notrace #endif /* CONFIG_KPROBES */ _ Patches currently in -mm which might be from mhiramat@xxxxxxxxxx are kprobes-fix-module-compilation-error-with-config_kprobes=n.patch kprobes-fix-module-compilation-error-with-config_kprobes=n-fix.patch kprobes-fix-module-compilation-error-with-config_kprobes=n-fix-fix.patch linux-next.patch kprobes-cleanup-aggr_kprobe-related-code.patch kprobes-move-export_symbol_gpl-just-after-function-definitions.patch kprobes-cleanup-comment-style-in-kprobesh.patch kprobes-rename-kprobe_enabled-to-kprobes_all_disarmed.patch kprobes-support-per-kprobe-disabling.patch kprobes-support-kretprobe-and-jprobe-per-probe-disabling.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html