Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46761bb authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'origin/v3.18/topic/pcie/master' into linux-linaro-lsk-v3.18 

For gicv3 compiler fix.
parents fd2b464f 96f9c914

drivers/irqchip/irq-gic-v3-its.c

+1 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, 
	 * of two entries. No, the architecture doesn't let you

	 * express an ITT with a single entry.

	 */

	nr_ites = max(2, roundup_pow_of_two(nvecs));

	nr_ites = max(2UL, roundup_pow_of_two(nvecs));

	sz = nr_ites * its->ite_size;

	sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1;

	itt = kzalloc(sz, GFP_KERNEL);