diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:38 +0100 |
| commit | 3578facf737dc9a60ed19a83458bd9cfdc2af233 (patch) | |
| tree | 7e025ccef144287fff8aaf538c7f944ca60fe6c0 | |
| parent | 3367e56f26a3a8647784328ffa846fe8021a5b79 (diff) | |
x86: merge resume-trace.h variants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/asm-x86/asm.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/resume-trace.h | 23 | ||||
| -rw-r--r-- | include/asm-x86/resume-trace_32.h | 13 | ||||
| -rw-r--r-- | include/asm-x86/resume-trace_64.h | 13 |
4 files changed, 21 insertions, 30 deletions
diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h index b5006eb9acb..8661ae75488 100644 --- a/include/asm-x86/asm.h +++ b/include/asm-x86/asm.h @@ -6,12 +6,14 @@ # define _ASM_PTR " .long " # define _ASM_ALIGN " .balign 4 " +# define _ASM_MOV_UL " movl " #else /* 64 bits */ # define _ASM_PTR " .quad " # define _ASM_ALIGN " .balign 8 " +# define _ASM_MOV_UL " movq " #endif /* CONFIG_X86_32 */ diff --git a/include/asm-x86/resume-trace.h b/include/asm-x86/resume-trace.h index 9b6dd093a9f..46f725b0bc8 100644 --- a/include/asm-x86/resume-trace.h +++ b/include/asm-x86/resume-trace.h @@ -1,5 +1,20 @@ -#ifdef CONFIG_X86_32 -# include "resume-trace_32.h" -#else -# include "resume-trace_64.h" +#ifndef _ASM_X86_RESUME_TRACE_H +#define _ASM_X86_RESUME_TRACE_H + +#include <asm/asm.h> + +#define TRACE_RESUME(user) do { \ + if (pm_trace_enabled) { \ + void *tracedata; \ + asm volatile(_ASM_MOV_UL " $1f,%0\n" \ + ".section .tracedata,\"a\"\n" \ + "1:\t.word %c1\n\t" \ + _ASM_PTR " %c2\n" \ + ".previous" \ + :"=r" (tracedata) \ + : "i" (__LINE__), "i" (__FILE__)); \ + generate_resume_trace(tracedata, user); \ + } \ +} while (0) + #endif diff --git a/include/asm-x86/resume-trace_32.h b/include/asm-x86/resume-trace_32.h deleted file mode 100644 index ec9cfd65623..00000000000 --- a/include/asm-x86/resume-trace_32.h +++ /dev/null @@ -1,13 +0,0 @@ -#define TRACE_RESUME(user) do { \ - if (pm_trace_enabled) { \ - void *tracedata; \ - asm volatile("movl $1f,%0\n" \ - ".section .tracedata,\"a\"\n" \ - "1:\t.word %c1\n" \ - "\t.long %c2\n" \ - ".previous" \ - :"=r" (tracedata) \ - : "i" (__LINE__), "i" (__FILE__)); \ - generate_resume_trace(tracedata, user); \ - } \ -} while (0) diff --git a/include/asm-x86/resume-trace_64.h b/include/asm-x86/resume-trace_64.h deleted file mode 100644 index 34bf998fdf6..00000000000 --- a/include/asm-x86/resume-trace_64.h +++ /dev/null @@ -1,13 +0,0 @@ -#define TRACE_RESUME(user) do { \ - if (pm_trace_enabled) { \ - void *tracedata; \ - asm volatile("movq $1f,%0\n" \ - ".section .tracedata,\"a\"\n" \ - "1:\t.word %c1\n" \ - "\t.quad %c2\n" \ - ".previous" \ - :"=r" (tracedata) \ - : "i" (__LINE__), "i" (__FILE__)); \ - generate_resume_trace(tracedata, user); \ - } \ -} while (0) |