x86: unify power/cpu_(32|64) global variables
authorSergio Luis <sergio@larces.uece.br>
Mon, 27 Apr 2009 22:26:50 +0000 (00:26 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 12 Jun 2009 19:32:30 +0000 (21:32 +0200)
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>
arch/x86/power/cpu_32.c
arch/x86/power/cpu_64.c

index 12a9c871d2ecde2fd24b450fdd1e65e6e82104a1..de1a86b2cffa3f1ab2ee06c1afc30706c6cd1dcd 100644 (file)
 #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)
 {
index 39b27b72e3c5d378ef58856de743a596236569c6..6ce0eca847c35ff2b3274b5a068d449d3e87fe7e 100644 (file)
 #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