aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDivyesh Shah <dpshah@google.com>2010-04-15 08:54:59 +0200
committerJens Axboe <jens.axboe@oracle.com>2010-04-15 08:54:59 +0200
commitb6ac23af2c66e114d3a87ef28d56f1ceec283007 (patch)
treef514445bea36dbeb2bc37f663a6f94275d484515
parentc0d97e9ca2cfa66bdfd1ed8ecb5dcd230924d675 (diff)
downloadmrst-s0i3-test-b6ac23af2c66e114d3a87ef28d56f1ceec283007.tar.gz
mrst-s0i3-test-b6ac23af2c66e114d3a87ef28d56f1ceec283007.tar.xz
mrst-s0i3-test-b6ac23af2c66e114d3a87ef28d56f1ceec283007.zip
blkio: fix for modular blk-cgroup build
After merging the block tree, 20100414's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "get_gendisk" [block/blk-cgroup.ko] undefined! ERROR: "sched_clock" [block/blk-cgroup.ko] undefined! This happens because the two symbols aren't exported and hence not available when blk-cgroup code is built as a module. I've tried to stay consistent with the use of EXPORT_SYMBOL or EXPORT_SYMBOL_GPL with the other symbols in the respective files. Signed-off-by: Divyesh Shah <dpshah@google.com> Acked-by: Gui Jianfeng <guijianfeng@cn.fujitsu.cn> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/genhd.c1
-rw-r--r--kernel/sched_clock.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c
index d13ba76a169..154b5f80b3a 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -596,6 +596,7 @@ struct gendisk *get_gendisk(dev_t devt, int *partno)
return disk;
}
+EXPORT_SYMBOL(get_gendisk);
/**
* bdget_disk - do bdget() by gendisk and partition number
diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 5b496132c28..906a0f718cb 100644
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -41,6 +41,7 @@ unsigned long long __attribute__((weak)) sched_clock(void)
return (unsigned long long)(jiffies - INITIAL_JIFFIES)
* (NSEC_PER_SEC / HZ);
}
+EXPORT_SYMBOL_GPL(sched_clock);
static __read_mostly int sched_clock_running;