diff --git a/[refs] b/[refs] index 8d0aa60a59a6..8daf0f3b1eed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0d97e9ca2cfa66bdfd1ed8ecb5dcd230924d675 +refs/heads/master: b6ac23af2c66e114d3a87ef28d56f1ceec283007 diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index d13ba76a169c..154b5f80b3ab 100644 --- a/trunk/block/genhd.c +++ b/trunk/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/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c index 5b496132c28a..906a0f718cb3 100644 --- a/trunk/kernel/sched_clock.c +++ b/trunk/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;