lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin arch: fix bug which unaligns the init thread's stack and causes the current macro to fail.

Browse Source 
switch to using proper defines this time (THREAD_SIZE and PAGE_SIZE)
instead of just PAGE_SIZE everywhere

Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bernd Schmidt <bernd.schmidt@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
This commit is contained in:
Bernd Schmidt
2007-07-25 10:19:59 +08:00
committed by Bryan Wu
parent f1b927dc85
commit 0fa63ad7d1
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/blackfin/kernel/vmlinux.lds.S
View File

@@ -32,6 +32,7 @@
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#include <asm/mem_map.h> #include <asm/mem_map.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/thread_info.h>
OUTPUT_FORMAT("elf32-bfin") OUTPUT_FORMAT("elf32-bfin")
ENTRY(__start) ENTRY(__start)
@@ -64,8 +65,12 @@ SECTIONS
.data : .data :
{ {
. = ALIGN(PAGE_SIZE); /* make sure the init_task is aligned to the
* kernel thread size so we can locate the kernel
* stack properly and quickly.
*/
__sdata = .; __sdata = .;
. = ALIGN(THREAD_SIZE);
*(.data.init_task) *(.data.init_task)
DATA_DATA DATA_DATA
CONSTRUCTORS CONSTRUCTORS
@@ -73,14 +78,14 @@ SECTIONS
. = ALIGN(32); . = ALIGN(32);
*(.data.cacheline_aligned) *(.data.cacheline_aligned)
. = ALIGN(PAGE_SIZE); . = ALIGN(THREAD_SIZE);
__edata = .; __edata = .;
} }
. = ALIGN(PAGE_SIZE);
___init_begin = .; ___init_begin = .;
.init : .init :
{ {
. = ALIGN(PAGE_SIZE);
__sinittext = .; __sinittext = .;
*(.init.text) *(.init.text)
__einittext = .; __einittext = .;
@@ -153,10 +158,9 @@ SECTIONS
__ebss_b_l1 = .; __ebss_b_l1 = .;
} }
. = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1); ___init_end = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
___init_end = ALIGN(PAGE_SIZE);
.bss ___init_end : .bss LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1) :
{ {
. = ALIGN(4); . = ALIGN(4);
___bss_start = .; ___bss_start = .;