diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-07 12:34:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-07 12:34:03 +0800 |
| commit | 24284529d5e0b544b87f340850bf51690d50f573 (patch) | |
| tree | bb3d8078cae8dd89430457f262dd4a1414ae722d /include/linux | |
| parent | ffded77eacc0ffbf14f48e190ac45417102e1eea (diff) | |
| parent | b36eba9b4dd4344ed51b8f644049aeac606ccff2 (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18
Conflicts:
add cpufeature.o in arch/arm64/kernel/Makefile
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/tracepoint.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index 72486551c4ca..e267dc488cdf 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -123,9 +123,6 @@ extern void syscall_unregfunc(void); void *it_func; \ void *__data; \ \ - if (!cpu_online(raw_smp_processor_id())) \ - return; \ - \ if (!(cond)) \ return; \ prercu; \ @@ -324,15 +321,19 @@ extern void syscall_unregfunc(void); * "void *__data, proto" as the callback prototype. */ #define DECLARE_TRACE_NOARGS(name) \ - __DECLARE_TRACE(name, void, , 1, void *__data, __data) + __DECLARE_TRACE(name, void, , \ + cpu_online(raw_smp_processor_id()), \ + void *__data, __data) #define DECLARE_TRACE(name, proto, args) \ - __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), 1, \ - PARAMS(void *__data, proto), \ - PARAMS(__data, args)) + __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ + cpu_online(raw_smp_processor_id()), \ + PARAMS(void *__data, proto), \ + PARAMS(__data, args)) #define DECLARE_TRACE_CONDITION(name, proto, args, cond) \ - __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), PARAMS(cond), \ + __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ + cpu_online(raw_smp_processor_id()) && (PARAMS(cond)), \ PARAMS(void *__data, proto), \ PARAMS(__data, args)) |