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

Commit 97d26e73 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Linus Torvalds
Browse files

m68k: vmlinux-std/sun3.lds.S cleanup - use PAGE_SIZE macro 



This patch includes page.h header into linker script that
allow us to use PAGE_SIZE macro instead of numeric constant

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e945b568

arch/m68k/kernel/vmlinux-std.lds

+2 −1
Original line number Diff line number Diff line 
/* ld script to make m68k Linux kernel */



#include <asm-generic/vmlinux.lds.h>

#include <asm/page.h>



OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")

OUTPUT_ARCH(m68k)
@@ -41,7 +42,7 @@ SECTIONS 
  _edata = .;			/* End of data section */



  /* will be freed after init */

  . = ALIGN(4096);		/* Init code and data */

  . = ALIGN(PAGE_SIZE);		/* Init code and data */

  __init_begin = .;

  .init.text : {

	_sinittext = .;

arch/m68k/kernel/vmlinux-sun3.lds

+4 −3
Original line number Diff line number Diff line 
/* ld script to make m68k Linux kernel */



#include <asm-generic/vmlinux.lds.h>

#include <asm/page.h>



OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k")

OUTPUT_ARCH(m68k)
@@ -34,7 +35,7 @@ SECTIONS 
  _edata = .;



  /* will be freed after init */

  . = ALIGN(8192);	/* Init code and data */

  . = ALIGN(PAGE_SIZE);	/* Init code and data */

__init_begin = .;

	.init.text : {

		_sinittext = .;
@@ -61,12 +62,12 @@ __init_begin = .; 
	}

	SECURITY_INIT

#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(8192);

	. = ALIGN(PAGE_SIZE);

	__initramfs_start = .;

	.init.ramfs : { *(.init.ramfs) }

	__initramfs_end = .;

#endif

	. = ALIGN(8192);

	. = ALIGN(PAGE_SIZE);

	__init_end = .;

	.data.init.task : { *(.data.init_task) }