diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
commit | 5af6a242945e39bf6ea39716d4eba316b735dce8 (patch) | |
tree | 35363a04680e1618f6ed1c2b4eafbbc3d59ef048 /include/linux/tracepoint.h | |
parent | 7eff2ffe05a8b2c6c83a4f511ac6c31c858e3048 (diff) | |
parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'include/linux/tracepoint.h')
-rw-r--r-- | include/linux/tracepoint.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index 7159a0a933df..97c8689c7e51 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -14,8 +14,11 @@ * See the file COPYING for more details. */ +#include <linux/smp.h> #include <linux/errno.h> #include <linux/types.h> +#include <linux/percpu.h> +#include <linux/cpumask.h> #include <linux/rcupdate.h> #include <linux/static_key.h> @@ -126,6 +129,9 @@ static inline void tracepoint_synchronize_unregister(void) void *it_func; \ void *__data; \ \ + if (!cpu_online(raw_smp_processor_id())) \ + return; \ + \ if (!(cond)) \ return; \ prercu; \ |