| Message ID | 1546183405-8931-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] x86/trace: set TRACE_INCLUDE_PATH correctly instead of header search path | expand |
On Mon, Dec 31, 2018 at 12:23:25AM +0900, Masahiro Yamada wrote: > --- > > 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(-) > > 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/ As I replied in another thread: Note, the reason why I did not show this method in the samples/trace_events/ is that there's one "gotcha" that you need to be careful about. It may not be an issue here, but please be aware of it. The words in TRACE_INCLUDE_PATH can be updated by C preprocessor defines. For example, if for some reason you had: #define asm special_asm The above would turn into: #define TRACE_INCLUDE_PATH special_asm/trace and it wont build, and you will be left scratching your head wondering why. Again, it most likely wont be an issue, but perhaps a comment or something should be noted to warn about it? -- Steve > #define TRACE_INCLUDE_FILE exceptions > #endif /* _TRACE_PAGE_FAULT_H */
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
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 <yamada.masahiro@socionext.com> --- 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