diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-05-12 14:01:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 08:02:22 -0700 |
commit | a7dfa9403bf3b03899d5ef5d10b0c5c3f74b0682 (patch) | |
tree | a65021eecb15793d453c1ed1258759312f17e3cb /arch/um/kernel/dyn.lds.S | |
parent | 6d0742426c9adc7465ef5c62a99a1d3e9696ea19 (diff) | |
download | kernel_samsung_smdk4412-a7dfa9403bf3b03899d5ef5d10b0c5c3f74b0682.zip kernel_samsung_smdk4412-a7dfa9403bf3b03899d5ef5d10b0c5c3f74b0682.tar.gz kernel_samsung_smdk4412-a7dfa9403bf3b03899d5ef5d10b0c5c3f74b0682.tar.bz2 |
uml: use PAGE_SIZE in linker scripts
This patch includes page.h header into linker scripts that allow us to
use PAGE_SIZE macro instead of numeric constant.
To be able to include page.h into linker scripts page.h is needed for
some modification - i.e. we need to use __ASSEMBLY__ and _AC macro
[jdike@linux.intel.com - fixed conflict with as-layout.h]
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel/dyn.lds.S')
-rw-r--r-- | arch/um/kernel/dyn.lds.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S index 26090b7..9975e1a 100644 --- a/arch/um/kernel/dyn.lds.S +++ b/arch/um/kernel/dyn.lds.S @@ -1,4 +1,5 @@ #include <asm-generic/vmlinux.lds.h> +#include <asm/page.h> OUTPUT_FORMAT(ELF_FORMAT) OUTPUT_ARCH(ELF_ARCH) @@ -21,7 +22,7 @@ SECTIONS _einittext = .; } - . = ALIGN(4096); + . = ALIGN(PAGE_SIZE); /* Read-only sections, merged into text segment: */ .hash : { *(.hash) } @@ -68,9 +69,9 @@ SECTIONS /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - . = ALIGN(4096); + . = ALIGN(PAGE_SIZE); } =0x90909090 - . = ALIGN(4096); + . = ALIGN(PAGE_SIZE); .syscall_stub : { __syscall_stub_start = .; *(.__syscall_stub*) |