aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStefan Bader <stefan.bader@canonical.com>2011-07-14 15:30:37 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-29 13:29:11 -0700
commitb3120702bfb40e3689c2a6ae3944d9886201b753 (patch)
tree866e8c2a05b2faa39804f535225e2c633c7ed4be /drivers
parentc70ea5da1319eace8f5a6923b327fa2b325661fd (diff)
downloadkernel_samsung_smdk4412-b3120702bfb40e3689c2a6ae3944d9886201b753.zip
kernel_samsung_smdk4412-b3120702bfb40e3689c2a6ae3944d9886201b753.tar.gz
kernel_samsung_smdk4412-b3120702bfb40e3689c2a6ae3944d9886201b753.tar.bz2
xen-blkfront: Fix one off warning about name clash
commit 89153b5cae9f40c224a5d321665a97bf14220c2c upstream. Avoid telling users to use xvde and onwards when using xvde. Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/xen-blkfront.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 238b941..9ea8c25 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -529,7 +529,7 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,
minor = BLKIF_MINOR_EXT(info->vdevice);
nr_parts = PARTS_PER_EXT_DISK;
offset = minor / nr_parts;
- if (xen_hvm_domain() && offset <= EMULATED_HD_DISK_NAME_OFFSET + 4)
+ if (xen_hvm_domain() && offset < EMULATED_HD_DISK_NAME_OFFSET + 4)
printk(KERN_WARNING "blkfront: vdevice 0x%x might conflict with "
"emulated IDE disks,\n\t choose an xvd device name"
"from xvde on\n", info->vdevice);