[tip:x86/asmlinkage] x86, asmlinkage, power: Make various symbols used by the suspend asm code visible

From: tip-bot for Andi Kleen
Date: Tue Aug 06 2013 - 17:45:10 EST

Commit-ID: d6efc2f7240b4e55590df69d74f33fdb72ce934a
Gitweb: http://git.kernel.org/tip/d6efc2f7240b4e55590df69d74f33fdb72ce934a
Author: Andi Kleen <ak@xxxxxxxxxxxxxxx>
AuthorDate: Mon, 5 Aug 2013 15:02:49 -0700
Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
CommitDate: Tue, 6 Aug 2013 14:21:03 -0700

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

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1375740170-7446-16-git-send-email-andi@xxxxxxxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
arch/x86/power/cpu.c | 8 ++++----
arch/x86/power/hibernate_64.c | 12 ++++++------
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 1cf5b30..424f4c9 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -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;
struct saved_context saved_context;

diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index a0fde91..304fca2 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -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)
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b26f5f1..3085e62 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -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 {
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/