Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block

[pandora-kernel.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 57647ec..557c392 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -139,9 +139,9 @@ struct blk_scsi_cmd_filter {
 struct disk_part_tbl {
        struct rcu_head rcu_head;
        int len;
-       struct hd_struct *last_lookup;
+       struct hd_struct __rcu *last_lookup;
        struct gendisk *disk;
-       struct hd_struct *part[];
+       struct hd_struct __rcu *part[];
 };
 
 struct gendisk {
@@ -160,7 +160,7 @@ struct gendisk {
         * non-critical accesses use RCU.  Always access through
         * helpers.
         */
-       struct disk_part_tbl *part_tbl;
+       struct disk_part_tbl __rcu *part_tbl;
        struct hd_struct part0;
 
        const struct block_device_operations *fops;