aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/power
diff options
context:
space:
mode:
authorSergio Luis <sergio@larces.uece.br>2009-04-28 00:26:50 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2009-06-12 21:32:30 +0200
commit833b2ca0795526898a66c7b6770273bb16567e19 (patch)
treeacc8ab4f3d352717a45fc1ee7a2923ef1b99ff79 /arch/x86/power
parentf6783d20d4b85b360b4a6f86bdbd9282a4a7004c (diff)
downloadlinux-833b2ca0795526898a66c7b6770273bb16567e19.tar.gz
x86: unify power/cpu_(32|64) global variables
Aiming total unification of cpu_32.c and cpu_64.c, in this step we do unify the global variables and existing forward declarations for such files. Signed-off-by: Sergio Luis <sergio@larces.uece.br> Signed-off-by: Lauro Salmito <laurosalmito@gmail.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/x86/power')
-rw-r--r--arch/x86/power/cpu_32.c7
-rw-r--r--arch/x86/power/cpu_64.c10
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c
index 12a9c871d2e..de1a86b2cff 100644
--- a/arch/x86/power/cpu_32.c
+++ b/arch/x86/power/cpu_32.c
@@ -18,12 +18,19 @@
#include <asm/xcr.h>
#include <asm/suspend.h>
+#ifdef CONFIG_X86_32
static struct saved_context saved_context;
unsigned long saved_context_ebx;
unsigned long saved_context_esp, saved_context_ebp;
unsigned long saved_context_esi, saved_context_edi;
unsigned long saved_context_eflags;
+#else
+/* CONFIG_X86_64 */
+static void fix_processor_context(void);
+
+struct saved_context saved_context;
+#endif
static void __save_processor_state(struct saved_context *ctxt)
{
diff --git a/arch/x86/power/cpu_64.c b/arch/x86/power/cpu_64.c
index 39b27b72e3c..6ce0eca847c 100644
--- a/arch/x86/power/cpu_64.c
+++ b/arch/x86/power/cpu_64.c
@@ -19,9 +19,19 @@
#include <asm/xcr.h>
#include <asm/suspend.h>
+#ifdef CONFIG_X86_32
+static struct saved_context saved_context;
+
+unsigned long saved_context_ebx;
+unsigned long saved_context_esp, saved_context_ebp;
+unsigned long saved_context_esi, saved_context_edi;
+unsigned long saved_context_eflags;
+#else
+/* CONFIG_X86_64 */
static void fix_processor_context(void);
struct saved_context saved_context;
+#endif
/**
* __save_processor_state - save CPU registers before creating a