Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cae45957 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

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: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3e7622f9

arch/x86/kernel/suspend_64.c

+5 −3
Original line number Diff line number Diff line
@@ -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);

arch/x86/power/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -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

include/asm-x86/suspend_64.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/suspend.h

+0 −3
Original line number Diff line number Diff line
@@ -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;