From: Greg Kroah-Hartman Date: Mon, 4 May 2015 21:38:18 +0000 (+0200) Subject: 3.14-stable patches X-Git-Tag: v3.10.77~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24c01f0d5d71ae9f5a0e5449540151546cabfaed;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: nosave-consolidate-__nosave_-begin-end-in-asm-sections.h.patch --- diff --git a/queue-3.14/nosave-consolidate-__nosave_-begin-end-in-asm-sections.h.patch b/queue-3.14/nosave-consolidate-__nosave_-begin-end-in-asm-sections.h.patch new file mode 100644 index 00000000000..a6d08271f1c --- /dev/null +++ b/queue-3.14/nosave-consolidate-__nosave_-begin-end-in-asm-sections.h.patch @@ -0,0 +1,195 @@ +From 7f8998c7aef3ac9c5f3f2943e083dfa6302e90d0 Mon Sep 17 00:00:00 2001 +From: Geert Uytterhoeven +Date: Thu, 9 Oct 2014 15:30:30 -0700 +Subject: nosave: consolidate __nosave_{begin,end} in + +From: Geert Uytterhoeven + +commit 7f8998c7aef3ac9c5f3f2943e083dfa6302e90d0 upstream. + +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 . + +Signed-off-by: Geert Uytterhoeven +Cc: Russell King +Cc: Ralf Baechle +Cc: Benjamin Herrenschmidt +Cc: Martin Schwidefsky +Cc: "David S. Miller" +Cc: Guan Xuetao +Cc: Thomas Gleixner +Cc: Ingo Molnar +Cc: "H. Peter Anvin" +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/include/asm/suspend.h | 7 ------- + arch/mips/power/cpu.c | 2 +- + arch/powerpc/kernel/suspend.c | 4 +--- + arch/s390/kernel/suspend.c | 6 +----- + arch/sh/include/asm/sections.h | 1 - + arch/sparc/power/hibernate.c | 4 +--- + arch/unicore32/include/mach/pm.h | 3 --- + arch/unicore32/kernel/hibernate.c | 1 + + arch/x86/power/hibernate_32.c | 4 +--- + arch/x86/power/hibernate_64.c | 4 +--- + include/asm-generic/sections.h | 4 ++++ + 11 files changed, 11 insertions(+), 29 deletions(-) + +--- a/arch/mips/include/asm/suspend.h ++++ /dev/null +@@ -1,7 +0,0 @@ +-#ifndef __ASM_SUSPEND_H +-#define __ASM_SUSPEND_H +- +-/* References to section boundaries */ +-extern const void __nosave_begin, __nosave_end; +- +-#endif /* __ASM_SUSPEND_H */ +--- a/arch/mips/power/cpu.c ++++ b/arch/mips/power/cpu.c +@@ -7,7 +7,7 @@ + * Author: Hu Hongbing + * Wu Zhangjin + */ +-#include ++#include + #include + #include + +--- a/arch/powerpc/kernel/suspend.c ++++ b/arch/powerpc/kernel/suspend.c +@@ -9,9 +9,7 @@ + + #include + #include +- +-/* References to section boundaries */ +-extern const void __nosave_begin, __nosave_end; ++#include + + /* + * pfn_is_nosave - check if given pfn is in the 'nosave' section +--- a/arch/s390/kernel/suspend.c ++++ b/arch/s390/kernel/suspend.c +@@ -13,14 +13,10 @@ + #include + #include + #include ++#include + #include "entry.h" + + /* +- * References to section boundaries +- */ +-extern const void __nosave_begin, __nosave_end; +- +-/* + * The restore of the saved pages in an hibernation image will set + * the change and referenced bits in the storage key for each page. + * Overindication of the referenced bits after an hibernation cycle +--- a/arch/sh/include/asm/sections.h ++++ b/arch/sh/include/asm/sections.h +@@ -3,7 +3,6 @@ + + #include + +-extern long __nosave_begin, __nosave_end; + extern long __machvec_start, __machvec_end; + extern char __uncached_start, __uncached_end; + extern char __start_eh_frame[], __stop_eh_frame[]; +--- a/arch/sparc/power/hibernate.c ++++ b/arch/sparc/power/hibernate.c +@@ -9,11 +9,9 @@ + #include + #include + #include ++#include + #include + +-/* References to section boundaries */ +-extern const void __nosave_begin, __nosave_end; +- + struct saved_context saved_context; + + /* +--- 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 + /* Defined in hibernate_asm.S */ + extern int restore_image(pgd_t *resume_pg_dir, struct pbe *restore_pblist); + +-/* References to section boundaries */ +-extern const void __nosave_begin, __nosave_end; +- + extern struct pbe *restore_pblist; + #endif +--- a/arch/unicore32/kernel/hibernate.c ++++ b/arch/unicore32/kernel/hibernate.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + + #include "mach/pm.h" +--- a/arch/x86/power/hibernate_32.c ++++ b/arch/x86/power/hibernate_32.c +@@ -13,13 +13,11 @@ + #include + #include + #include ++#include + + /* Defined in hibernate_asm_32.S */ + extern int restore_image(void); + +-/* References to section boundaries */ +-extern const void __nosave_begin, __nosave_end; +- + /* Pointer to the temporary resume page tables */ + pgd_t *resume_pg_dir; + +--- a/arch/x86/power/hibernate_64.c ++++ b/arch/x86/power/hibernate_64.c +@@ -17,11 +17,9 @@ + #include + #include + #include ++#include + #include + +-/* References to section boundaries */ +-extern __visible const void __nosave_begin, __nosave_end; +- + /* Defined in hibernate_asm_64.S */ + extern asmlinkage int restore_image(void); + +--- a/include/asm-generic/sections.h ++++ b/include/asm-generic/sections.h +@@ -3,6 +3,8 @@ + + /* References to section boundaries */ + ++#include ++ + /* + * Usage guidelines: + * _text, _data: architecture specific, don't use them in arch-independent code +@@ -37,6 +39,8 @@ extern char __start_rodata[], __end_roda + /* Start and end of .ctors section - used for constructor calls. */ + extern char __ctors_start[], __ctors_end[]; + ++extern __visible const void __nosave_begin, __nosave_end; ++ + /* function descriptor handling (if any). Override + * in asm/sections.h */ + #ifndef dereference_function_descriptor diff --git a/queue-3.14/series b/queue-3.14/series index 38b6f6f9517..6479ebc7c24 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -90,3 +90,4 @@ c6x-time-ensure-consistency-in-__init.patch memstick-mspro_block-add-missing-curly-braces.patch driver-core-bus-goto-appropriate-labels-on-failure-in-bus_add_device.patch fs-take-i_mutex-during-prepare_binprm-for-setid-executables.patch +nosave-consolidate-__nosave_-begin-end-in-asm-sections.h.patch