2 files changed, 6 insertions, 10 deletions

diff --git a/block/genhd.c b/block/genhd.c
index f6ecddb7995..d7f7d4e3da3 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -744,7 +744,7 @@ void __init printk_all_partitions(void)
                 struct hd_struct *part;
                 char name_buf[BDEVNAME_SIZE];
                 char devt_buf[BDEVT_SIZE];
-                u8 uuid[PARTITION_META_INFO_UUIDLTH * 2 + 1];
+                char uuid_buf[PARTITION_META_INFO_UUIDLTH * 2 + 5];
 
                 /*
                  * Don't show empty devices or things that have been
@@ -763,14 +763,16 @@ void __init printk_all_partitions(void)
                 while ((part = disk_part_iter_next(&piter))) {
                         bool is_part0 = part == &disk->part0;
 
-                        uuid[0] = 0;
+                        uuid_buf[0] = '\0';
                         if (part->info)
-                                part_unpack_uuid(part->info->uuid, uuid);
+                                snprintf(uuid_buf, sizeof(uuid_buf), "%pU",
+                                         part->info->uuid);
 
                         printk("%s%s %10llu %s %s", is_part0 ? "" : "  ",
                                bdevt_str(part_devt(part), devt_buf),
                                (unsigned long long)part->nr_sects >> 1,
-                               disk_name(disk, part->partno, name_buf), uuid);
+                               disk_name(disk, part->partno, name_buf),
+                               uuid_buf);
                         if (is_part0) {
                                 if (disk->driverfs_dev != NULL &&
                                     disk->driverfs_dev->driver != NULL)
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 6f43b145a63..7a1ce181644 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -221,12 +221,6 @@ static inline void part_pack_uuid(const u8 *uuid_str, u8 *to)
         }
 }
 
-static inline char *part_unpack_uuid(const u8 *uuid, char *out)
-{
-        sprintf(out, "%pU", uuid);
-        return out;
-}
-
 static inline int disk_max_parts(struct gendisk *disk)
 {
         if (disk->flags & GENHD_FL_EXT_DEVT)