aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 09:58:49 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 09:58:49 -0700
commitcabca0cb0d0e8579428d8f8c3f606e2f01d26d14 (patch)
treea32426d345bab465488df20a228a495a12b26b8b /include/linux
parent853da0022023c046e0a5ccc51d427745f0c94de7 (diff)
parent87c1efbfeac49849b981a7eac8cba42d4a49b2e9 (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')
-rw-r--r--include/linux/genhd.h6
-rw-r--r--include/linux/sched.h4
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index f589559cf07..4c03ee353e7 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -434,6 +434,10 @@ static inline struct block_device *bdget_disk(struct gendisk *disk, int index)
#endif
-#endif
+#else /* CONFIG_BLOCK */
+
+static inline void printk_all_partitions(void) { }
+
+#endif /* CONFIG_BLOCK */
#endif
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 97c0c7da58e..a81897e2a24 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -88,6 +88,7 @@ struct sched_param {
struct exec_domain;
struct futex_pi_state;
+struct bio;
/*
* List of flags we want to share for kernel threads,
@@ -1016,6 +1017,9 @@ struct task_struct {
/* journalling filesystem info */
void *journal_info;
+/* stacked block device info */
+ struct bio *bio_list, **bio_tail;
+
/* VM state */
struct reclaim_state *reclaim_state;