diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /arch/blackfin/kernel/init_task.c | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'arch/blackfin/kernel/init_task.c')
| -rw-r--r-- | arch/blackfin/kernel/init_task.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/init_task.c b/arch/blackfin/kernel/init_task.c index 118c5b9dedac..d3970e8acd1a 100644 --- a/arch/blackfin/kernel/init_task.c +++ b/arch/blackfin/kernel/init_task.c | |||
| @@ -28,5 +28,5 @@ EXPORT_SYMBOL(init_task); | |||
| 28 | * "init_task" linker map entry. | 28 | * "init_task" linker map entry. |
| 29 | */ | 29 | */ |
| 30 | union thread_union init_thread_union | 30 | union thread_union init_thread_union |
| 31 | __attribute__ ((__section__(".init_task.data"))) = { | 31 | __init_task_data = { |
| 32 | INIT_THREAD_INFO(init_task)}; | 32 | INIT_THREAD_INFO(init_task)}; |