From 72ef8ca8c6712cbc75ec3ed2cb26e7c108289300 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann?= Date: Sat, 29 Mar 2008 12:14:13 +0000 Subject: [PATCH] x86 merge happened in 2.6.25 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sat Mar 29 08:05:46 2008 Søren Sandmann * module/sysprof-module.c: x86 merge happened in 2.6.25 svn path=/trunk/; revision=404 --- ChangeLog | 4 ++++ module/sysprof-module.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dbe8bf0..2e511f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 29 08:05:46 2008 Søren Sandmann + + * module/sysprof-module.c: x86 merge happened in 2.6.25 + 2008-03-23 Soren Sandmann * sysprof.c (queue_show_samples): Update samples immediately when diff --git a/module/sysprof-module.c b/module/sysprof-module.c index aac5155..cb1c0f5 100644 --- a/module/sysprof-module.c +++ b/module/sysprof-module.c @@ -67,7 +67,7 @@ DECLARE_WAIT_QUEUE_HEAD (wait_for_trace); # define REG_STACK_PTR rsp # define REG_STACK_PTR0 rsp0 #elif defined(CONFIG_X86) -# if LINUX_VERSION_CODE >= KERNEL_VERSION (2,6,24) +# if LINUX_VERSION_CODE >= KERNEL_VERSION (2,6,25) # define REG_FRAME_PTR bp # define REG_INS_PTR ip # define REG_STACK_PTR sp -- 2.7.4