x86: make __{save,restore}_processor_state static

.. allowing to remove their declarations from a global include file
(the symbols don't exist for anything but x86).

Likewise for 64-bits' fix_processor_context(), just that that one was
properly declared in an arch-specific header.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c
index 279c25775d19780432a88de453d3fd4f51c42c96..09199511c25623057b8f3c60c96069c646ee27b8 100644 (file)
--- a/arch/x86/kernel/suspend_64.c
+++ b/arch/x86/kernel/suspend_64.c
@@ -17,6 +17,8 @@
 /* References to section boundaries */
 extern const void __nosave_begin, __nosave_end;
 
+static void fix_processor_context(void);
+
 struct saved_context saved_context;
 
 /**
@@ -34,7 +36,7 @@ struct saved_context saved_context;
  *     needed by kernel A, so that it can operate correctly after the resume
  *     regardless of what kernel B does in the meantime.
  */
-void __save_processor_state(struct saved_context *ctxt)
+static void __save_processor_state(struct saved_context *ctxt)
 {
        kernel_fpu_begin();
 
@@ -89,7 +91,7 @@ static void do_fpu_end(void)
  *             by __save_processor_state()
  *     @ctxt - structure to load the registers contents from
  */
-void __restore_processor_state(struct saved_context *ctxt)
+static void __restore_processor_state(struct saved_context *ctxt)
 {
        /*
         * control registers
@@ -133,7 +135,7 @@ void restore_processor_state(void)
        __restore_processor_state(&saved_context);
 }
 
-void fix_processor_context(void)
+static void fix_processor_context(void)
 {
        int cpu = smp_processor_id();
        struct tss_struct *t = &per_cpu(init_tss, cpu);

diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 5a98dc35addf3b1e537c857657eb387d97139a75..efcf620d1439490b7311fe4aa05f6d3ce4f7df75 100644 (file)
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -19,7 +19,7 @@ unsigned long saved_context_esp, saved_context_ebp;
 unsigned long saved_context_esi, saved_context_edi;
 unsigned long saved_context_eflags;
 
-void __save_processor_state(struct saved_context *ctxt)
+static void __save_processor_state(struct saved_context *ctxt)
 {
        mtrr_save_fixed_ranges(NULL);
        kernel_fpu_begin();
@@ -86,7 +86,7 @@ static void fix_processor_context(void)
 
 }
 
-void __restore_processor_state(struct saved_context *ctxt)
+static void __restore_processor_state(struct saved_context *ctxt)
 {
        /*
         * control registers

diff --git a/include/asm-x86/suspend_64.h b/include/asm-x86/suspend_64.h
index 4404668f9aa46b189bab36ec650f81e15d3072f8..2eb92cb81a0d2c7c2fac3a8ea227835648cfaf0c 100644 (file)
--- a/include/asm-x86/suspend_64.h
+++ b/include/asm-x86/suspend_64.h
@@ -45,8 +45,6 @@ struct saved_context {
 #define loaddebug(thread,register) \
        set_debugreg((thread)->debugreg##register, register)
 
-extern void fix_processor_context(void);
-
 /* routines for saving/restoring kernel state */
 extern int acpi_save_state_mem(void);
 extern char core_restore_code;

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 4360e0816956e536d929d7fffd23fedaab14fd46..40280df2a3dbc5d91d61291f8793f3d98b989cbc 100644 (file)
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -211,9 +211,6 @@ static inline int hibernate(void) { return -ENOSYS; }
 #ifdef CONFIG_PM_SLEEP
 void save_processor_state(void);
 void restore_processor_state(void);
-struct saved_context;
-void __save_processor_state(struct saved_context *ctxt);
-void __restore_processor_state(struct saved_context *ctxt);
 
 /* kernel/power/main.c */
 extern struct blocking_notifier_head pm_chain_head;