From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755461AbcBHQJX (ORCPT ); Mon, 8 Feb 2016 11:09:23 -0500 Received: from mail.skyhub.de ([78.46.96.112]:44997 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754495AbcBHQJV (ORCPT ); Mon, 8 Feb 2016 11:09:21 -0500 From: Borislav Petkov To: Ingo Molnar Cc: Peter Zijlstra , X86 ML , LKML Subject: [PATCH 3/5] x86/events: Move perf_event_amd_ibs.c Date: Mon, 8 Feb 2016 17:09:06 +0100 Message-Id: <1454947748-28629-4-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1454947748-28629-1-git-send-email-bp@alien8.de> References: <1454947748-28629-1-git-send-email-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov Signed-off-by: Borislav Petkov --- 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(-) rename arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c} (99%) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index e0560b6dd77b..88f787350bf0 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 aa12f9509cfb..a8abd082d932 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 2ba0e37acb2d..b1711586005b 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 -- 2.3.5