From 17b1b17be3b1a03ef1f16fbea7bf05a1e5a7aaee Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Thu, 31 Mar 2011 11:48:42 -0400 Subject: [PATCH 4/5] use extern char[] (follows include/linux/pm.h pattern) - may avoid this approach.. *shrug* --- block/blk-integrity.c | 3 +++ include/linux/blkdev.h | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/block/blk-integrity.c b/block/blk-integrity.c index c2408ff..a36186d 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -30,6 +30,9 @@ static struct kmem_cache *integrity_cachep; +const char bi_unsupported_name[] = "unsupported"; +EXPORT_SYMBOL_GPL(bi_unsupported_name); + /** * blk_rq_count_integrity_sg - Count number of integrity scatterlist elements * @q: request queue diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 8dd2beb..405b93b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1248,7 +1248,7 @@ queue_max_integrity_segments(struct request_queue *q) return q->limits.max_integrity_segments; } -static const char *bi_unsupported_name = "unsupported"; +extern const char bi_unsupported_name[]; /* = "unsupported" */ static inline bool blk_integrity_is_initialized(struct blk_integrity *bi) { -- 1.7.3.4