Commit 74ff698e authored by David Mosberger's avatar David Mosberger

ia64: Rename init_thread_union to init_task_mem to avoid conflicting

	declration in <linux/sched.h>.
parent 819a8739
...@@ -144,13 +144,13 @@ start_ap: ...@@ -144,13 +144,13 @@ start_ap:
movl r3=task_for_booting_cpu movl r3=task_for_booting_cpu
;; ;;
ld8 r3=[r3] ld8 r3=[r3]
movl r2=init_thread_union movl r2=init_task
;; ;;
cmp.eq isBP,isAP=r3,r0 cmp.eq isBP,isAP=r3,r0
;; ;;
(isAP) mov r2=r3 (isAP) mov r2=r3
#else #else
movl r2=init_thread_union movl r2=init_task
cmp.eq isBP,isAP=r0,r0 cmp.eq isBP,isAP=r0,r0
#endif #endif
;; ;;
......
...@@ -26,17 +26,17 @@ struct mm_struct init_mm = INIT_MM(init_mm); ...@@ -26,17 +26,17 @@ struct mm_struct init_mm = INIT_MM(init_mm);
* We need to make sure that this is properly aligned due to the way process stacks are * We need to make sure that this is properly aligned due to the way process stacks are
* handled. This is done by having a special ".data.init_task" section... * handled. This is done by having a special ".data.init_task" section...
*/ */
#define init_thread_info init_thread_union.s.thread_info #define init_thread_info init_task_mem.s.thread_info
union init_thread { static union {
struct { struct {
struct task_struct task; struct task_struct task;
struct thread_info thread_info; struct thread_info thread_info;
} s; } s;
unsigned long stack[KERNEL_STACK_SIZE/sizeof (unsigned long)]; unsigned long stack[KERNEL_STACK_SIZE/sizeof (unsigned long)];
} init_thread_union __attribute__((section(".data.init_task"))) = {{ } init_task_mem __attribute__((section(".data.init_task"))) = {{
.task = INIT_TASK(init_thread_union.s.task), .task = INIT_TASK(init_task_mem.s.task),
.thread_info = INIT_THREAD_INFO(init_thread_union.s.task) .thread_info = INIT_THREAD_INFO(init_task_mem.s.task)
}}; }};
asm (".global init_task; init_task = init_thread_union"); asm (".global init_task; init_task = init_task_mem");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment