[PATCH 8/21] [PATCH] 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 <[email protected]>
---
 include/asm-x86/processor.h    |   11 +++++++++++
 include/asm-x86/processor_32.h |    6 ------
 include/asm-x86/processor_64.h |    6 ------
 3 files changed, 11 insertions(+), 12 deletions(-)

Index: linux-2.6-x86/include/asm-x86/processor.h
===================================================================
--- linux-2.6-x86.orig/include/asm-x86/processor.h
+++ linux-2.6-x86/include/asm-x86/processor.h
@@ -6,6 +6,17 @@
 #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)
 {
Index: linux-2.6-x86/include/asm-x86/processor_32.h
===================================================================
--- linux-2.6-x86.orig/include/asm-x86/processor_32.h
+++ linux-2.6-x86/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]
Index: linux-2.6-x86/include/asm-x86/processor_64.h
===================================================================
--- linux-2.6-x86.orig/include/asm-x86/processor_64.h
+++ linux-2.6-x86/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.
  */
 
--
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/

---

• Follow-Ups:
  • [PATCH 9/21] [PATCH] unify tss_struct
    • From: Glauber de Oliveira Costa <[email protected]>

• References:
  • [PATCH 0/21] Integrate processor.h
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 1/21] move tsc definitions to were they belong
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 2/21] [PATCH] get rid of _MASK flags
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 3/21] [PATCH] move desc_empty to where they belong
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 4/21] [PATCH] move load_cr3 to a common place.
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 5/21] [PATCH] unify paravirt pieces of processor.h
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 6/21] [PATCH] move the definition of set_iopl_mask to common header
    • From: Glauber de Oliveira Costa <[email protected]>
  • [PATCH 7/21] [PATCH] unify common parts of processor.h
    • From: Glauber de Oliveira Costa <[email protected]>

• Prev by Date: [PATCH 7/21] [PATCH] unify common parts of processor.h
• Next by Date: [PATCH 9/21] [PATCH] unify tss_struct
• Previous by thread: [PATCH 7/21] [PATCH] unify common parts of processor.h
• Next by thread: [PATCH 9/21] [PATCH] unify tss_struct
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]