lkml.org 
[lkml]   [2009]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[GIT PULL] arch/microblaze bug-fix for merge window (2.6.31)
Hi Linus,

these two patches solve compilation build failures because
Alexey Dobriyan (bb1f17b0372de93758653ca3454bc0df18dc2e5c) forget to
remove init_mm from Microblaze kernel code.

and

Peter Oberparleiter (b99b87f70c7785ab1e253c6220f4b0b57ce3a7f7) add
constructor support
and Microblaze hadn't some exported symbols

Please add them asap.

Thanks,
Michal


The following changes since commit fb20871a54961b82d35303b43452928186c1361d:
Linus Torvalds (1):
Merge git://git.kernel.org/.../gregkh/staging-2.6

are available in the git repository at:

git://git.monstr.eu/linux-2.6-microblaze.git for-linus

Arnd Bergmann (1):
microblaze: remove init_mm

Michal Simek (1):
microblaze: Add missing symbols for CONSTRUCTORS support

arch/microblaze/kernel/init_task.c | 2 --
arch/microblaze/kernel/vmlinux.lds.S | 11 ++++++-----
2 files changed, 6 insertions(+), 7 deletions(-)


diff --git a/arch/microblaze/kernel/init_task.c
b/arch/microblaze/kernel/init_task.c
index 48eb9fb..67da225 100644
--- a/arch/microblaze/kernel/init_task.c
+++ b/arch/microblaze/kernel/init_task.c
@@ -18,8 +18,6 @@

static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
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
__attribute__((__section__(".data.init_task"))) =
diff --git a/arch/microblaze/kernel/vmlinux.lds.S
b/arch/microblaze/kernel/vmlinux.lds.S
index 8ae807a..d34d38d 100644
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -62,7 +62,8 @@ SECTIONS {

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

- .init.data : { *(.init.data) }
+ .init.data : {
+ INIT_DATA
+ }

. = ALIGN(4);
.init.ivt : {

--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854



\
 
 \ /
  Last update: 2009-06-20 15:01    [W:0.053 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site