diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-10-09 15:30:30 -0700 |
|---|---|---|
| committer | Grygorii Strashko <Grygorii.Strashko@linaro.org> | 2015-02-09 16:37:08 +0800 |
| commit | 96f4781eacf53f35539b8b07e98c45058d0cb2fd (patch) | |
| tree | 8807511f11a6f80c79f2f7a1aee5ebbd4d56b867 /arch/unicore32/kernel/hibernate.c | |
| parent | f2d3525b8be445bc20398d16b5fc55ed55792f4b (diff) | |
[hib-backport] nosave: consolidate __nosave_{begin,end} in <asm/sections.h>p-ti-linux-3.14.y-android-hib-basic
[Upstream commit 7f8998c7aef3ac9c5f3f2943e083dfa6302e90d0]
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/kernel/hibernate.c')
| -rw-r--r-- | arch/unicore32/kernel/hibernate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/unicore32/kernel/hibernate.c b/arch/unicore32/kernel/hibernate.c index d75ef8b6cb5..9969ec374ab 100644 --- a/arch/unicore32/kernel/hibernate.c +++ b/arch/unicore32/kernel/hibernate.c @@ -18,6 +18,7 @@ #include <asm/page.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> +#include <asm/sections.h> #include <asm/suspend.h> #include "mach/pm.h" |