From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756774AbcBIMSv (ORCPT ); Tue, 9 Feb 2016 07:18:51 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35973 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755143AbcBIMSt (ORCPT ); Tue, 9 Feb 2016 07:18:49 -0500 Date: Tue, 9 Feb 2016 04:17:58 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: jolsa@redhat.com, mingo@kernel.org, eranian@google.com, vincent.weaver@maine.edu, bp@suse.de, peterz@infradead.org, tglx@linutronix.de, acme@redhat.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, torvalds@linux-foundation.org, hpa@zytor.com Reply-To: eranian@google.com, bp@suse.de, vincent.weaver@maine.edu, jolsa@redhat.com, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com, peterz@infradead.org, torvalds@linux-foundation.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <1454947748-28629-4-git-send-email-bp@alien8.de> References: <1454947748-28629-4-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_amd_ibs.c ....... => x86/events/amd/ibs.c Git-Commit-ID: 218cfe4ed8885f988d67ac5f52efeff7233ae1f2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 218cfe4ed8885f988d67ac5f52efeff7233ae1f2 Gitweb: http://git.kernel.org/tip/218cfe4ed8885f988d67ac5f52efeff7233ae1f2 Author: Borislav Petkov AuthorDate: Mon, 8 Feb 2016 17:09:06 +0100 Committer: Ingo Molnar CommitDate: Tue, 9 Feb 2016 10:23:49 +0100 perf/x86: Move perf_event_amd_ibs.c ....... => x86/events/amd/ibs.c Signed-off-by: Borislav Petkov Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1454947748-28629-4-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 1 + arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index e0560b6..88f7873 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -1,3 +1,4 @@ obj-y += core.o obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o +obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/events/amd/ibs.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_amd_ibs.c rename to arch/x86/events/amd/ibs.c index aa12f95..a8abd08 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/arch/x86/events/amd/ibs.c @@ -14,7 +14,7 @@ #include -#include "perf_event.h" +#include "../../kernel/cpu/perf_event.h" static u32 ibs_caps; diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index d549b02..dddba22 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -54,7 +54,7 @@ obj-$(CONFIG_X86_MCE) += mcheck/ obj-$(CONFIG_MTRR) += mtrr/ obj-$(CONFIG_MICROCODE) += microcode/ -obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o perf_event_amd_ibs.o +obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o