diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /kernel/fork.c | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index a8dd75d4992b..5dd3979747f5 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -105,7 +105,7 @@ static struct kmem_cache *mm_cachep; | |||
| 105 | 105 | ||
| 106 | void free_task(struct task_struct *tsk) | 106 | void free_task(struct task_struct *tsk) |
| 107 | { | 107 | { |
| 108 | free_thread_info(tsk->thread_info); | 108 | free_thread_info(tsk->stack); |
| 109 | rt_mutex_debug_task_free(tsk); | 109 | rt_mutex_debug_task_free(tsk); |
| 110 | free_task_struct(tsk); | 110 | free_task_struct(tsk); |
| 111 | } | 111 | } |
| @@ -175,7 +175,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) | |||
| 175 | } | 175 | } |
| 176 | 176 | ||
| 177 | *tsk = *orig; | 177 | *tsk = *orig; |
| 178 | tsk->thread_info = ti; | 178 | tsk->stack = ti; |
| 179 | setup_thread_stack(tsk, orig); | 179 | setup_thread_stack(tsk, orig); |
| 180 | 180 | ||
| 181 | #ifdef CONFIG_CC_STACKPROTECTOR | 181 | #ifdef CONFIG_CC_STACKPROTECTOR |