diff options
| author | Matthew Garrett <mjg@redhat.com> | 2010-05-17 12:11:21 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-05-17 12:11:21 -0400 |
| commit | a1e66dd0515c8cfa72b8e2a3834d59548cf84ba5 (patch) | |
| tree | e1e1edf210c8dde6edbdfa32ed6ff59ac553729b /include/linux/sched.h | |
| parent | d89d63a973986bf6c1d8b28ab62eb61491a3bb34 (diff) | |
| parent | 6c62673cf58516e1b82329ac90ebf3ff3f485672 (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index dad7f668ebf7..2b7b81df78b3 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1497,7 +1497,6 @@ struct task_struct { | |||
| 1497 | /* bitmask of trace recursion */ | 1497 | /* bitmask of trace recursion */ |
| 1498 | unsigned long trace_recursion; | 1498 | unsigned long trace_recursion; |
| 1499 | #endif /* CONFIG_TRACING */ | 1499 | #endif /* CONFIG_TRACING */ |
| 1500 | unsigned long stack_start; | ||
| 1501 | #ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */ | 1500 | #ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */ |
| 1502 | struct memcg_batch_info { | 1501 | struct memcg_batch_info { |
| 1503 | int do_batch; /* incremented when batch uncharge started */ | 1502 | int do_batch; /* incremented when batch uncharge started */ |