If CONFIG_KPROBES is set, we get the error during build: kernel/kprobes.c:1057: error: __ksymtab_jprobe_return causes a section type conflict
This is because ia64 defines a static inline jprobe_return which kprobes attempts to EXPORT_SYMBOL. Signed-off-by: Matthew Wilcox <[EMAIL PROTECTED]> diff --git a/kernel/kprobes.c b/kernel/kprobes.c index e3a5d81..ecc25b3 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1053,11 +1053,11 @@ EXPORT_SYMBOL_GPL(register_kprobe); EXPORT_SYMBOL_GPL(unregister_kprobe); EXPORT_SYMBOL_GPL(register_jprobe); EXPORT_SYMBOL_GPL(unregister_jprobe); + #ifdef CONFIG_KPROBES +#ifndef __ia64__ /* It's static inline */ EXPORT_SYMBOL_GPL(jprobe_return); #endif - -#ifdef CONFIG_KPROBES EXPORT_SYMBOL_GPL(register_kretprobe); EXPORT_SYMBOL_GPL(unregister_kretprobe); #endif -- Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step." -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
