diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-07 01:35:03 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-07 01:35:03 +0200 |
| commit | fccfb9950836524d79260448fba6131f6b1d73c3 (patch) | |
| tree | a6fef32e330852138d9e7bd12d7b3dd97c4360c3 /kernel/trace/trace_probe.h | |
| parent | generic ...copy_..._user primitives (diff) | |
| parent | mm, page_alloc: Add missing check for memory holes (diff) | |
| download | linux-fccfb9950836524d79260448fba6131f6b1d73c3.tar.xz linux-fccfb9950836524d79260448fba6131f6b1d73c3.zip | |
Merge commit 'b4fb8f66f1ae2e167d06c12d018025a8d4d3ba7e' into uaccess.ia64
backmerge of mainline ia64 fix
Diffstat (limited to 'kernel/trace/trace_probe.h')
| -rw-r--r-- | kernel/trace/trace_probe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index 0c0ae54d44c6..903273c93e61 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -248,7 +248,7 @@ ASSIGN_FETCH_FUNC(file_offset, ftype), \ #define FETCH_TYPE_STRING 0 #define FETCH_TYPE_STRSIZE 1 -#ifdef CONFIG_KPROBE_EVENT +#ifdef CONFIG_KPROBE_EVENTS struct symbol_cache; unsigned long update_symbol_cache(struct symbol_cache *sc); void free_symbol_cache(struct symbol_cache *sc); @@ -278,7 +278,7 @@ alloc_symbol_cache(const char *sym, long offset) { return NULL; } -#endif /* CONFIG_KPROBE_EVENT */ +#endif /* CONFIG_KPROBE_EVENTS */ struct probe_arg { struct fetch_param fetch; |