Patch "nosave: consolidate __nosave_{begin,end} in <asm/sections.h>" has been added to the 3.10-stable tree
Subsystems (9)
This is a note to let you know that I've just added the patch titled
nosave: consolidate __nosave_{begin,end} in <asm/sections.h>
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nosave-consolidate-__nosave_-begin-end-in-asm-sections.h.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
7f8998c7aef3ac9c5f3f2943e083dfa6302e90d0Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <[email protected]>
Date: Thu, 9 Oct 2014 15:30:30 -0700
Subject: nosave: consolidate __nosave_{begin,end} in <asm/sections.h>
From: Geert Uytterhoeven <[email protected]>
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 <asm/sections.h>.
--- 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(-)
arch/mips/include/asm/suspend.h deleted +0 -7
@@ -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 */
arch/mips/power/cpu.c +1 -1
@@ -7,7 +7,7 @@* Author: Hu Hongbing <[email protected]> * Wu Zhangjin <[email protected]> */ -#include <asm/suspend.h> +#include <asm/sections.h> #include <asm/fpu.h> #include <asm/dsp.h>
arch/powerpc/kernel/suspend.c +1 -3
@@ -9,9 +9,7 @@#include <linux/mm.h> #include <asm/page.h> - -/* References to section boundaries */ -extern const void __nosave_begin, __nosave_end; +#include <asm/sections.h> /* * pfn_is_nosave - check if given pfn is in the 'nosave' section
arch/s390/kernel/suspend.c +1 -5
@@ -9,14 +9,10 @@#include <linux/pfn.h> #include <linux/suspend.h> #include <linux/mm.h> +#include <asm/sections.h> #include <asm/ctl_reg.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
arch/sh/include/asm/sections.h +0 -1
@@ -3,7 +3,6 @@#include <asm-generic/sections.h> -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[];
arch/sparc/power/hibernate.c +1 -3
@@ -9,11 +9,9 @@#include <asm/hibernate.h> #include <asm/visasm.h> #include <asm/page.h> +#include <asm/sections.h> #include <asm/tlb.h> -/* References to section boundaries */ -extern const void __nosave_begin, __nosave_end; -struct saved_context saved_context;/*
arch/unicore32/include/mach/pm.h +0 -3
@@ -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
arch/unicore32/kernel/hibernate.c +1 -0
@@ -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"
arch/x86/power/hibernate_32.c +1 -3
@@ -13,13 +13,11 @@#include <asm/page.h> #include <asm/pgtable.h> #include <asm/mmzone.h> +#include <asm/sections.h> /* 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;
arch/x86/power/hibernate_64.c +1 -3
@@ -17,11 +17,9 @@#include <asm/page.h> #include <asm/pgtable.h> #include <asm/mtrr.h> +#include <asm/sections.h> #include <asm/suspend.h> -/* References to section boundaries */ -extern const void __nosave_begin, __nosave_end; -/* Defined in hibernate_asm_64.S */ extern int restore_image (void );
include/asm-generic/sections.h +4 -0
@@ -3,6 +3,8 @@/* References to section boundaries */ +#include <linux/compiler.h> +extern char _text[], _stext[], _etext[];extern char _data[], _sdata[], _edata[];extern char __bss_start[], __bss_stop[];
@@ -18,6 +20,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
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/nosave-consolidate-__nosave_-begin-end-in-asm-sections.h.patch queue-3.10/console-disable-vga-text-console-support-on-cris.patch queue-3.10/parport-disable-pc-style-parallel-port-support-on-cris.patch