From patchwork Sun Dec 23 15:13:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154444 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3010731ljp; Sun, 23 Dec 2018 07:18:09 -0800 (PST) X-Google-Smtp-Source: ALg8bN4xna8wsm0C6HvxWCJwUMRcj4srOi40KkMwLdYcNpKdEGz3D1b1IcEgqEHm5FvIA7siUGRx X-Received: by 2002:a25:33c1:: with SMTP id z184mr9753301ybz.369.1545578289367; Sun, 23 Dec 2018 07:18:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545578289; cv=none; d=google.com; s=arc-20160816; b=Fiind1DClTzR7r36ly7fgpXTV/N2d8q1m9ppfQ4i6yoPuwnEg4zavQF/4g9tN1xgdu usC6/HeHbpdmjxG4sYImjWtrBHy62bgUl7BBpa2G0mN8JrllcfisrQEifea/m3pGHGOc eZAJgHau7HChJcbk9EzExF4sJ/X3Yom47jORCvAf9rxeziP54KhBOvgg0O48+lcjw1lJ zuZpsgr0DFDJl0yD1UhZ6EqNVVQc/HACEnUOw2H6Ot+psDILXmss8ObMSgMzntHpe1zC JKcDJ//J8cmXpGIj7MqmP2Z5FKc1mB8QU9AvXVUFr+uGfGkMYEpXt+SNPRzfliFnQ+ZQ 6SXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=TnkmH1oWl9Y75i5YAnHWmSNHaqRANe2OtGoNyalrVew=; b=fjRMVfE1uuTUDpalQNSFkgyjcT4oQSRjmAhTC/a8et+SIjCLHB46SitAgFXOtAILqX NSOw6dwS5euPpPThe3z42M3l2ME+lkjPIuIuy2OCmEDgLEuKDyXyYEhbd9kw2wwkwB/X h20F+5scix0f5PaB3BSgTp4ljAxmc8GDLzBRtEGV8Nboasqu+TrxgtzX7TRqvMg/tn8t cH3DiHX29wdE1JTHVskiChZXrHPGjSWZa4kWHwX31deQywX8/zMWnXsZzq2L6Kk7Lsgj dAvrdlpFx6dvu9Jgg8Fp1R1YaTm0AJ72BnpKMY5wBuL0x6CJsC0oeNlCsZgA/pH+o/Za 4rVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=PdffNuuW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 138si4753876ywq.76.2018.12.23.07.18.09; Sun, 23 Dec 2018 07:18:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=PdffNuuW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729282AbeLWPQc (ORCPT + 31 others); Sun, 23 Dec 2018 10:16:32 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:55655 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725764AbeLWPQb (ORCPT ); Sun, 23 Dec 2018 10:16:31 -0500 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-08.nifty.com with ESMTP id wBNFDsk0019864; Mon, 24 Dec 2018 00:13:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com wBNFDsk0019864 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545578035; bh=TnkmH1oWl9Y75i5YAnHWmSNHaqRANe2OtGoNyalrVew=; h=From:To:Cc:Subject:Date:From; b=PdffNuuWbYnUdXa2DUKSV6MCcUgu7enR9wBDf8O8nMWXErxY7dXWXaPFvfoU+MDE6 hsUloc/H8W+RNi9Sl5nuM7AyMvYOxLiFMh3sq/ruEQ3FGCc9SW9rg+KBciybSSWoQs B29Wwt+nZkZ8M/wLmleZXsdS/vh5mkHsSh5c8LNozMDozGvt1RO6DI7GQJX/t7Hp4/ +0KitPgEp07fYMbR/S1DOmDj85Cb2ZpwHDwvVU6pkWoArYOK2ra/n5dvMQrtZLqglK pRa4RHDQ8s4LJ+Y7yMMIRQ267qBAQNPbYlyO3JtrJq1HqTudcTtLrj5GV7exYCxKoy SF3SNOM9aLMbA== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: x86@kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" Cc: Kees Cook , Linus Torvalds , Masahiro Yamada , Peter Zijlstra , linux-kernel@vger.kernel.org, Dave Hansen , Andy Lutomirski Subject: [PATCH] x86/trace: set TRACE_INCLUDE_PATH instead of include path Date: Mon, 24 Dec 2018 00:13:50 +0900 Message-Id: <1545578030-30097-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Set TRACE_INCLUDE_PATH correctly for exceptions.h and irq_vectors.h This is consistent with fpu.h, hyperv.h, mpx.h in the same directory. The ugly include paths will go away. Signed-off-by: Masahiro Yamada --- arch/x86/include/asm/trace/exceptions.h | 2 +- arch/x86/include/asm/trace/irq_vectors.h | 2 +- arch/x86/kernel/Makefile | 2 -- arch/x86/mm/Makefile | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/arch/x86/include/asm/trace/exceptions.h b/arch/x86/include/asm/trace/exceptions.h index 69615e3..3d1f138 100644 --- a/arch/x86/include/asm/trace/exceptions.h +++ b/arch/x86/include/asm/trace/exceptions.h @@ -45,7 +45,7 @@ DEFINE_PAGE_FAULT_EVENT(page_fault_user); DEFINE_PAGE_FAULT_EVENT(page_fault_kernel); #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH asm/trace/ #define TRACE_INCLUDE_FILE exceptions #endif /* _TRACE_PAGE_FAULT_H */ diff --git a/arch/x86/include/asm/trace/irq_vectors.h b/arch/x86/include/asm/trace/irq_vectors.h index 0af81b5..e38a76e 100644 --- a/arch/x86/include/asm/trace/irq_vectors.h +++ b/arch/x86/include/asm/trace/irq_vectors.h @@ -389,7 +389,7 @@ TRACE_EVENT(vector_free_moved, #endif /* CONFIG_X86_LOCAL_APIC */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH asm/trace/ #define TRACE_INCLUDE_FILE irq_vectors #endif /* _TRACE_IRQ_VECTORS_H */ diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index da0b6bc..e581734 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -42,8 +42,6 @@ endif # non-deterministic coverage. KCOV_INSTRUMENT := n -CFLAGS_irq.o := -I$(src)/../include/asm/trace - obj-y := process_$(BITS).o signal.o obj-$(CONFIG_COMPAT) += signal_compat.o obj-y += traps.o idt.o irq.o irq_$(BITS).o dumpstack_$(BITS).o diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 4b101dd..6d474d9 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -21,8 +21,6 @@ CFLAGS_physaddr.o := $(nostackp) CFLAGS_setup_nx.o := $(nostackp) CFLAGS_mem_encrypt_identity.o := $(nostackp) -CFLAGS_fault.o := -I$(src)/../include/asm/trace - obj-$(CONFIG_X86_PAT) += pat_rbtree.o obj-$(CONFIG_X86_32) += pgtable_32.o iomap_32.o