diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 05:12:55 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 05:12:55 -0400 |
| commit | f3831a592fe4332a70baad64a860b345398885b7 (patch) | |
| tree | fd27b986295fe5a4f1c0924a804228f829a4c894 /include/linux/init_task.h | |
| parent | 376f7839b72ec526173cafb5d8eadfc61e2effdf (diff) | |
| parent | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (diff) | |
Merge commit 'takashi/topic/asoc' into for-2.6.31
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index dcfb93337e9a..d87247d2641f 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -15,19 +15,6 @@ | |||
| 15 | extern struct files_struct init_files; | 15 | extern struct files_struct init_files; |
| 16 | extern struct fs_struct init_fs; | 16 | extern struct fs_struct init_fs; |
| 17 | 17 | ||
| 18 | #define INIT_KIOCTX(name, which_mm) \ | ||
| 19 | { \ | ||
| 20 | .users = ATOMIC_INIT(1), \ | ||
| 21 | .dead = 0, \ | ||
| 22 | .mm = &which_mm, \ | ||
| 23 | .user_id = 0, \ | ||
| 24 | .next = NULL, \ | ||
| 25 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait), \ | ||
| 26 | .ctx_lock = __SPIN_LOCK_UNLOCKED(name.ctx_lock), \ | ||
| 27 | .reqs_active = 0U, \ | ||
| 28 | .max_reqs = ~0U, \ | ||
| 29 | } | ||
| 30 | |||
| 31 | #define INIT_MM(name) \ | 18 | #define INIT_MM(name) \ |
| 32 | { \ | 19 | { \ |
| 33 | .mm_rb = RB_ROOT, \ | 20 | .mm_rb = RB_ROOT, \ |