X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=block%2Fblk-settings.c;h=d55a3e4783e4dda0f291cd7ed734dc85bdff8054;hp=fa1eb0449a05f0db45de3ab8e6a01a2fc2a95238;hb=refs%2Fheads%2Fpandora-3.2;hpb=c0880dcded3ffe77700184e9d96c110ce0094c11 diff --git a/block/blk-settings.c b/block/blk-settings.c index fa1eb0449a05..d55a3e4783e4 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -521,7 +521,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, bottom = max(b->physical_block_size, b->io_min) + alignment; /* Verify that top and bottom intervals line up */ - if (max(top, bottom) & (min(top, bottom) - 1)) { + if (max(top, bottom) % min(top, bottom)) { t->misaligned = 1; ret = -1; } @@ -562,7 +562,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, /* Find lowest common alignment_offset */ t->alignment_offset = lcm(t->alignment_offset, alignment) - & (max(t->physical_block_size, t->io_min) - 1); + % max(t->physical_block_size, t->io_min); /* Verify that new alignment_offset is on a logical block boundary */ if (t->alignment_offset & (t->logical_block_size - 1)) {