Merge branch 'android-3.8' of ti-android-kernel/kernel-common into p-ti-android-3.8.y

[android-sdk/kernel-video.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 7dcfdd84efcf4221cff530cbead9a9c5c7da64f5..c8b520eea3667927838de9a230562e642668fe35 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1106,6 +1106,22 @@ static void disk_release(struct device *dev)
                blk_put_queue(disk->queue);
        kfree(disk);
 }
+
+static int disk_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+       struct gendisk *disk = dev_to_disk(dev);
+       struct disk_part_iter piter;
+       struct hd_struct *part;
+       int cnt = 0;
+
+       disk_part_iter_init(&piter, disk, 0);
+       while((part = disk_part_iter_next(&piter)))
+               cnt++;
+       disk_part_iter_exit(&piter);
+       add_uevent_var(env, "NPARTS=%u", cnt);
+       return 0;
+}
+
 struct class block_class = {
        .name           = "block",
 };
@@ -1124,6 +1140,7 @@ static struct device_type disk_type = {
        .groups         = disk_attr_groups,
        .release        = disk_release,
        .devnode        = block_devnode,
+       .uevent         = disk_uevent,
 };
 
 #ifdef CONFIG_PROC_FS