varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-10 07:00:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder the tests for CONFIG_X86 and CONFIG_X86_64 since post 2.6.26, they

Browse Source 
2008-04-30  Owen Taylor  <otaylor@redhat.com>

	* module/sysprof-module.c: Reorder the tests for 
	CONFIG_X86 and CONFIG_X86_64 since post 2.6.26, they are
	both defined on x86-64 machines.

svn path=/trunk/; revision=419
This commit is contained in:
Owen Taylor
2008-05-08 13:27:06 +00:00
committed by Owen Taylor
parent 282783bf2b
commit 3911e057d7
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-04-30 Owen Taylor <otaylor@redhat.com>
* module/sysprof-module.c: Reorder the tests for
CONFIG_X86 and CONFIG_X86_64 since post 2.6.26, they are
both defined on x86-64 machines.
2008-05-07 Soren Sandmann Pedersen <sandmann@daimi.au.dk> 2008-05-07 Soren Sandmann Pedersen <sandmann@daimi.au.dk>
* binfile.c (get_build_id_file): Fix bug where the build id name * binfile.c (get_build_id_file): Fix bug where the build id name

12
module/sysprof-module.c
View File

@ -61,12 +61,7 @@ static atomic_t client_count = ATOMIC_INIT(0);
DECLARE_WAIT_QUEUE_HEAD (wait_for_trace); DECLARE_WAIT_QUEUE_HEAD (wait_for_trace);
/* Macro the names of the registers that are used on each architecture */ /* Macro the names of the registers that are used on each architecture */
#if defined(CONFIG_X86_64) #if defined(CONFIG_X86)
# define REG_FRAME_PTR rbp
# define REG_INS_PTR rip
# define REG_STACK_PTR rsp
# define REG_STACK_PTR0 rsp0
#elif defined(CONFIG_X86)
# if LINUX_VERSION_CODE >= KERNEL_VERSION (2,6,25) # if LINUX_VERSION_CODE >= KERNEL_VERSION (2,6,25)
# define REG_FRAME_PTR bp # define REG_FRAME_PTR bp
# define REG_INS_PTR ip # define REG_INS_PTR ip
@ -78,6 +73,11 @@ DECLARE_WAIT_QUEUE_HEAD (wait_for_trace);
# define REG_STACK_PTR esp # define REG_STACK_PTR esp
# define REG_STACK_PTR0 esp0 # define REG_STACK_PTR0 esp0
# endif # endif
#elif defined(CONFIG_X86_64) /* pre-2.6.25 separate architecture */
# define REG_FRAME_PTR rbp
# define REG_INS_PTR rip
# define REG_STACK_PTR rsp
# define REG_STACK_PTR0 rsp0
#else #else
# error Sysprof only supports the i386 and x86-64 architectures # error Sysprof only supports the i386 and x86-64 architectures
#endif #endif