From af3c4acb17c639ceace6d3a8a5ff2946cd58563c Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Thu, 28 Aug 2008 09:27:42 +0200 Subject: [PATCH] --- yaml --- r: 110510 b: refs/heads/master c: aeb3d3a81e81c6323a17fe914e91eb228b3f1aa1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-settings.c | 2 +- trunk/block/genhd.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 74cee20bebba..9773e01a9669 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01cfcddd98f09e05a2e36031654ed46643b76f23 +refs/heads/master: aeb3d3a81e81c6323a17fe914e91eb228b3f1aa1 diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c index a60e959a12c4..d70692badcdb 100644 --- a/trunk/block/blk-settings.c +++ b/trunk/block/blk-settings.c @@ -443,7 +443,7 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask) } EXPORT_SYMBOL(blk_queue_update_dma_alignment); -int __init blk_settings_init(void) +static int __init blk_settings_init(void) { blk_max_low_pfn = max_low_pfn - 1; blk_max_pfn = max_pfn - 1; diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index d9de3e482d1e..32ee73c67560 100644 --- a/trunk/block/genhd.c +++ b/trunk/block/genhd.c @@ -578,7 +578,7 @@ struct gendisk *get_gendisk(dev_t devt, int *partno) * RETURNS: * Resulting block_device on success, NULL on failure. */ -extern struct block_device *bdget_disk(struct gendisk *disk, int partno) +struct block_device *bdget_disk(struct gendisk *disk, int partno) { struct hd_struct *part; struct block_device *bdev = NULL; @@ -654,7 +654,7 @@ static void *disk_seqf_start(struct seq_file *seqf, loff_t *pos) struct class_dev_iter *iter; struct device *dev; - iter = kmalloc(GFP_KERNEL, sizeof(*iter)); + iter = kmalloc(sizeof(*iter), GFP_KERNEL); if (!iter) return ERR_PTR(-ENOMEM);