brd->brd_queue = blk_alloc_queue(GFP_KERNEL);
        if (!brd->brd_queue)
                goto out_free_dev;
+
        blk_queue_make_request(brd->brd_queue, brd_make_request);
        blk_queue_max_hw_sectors(brd->brd_queue, 1024);
        blk_queue_bounce_limit(brd->brd_queue, BLK_BOUNCE_ANY);
 
+       /* This is so fdisk will align partitions on 4k, because of
+        * direct_access API needing 4k alignment, returning a PFN
+        * (This is only a problem on very small devices <= 4M,
+        *  otherwise fdisk will align on 1M. Regardless this call
+        *  is harmless)
+        */
+       blk_queue_physical_block_size(brd->brd_queue, PAGE_SIZE);
+
        brd->brd_queue->limits.discard_granularity = PAGE_SIZE;
        brd->brd_queue->limits.max_discard_sectors = UINT_MAX;
        brd->brd_queue->limits.discard_zeroes_data = 1;