diff options
-rw-r--r-- | arch/x86/power/cpu.c | 8 | ||||
-rw-r--r-- | arch/x86/power/hibernate_64.c | 12 | ||||
-rw-r--r-- | kernel/power/hibernate.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 1cf5b300305e..424f4c97a44d 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c | |||
@@ -25,10 +25,10 @@ | |||
25 | #include <asm/cpu.h> | 25 | #include <asm/cpu.h> |
26 | 26 | ||
27 | #ifdef CONFIG_X86_32 | 27 | #ifdef CONFIG_X86_32 |
28 | unsigned long saved_context_ebx; | 28 | __visible unsigned long saved_context_ebx; |
29 | unsigned long saved_context_esp, saved_context_ebp; | 29 | __visible unsigned long saved_context_esp, saved_context_ebp; |
30 | unsigned long saved_context_esi, saved_context_edi; | 30 | __visible unsigned long saved_context_esi, saved_context_edi; |
31 | unsigned long saved_context_eflags; | 31 | __visible unsigned long saved_context_eflags; |
32 | #endif | 32 | #endif |
33 | struct saved_context saved_context; | 33 | struct saved_context saved_context; |
34 | 34 | ||
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index a0fde91c16cf..304fca20d96e 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c | |||
@@ -20,26 +20,26 @@ | |||
20 | #include <asm/suspend.h> | 20 | #include <asm/suspend.h> |
21 | 21 | ||
22 | /* References to section boundaries */ | 22 | /* References to section boundaries */ |
23 | extern const void __nosave_begin, __nosave_end; | 23 | extern __visible const void __nosave_begin, __nosave_end; |
24 | 24 | ||
25 | /* Defined in hibernate_asm_64.S */ | 25 | /* Defined in hibernate_asm_64.S */ |
26 | extern int restore_image(void); | 26 | extern asmlinkage int restore_image(void); |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * Address to jump to in the last phase of restore in order to get to the image | 29 | * Address to jump to in the last phase of restore in order to get to the image |
30 | * kernel's text (this value is passed in the image header). | 30 | * kernel's text (this value is passed in the image header). |
31 | */ | 31 | */ |
32 | unsigned long restore_jump_address; | 32 | unsigned long restore_jump_address __visible; |
33 | 33 | ||
34 | /* | 34 | /* |
35 | * Value of the cr3 register from before the hibernation (this value is passed | 35 | * Value of the cr3 register from before the hibernation (this value is passed |
36 | * in the image header). | 36 | * in the image header). |
37 | */ | 37 | */ |
38 | unsigned long restore_cr3; | 38 | unsigned long restore_cr3 __visible; |
39 | 39 | ||
40 | pgd_t *temp_level4_pgt; | 40 | pgd_t *temp_level4_pgt __visible; |
41 | 41 | ||
42 | void *relocated_restore_code; | 42 | void *relocated_restore_code __visible; |
43 | 43 | ||
44 | static void *alloc_pgt_page(void *context) | 44 | static void *alloc_pgt_page(void *context) |
45 | { | 45 | { |
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b26f5f1e773e..3085e62a80a5 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c | |||
@@ -39,7 +39,7 @@ static int resume_delay; | |||
39 | static char resume_file[256] = CONFIG_PM_STD_PARTITION; | 39 | static char resume_file[256] = CONFIG_PM_STD_PARTITION; |
40 | dev_t swsusp_resume_device; | 40 | dev_t swsusp_resume_device; |
41 | sector_t swsusp_resume_block; | 41 | sector_t swsusp_resume_block; |
42 | int in_suspend __nosavedata; | 42 | __visible int in_suspend __nosavedata; |
43 | 43 | ||
44 | enum { | 44 | enum { |
45 | HIBERNATION_INVALID, | 45 | HIBERNATION_INVALID, |