Subject: Re: [PATCH] blkio: Fix linux-next build failure after merge of block tree

From: Gui Jianfeng <[email-masked]>
Date: Thu, 15 Apr 2010 13:51:33 +0800

Divyesh Shah wrote:
> 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 <[email-masked]>

I was just about to post a same patch. :)

Acked-by: Gui Jianfeng <[email-masked]>

> ---
> 
>  block/genhd.c        |    1 +
>  kernel/sched_clock.c |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/block/genhd.c b/block/genhd.c
> index d13ba76..154b5f8 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 5b49613..906a0f7 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;
>  
> 
> 
> 
>