[<prev] [next>] [day] [month] [year] [list]
Message-ID: <49D71E5D.6010203@larces.uece.br>
Date: Sat, 04 Apr 2009 05:46:21 -0300
From: Sergio Luis <sergio@...ces.uece.br>
To: Linux-kernel Mailing List <linux-kernel@...r.kernel.org>
CC: "Rafael J. Wysocki" <rjw@...k.pl>, Pavel Machek <pavel@...e.cz>,
x86 Maintainers <x86@...nel.org>, Ingo Molnar <mingo@...e.hu>
Subject: [PATCH 2/6] x86: unify power/cpu_(32|64) global variables
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@...ces.uece.br>
Signed-off-by: Lauro Salmito <laurosalmito@...il.com>
---
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 e9ceaa0..e4bdc2a 100644
--- a/arch/x86/power/cpu_32.c
+++ b/arch/x86/power/cpu_32.c
@@ -17,12 +17,19 @@
#include <asm/mce.h>
#include <asm/xcr.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 d1cf7ae..1ee153e 100644
--- a/arch/x86/power/cpu_64.c
+++ b/arch/x86/power/cpu_64.c
@@ -18,9 +18,19 @@
#include <asm/mce.h>
#include <asm/xcr.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 linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists