diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-19 09:34:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-19 09:34:42 +0200 |
| commit | e43fff2b98b4e99b189c086a9cf740b19eaf3538 (patch) | |
| tree | 658a5f73d5806fe47856547b17cbd23592856c62 /kernel/events | |
| parent | 67516844625f45f0ce148a01c27bf41f591872b2 (diff) | |
| parent | ecb2cf1a6b63825a258ff4fe0d7f3070fbe4676b (diff) | |
Merge branch 'linus' into perf/core
Merge in a v3.11-rc1-ish branch to go from v3.10 based development
to a v3.11 based one.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 708ab70ca442..5e2bce90b477 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6233,8 +6233,6 @@ perf_event_mux_interval_ms_store(struct device *dev, return count; } -#define __ATTR_RW(attr) __ATTR(attr, 0644, attr##_show, attr##_store) - static struct device_attribute pmu_dev_attrs[] = { __ATTR_RO(type), __ATTR_RW(perf_event_mux_interval_ms), @@ -7629,7 +7627,7 @@ static void __init perf_event_init_all_cpus(void) } } -static void __cpuinit perf_event_init_cpu(int cpu) +static void perf_event_init_cpu(int cpu) { struct swevent_htable *swhash = &per_cpu(swevent_htable, cpu); @@ -7718,7 +7716,7 @@ static struct notifier_block perf_reboot_notifier = { .priority = INT_MIN, }; -static int __cpuinit +static int perf_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) { unsigned int cpu = (long)hcpu; |