Commit 83ab8514 authored Jun 21, 2013 by Steven Rostedt (Red Hat) Committed by Steven Rostedt Jun 21, 2013

trace,x86: Move creation of irq tracepoints from apic.c to irq.c

Compiling without CONFIG_X86_LOCAL_APIC set, apic.c will not be
compiled, and the irq tracepoints will not be created via the
CREATE_TRACE_POINTS macro. When CONFIG_X86_LOCAL_APIC is not set,
we get the following build error:

LD init/built-in.o
arch/x86/built-in.o: In function `trace_x86_platform_ipi_entry':
linux-test.git/arch/x86/include/asm/trace/irq_vectors.h:66: undefined reference to `__tracepoint_x86_platform_ipi_entry'
arch/x86/built-in.o: In function `trace_x86_platform_ipi_exit':
linux-test.git/arch/x86/include/asm/trace/irq_vectors.h:66: undefined reference to `__tracepoint_x86_platform_ipi_exit'
arch/x86/built-in.o: In function `trace_irq_work_entry':
linux-test.git/arch/x86/include/asm/trace/irq_vectors.h:72: undefined reference to `__tracepoint_irq_work_entry'
arch/x86/built-in.o: In function `trace_irq_work_exit':
linux-test.git/arch/x86/include/asm/trace/irq_vectors.h:72: undefined reference to `__tracepoint_irq_work_exit'
arch/x86/built-in.o:(__jump_table+0x8): undefined reference to `__tracepoint_x86_platform_ipi_entry'
arch/x86/built-in.o:(__jump_table+0x14): undefined reference to `__tracepoint_x86_platform_ipi_exit'
arch/x86/built-in.o:(__jump_table+0x20): undefined reference to `__tracepoint_irq_work_entry'
arch/x86/built-in.o:(__jump_table+0x2c): undefined reference to `__tracepoint_irq_work_exit'
make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2

As irq.c is always compiled for x86, it is a more appropriate location
to create the irq tracepoints.

Cc: Seiji Aguchi <seiji.aguchi@hds.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

parent cf910e83

arch/x86/kernel/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ CFLAGS_REMOVE_ftrace.o = -pg
		CFLAGS_REMOVE_early_printk.o = -pg
		endif

		CFLAGS_irq.o := -I$(src)/../include/asm/trace

		obj-y := process_$(BITS).o signal.o entry_$(BITS).o
		obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
		obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o

arch/x86/kernel/apic/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		# Makefile for local APIC drivers and for the IO-APIC code
		#

		CFLAGS_apic.o := -I$(src)/../../include/asm/trace
		obj-$(CONFIG_X86_LOCAL_APIC) += apic.o apic_noop.o ipi.o
		obj-y += hw_nmi.o

arch/x86/kernel/apic/apic.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include <linux/smp.h>
		#include <linux/mm.h>

		#include <asm/trace/irq_vectors.h>
		#include <asm/irq_remapping.h>
		#include <asm/perf_event.h>
		#include <asm/x86_init.h>
		@@ -55,9 +56,6 @@
		#include <asm/tsc.h>
		#include <asm/hypervisor.h>

		#define CREATE_TRACE_POINTS
		#include <asm/trace/irq_vectors.h>

		unsigned int num_processors;

		unsigned disabled_cpus __cpuinitdata;

arch/x86/kernel/irq.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		#include <asm/idle.h>
		#include <asm/mce.h>
		#include <asm/hw_irq.h>

		#define CREATE_TRACE_POINTS
		#include <asm/trace/irq_vectors.h>

		atomic_t irq_err_count;