[PATCH 1/2] Kprobes: Indicate kretprobe support in arch/arch/Kconfig
From: Ananth N Mavinakayanahalli [EMAIL PROTECTED]
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-kernelm=119496432229633w=2)
Updated to apply on 2.6.24-rc4-mm1.
Signed-off-by: Ananth N Mavinakayanahalli [EMAIL PROTECTED]
---
arch/avr32/Kconfig|5 +
arch/ia64/Kconfig |5 +
arch/powerpc/Kconfig |5 +
arch/s390/Kconfig |5 +
arch/sparc64/Kconfig |5 +
arch/x86/Kconfig |5 +
include/asm-ia64/kprobes.h|1 -
include/asm-powerpc/kprobes.h |1 -
include/asm-s390/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 +++-
13 files changed, 36 insertions(+), 13 deletions(-)
Index: linux-2.6.24-rc4/arch/avr32/Kconfig
===
--- linux-2.6.24-rc4.orig/arch/avr32/Kconfig
+++ linux-2.6.24-rc4/arch/avr32/Kconfig
@@ -66,6 +66,11 @@ config GENERIC_BUG
def_bool y
depends on BUG
+config HAVE_KRETPROBES
+ bool
+ depends on HAVE_KPROBES
+ default n
+
source init/Kconfig
menu System Type and features
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
@@ -101,6 +101,11 @@ config AUDIT_ARCH
bool
default y
+config HAVE_KRETPROBES
+ bool
+ depends on HAVE_KPROBES
+ default y
+
choice
prompt System type
default IA64_GENERIC
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
@@ -165,6 +165,11 @@ config PPC_OF_PLATFORM_PCI
depends on PPC64 # not supported on 32 bits yet
default n
+config HAVE_KRETPROBES
+ bool
+ depends on HAVE_KPROBES
+ default y
+
source init/Kconfig
source arch/powerpc/platforms/Kconfig
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
@@ -54,6 +54,11 @@ config S390
select HAVE_OPROFILE
select HAVE_KPROBES
+config HAVE_KRETPROBES
+ bool
+ depends on HAVE_KPROBES
+ default y
+
source init/Kconfig
menu Base setup
Index: linux-2.6.24-rc4/arch/sparc64/Kconfig
===
--- linux-2.6.24-rc4.orig/arch/sparc64/Kconfig
+++ linux-2.6.24-rc4/arch/sparc64/Kconfig
@@ -81,6 +81,11 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
config ARCH_SUPPORTS_AOUT
def_bool y
+config HAVE_KRETPROBES
+ bool
+ depends on HAVE_KPROBES
+ default n
+
choice
prompt Kernel page size
default SPARC64_PAGE_SIZE_8KB
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
@@ -145,6 +145,11 @@ config X86_TRAMPOLINE
config KTIME_SCALAR
def_bool X86_32
+config HAVE_KRETPROBES
+ bool
+ depends on HAVE_KPROBES
+ default y
+
source init/Kconfig
menu Processor type and features
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-s390/kprobes.h
===
--- linux-2.6.24-rc4.orig/include/asm-s390/kprobes.h
+++ linux-2.6.24-rc4/include/asm-s390/kprobes.h
@@ -46,7 +46,6 @@ typedef u16 kprobe_opcode_t;
? (MAX_STACK_SIZE) \
Re: [PATCH 1/2] Kprobes: Indicate kretprobe support in arch/arch/Kconfig
On Mon, Dec 10, 2007 at 03:22:22PM +0530, Ananth N Mavinakayanahalli wrote: From: Ananth N Mavinakayanahalli [EMAIL PROTECTED] 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-kernelm=119496432229633w=2) Updated to apply on 2.6.24-rc4-mm1. Signed-off-by: Ananth N Mavinakayanahalli [EMAIL PROTECTED] --- arch/avr32/Kconfig|5 + arch/ia64/Kconfig |5 + arch/powerpc/Kconfig |5 + arch/s390/Kconfig |5 + arch/sparc64/Kconfig |5 + arch/x86/Kconfig |5 + include/asm-ia64/kprobes.h|1 - include/asm-powerpc/kprobes.h |1 - include/asm-s390/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 +++- 13 files changed, 36 insertions(+), 13 deletions(-) Index: linux-2.6.24-rc4/arch/avr32/Kconfig === --- linux-2.6.24-rc4.orig/arch/avr32/Kconfig +++ linux-2.6.24-rc4/arch/avr32/Kconfig @@ -66,6 +66,11 @@ config GENERIC_BUG def_bool y depends on BUG +config HAVE_KRETPROBES + bool + depends on HAVE_KPROBES + default n + The symbol HAVE_KRETPROBES should be defined in the common file - so the only thing you have to do is a single line: config AVR32 + select HAVE_KRETPROBES Much more dense than defining the symbols once for each arch. Sam -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/2] Kprobes: Indicate kretprobe support in arch/arch/Kconfig - updated
On Mon, Dec 10, 2007 at 11:13:07AM +0100, Sam Ravnborg wrote: On Mon, Dec 10, 2007 at 03:22:22PM +0530, Ananth N Mavinakayanahalli wrote: From: Ananth N Mavinakayanahalli [EMAIL PROTECTED] 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-kernelm=119496432229633w=2) Updated to apply on 2.6.24-rc4-mm1. Signed-off-by: Ananth N Mavinakayanahalli [EMAIL PROTECTED] --- arch/avr32/Kconfig|5 + arch/ia64/Kconfig |5 + arch/powerpc/Kconfig |5 + arch/s390/Kconfig |5 + arch/sparc64/Kconfig |5 + arch/x86/Kconfig |5 + include/asm-ia64/kprobes.h|1 - include/asm-powerpc/kprobes.h |1 - include/asm-s390/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 +++- 13 files changed, 36 insertions(+), 13 deletions(-) Index: linux-2.6.24-rc4/arch/avr32/Kconfig === --- linux-2.6.24-rc4.orig/arch/avr32/Kconfig +++ linux-2.6.24-rc4/arch/avr32/Kconfig @@ -66,6 +66,11 @@ config GENERIC_BUG def_bool y depends on BUG +config HAVE_KRETPROBES + bool + depends on HAVE_KPROBES + default n + The symbol HAVE_KRETPROBES should be defined in the common file - so the only thing you have to do is a single line: config AVR32 + select HAVE_KRETPROBES Much more dense than defining the symbols once for each arch. Agreed. Updated patch below. From: Ananth N Mavinakayanahalli [EMAIL PROTECTED] 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-kernelm=119496432229633w=2) Updated to apply on 2.6.24-rc4-mm1. Thanks to Sam Ravnborg for helping make the patch more lean. Signed-off-by: Ananth N Mavinakayanahalli [EMAIL PROTECTED] --- arch/Kconfig |4 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, 14 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 @@ -29,3 +29,7 @@ config KPROBES config HAVE_KPROBES def_bool n + +config HAVE_KRETPROBES + def_bool n + depends on HAVE_KPROBES 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
Re: [PATCH 1/2] Kprobes: Indicate kretprobe support in arch/arch/Kconfig - updated
* Ananth N Mavinakayanahalli ([EMAIL PROTECTED]) wrote: On Mon, Dec 10, 2007 at 11:13:07AM +0100, Sam Ravnborg wrote: On Mon, Dec 10, 2007 at 03:22:22PM +0530, Ananth N Mavinakayanahalli wrote: From: Ananth N Mavinakayanahalli [EMAIL PROTECTED] 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-kernelm=119496432229633w=2) Updated to apply on 2.6.24-rc4-mm1. Signed-off-by: Ananth N Mavinakayanahalli [EMAIL PROTECTED] --- arch/avr32/Kconfig|5 + arch/ia64/Kconfig |5 + arch/powerpc/Kconfig |5 + arch/s390/Kconfig |5 + arch/sparc64/Kconfig |5 + arch/x86/Kconfig |5 + include/asm-ia64/kprobes.h|1 - include/asm-powerpc/kprobes.h |1 - include/asm-s390/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 +++- 13 files changed, 36 insertions(+), 13 deletions(-) Index: linux-2.6.24-rc4/arch/avr32/Kconfig === --- linux-2.6.24-rc4.orig/arch/avr32/Kconfig +++ linux-2.6.24-rc4/arch/avr32/Kconfig @@ -66,6 +66,11 @@ config GENERIC_BUG def_bool y depends on BUG +config HAVE_KRETPROBES + bool + depends on HAVE_KPROBES + default n + The symbol HAVE_KRETPROBES should be defined in the common file - so the only thing you have to do is a single line: config AVR32 + select HAVE_KRETPROBES Much more dense than defining the symbols once for each arch. Agreed. Updated patch below. From: Ananth N Mavinakayanahalli [EMAIL PROTECTED] 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-kernelm=119496432229633w=2) Updated to apply on 2.6.24-rc4-mm1. Thanks to Sam Ravnborg for helping make the patch more lean. Signed-off-by: Ananth N Mavinakayanahalli [EMAIL PROTECTED] --- arch/Kconfig |4 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, 14 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 @@ -29,3 +29,7 @@ config KPROBES config HAVE_KPROBES def_bool n + +config HAVE_KRETPROBES + def_bool n + depends on HAVE_KPROBES 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
Re: [PATCH 1/2] Kprobes: Indicate kretprobe support in arch/arch/Kconfig - updated
On Mon, Dec 10, 2007 at 10:10:01AM -0500, Mathieu Desnoyers wrote:
* Ananth N Mavinakayanahalli ([EMAIL PROTECTED]) wrote:
On Mon, Dec 10, 2007 at 11:13:07AM +0100, Sam Ravnborg wrote:
On Mon, Dec 10, 2007 at 03:22:22PM +0530, Ananth N Mavinakayanahalli
wrote:
From: Ananth N Mavinakayanahalli [EMAIL PROTECTED]
snip
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_HAVE_KRETPROBES
Hi Ananth,
I just want to point out a detail: if someone sets CONFIG_KPROBES to n,
the CONFIG_HAVE_KPROBES is still y, and so is CONFIG_HAVE_KRETPROBES.
However, I doubt that you want to activate this code in this case ?
The code paths are OK because they are nested into CONFIG_KPROBES
ifdefs (or not built due to dependency on CONFIG_KPROBES in the
Makfile), but if one wants to use CONFIG_HAVE_KRETPROBE for something
else (Makefile), then it could become a problem.
Could we add a menu entry CONFIG_KRETPROBES that depends on
CONFIG_HAVE_KRETPROBES and CONFIG_KPROBES, and also remove the
CONFIG_HAVE_KPROBES dependency for the CONFIG_HAVE_KRETPROBE option ?
This way, we would have much more flexibility (like specifiying if we
want CONFIG_KRETPROBES to be default y or default n...)
Done... Updated patch coming up.
Ananth
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [patch 1/2] Kprobes: Indicate kretprobe support in arch/arch/Kconfig
* Andrew Morton ([EMAIL PROTECTED]) wrote: On Tue, 13 Nov 2007 21:17:10 +0530 Ananth N Mavinakayanahalli [EMAIL PROTECTED] wrote: From: Ananth N Mavinakayanahalli [EMAIL PROTECTED] This patch adds CONFIG_ARCH_SUPPORTS_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-kernelm=119496432229633w=2) I didn't merge this because I didn't merge Mathieu's patches because my brain is not large enough to keep up with Mathieu's patches so sparc64 is still busted. Please send fixes against 2.6.24-rc4-mm1? Thanks. I'll resend the instrumentation menu removal patchset against 2.6.24-rc4-mm1 immediately. 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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [patch 1/2] Kprobes: Indicate kretprobe support in arch/arch/Kconfig
On Tue, 13 Nov 2007 21:17:10 +0530 Ananth N Mavinakayanahalli [EMAIL PROTECTED] wrote: From: Ananth N Mavinakayanahalli [EMAIL PROTECTED] This patch adds CONFIG_ARCH_SUPPORTS_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-kernelm=119496432229633w=2) I didn't merge this because I didn't merge Mathieu's patches because my brain is not large enough to keep up with Mathieu's patches so sparc64 is still busted. Please send fixes against 2.6.24-rc4-mm1? Thanks. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[patch 1/2] Kprobes: Indicate kretprobe support in arch/arch/Kconfig
From: Ananth N Mavinakayanahalli [EMAIL PROTECTED]
This patch adds CONFIG_ARCH_SUPPORTS_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-kernelm=119496432229633w=2)
Signed-off-by: Ananth N Mavinakayanahalli [EMAIL PROTECTED]
---
arch/avr32/Kconfig|5 +
arch/ia64/Kconfig |5 +
arch/powerpc/Kconfig |5 +
arch/s390/Kconfig |5 +
arch/sparc64/Kconfig |5 +
arch/x86/Kconfig.i386 |5 +
arch/x86/Kconfig.x86_64 |5 +
include/asm-ia64/kprobes.h|1 -
include/asm-powerpc/kprobes.h |1 -
include/asm-s390/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 |6 +++---
14 files changed, 41 insertions(+), 11 deletions(-)
Index: kernel-13nov/arch/avr32/Kconfig
===
--- kernel-13nov.orig/arch/avr32/Kconfig
+++ kernel-13nov/arch/avr32/Kconfig
@@ -73,6 +73,11 @@ config GENERIC_BUG
config ARCH_SUPPORTS_KPROBES
def_bool y
+config ARCH_SUPPORTS_KRETPROBES
+ bool
+ depends on ARCH_SUPPORTS_KPROBES
+ default n
+
source init/Kconfig
menu System Type and features
Index: kernel-13nov/arch/ia64/Kconfig
===
--- kernel-13nov.orig/arch/ia64/Kconfig
+++ kernel-13nov/arch/ia64/Kconfig
@@ -105,6 +105,11 @@ config ARCH_SUPPORTS_OPROFILE
config ARCH_SUPPORTS_KPROBES
def_bool y
+config ARCH_SUPPORTS_KRETPROBES
+ bool
+ depends on ARCH_SUPPORTS_KPROBES
+ default y
+
choice
prompt System type
default IA64_GENERIC
Index: kernel-13nov/arch/powerpc/Kconfig
===
--- kernel-13nov.orig/arch/powerpc/Kconfig
+++ kernel-13nov/arch/powerpc/Kconfig
@@ -169,6 +169,11 @@ config ARCH_SUPPORTS_OPROFILE
config ARCH_SUPPORTS_KPROBES
def_bool y
+config ARCH_SUPPORTS_KRETPROBES
+ bool
+ depends on ARCH_SUPPORTS_KPROBES
+ default y
+
source init/Kconfig
source arch/powerpc/platforms/Kconfig
Index: kernel-13nov/arch/s390/Kconfig
===
--- kernel-13nov.orig/arch/s390/Kconfig
+++ kernel-13nov/arch/s390/Kconfig
@@ -58,6 +58,11 @@ config ARCH_SUPPORTS_OPROFILE
config ARCH_SUPPORTS_KPROBES
def_bool y
+config ARCH_SUPPORTS_KRETPROBES
+ bool
+ depends on ARCH_SUPPORTS_KPROBES
+ default y
+
source init/Kconfig
menu Base setup
Index: kernel-13nov/arch/sparc64/Kconfig
===
--- kernel-13nov.orig/arch/sparc64/Kconfig
+++ kernel-13nov/arch/sparc64/Kconfig
@@ -82,6 +82,11 @@ config ARCH_SUPPORTS_OPROFILE
config ARCH_SUPPORTS_KPROBES
def_bool y
+config ARCH_SUPPORTS_KRETPROBES
+ bool
+ depends on ARCH_SUPPORTS_KPROBES
+ default n
+
choice
prompt Kernel page size
default SPARC64_PAGE_SIZE_8KB
Index: kernel-13nov/arch/x86/Kconfig.i386
===
--- kernel-13nov.orig/arch/x86/Kconfig.i386
+++ kernel-13nov/arch/x86/Kconfig.i386
@@ -97,6 +97,11 @@ config ARCH_SUPPORTS_OPROFILE
config ARCH_SUPPORTS_KPROBES
def_bool y
+config ARCH_SUPPORTS_KRETPROBES
+ bool
+ depends on ARCH_SUPPORTS_KPROBES
+ default y
+
source init/Kconfig
menu Processor type and features
Index: kernel-13nov/arch/x86/Kconfig.x86_64
===
--- kernel-13nov.orig/arch/x86/Kconfig.x86_64
+++ kernel-13nov/arch/x86/Kconfig.x86_64
@@ -139,6 +139,11 @@ config ARCH_SUPPORTS_OPROFILE
config ARCH_SUPPORTS_KPROBES
def_bool y
+config ARCH_SUPPORTS_KRETPROBES
+ bool
+ depends on ARCH_SUPPORTS_KPROBES
+ default y
+
source init/Kconfig
Index: kernel-13nov/include/asm-ia64/kprobes.h
===
--- kernel-13nov.orig/include/asm-ia64/kprobes.h
+++ kernel-13nov/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: kernel-13nov/include/asm-powerpc/kprobes.h
===
--- kernel-13nov.orig/include/asm-powerpc/kprobes.h
+++ kernel-13nov/include/asm-powerpc/kprobes.h
@@ -80,7 +80,6 @@ typedef
