Merge tag 'for-linus' of git://github.com/openrisc/linux

[sfrench/cifs-2.6.git] / init / init_task.c

diff --git a/init/init_task.c b/init/init_task.c
index 89024e8c4e95e56eb6abf6526c8bf7c52db68b56..f6889fce64af7c848e64912c92add9abfb5f0141 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -65,6 +65,7 @@ struct task_struct init_task
 #ifdef CONFIG_ARCH_TASK_STRUCT_ON_STACK
        __init_task_data
 #endif
+       __aligned(L1_CACHE_BYTES)
 = {
 #ifdef CONFIG_THREAD_INFO_IN_TASK
        .thread_info    = INIT_THREAD_INFO(init_task),