projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
events
/
core.c
diff --git
a/kernel/events/core.c
b/kernel/events/core.c
index e8183895691c61f021e9dc9a7e0aab5f6cc709fc..f548f69c4299dd1ee44bfdc1f84d79d655d0d6d7 100644
(file)
--- a/
kernel/events/core.c
+++ b/
kernel/events/core.c
@@
-9094,7
+9094,7
@@
static void perf_event_init_cpu(int cpu)
mutex_unlock(&swhash->hlist_mutex);
}
mutex_unlock(&swhash->hlist_mutex);
}
-#if defined CONFIG_HOTPLUG_CPU || defined CONFIG_KEXEC
+#if defined CONFIG_HOTPLUG_CPU || defined CONFIG_KEXEC
_CORE
static void __perf_event_exit_context(void *__info)
{
struct remove_event re = { .detach_group = true };
static void __perf_event_exit_context(void *__info)
{
struct remove_event re = { .detach_group = true };