linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2 V2] Kprobes: Indicate kretprobe support in arch/<arch>/Kconfig
@ 2007-12-11  6:22 Ananth N Mavinakayanahalli
  2007-12-11  6:24 ` [PATCH 2/2 V2] Kprobes: Build kretprobe examples only if arch supports kretprobes Ananth N Mavinakayanahalli
  2007-12-11 14:39 ` [PATCH 1/2 V2] Kprobes: Indicate kretprobe support in arch/<arch>/Kconfig Mathieu Desnoyers
  0 siblings, 2 replies; 4+ messages in thread
From: Ananth N Mavinakayanahalli @ 2007-12-11  6:22 UTC (permalink / raw)
  To: akpm
  Cc: lkml, Anil S Keshavamurthy, davem, mathieu.desnoyers, hskinnemoen, sam

From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>

This patch adds CONFIG_HAVE_KRETPROBES to the arch/<arch>/Kconfig file
for relevant architectures with kprobes support. This facilitates easy
handling of in-kernel modules (like samples/kprobes/kretprobe_example.c)
that depend on kretprobes being present in the kernel.

This patch depends on Mathieu Desnoyers' "Instrumentation menu removal"
patchset (http://marc.info/?l=linux-kernel&m=119496432229633&w=2)

Updated to apply on 2.6.24-rc4-mm1. Thanks to Sam Ravnborg for helping
make the patch more lean.

V2: Per Mathieu's suggestion, added CONFIG_KRETPROBES and fixed up
dependencies.

Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
---
 arch/Kconfig                  |    7 +++++++
 arch/ia64/Kconfig             |    1 +
 arch/powerpc/Kconfig          |    1 +
 arch/s390/Kconfig             |    1 +
 arch/x86/Kconfig              |    1 +
 include/asm-ia64/kprobes.h    |    1 -
 include/asm-powerpc/kprobes.h |    1 -
 include/asm-x86/kprobes_32.h  |    1 -
 include/asm-x86/kprobes_64.h  |    1 -
 include/linux/kprobes.h       |    6 +++---
 kernel/kprobes.c              |    8 +++-----
 11 files changed, 17 insertions(+), 12 deletions(-)

Index: linux-2.6.24-rc4/arch/Kconfig
===================================================================
--- linux-2.6.24-rc4.orig/arch/Kconfig
+++ linux-2.6.24-rc4/arch/Kconfig
@@ -27,5 +27,12 @@ config KPROBES
 	  for kernel debugging, non-intrusive instrumentation and testing.
 	  If in doubt, say "N".
 
+config KRETPROBES
+	def_bool y
+	depends on KPROBES && HAVE_KRETPROBES
+
 config HAVE_KPROBES
 	def_bool n
+
+config HAVE_KRETPROBES
+	def_bool n
Index: linux-2.6.24-rc4/arch/ia64/Kconfig
===================================================================
--- linux-2.6.24-rc4.orig/arch/ia64/Kconfig
+++ linux-2.6.24-rc4/arch/ia64/Kconfig
@@ -17,6 +17,7 @@ config IA64
 	select ARCH_SUPPORTS_MSI
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
+	select HAVE_KRETPROBES
 	default y
 	help
 	  The Itanium Processor Family is Intel's 64-bit successor to
Index: linux-2.6.24-rc4/arch/powerpc/Kconfig
===================================================================
--- linux-2.6.24-rc4.orig/arch/powerpc/Kconfig
+++ linux-2.6.24-rc4/arch/powerpc/Kconfig
@@ -81,6 +81,7 @@ config PPC
 	default y
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
+	select HAVE_KRETPROBES
 
 config EARLY_PRINTK
 	bool
Index: linux-2.6.24-rc4/arch/s390/Kconfig
===================================================================
--- linux-2.6.24-rc4.orig/arch/s390/Kconfig
+++ linux-2.6.24-rc4/arch/s390/Kconfig
@@ -53,6 +53,7 @@ config S390
 	def_bool y
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
+	select HAVE_KRETPROBES
 
 source "init/Kconfig"
 
Index: linux-2.6.24-rc4/arch/x86/Kconfig
===================================================================
--- linux-2.6.24-rc4.orig/arch/x86/Kconfig
+++ linux-2.6.24-rc4/arch/x86/Kconfig
@@ -20,6 +20,7 @@ config X86
 	def_bool y
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
+	select HAVE_KRETPROBES
 
 config GENERIC_TIME
 	def_bool y
Index: linux-2.6.24-rc4/include/asm-ia64/kprobes.h
===================================================================
--- linux-2.6.24-rc4.orig/include/asm-ia64/kprobes.h
+++ linux-2.6.24-rc4/include/asm-ia64/kprobes.h
@@ -82,7 +82,6 @@ struct kprobe_ctlblk {
 	struct prev_kprobe prev_kprobe[ARCH_PREV_KPROBE_SZ];
 };
 
-#define ARCH_SUPPORTS_KRETPROBES
 #define kretprobe_blacklist_size 0
 
 #define SLOT0_OPCODE_SHIFT	(37)
Index: linux-2.6.24-rc4/include/asm-powerpc/kprobes.h
===================================================================
--- linux-2.6.24-rc4.orig/include/asm-powerpc/kprobes.h
+++ linux-2.6.24-rc4/include/asm-powerpc/kprobes.h
@@ -80,7 +80,6 @@ typedef unsigned int kprobe_opcode_t;
 #define is_trap(instr)	(IS_TW(instr) || IS_TWI(instr))
 #endif
 
-#define ARCH_SUPPORTS_KRETPROBES
 #define flush_insn_slot(p)	do { } while (0)
 #define kretprobe_blacklist_size 0
 
Index: linux-2.6.24-rc4/include/asm-x86/kprobes_32.h
===================================================================
--- linux-2.6.24-rc4.orig/include/asm-x86/kprobes_32.h
+++ linux-2.6.24-rc4/include/asm-x86/kprobes_32.h
@@ -42,7 +42,6 @@ typedef u8 kprobe_opcode_t;
 	? (MAX_STACK_SIZE) \
 	: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
 
-#define ARCH_SUPPORTS_KRETPROBES
 #define flush_insn_slot(p)	do { } while (0)
 
 extern const int kretprobe_blacklist_size;
Index: linux-2.6.24-rc4/include/asm-x86/kprobes_64.h
===================================================================
--- linux-2.6.24-rc4.orig/include/asm-x86/kprobes_64.h
+++ linux-2.6.24-rc4/include/asm-x86/kprobes_64.h
@@ -41,7 +41,6 @@ typedef u8 kprobe_opcode_t;
 	? (MAX_STACK_SIZE) \
 	: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
 
-#define ARCH_SUPPORTS_KRETPROBES
 extern const int kretprobe_blacklist_size;
 
 void kretprobe_trampoline(void);
Index: linux-2.6.24-rc4/include/linux/kprobes.h
===================================================================
--- linux-2.6.24-rc4.orig/include/linux/kprobes.h
+++ linux-2.6.24-rc4/include/linux/kprobes.h
@@ -125,11 +125,11 @@ struct jprobe {
 DECLARE_PER_CPU(struct kprobe *, current_kprobe);
 DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 
-#ifdef ARCH_SUPPORTS_KRETPROBES
+#ifdef CONFIG_KRETPROBES
 extern void arch_prepare_kretprobe(struct kretprobe_instance *ri,
 				   struct pt_regs *regs);
 extern int arch_trampoline_kprobe(struct kprobe *p);
-#else /* ARCH_SUPPORTS_KRETPROBES */
+#else /* CONFIG_KRETPROBES */
 static inline void arch_prepare_kretprobe(struct kretprobe *rp,
 					struct pt_regs *regs)
 {
@@ -138,7 +138,7 @@ static inline int arch_trampoline_kprobe
 {
 	return 0;
 }
-#endif /* ARCH_SUPPORTS_KRETPROBES */
+#endif /* CONFIG_KRETPROBES */
 /*
  * Function-return probe -
  * Note:
Index: linux-2.6.24-rc4/kernel/kprobes.c
===================================================================
--- linux-2.6.24-rc4.orig/kernel/kprobes.c
+++ linux-2.6.24-rc4/kernel/kprobes.c
@@ -678,8 +678,7 @@ void __kprobes unregister_jprobe(struct 
 	unregister_kprobe(&jp->kp);
 }
 
-#ifdef ARCH_SUPPORTS_KRETPROBES
-
+#ifdef CONFIG_KRETPROBES
 /*
  * This kprobe pre_handler is registered with every kretprobe. When probe
  * hits it will set up the return probe.
@@ -762,7 +761,7 @@ int __kprobes register_kretprobe(struct 
 	return ret;
 }
 
-#else /* ARCH_SUPPORTS_KRETPROBES */
+#else /* CONFIG_KRETPROBES */
 
 int __kprobes register_kretprobe(struct kretprobe *rp)
 {
@@ -774,8 +773,7 @@ static int __kprobes pre_handler_kretpro
 {
 	return 0;
 }
-
-#endif /* ARCH_SUPPORTS_KRETPROBES */
+#endif /* CONFIG_KRETPROBES */
 
 void __kprobes unregister_kretprobe(struct kretprobe *rp)
 {

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

* [PATCH 2/2 V2] Kprobes: Build kretprobe examples only if arch supports kretprobes
  2007-12-11  6:22 [PATCH 1/2 V2] Kprobes: Indicate kretprobe support in arch/<arch>/Kconfig Ananth N Mavinakayanahalli
@ 2007-12-11  6:24 ` Ananth N Mavinakayanahalli
  2007-12-11 14:39   ` Mathieu Desnoyers
  2007-12-11 14:39 ` [PATCH 1/2 V2] Kprobes: Indicate kretprobe support in arch/<arch>/Kconfig Mathieu Desnoyers
  1 sibling, 1 reply; 4+ messages in thread
From: Ananth N Mavinakayanahalli @ 2007-12-11  6:24 UTC (permalink / raw)
  To: akpm
  Cc: lkml, Anil S Keshavamurthy, davem, mathieu.desnoyers, hskinnemoen, sam

From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>

This patch builds samples/kprobes/kretprobe_example.c only on archs that
support kretprobes. Thanks to Sam Ravnborg for Kconfig suggestions.

V2: Updated dependency on CONFIG_KRETPROBES

Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
---
 samples/Kconfig          |    5 +++++
 samples/kprobes/Makefile |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

Index: linux-2.6.24-rc4/samples/kprobes/Makefile
===================================================================
--- linux-2.6.24-rc4.orig/samples/kprobes/Makefile
+++ linux-2.6.24-rc4/samples/kprobes/Makefile
@@ -1,5 +1,5 @@
 # builds the kprobes example kernel modules;
 # then to use one (as root):  insmod <module_name.ko>
 
-obj-$(CONFIG_SAMPLE_KPROBES) += kprobe_example.o jprobe_example.o \
-		kretprobe_example.o
+obj-$(CONFIG_SAMPLE_KPROBES) += kprobe_example.o jprobe_example.o
+obj-$(CONFIG_SAMPLE_KRETPROBES) += kretprobe_example.o
Index: linux-2.6.24-rc4/samples/Kconfig
===================================================================
--- linux-2.6.24-rc4.orig/samples/Kconfig
+++ linux-2.6.24-rc4/samples/Kconfig
@@ -28,5 +28,10 @@ config SAMPLE_KPROBES
 	help
 	  This build several kprobes example modules.
 
+config SAMPLE_KRETPROBES
+	tristate "Build kretprobes example -- loadable modules only"
+	default m
+	depends on SAMPLE_KPROBES && KRETPROBES
+
 endif # SAMPLES
 

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

* Re: [PATCH 1/2 V2] Kprobes: Indicate kretprobe support in arch/<arch>/Kconfig
  2007-12-11  6:22 [PATCH 1/2 V2] Kprobes: Indicate kretprobe support in arch/<arch>/Kconfig Ananth N Mavinakayanahalli
  2007-12-11  6:24 ` [PATCH 2/2 V2] Kprobes: Build kretprobe examples only if arch supports kretprobes Ananth N Mavinakayanahalli
@ 2007-12-11 14:39 ` Mathieu Desnoyers
  1 sibling, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2007-12-11 14:39 UTC (permalink / raw)
  To: Ananth N Mavinakayanahalli
  Cc: akpm, lkml, Anil S Keshavamurthy, davem, hskinnemoen, sam

* Ananth N Mavinakayanahalli (ananth@in.ibm.com) wrote:
> From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
> 
> This patch adds CONFIG_HAVE_KRETPROBES to the arch/<arch>/Kconfig file
> for relevant architectures with kprobes support. This facilitates easy
> handling of in-kernel modules (like samples/kprobes/kretprobe_example.c)
> that depend on kretprobes being present in the kernel.
> 
> This patch depends on Mathieu Desnoyers' "Instrumentation menu removal"
> patchset (http://marc.info/?l=linux-kernel&m=119496432229633&w=2)
> 
> Updated to apply on 2.6.24-rc4-mm1. Thanks to Sam Ravnborg for helping
> make the patch more lean.
> 
> V2: Per Mathieu's suggestion, added CONFIG_KRETPROBES and fixed up
> dependencies.
> 
> Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>

You can add my Acked-by if it helps.

Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

Mathieu

> ---
>  arch/Kconfig                  |    7 +++++++
>  arch/ia64/Kconfig             |    1 +
>  arch/powerpc/Kconfig          |    1 +
>  arch/s390/Kconfig             |    1 +
>  arch/x86/Kconfig              |    1 +
>  include/asm-ia64/kprobes.h    |    1 -
>  include/asm-powerpc/kprobes.h |    1 -
>  include/asm-x86/kprobes_32.h  |    1 -
>  include/asm-x86/kprobes_64.h  |    1 -
>  include/linux/kprobes.h       |    6 +++---
>  kernel/kprobes.c              |    8 +++-----
>  11 files changed, 17 insertions(+), 12 deletions(-)
> 
> Index: linux-2.6.24-rc4/arch/Kconfig
> ===================================================================
> --- linux-2.6.24-rc4.orig/arch/Kconfig
> +++ linux-2.6.24-rc4/arch/Kconfig
> @@ -27,5 +27,12 @@ config KPROBES
>  	  for kernel debugging, non-intrusive instrumentation and testing.
>  	  If in doubt, say "N".
>  
> +config KRETPROBES
> +	def_bool y
> +	depends on KPROBES && HAVE_KRETPROBES
> +
>  config HAVE_KPROBES
>  	def_bool n
> +
> +config HAVE_KRETPROBES
> +	def_bool n
> Index: linux-2.6.24-rc4/arch/ia64/Kconfig
> ===================================================================
> --- linux-2.6.24-rc4.orig/arch/ia64/Kconfig
> +++ linux-2.6.24-rc4/arch/ia64/Kconfig
> @@ -17,6 +17,7 @@ config IA64
>  	select ARCH_SUPPORTS_MSI
>  	select HAVE_OPROFILE
>  	select HAVE_KPROBES
> +	select HAVE_KRETPROBES
>  	default y
>  	help
>  	  The Itanium Processor Family is Intel's 64-bit successor to
> Index: linux-2.6.24-rc4/arch/powerpc/Kconfig
> ===================================================================
> --- linux-2.6.24-rc4.orig/arch/powerpc/Kconfig
> +++ linux-2.6.24-rc4/arch/powerpc/Kconfig
> @@ -81,6 +81,7 @@ config PPC
>  	default y
>  	select HAVE_OPROFILE
>  	select HAVE_KPROBES
> +	select HAVE_KRETPROBES
>  
>  config EARLY_PRINTK
>  	bool
> Index: linux-2.6.24-rc4/arch/s390/Kconfig
> ===================================================================
> --- linux-2.6.24-rc4.orig/arch/s390/Kconfig
> +++ linux-2.6.24-rc4/arch/s390/Kconfig
> @@ -53,6 +53,7 @@ config S390
>  	def_bool y
>  	select HAVE_OPROFILE
>  	select HAVE_KPROBES
> +	select HAVE_KRETPROBES
>  
>  source "init/Kconfig"
>  
> Index: linux-2.6.24-rc4/arch/x86/Kconfig
> ===================================================================
> --- linux-2.6.24-rc4.orig/arch/x86/Kconfig
> +++ linux-2.6.24-rc4/arch/x86/Kconfig
> @@ -20,6 +20,7 @@ config X86
>  	def_bool y
>  	select HAVE_OPROFILE
>  	select HAVE_KPROBES
> +	select HAVE_KRETPROBES
>  
>  config GENERIC_TIME
>  	def_bool y
> Index: linux-2.6.24-rc4/include/asm-ia64/kprobes.h
> ===================================================================
> --- linux-2.6.24-rc4.orig/include/asm-ia64/kprobes.h
> +++ linux-2.6.24-rc4/include/asm-ia64/kprobes.h
> @@ -82,7 +82,6 @@ struct kprobe_ctlblk {
>  	struct prev_kprobe prev_kprobe[ARCH_PREV_KPROBE_SZ];
>  };
>  
> -#define ARCH_SUPPORTS_KRETPROBES
>  #define kretprobe_blacklist_size 0
>  
>  #define SLOT0_OPCODE_SHIFT	(37)
> Index: linux-2.6.24-rc4/include/asm-powerpc/kprobes.h
> ===================================================================
> --- linux-2.6.24-rc4.orig/include/asm-powerpc/kprobes.h
> +++ linux-2.6.24-rc4/include/asm-powerpc/kprobes.h
> @@ -80,7 +80,6 @@ typedef unsigned int kprobe_opcode_t;
>  #define is_trap(instr)	(IS_TW(instr) || IS_TWI(instr))
>  #endif
>  
> -#define ARCH_SUPPORTS_KRETPROBES
>  #define flush_insn_slot(p)	do { } while (0)
>  #define kretprobe_blacklist_size 0
>  
> Index: linux-2.6.24-rc4/include/asm-x86/kprobes_32.h
> ===================================================================
> --- linux-2.6.24-rc4.orig/include/asm-x86/kprobes_32.h
> +++ linux-2.6.24-rc4/include/asm-x86/kprobes_32.h
> @@ -42,7 +42,6 @@ typedef u8 kprobe_opcode_t;
>  	? (MAX_STACK_SIZE) \
>  	: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
>  
> -#define ARCH_SUPPORTS_KRETPROBES
>  #define flush_insn_slot(p)	do { } while (0)
>  
>  extern const int kretprobe_blacklist_size;
> Index: linux-2.6.24-rc4/include/asm-x86/kprobes_64.h
> ===================================================================
> --- linux-2.6.24-rc4.orig/include/asm-x86/kprobes_64.h
> +++ linux-2.6.24-rc4/include/asm-x86/kprobes_64.h
> @@ -41,7 +41,6 @@ typedef u8 kprobe_opcode_t;
>  	? (MAX_STACK_SIZE) \
>  	: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
>  
> -#define ARCH_SUPPORTS_KRETPROBES
>  extern const int kretprobe_blacklist_size;
>  
>  void kretprobe_trampoline(void);
> Index: linux-2.6.24-rc4/include/linux/kprobes.h
> ===================================================================
> --- linux-2.6.24-rc4.orig/include/linux/kprobes.h
> +++ linux-2.6.24-rc4/include/linux/kprobes.h
> @@ -125,11 +125,11 @@ struct jprobe {
>  DECLARE_PER_CPU(struct kprobe *, current_kprobe);
>  DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
>  
> -#ifdef ARCH_SUPPORTS_KRETPROBES
> +#ifdef CONFIG_KRETPROBES
>  extern void arch_prepare_kretprobe(struct kretprobe_instance *ri,
>  				   struct pt_regs *regs);
>  extern int arch_trampoline_kprobe(struct kprobe *p);
> -#else /* ARCH_SUPPORTS_KRETPROBES */
> +#else /* CONFIG_KRETPROBES */
>  static inline void arch_prepare_kretprobe(struct kretprobe *rp,
>  					struct pt_regs *regs)
>  {
> @@ -138,7 +138,7 @@ static inline int arch_trampoline_kprobe
>  {
>  	return 0;
>  }
> -#endif /* ARCH_SUPPORTS_KRETPROBES */
> +#endif /* CONFIG_KRETPROBES */
>  /*
>   * Function-return probe -
>   * Note:
> Index: linux-2.6.24-rc4/kernel/kprobes.c
> ===================================================================
> --- linux-2.6.24-rc4.orig/kernel/kprobes.c
> +++ linux-2.6.24-rc4/kernel/kprobes.c
> @@ -678,8 +678,7 @@ void __kprobes unregister_jprobe(struct 
>  	unregister_kprobe(&jp->kp);
>  }
>  
> -#ifdef ARCH_SUPPORTS_KRETPROBES
> -
> +#ifdef CONFIG_KRETPROBES
>  /*
>   * This kprobe pre_handler is registered with every kretprobe. When probe
>   * hits it will set up the return probe.
> @@ -762,7 +761,7 @@ int __kprobes register_kretprobe(struct 
>  	return ret;
>  }
>  
> -#else /* ARCH_SUPPORTS_KRETPROBES */
> +#else /* CONFIG_KRETPROBES */
>  
>  int __kprobes register_kretprobe(struct kretprobe *rp)
>  {
> @@ -774,8 +773,7 @@ static int __kprobes pre_handler_kretpro
>  {
>  	return 0;
>  }
> -
> -#endif /* ARCH_SUPPORTS_KRETPROBES */
> +#endif /* CONFIG_KRETPROBES */
>  
>  void __kprobes unregister_kretprobe(struct kretprobe *rp)
>  {

-- 
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] 4+ messages in thread

* Re: [PATCH 2/2 V2] Kprobes: Build kretprobe examples only if arch supports kretprobes
  2007-12-11  6:24 ` [PATCH 2/2 V2] Kprobes: Build kretprobe examples only if arch supports kretprobes Ananth N Mavinakayanahalli
@ 2007-12-11 14:39   ` Mathieu Desnoyers
  0 siblings, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2007-12-11 14:39 UTC (permalink / raw)
  To: Ananth N Mavinakayanahalli
  Cc: akpm, lkml, Anil S Keshavamurthy, davem, hskinnemoen, sam

* Ananth N Mavinakayanahalli (ananth@in.ibm.com) wrote:
> From: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
> 
> This patch builds samples/kprobes/kretprobe_example.c only on archs that
> support kretprobes. Thanks to Sam Ravnborg for Kconfig suggestions.
> 
> V2: Updated dependency on CONFIG_KRETPROBES
> 
> Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>

Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

> ---
>  samples/Kconfig          |    5 +++++
>  samples/kprobes/Makefile |    4 ++--
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6.24-rc4/samples/kprobes/Makefile
> ===================================================================
> --- linux-2.6.24-rc4.orig/samples/kprobes/Makefile
> +++ linux-2.6.24-rc4/samples/kprobes/Makefile
> @@ -1,5 +1,5 @@
>  # builds the kprobes example kernel modules;
>  # then to use one (as root):  insmod <module_name.ko>
>  
> -obj-$(CONFIG_SAMPLE_KPROBES) += kprobe_example.o jprobe_example.o \
> -		kretprobe_example.o
> +obj-$(CONFIG_SAMPLE_KPROBES) += kprobe_example.o jprobe_example.o
> +obj-$(CONFIG_SAMPLE_KRETPROBES) += kretprobe_example.o
> Index: linux-2.6.24-rc4/samples/Kconfig
> ===================================================================
> --- linux-2.6.24-rc4.orig/samples/Kconfig
> +++ linux-2.6.24-rc4/samples/Kconfig
> @@ -28,5 +28,10 @@ config SAMPLE_KPROBES
>  	help
>  	  This build several kprobes example modules.
>  
> +config SAMPLE_KRETPROBES
> +	tristate "Build kretprobes example -- loadable modules only"
> +	default m
> +	depends on SAMPLE_KPROBES && KRETPROBES
> +
>  endif # SAMPLES
>  

-- 
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] 4+ messages in thread

end of thread, other threads:[~2007-12-11 14:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-12-11  6:22 [PATCH 1/2 V2] Kprobes: Indicate kretprobe support in arch/<arch>/Kconfig Ananth N Mavinakayanahalli
2007-12-11  6:24 ` [PATCH 2/2 V2] Kprobes: Build kretprobe examples only if arch supports kretprobes Ananth N Mavinakayanahalli
2007-12-11 14:39   ` Mathieu Desnoyers
2007-12-11 14:39 ` [PATCH 1/2 V2] Kprobes: Indicate kretprobe support in arch/<arch>/Kconfig 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).