public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Divyesh Shah <dpshah@google•com>
To: jens.axboe@oracle•com, sfr@canb•auug.org.au
Cc: guijianfeng@cn•fujitsu.com, vgoyal@redhat•com,
	linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: [PATCH] blkio: Fix linux-next build failure after merge of block tree
Date: Wed, 14 Apr 2010 22:36:00 -0700	[thread overview]
Message-ID: <20100415053543.15190.98919.stgit@austin.mtv.corp.google.com> (raw)

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>
---

 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;
 

             reply	other threads:[~2010-04-15  5:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-15  5:36 Divyesh Shah [this message]
2010-04-15  5:51 ` [PATCH] blkio: Fix linux-next build failure after merge of block tree Gui Jianfeng
2010-04-15  6:56 ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100415053543.15190.98919.stgit@austin.mtv.corp.google.com \
    --to=dpshah@google$(echo .)com \
    --cc=guijianfeng@cn$(echo .)fujitsu.com \
    --cc=jens.axboe@oracle$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=vgoyal@redhat$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox