Gitweb:     http://git.kernel.org/linus/833b2ca0795526898a66c7b6770273bb16567e19
Commit:     833b2ca0795526898a66c7b6770273bb16567e19
Parent:     f6783d20d4b85b360b4a6f86bdbd9282a4a7004c
Author:     Sergio Luis <sergio@larces.uece.br>
AuthorDate: Tue Apr 28 00:26:50 2009 +0200
Committer:  Rafael J. Wysocki <rjw@sisk.pl>
CommitDate: Fri Jun 12 21:32:30 2009 +0200

    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>
---
 arch/x86/power/cpu_32.c |    7 +++++++
 arch/x86/power/cpu_64.c |   10 ++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c
index 12a9c87..de1a86b 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 39b27b7..6ce0eca 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
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html