Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74104
b: refs/heads/master
c: 839e01c
h: refs/heads/master
v: v3
  • Loading branch information
Robin Getz authored and Bryan Wu committed Nov 15, 2007
1 parent 2cf1637 commit afc7911
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 74ce8322bf8843e6fd04e081d361c107bcf73564
refs/heads/master: 839e01c2bfba34f97ec36d0d355801e94254ffd5
2 changes: 1 addition & 1 deletion trunk/arch/blackfin/kernel/init_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ EXPORT_SYMBOL(init_task);
* "init_task" linker map entry.
*/
union thread_union init_thread_union
__attribute__ ((__section__(".data.init_task"))) = {
__attribute__ ((__section__(".init_task.data"))) = {
INIT_THREAD_INFO(init_task)};
8 changes: 4 additions & 4 deletions trunk/arch/blackfin/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ void __init setup_arch(char **cmdline_p)
/* by now the stack is part of the init task */
memory_end = _ramend - DMA_UNCACHED_REGION;

_ramstart = (unsigned long)__bss_stop;
_ramstart = (unsigned long)_end;
memory_start = PAGE_ALIGN(_ramstart);

#if defined(CONFIG_MTD_UCLINUX)
Expand Down Expand Up @@ -285,7 +285,7 @@ void __init setup_arch(char **cmdline_p)
}

/* Relocate MTD image to the top of memory after the uncached memory area */
dma_memcpy((char *)memory_end, __bss_stop, mtd_size);
dma_memcpy((char *)memory_end, _end, mtd_size);

memory_mtd_start = memory_end;
_ebss = memory_mtd_start; /* define _ebss for compatible */
Expand Down Expand Up @@ -357,10 +357,10 @@ void __init setup_arch(char **cmdline_p)
printk(KERN_INFO "Memory map:\n"
KERN_INFO " text = 0x%p-0x%p\n"
KERN_INFO " rodata = 0x%p-0x%p\n"
KERN_INFO " bss = 0x%p-0x%p\n"
KERN_INFO " data = 0x%p-0x%p\n"
KERN_INFO " stack = 0x%p-0x%p\n"
KERN_INFO " init = 0x%p-0x%p\n"
KERN_INFO " bss = 0x%p-0x%p\n"
KERN_INFO " available = 0x%p-0x%p\n"
#ifdef CONFIG_MTD_UCLINUX
KERN_INFO " rootfs = 0x%p-0x%p\n"
Expand All @@ -370,10 +370,10 @@ void __init setup_arch(char **cmdline_p)
#endif
, _stext, _etext,
__start_rodata, __end_rodata,
__bss_start, __bss_stop,
_sdata, _edata,
(void *)&init_thread_union, (void *)((int)(&init_thread_union) + 0x2000),
__init_begin, __init_end,
__bss_start, __bss_stop,
(void *)_ramstart, (void *)memory_end
#ifdef CONFIG_MTD_UCLINUX
, (void *)memory_mtd_start, (void *)(memory_mtd_start + mtd_size)
Expand Down
47 changes: 28 additions & 19 deletions trunk/arch/blackfin/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ _jiffies = _jiffies_64;
SECTIONS
{
. = CONFIG_BOOT_LOAD;
/* Neither the text, ro_data or bss section need to be aligned
* So pack them back to back
*/
.text :
{
__text = .;
Expand All @@ -58,33 +61,48 @@ SECTIONS
*(__ex_table)
___stop___ex_table = .;

. = ALIGN(4);
__etext = .;
}

RO_DATA(PAGE_SIZE)
/* Just in case the first read only is a 32-bit access */
RO_DATA(4)

.bss :
{
. = ALIGN(4);
___bss_start = .;
*(.bss .bss.*)
*(COMMON)
___bss_stop = .;
}

.data :
{
/* make sure the init_task is aligned to the
* kernel thread size so we can locate the kernel
* stack properly and quickly.
*/
__sdata = .;
. = ALIGN(THREAD_SIZE);
*(.data.init_task)

/* This gets done first, so the glob doesn't suck it in */
. = ALIGN(32);
*(.data.cacheline_aligned)

DATA_DATA
*(.data.*)
CONSTRUCTORS

/* make sure the init_task is aligned to the
* kernel thread size so we can locate the kernel
* stack properly and quickly.
*/
. = ALIGN(THREAD_SIZE);
*(.init_task.data)

__edata = .;
}

/* The init section should be last, so when we free it, it goes into
* the general memory pool, and (hopefully) will decrease fragmentation
* a tiny bit. The init section has a _requirement_ that it be
* PAGE_SIZE aligned
*/
. = ALIGN(PAGE_SIZE);
___init_begin = .;

.init.text :
Expand Down Expand Up @@ -179,16 +197,7 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
___init_end = .;

.bss :
{
. = ALIGN(4);
___bss_start = .;
*(.bss .bss.*)
*(COMMON)
. = ALIGN(4);
___bss_stop = .;
__end = .;
}
__end =.;

STABS_DEBUG

Expand Down

0 comments on commit afc7911

Please sign in to comment.