diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-10-09 18:30:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 22:26:04 -0400 |
commit | 7f8998c7aef3ac9c5f3f2943e083dfa6302e90d0 (patch) | |
tree | 76e7971a0c7a615a553c9071d66c02b5ffbde847 /arch/unicore32 | |
parent | 578b25dfce2990d8bab5631f33a4283bd5b01556 (diff) |
nosave: consolidate __nosave_{begin,end} in <asm/sections.h>
The different architectures used their own (and different) declarations:
extern __visible const void __nosave_begin, __nosave_end;
extern const void __nosave_begin, __nosave_end;
extern long __nosave_begin, __nosave_end;
Consolidate them using the first variant in <asm/sections.h>.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/include/mach/pm.h | 3 | ||||
-rw-r--r-- | arch/unicore32/kernel/hibernate.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/unicore32/include/mach/pm.h b/arch/unicore32/include/mach/pm.h index 4dcd34ae194c..77b522694e74 100644 --- a/arch/unicore32/include/mach/pm.h +++ b/arch/unicore32/include/mach/pm.h | |||
@@ -36,8 +36,5 @@ extern int puv3_pm_enter(suspend_state_t state); | |||
36 | /* Defined in hibernate_asm.S */ | 36 | /* Defined in hibernate_asm.S */ |
37 | extern int restore_image(pgd_t *resume_pg_dir, struct pbe *restore_pblist); | 37 | extern int restore_image(pgd_t *resume_pg_dir, struct pbe *restore_pblist); |
38 | 38 | ||
39 | /* References to section boundaries */ | ||
40 | extern const void __nosave_begin, __nosave_end; | ||
41 | |||
42 | extern struct pbe *restore_pblist; | 39 | extern struct pbe *restore_pblist; |
43 | #endif | 40 | #endif |
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c index d75ef8b6cb56..9969ec374abb 100644 --- a/arch/unicore32/kernel/hibernate.c +++ b/arch/unicore32/kernel/hibernate.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
19 | #include <asm/pgtable.h> | 19 | #include <asm/pgtable.h> |
20 | #include <asm/pgalloc.h> | 20 | #include <asm/pgalloc.h> |
21 | #include <asm/sections.h> | ||
21 | #include <asm/suspend.h> | 22 | #include <asm/suspend.h> |
22 | 23 | ||
23 | #include "mach/pm.h" | 24 | #include "mach/pm.h" |