Merge branch 'linus' into timers/nohz

[linux-2.6-omap-h63xx.git] / arch / arm / kernel / init_task.c

diff --git a/arch/arm/kernel/init_task.c b/arch/arm/kernel/init_task.c
index a00cca0000bd2782bcfe50eee16e6c7b412f4aef..8b8c9d38a7611daaad9ddd2af7de18ec2176e374 100644 (file)
--- a/arch/arm/kernel/init_task.c
+++ b/arch/arm/kernel/init_task.c
@@ -13,7 +13,6 @@
 #include <asm/pgtable.h>
 
 static struct fs_struct init_fs = INIT_FS;
-static struct files_struct init_files = INIT_FILES;
 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);
@@ -31,7 +30,7 @@ EXPORT_SYMBOL(init_mm);
  * The things we do for performance..
  */
 union thread_union init_thread_union
-       __attribute__((__section__(".init.task"))) =
+       __attribute__((__section__(".data.init_task"))) =
                { INIT_THREAD_INFO(init_task) };
 
 /*