Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f8998c7 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

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: default avatarGeert 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 578b25df

arch/arm/kernel/hibernate.c

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 
#include <asm/idmap.h>

#include <asm/suspend.h>

#include <asm/memory.h>



extern const void __nosave_begin, __nosave_end;

#include <asm/sections.h>



int pfn_is_nosave(unsigned long pfn)

{

arch/mips/include/asm/suspend.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * Author: Hu Hongbing <huhb@lemote.com>

 *	   Wu Zhangjin <wuzhangjin@gmail.com>

 */

#include <asm/suspend.h>

#include <asm/sections.h>

#include <asm/fpu.h>

#include <asm/dsp.h>

arch/powerpc/kernel/suspend.c

+1 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -13,13 +13,9 @@ 
#include <asm/ipl.h>

#include <asm/cio.h>

#include <asm/pci.h>

#include <asm/sections.h>

#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.