diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 12:58:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 12:58:49 -0400 |
commit | cabca0cb0d0e8579428d8f8c3f606e2f01d26d14 (patch) | |
tree | a32426d345bab465488df20a228a495a12b26b8b /include/linux/sched.h | |
parent | 853da0022023c046e0a5ccc51d427745f0c94de7 (diff) | |
parent | 87c1efbfeac49849b981a7eac8cba42d4a49b2e9 (diff) |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
Fix compile/link of init/do_mounts.c with !CONFIG_BLOCK
When stacked block devices are in-use (e.g. md or dm), the recursive calls
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 97c0c7da58ef..a81897e2a244 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -88,6 +88,7 @@ struct sched_param { | |||
88 | 88 | ||
89 | struct exec_domain; | 89 | struct exec_domain; |
90 | struct futex_pi_state; | 90 | struct futex_pi_state; |
91 | struct bio; | ||
91 | 92 | ||
92 | /* | 93 | /* |
93 | * List of flags we want to share for kernel threads, | 94 | * List of flags we want to share for kernel threads, |
@@ -1016,6 +1017,9 @@ struct task_struct { | |||
1016 | /* journalling filesystem info */ | 1017 | /* journalling filesystem info */ |
1017 | void *journal_info; | 1018 | void *journal_info; |
1018 | 1019 | ||
1020 | /* stacked block device info */ | ||
1021 | struct bio *bio_list, **bio_tail; | ||
1022 | |||
1019 | /* VM state */ | 1023 | /* VM state */ |
1020 | struct reclaim_state *reclaim_state; | 1024 | struct reclaim_state *reclaim_state; |
1021 | 1025 | ||