LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH for -mm] Fix ARM to play nicely with generic Instrumentation menu
@ 2008-01-16  2:53 Mathieu Desnoyers
  2008-01-16  8:51 ` Russell King
  0 siblings, 1 reply; 3+ messages in thread
From: Mathieu Desnoyers @ 2008-01-16  2:53 UTC (permalink / raw)
  To: akpm, linux-kernel
  Cc: Linus Torvalds, ananth, dhowells, jdike, sam, Adrian Bunk,
	Randy Dunlap, rmk, phil.el, oprofile-list

The conflicting commit for 
move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch
is the ARM fix from Linus :

commit 38ad9aebe70dc72df08851bbd1620d89329129ba

He just seemed to agree that my approach (just putting the missing ARM
config options in arch/arm/Kconfig) works too. The main advantage it has
is that it is smaller, does not need a cleanup in the future and does
not break the following patches unnecessarily.

It's just been discussed here

http://lkml.org/lkml/2008/1/15/267

However, Linus might prefer to stay with his own patch and I would
totally understand it that late in the release cycle. Therefore I submit
this for the next release cycle.

This patch cleans up the fix from Linus so it does not conflict with the
following patches in -mm.

It applies on top of the current 2.6.24-rc7-git8 + possibly some more
git commits (at commit 0938e7586440ac97cedc0f5528a8684ebfa4ce43).

After applying this patch,
move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch
applies nicely in the -mm tree without any modification.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: ananth@in.ibm.com
CC: dhowells@redhat.com
CC: jdike@addtoit.com
CC: sam@ravnborg.org
CC: Adrian Bunk <adrian.bunk@movial.fi>
CC: Randy Dunlap <randy.dunlap@oracle.com>
CC: rmk@arm.linux.org.uk
CC: phil.el@wanadoo.fr
CC: oprofile-list@lists.sourceforge.net
---
 arch/arm/Kconfig                 |    2 -
 arch/arm/Kconfig.instrumentation |   52 ---------------------------------------
 2 files changed, 1 insertion(+), 53 deletions(-)

Index: linux-2.6-lttng/arch/arm/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig	2008-01-15 21:37:06.000000000 -0500
+++ linux-2.6-lttng/arch/arm/Kconfig	2008-01-15 21:45:23.000000000 -0500
@@ -130,6 +130,23 @@ config FIQ
 config ARCH_MTD_XIP
 	bool
 
+if OPROFILE
+
+config OPROFILE_ARMV6
+	def_bool y
+	depends on CPU_V6 && !SMP
+	select OPROFILE_ARM11_CORE
+
+config OPROFILE_MPCORE
+	def_bool y
+	depends on CPU_V6 && SMP
+	select OPROFILE_ARM11_CORE
+
+config OPROFILE_ARM11_CORE
+	bool
+
+endif
+
 config VECTORS_BASE
 	hex
 	default 0xffff0000 if MMU || CPU_HIGH_VECTOR
@@ -1076,7 +1093,7 @@ endmenu
 
 source "fs/Kconfig"
 
-source "arch/arm/Kconfig.instrumentation"
+source "kernel/Kconfig.instrumentation"
 
 source "arch/arm/Kconfig.debug"
 
Index: linux-2.6-lttng/arch/arm/Kconfig.instrumentation
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig.instrumentation	2008-01-15 21:37:06.000000000 -0500
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-menuconfig INSTRUMENTATION
-	bool "Instrumentation Support"
-	default y
-	---help---
-	  Say Y here to get to see options related to performance measurement,
-	  system-wide debugging, and testing. This option alone does not add any
-	  kernel code.
-
-	  If you say N, all options in this submenu will be skipped and
-	  disabled. If you're trying to debug the kernel itself, go see the
-	  Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-config PROFILING
-	bool "Profiling support (EXPERIMENTAL)"
-	help
-	  Say Y here to enable the extended profiling support mechanisms used
-	  by profilers such as OProfile.
-
-config OPROFILE
-	tristate "OProfile system profiling (EXPERIMENTAL)"
-	depends on PROFILING && !UML
-	help
-	  OProfile is a profiling system capable of profiling the
-	  whole system, include the kernel, kernel modules, libraries,
-	  and applications.
-
-	  If unsure, say N.
-
-config OPROFILE_ARMV6
-	bool
-	depends on OPROFILE && CPU_V6 && !SMP
-	default y
-	select OPROFILE_ARM11_CORE
-
-config OPROFILE_MPCORE
-	bool
-	depends on OPROFILE && CPU_V6 && SMP
-	default y
-	select OPROFILE_ARM11_CORE
-
-config OPROFILE_ARM11_CORE
-	bool
-
-config MARKERS
-	bool "Activate markers"
-	help
-	  Place an empty function call at each marker site. Can be
-	  dynamically changed for a probe function.
-
-endif # INSTRUMENTATION

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH for -mm] Fix ARM to play nicely with generic Instrumentation menu
  2008-01-16  2:53 [PATCH for -mm] Fix ARM to play nicely with generic Instrumentation menu Mathieu Desnoyers
@ 2008-01-16  8:51 ` Russell King
  2008-01-16 14:34   ` Mathieu Desnoyers
  0 siblings, 1 reply; 3+ messages in thread
From: Russell King @ 2008-01-16  8:51 UTC (permalink / raw)
  To: Mathieu Desnoyers
  Cc: akpm, linux-kernel, Linus Torvalds, ananth, dhowells, jdike, sam,
	Adrian Bunk, Randy Dunlap, phil.el, oprofile-list

On Tue, Jan 15, 2008 at 09:53:41PM -0500, Mathieu Desnoyers wrote:
> This patch cleans up the fix from Linus so it does not conflict with the
> following patches in -mm.

What following patches?

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH for -mm] Fix ARM to play nicely with generic Instrumentation menu
  2008-01-16  8:51 ` Russell King
@ 2008-01-16 14:34   ` Mathieu Desnoyers
  0 siblings, 0 replies; 3+ messages in thread
From: Mathieu Desnoyers @ 2008-01-16 14:34 UTC (permalink / raw)
  To: Russell King
  Cc: akpm, linux-kernel, Linus Torvalds, ananth, dhowells, jdike, sam,
	Adrian Bunk, Randy Dunlap, phil.el, oprofile-list

* Russell King (rmk+lkml@arm.linux.org.uk) wrote:
> On Tue, Jan 15, 2008 at 09:53:41PM -0500, Mathieu Desnoyers wrote:
> > This patch cleans up the fix from Linus so it does not conflict with the
> > following patches in -mm.
> 
> What following patches?
> 

Instrumentation menu removal, which was in -mm until yesterday.

http://lkml.org/lkml/2007/12/8/81

I did this patch following a discussion with Linus about a month ago
where I was proposing the creation of the instrumentation/ directory in
the kernel sources to follow the menus/tree directories logic found in
the rest of the kernel.

http://lkml.org/lkml/2007/10/30/318

Mathieu

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-01-16 14:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-16  2:53 [PATCH for -mm] Fix ARM to play nicely with generic Instrumentation menu Mathieu Desnoyers
2008-01-16  8:51 ` Russell King
2008-01-16 14:34   ` Mathieu Desnoyers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).