diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-05-26 12:03:29 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-05-26 12:03:29 +0800 |
| commit | bded05d18ce5d06d169e1a097d4477fcbdae57ff (patch) | |
| tree | c50310f76cc635d38773e5a00afee6a6353fddbc /include | |
| parent | f08537113440b60725c7bbfbae0702caeddad655 (diff) | |
| parent | be8cec38166830bd968b13389b8b22da6913f439 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kprobes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 8f6849084248..e23392517db9 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -330,7 +330,9 @@ extern int proc_kprobes_optimization_handler(struct ctl_table *table, int write, void __user *buffer, size_t *length, loff_t *ppos); #endif - +extern void wait_for_kprobe_optimizer(void); +#else +static inline void wait_for_kprobe_optimizer(void) { } #endif /* CONFIG_OPTPROBES */ #ifdef CONFIG_KPROBES_ON_FTRACE extern void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, |