diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-19 02:01:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-19 02:01:55 -0400 |
| commit | 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (patch) | |
| tree | fa7f8400ac685fb52e96f64997c7c682fc2aa021 /kernel/fork.c | |
| parent | 7b39f90fabcf9e2af0cd79d0a60440d821e22b56 (diff) | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 4c14942a0ee3..4d57d9e3a6e9 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -1112,8 +1112,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
| 1112 | p->memcg_batch.memcg = NULL; | 1112 | p->memcg_batch.memcg = NULL; |
| 1113 | #endif | 1113 | #endif |
| 1114 | 1114 | ||
| 1115 | p->bts = NULL; | ||
| 1116 | |||
| 1117 | /* Perform scheduler related setup. Assign this task to a CPU. */ | 1115 | /* Perform scheduler related setup. Assign this task to a CPU. */ |
| 1118 | sched_fork(p, clone_flags); | 1116 | sched_fork(p, clone_flags); |
| 1119 | 1117 | ||