Merge branch 'remote' into hybrid-5.1

NoelMacwan · Oct 9, 2015 · d12158e · d12158e
2 parents 162eca6 + ce78d48
commit d12158e
Show file tree

Hide file tree

Showing 5 changed files with 510 additions and 149 deletions.
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
@@ -72,6 +72,12 @@ static inline void bfq_group_init_entity(struct bfqio_cgroup *bgrp,
 		entity->new_weight = bfq_ioprio_to_weight(bgrp->ioprio);
 		entity->new_ioprio = bgrp->ioprio;
 	} else {
+		if (bgrp->weight < BFQ_MIN_WEIGHT ||
+		    bgrp->weight > BFQ_MAX_WEIGHT) {
+			printk(KERN_CRIT "bfq_group_init_entity: "
+					 "bgrp->weight %d\n", bgrp->weight);
+			BUG();
+		}
 		entity->new_weight = bgrp->weight;
 		entity->new_ioprio = bfq_weight_to_ioprio(bgrp->weight);
 	}