UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze 

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Add missing symbols for CONSTRUCTORS support
  microblaze: remove init_mm
This commit is contained in:
Linus Torvalds 2009-06-20 10:37:01 -07:00
parent ad5cf46b4e 05bf7d4631
commit 7fd5b632db
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/microblaze/kernel/init_task.c
View File

@ -18,8 +18,6 @@
static struct signal_struct init_signals = INIT_SIGNALS(init_signals); static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
EXPORT_SYMBOL(init_mm);
union thread_union init_thread_union union thread_union init_thread_union
__attribute__((__section__(".data.init_task"))) = __attribute__((__section__(".data.init_task"))) =

11
arch/microblaze/kernel/vmlinux.lds.S
View File

@ -62,7 +62,8 @@ SECTIONS {
_sdata = . ; _sdata = . ;
.data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */ .data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */
*(.data) DATA_DATA
CONSTRUCTORS
} }
. = ALIGN(32); . = ALIGN(32);
.data.cacheline_aligned : { *(.data.cacheline_aligned) } .data.cacheline_aligned : { *(.data.cacheline_aligned) }
@ -98,13 +99,13 @@ SECTIONS {
. = ALIGN(4096); . = ALIGN(4096);
.init.text : { .init.text : {
_sinittext = . ; _sinittext = . ;
*(.init.text) INIT_TEXT
*(.exit.text)
*(.exit.data)
_einittext = .; _einittext = .;
} }
.init.data : { *(.init.data) } .init.data : {
INIT_DATA
}
. = ALIGN(4); . = ALIGN(4);
.init.ivt : { .init.ivt : {