Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / target / target_core_rd.c

diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index 0921a64b555028997691fb28ad7ab84294b10a0d..51127d15d5c5accd6e39a8c408ef35a0f521db2f 100644 (file)
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -139,6 +139,11 @@ static int rd_build_device_space(struct rd_dev *rd_dev)
                        rd_dev->rd_page_count);
                return -EINVAL;
        }
+
+       /* Don't need backing pages for NULLIO */
+       if (rd_dev->rd_flags & RDF_NULLIO)
+               return 0;
+
        total_sg_needed = rd_dev->rd_page_count;
 
        sg_tables = (total_sg_needed / max_sg_per_table) + 1;