[PATCH 4/4] gcov: enable GCOV_PROFILE_ALL for x86_64

[Peter Oberparleiter]

From: Peter Oberparleiter <oberpar@xxxxxxxxxxxxxxxxxx>

Enable gcov profiling of the entire kernel on x86_64. Required changes
include disabling profiling for:

* arch/kernel/acpi/realmode and arch/kernel/boot/compressed:
  not linked to main kernel
* arch/vdso, arch/kernel/vsyscall_64 and arch/kernel/hpet:
  profiling causes segfaults during boot (incompatible context)

Signed-off-by: Peter Oberparleiter <oberpar@xxxxxxxxxxxxxxxxxx>
---
 arch/x86/boot/Makefile                 |    1 +
 arch/x86/boot/compressed/Makefile      |    1 +
 arch/x86/kernel/Makefile               |    2 ++
 arch/x86/kernel/acpi/realmode/Makefile |    1 +
 arch/x86/vdso/Makefile                 |    1 +
 kernel/gcov/Kconfig                    |    2 +-
 6 files changed, 7 insertions(+), 1 deletion(-)

Index: linux-2.6.30-rc6/kernel/gcov/Kconfig
===================================================================
--- linux-2.6.30-rc6.orig/kernel/gcov/Kconfig	2009-05-19 12:41:26.000000000 +0200
+++ linux-2.6.30-rc6/kernel/gcov/Kconfig	2009-05-19 12:41:27.000000000 +0200
@@ -34,7 +34,7 @@
 config GCOV_PROFILE_ALL
 	bool "Profile entire Kernel"
 	depends on GCOV_KERNEL
-	depends on S390 || X86_32
+	depends on S390 || X86
 	default n
 	---help---
 	This options activates profiling for the entire kernel.
Index: linux-2.6.30-rc6/arch/x86/kernel/acpi/realmode/Makefile
===================================================================
--- linux-2.6.30-rc6.orig/arch/x86/kernel/acpi/realmode/Makefile	2009-05-19 12:27:33.000000000 +0200
+++ linux-2.6.30-rc6/arch/x86/kernel/acpi/realmode/Makefile	2009-05-19 12:41:27.000000000 +0200
@@ -42,6 +42,7 @@
 		   $(call cc-option, -mpreferred-stack-boundary=2)
 KBUILD_CFLAGS	+= $(call cc-option, -m32)
 KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
+GCOV_PROFILE := n
 
 WAKEUP_OBJS = $(addprefix $(obj)/,$(wakeup-y))
 
Index: linux-2.6.30-rc6/arch/x86/boot/Makefile
===================================================================
--- linux-2.6.30-rc6.orig/arch/x86/boot/Makefile	2009-05-19 12:27:33.000000000 +0200
+++ linux-2.6.30-rc6/arch/x86/boot/Makefile	2009-05-19 12:41:27.000000000 +0200
@@ -69,6 +69,7 @@
 		   $(call cc-option, -mpreferred-stack-boundary=2)
 KBUILD_CFLAGS	+= $(call cc-option, -m32)
 KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
+GCOV_PROFILE := n
 
 $(obj)/bzImage: asflags-y  := $(SVGA_MODE)
 
Index: linux-2.6.30-rc6/arch/x86/boot/compressed/Makefile
===================================================================
--- linux-2.6.30-rc6.orig/arch/x86/boot/compressed/Makefile	2009-05-19 12:27:33.000000000 +0200
+++ linux-2.6.30-rc6/arch/x86/boot/compressed/Makefile	2009-05-19 12:41:27.000000000 +0200
@@ -15,6 +15,7 @@
 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
 
 KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+GCOV_PROFILE := n
 
 LDFLAGS := -m elf_$(UTS_MACHINE)
 LDFLAGS_vmlinux := -T
Index: linux-2.6.30-rc6/arch/x86/vdso/Makefile
===================================================================
--- linux-2.6.30-rc6.orig/arch/x86/vdso/Makefile	2009-05-19 12:27:33.000000000 +0200
+++ linux-2.6.30-rc6/arch/x86/vdso/Makefile	2009-05-19 12:41:27.000000000 +0200
@@ -123,6 +123,7 @@
 		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
 
 VDSO_LDFLAGS = -fPIC -shared $(call ld-option, -Wl$(comma)--hash-style=sysv)
+GCOV_PROFILE := n
 
 #
 # Install the unstripped copy of vdso*.so listed in $(vdso-install-y).
Index: linux-2.6.30-rc6/arch/x86/kernel/Makefile
===================================================================
--- linux-2.6.30-rc6.orig/arch/x86/kernel/Makefile	2009-05-19 12:27:33.000000000 +0200
+++ linux-2.6.30-rc6/arch/x86/kernel/Makefile	2009-05-19 12:41:27.000000000 +0200
@@ -24,6 +24,8 @@
 CFLAGS_hpet.o		:= $(nostackp)
 CFLAGS_tsc.o		:= $(nostackp)
 CFLAGS_paravirt.o	:= $(nostackp)
+GCOV_PROFILE_vsyscall_64.o	:= n
+GCOV_PROFILE_hpet.o		:= n
 
 obj-y			:= process_$(BITS).o signal.o entry_$(BITS).o
 obj-y			+= traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/