From patchwork Sun Dec 30 15:23:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154616 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp10065604ljp; Sun, 30 Dec 2018 07:25:15 -0800 (PST) X-Google-Smtp-Source: ALg8bN7aECshJV9yu6/LjqGIL8XFarJCRiRtElwE390nrkq3LNNakRO2SYOOOkMQ5b+Nz24tcDuI X-Received: by 2002:a17:902:a70b:: with SMTP id w11mr34230344plq.84.1546183515173; Sun, 30 Dec 2018 07:25:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546183515; cv=none; d=google.com; s=arc-20160816; b=BXDfy9X8Kak0jdaIiAEtt+LWAkUo+bb7T6xAl4pskZ1qypSsRJxySDLk/zkUktM436 Hsx5QWTWGM4Ai6D/nLMfnz8SMIyuBrnSQsSnqeWFBmAVNi6qc8Dev490A9eHItECC6ba TaZAkxNMLWarojKTSBYBJRZkyh43OMUmdq+XWNxyBMddBWaTmUToJg4UZICun1xum5oZ Og0+CHcUxjYWRpmFvnknxUcpGq+PgrveFrfqWkMqDdEbWU1Zu/AMc3CCzf9v2P1YvsFO ObRrbnp8+tumCHAfhTFyxRVxbMH1p6nqGzTaYxMIJLqzORU+VrCzbnF8wZEA6KyyfXED 1few== 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=3nomJ0xyGvd49gM4fdZMbUHm60QVizHCPZ/YGwrtxVo=; b=PJPrAj5uLNH/UZ6wsOOLBrSRAgWdwdDQejAVihr7TgGpqtgZBAxNm8BYq/ZgRd06MI wOzw2uzAsr+Vdwcs3ET5MLcklTHlIlTBpt2cRlQ9s/KwTwE4pisp2YM7LqW7IFPJCU0P 97jOklhm+zubv0ouYNvYaYvS6KZumxnvuUXe6Ev3znTetM8dbNBPOKTbNM3034jxoXVP oht2b4Rgzdd0K2vm7zVFFV6KZ05P1KAfh3PKVMYwAB0QKm5+5/iokcnemkrRLKODwkny huqx17frubAq0AYKu+sWHo2sBEsSyuk3n0BwoEiqVbPvj77q9C7WtGTk09Ud1vS1m2k7 Y9Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=iBX29uY7; 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 u28si9055433pgn.436.2018.12.30.07.25.14; Sun, 30 Dec 2018 07:25:15 -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=iBX29uY7; 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 S1726353AbeL3PZM (ORCPT + 31 others); Sun, 30 Dec 2018 10:25:12 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:51753 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725954AbeL3PZM (ORCPT ); Sun, 30 Dec 2018 10:25:12 -0500 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-12.nifty.com with ESMTP id wBUFNhmY025644; Mon, 31 Dec 2018 00:23:44 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com wBUFNhmY025644 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1546183424; bh=3nomJ0xyGvd49gM4fdZMbUHm60QVizHCPZ/YGwrtxVo=; h=From:To:Cc:Subject:Date:From; b=iBX29uY7C3wFwNLRLM+kiUAj6ytElqR09lIltceuYkuKKEFrtZR01XntEw/tJdcNI SxeK6hHMSS9gPwlBQ3WY4NtShFsI1QyETvcmAi6K88+Q5N84bdQp1pxTTX/evdqqM3 7m9pxkVqkF6fxrdJrGxbBVsO2DJL+Ne23AHcvtfOg+xNoj/y2Cz0ghgcmKCUm4cZwx iR0jNwP/D1tk/HhMdXzirFLviUhO5H6WlurdJtxEyxk2f4lpu6Co1MlWXxo0gHkLPN 6twPB2e3TRoMUTmv3LIm+prIKzYb3dAcWKZ+8LowZnCBHxo5fa3JB16rZWCX6GibBV 2cyoa7CyFNq+w== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: x86@kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" Cc: Masahiro Yamada , Peter Zijlstra , linux-kernel@vger.kernel.org, Dave Hansen , Andy Lutomirski Subject: [PATCH v2] x86/trace: set TRACE_INCLUDE_PATH correctly instead of header search path Date: Mon, 31 Dec 2018 00:23:25 +0900 Message-Id: <1546183405-8931-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 --- Changes in v2: - Rebase 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 e0e6d7f..00c1d1b 100644 --- a/arch/x86/include/asm/trace/exceptions.h +++ b/arch/x86/include/asm/trace/exceptions.h @@ -46,7 +46,7 @@ DEFINE_PAGE_FAULT_EVENT(page_fault_kernel); #undef TRACE_INCLUDE_PATH #undef TRACE_INCLUDE_FILE -#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 33b9d0f..abaed90 100644 --- a/arch/x86/include/asm/trace/irq_vectors.h +++ b/arch/x86/include/asm/trace/irq_vectors.h @@ -390,7 +390,7 @@ TRACE_EVENT(vector_free_moved, #undef TRACE_INCLUDE_PATH #undef TRACE_INCLUDE_FILE -#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