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

Commit d6efc2f7 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, asmlinkage, power: Make various symbols used by the suspend asm code visible

parent b6c035d0
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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;

+6 −6
Original line number Diff line number Diff line
@@ -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)
{
+1 −1
Original line number Diff line number Diff line
@@ -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,