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

2 files changed, 6 insertions, 7 deletions

diff --git a/arch/microblaze/kernel/init_task.c b/arch/microblaze/kernel/init_task.c
index 48eb9fb255fa..67da22579b62 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 8ae807ab7a51..d34d38dcd12c 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 : {