diff options
author | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
commit | 6a33fc8cacfc7fac829c72bd321868be7e72f609 (patch) | |
tree | ca8572f214a30c4743b731b4ab2809a980b78369 /arch/x86/kernel/cpu/perf_event_amd_ibs.c | |
parent | 3bd957978bb50390bb07678bc4c125989e9a81a2 (diff) | |
parent | 2746a7c272a3242f919fa2fd5a5f2d9f8a41173a (diff) |
Merge tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
From Jason Cooper:
mvebu fixes-non-critical for v3.12
- dove
- fix section mismatch (all callers are already _init, so it's just a space
issue)
* tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu:
ARM: dove: fix missing __init section of dove_mpp_gpio_mode
+ Linux 3.11-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_amd_ibs.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c index 5f0581e713c2..e09f0bfb7b8f 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c @@ -851,7 +851,7 @@ static void clear_APIC_ibs(void *dummy) setup_APIC_eilvt(offset, 0, APIC_EILVT_MSG_FIX, 1); } -static int __cpuinit +static int perf_ibs_cpu_notifier(struct notifier_block *self, unsigned long action, void *hcpu) { switch (action & ~CPU_TASKS_FROZEN) { |