From: "Jan Beulich" <jbeulich@novell.com>
To: <tglx@linutronix.de>, <mingo@redhat.com>, <hpa@zytor.com>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86: make __{save,restore}_processor_state static
Date: Thu, 13 Dec 2007 09:40:12 +0000 [thread overview]
Message-ID: <47610C0C.76E4.0078.0@novell.com> (raw)
.. 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>
arch/x86/kernel/suspend_64.c | 8 +++++---
arch/x86/power/cpu.c | 4 ++--
include/asm-x86/suspend_64.h | 2 --
include/linux/suspend.h | 3 ---
4 files changed, 7 insertions(+), 10 deletions(-)
--- linux-2.6.24-rc5/arch/x86/kernel/suspend_64.c 2007-12-12 11:28:18.000000000 +0100
+++ 2.6.24-rc5-x86-suspend-static/arch/x86/kernel/suspend_64.c 2007-12-05 15:57:55.000000000 +0100
@@ -17,9 +17,11 @@
/* References to section boundaries */
extern const void __nosave_begin, __nosave_end;
+static void fix_processor_context(void);
+
struct saved_context saved_context;
-void __save_processor_state(struct saved_context *ctxt)
+static void __save_processor_state(struct saved_context *ctxt)
{
kernel_fpu_begin();
@@ -69,7 +71,7 @@ static void do_fpu_end(void)
kernel_fpu_end();
}
-void __restore_processor_state(struct saved_context *ctxt)
+static void __restore_processor_state(struct saved_context *ctxt)
{
/*
* control registers
@@ -113,7 +115,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);
--- linux-2.6.24-rc5/arch/x86/power/cpu.c 2007-12-12 11:28:18.000000000 +0100
+++ 2.6.24-rc5-x86-suspend-static/arch/x86/power/cpu.c 2007-12-05 15:54:57.000000000 +0100
@@ -19,7 +19,7 @@ unsigned long saved_context_esp, saved_c
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
--- linux-2.6.24-rc5/include/asm-x86/suspend_64.h 2007-12-12 11:29:31.000000000 +0100
+++ 2.6.24-rc5-x86-suspend-static/include/asm-x86/suspend_64.h 2007-12-05 15:49:36.000000000 +0100
@@ -38,8 +38,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;
--- linux-2.6.24-rc5/include/linux/suspend.h 2007-12-12 11:29:38.000000000 +0100
+++ 2.6.24-rc5-x86-suspend-static/include/linux/suspend.h 2007-12-05 15:54:33.000000000 +0100
@@ -211,9 +211,6 @@ static inline int hibernate(void) { retu
#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;
next reply other threads:[~2007-12-13 9:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-13 9:40 Jan Beulich [this message]
2007-12-17 13:33 ` [PATCH] x86: make __{save,restore}_processor_state static Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47610C0C.76E4.0078.0@novell.com \
--to=jbeulich@novell.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.