sysprof r419 - in trunk: . module

[otaylor svn gnome org]

Author: otaylor
Date: Thu May  8 13:27:06 2008
New Revision: 419
URL: http://svn.gnome.org/viewvc/sysprof?rev=419&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/module/sysprof-module.c

Modified: trunk/module/sysprof-module.c
==============================================================================
--- trunk/module/sysprof-module.c	(original)
+++ trunk/module/sysprof-module.c	Thu May  8 13:27:06 2008
@@ -61,12 +61,7 @@
 DECLARE_WAIT_QUEUE_HEAD (wait_for_trace);
 
 /* Macro the names of the registers that are used on each architecture */
-#if defined(CONFIG_X86_64)
-#	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 defined(CONFIG_X86)
 #	if LINUX_VERSION_CODE >= KERNEL_VERSION (2,6,25)
 #		define REG_FRAME_PTR bp
 #		define REG_INS_PTR ip
@@ -78,6 +73,11 @@
 #		define REG_STACK_PTR esp
 #		define REG_STACK_PTR0 esp0
 #	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
 #	error Sysprof only supports the i386 and x86-64 architectures
 #endif