diff options
author | Jan Beulich <jbeulich@novell.com> | 2008-01-30 07:31:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:23 -0500 |
commit | cae4595764cb3b08f6517e99bac1e3862854b1a1 (patch) | |
tree | 7abb47b9e81fa4bcde3b6a0b98f87c5f88b5722a /arch/x86 | |
parent | 3e7622f9d7807a0a826d042cafc211cd1a29448c (diff) |
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>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/suspend_64.c | 8 | ||||
-rw-r--r-- | arch/x86/power/cpu.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c index 279c25775d19..09199511c256 100644 --- a/arch/x86/kernel/suspend_64.c +++ b/arch/x86/kernel/suspend_64.c | |||
@@ -17,6 +17,8 @@ | |||
17 | /* References to section boundaries */ | 17 | /* References to section boundaries */ |
18 | extern const void __nosave_begin, __nosave_end; | 18 | extern const void __nosave_begin, __nosave_end; |
19 | 19 | ||
20 | static void fix_processor_context(void); | ||
21 | |||
20 | struct saved_context saved_context; | 22 | struct saved_context saved_context; |
21 | 23 | ||
22 | /** | 24 | /** |
@@ -34,7 +36,7 @@ struct saved_context saved_context; | |||
34 | * needed by kernel A, so that it can operate correctly after the resume | 36 | * needed by kernel A, so that it can operate correctly after the resume |
35 | * regardless of what kernel B does in the meantime. | 37 | * regardless of what kernel B does in the meantime. |
36 | */ | 38 | */ |
37 | void __save_processor_state(struct saved_context *ctxt) | 39 | static void __save_processor_state(struct saved_context *ctxt) |
38 | { | 40 | { |
39 | kernel_fpu_begin(); | 41 | kernel_fpu_begin(); |
40 | 42 | ||
@@ -89,7 +91,7 @@ static void do_fpu_end(void) | |||
89 | * by __save_processor_state() | 91 | * by __save_processor_state() |
90 | * @ctxt - structure to load the registers contents from | 92 | * @ctxt - structure to load the registers contents from |
91 | */ | 93 | */ |
92 | void __restore_processor_state(struct saved_context *ctxt) | 94 | static void __restore_processor_state(struct saved_context *ctxt) |
93 | { | 95 | { |
94 | /* | 96 | /* |
95 | * control registers | 97 | * control registers |
@@ -133,7 +135,7 @@ void restore_processor_state(void) | |||
133 | __restore_processor_state(&saved_context); | 135 | __restore_processor_state(&saved_context); |
134 | } | 136 | } |
135 | 137 | ||
136 | void fix_processor_context(void) | 138 | static void fix_processor_context(void) |
137 | { | 139 | { |
138 | int cpu = smp_processor_id(); | 140 | int cpu = smp_processor_id(); |
139 | struct tss_struct *t = &per_cpu(init_tss, cpu); | 141 | struct tss_struct *t = &per_cpu(init_tss, cpu); |
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 5a98dc35addf..efcf620d1439 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c | |||
@@ -19,7 +19,7 @@ unsigned long saved_context_esp, saved_context_ebp; | |||
19 | unsigned long saved_context_esi, saved_context_edi; | 19 | unsigned long saved_context_esi, saved_context_edi; |
20 | unsigned long saved_context_eflags; | 20 | unsigned long saved_context_eflags; |
21 | 21 | ||
22 | void __save_processor_state(struct saved_context *ctxt) | 22 | static void __save_processor_state(struct saved_context *ctxt) |
23 | { | 23 | { |
24 | mtrr_save_fixed_ranges(NULL); | 24 | mtrr_save_fixed_ranges(NULL); |
25 | kernel_fpu_begin(); | 25 | kernel_fpu_begin(); |
@@ -86,7 +86,7 @@ static void fix_processor_context(void) | |||
86 | 86 | ||
87 | } | 87 | } |
88 | 88 | ||
89 | void __restore_processor_state(struct saved_context *ctxt) | 89 | static void __restore_processor_state(struct saved_context *ctxt) |
90 | { | 90 | { |
91 | /* | 91 | /* |
92 | * control registers | 92 | * control registers |