Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[firefly-linux-kernel-4.4.55.git] / drivers / block / null_blk.c

diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index aa2224aa7caa34d5854aebfb7ceaf4cebd29eccc..65cd61a4145ed2049944621c50b374cf742041ca 100644 (file)
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -579,7 +579,7 @@ static int null_add_dev(void)
        sector_div(size, bs);
        set_capacity(disk, size);
 
-       disk->flags |= GENHD_FL_EXT_DEVT;
+       disk->flags |= GENHD_FL_EXT_DEVT | GENHD_FL_SUPPRESS_PARTITION_INFO;
        disk->major             = null_major;
        disk->first_minor       = nullb->index;
        disk->fops              = &null_fops;