Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index a6f2dc66c3db..9b1e2f5ca630 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -508,7 +508,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
                 if (q->merge_bvec_fn)
                         rs->max_sectors =
                                 min_not_zero(rs->max_sectors,
-                                             (unsigned short)(PAGE_SIZE >> 9));
+                                             (unsigned int) (PAGE_SIZE >> 9));
 
                 rs->max_phys_segments =
                         min_not_zero(rs->max_phys_segments,