diff --git a/[refs] b/[refs]
index 83abf6f5ee64..7cca59a35853 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f23ef184b486ac021b6a471b4e94cfa04860d3b0
+refs/heads/master: f62c6d0a2607b2d1fdf280d4d1467a7a6e24c67d
diff --git a/trunk/drivers/block/genhd.c b/trunk/drivers/block/genhd.c
index 47fd3659a061..d42840cc0d1d 100644
--- a/trunk/drivers/block/genhd.c
+++ b/trunk/drivers/block/genhd.c
@@ -45,7 +45,7 @@ int get_blkdev_list(char *p, int used)
 	struct blk_major_name *n;
 	int i, len;
 
-	len = sprintf(p, "\nBlock devices:\n");
+	len = snprintf(p, (PAGE_SIZE-used), "\nBlock devices:\n");
 
 	down(&block_subsys_sem);
 	for (i = 0; i < ARRAY_SIZE(major_names); i++) {