Skip to content

Commit

Permalink
x86, asmlinkage, power: Make various symbols used by the suspend asm …
Browse files Browse the repository at this point in the history
…code visible

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1375740170-7446-16-git-send-email-andi@firstfloor.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Andi Kleen authored and H. Peter Anvin committed Aug 6, 2013
1 parent b6c035d commit d6efc2f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions arch/x86/power/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#include <asm/cpu.h>

#ifdef CONFIG_X86_32
unsigned long saved_context_ebx;
unsigned long saved_context_esp, saved_context_ebp;
unsigned long saved_context_esi, saved_context_edi;
unsigned long saved_context_eflags;
__visible unsigned long saved_context_ebx;
__visible unsigned long saved_context_esp, saved_context_ebp;
__visible unsigned long saved_context_esi, saved_context_edi;
__visible unsigned long saved_context_eflags;
#endif
struct saved_context saved_context;

Expand Down
12 changes: 6 additions & 6 deletions arch/x86/power/hibernate_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@
#include <asm/suspend.h>

/* References to section boundaries */
extern const void __nosave_begin, __nosave_end;
extern __visible const void __nosave_begin, __nosave_end;

/* Defined in hibernate_asm_64.S */
extern int restore_image(void);
extern asmlinkage int restore_image(void);

/*
* Address to jump to in the last phase of restore in order to get to the image
* kernel's text (this value is passed in the image header).
*/
unsigned long restore_jump_address;
unsigned long restore_jump_address __visible;

/*
* Value of the cr3 register from before the hibernation (this value is passed
* in the image header).
*/
unsigned long restore_cr3;
unsigned long restore_cr3 __visible;

pgd_t *temp_level4_pgt;
pgd_t *temp_level4_pgt __visible;

void *relocated_restore_code;
void *relocated_restore_code __visible;

static void *alloc_pgt_page(void *context)
{
Expand Down
2 changes: 1 addition & 1 deletion kernel/power/hibernate.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ static int resume_delay;
static char resume_file[256] = CONFIG_PM_STD_PARTITION;
dev_t swsusp_resume_device;
sector_t swsusp_resume_block;
int in_suspend __nosavedata;
__visible int in_suspend __nosavedata;

enum {
HIBERNATION_INVALID,
Expand Down

0 comments on commit d6efc2f

Please sign in to comment.