summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-01-30 13:31:27 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:31:27 +0100
commit0ccb8acc51693a2aef0f38024943808046d81251 (patch)
treeba3dd7f108803ba3f9ed71304c8ff1ea676cbb30 /include
parentx86: unify common parts of processor.h (diff)
downloadlinux-0ccb8acc51693a2aef0f38024943808046d81251.tar.xz
linux-0ccb8acc51693a2aef0f38024943808046d81251.zip
x86: unify current_text_addr
current_text_addr() has a different implementation in x86_64 and i386, but it is not fundamentally different. I stick to the i386 implementation, that seem to be a common base, and move it to processor.h Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/processor.h11
-rw-r--r--include/asm-x86/processor_32.h6
-rw-r--r--include/asm-x86/processor_64.h6
3 files changed, 11 insertions, 12 deletions
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 52e3637ef59e..3deb5ba55f55 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -10,6 +10,17 @@ struct mm_struct;
#include <asm/page.h>
#include <asm/system.h>
+/*
+ * Default implementation of macro that returns current
+ * instruction pointer ("program counter").
+ */
+static inline void *current_text_addr(void)
+{
+ void *pc;
+ asm volatile("mov $1f,%0\n1:":"=r" (pc));
+ return pc;
+}
+
static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
unsigned int *ecx, unsigned int *edx)
{
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 9e119d3789b4..6cd2149dcbad 100644
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -22,12 +22,6 @@
#include <asm/desc_defs.h>
/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ void *pc; __asm__("movl $1f,%0\n1:":"=g" (pc)); pc; })
-
-/*
* CPU type and hardware bug flags. Kept separately for each CPU.
* Members of this structure are referenced in head.S, so think twice
* before touching them. [mj]
diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h
index 5f5c7fc63797..1984a4a38b74 100644
--- a/include/asm-x86/processor_64.h
+++ b/include/asm-x86/processor_64.h
@@ -21,12 +21,6 @@
#include <asm/desc_defs.h>
/*
- * Default implementation of macro that returns current
- * instruction pointer ("program counter").
- */
-#define current_text_addr() ({ void *pc; asm volatile("leaq 1f(%%rip),%0\n1:":"=r"(pc)); pc; })
-
-/*
* CPU type and hardware bug flags. Kept separately for each CPU.
*/