From: Amitoj Kaur Chawla Date: Wed, 29 Jun 2016 15:00:38 +0000 (+0530) Subject: x86/xen: Use DIV_ROUND_UP X-Git-Tag: v4.1.12-92~55^2~30 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d73f48d56b4f0428ff947a4a0b0be01b3d515825;p=users%2Fjedix%2Flinux-maple.git x86/xen: Use DIV_ROUND_UP The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /(d)) but is perhaps more readable. The Coccinelle script used to make this change is as follows: @haskernel@ @@ @depends on haskernel@ expression n,d; @@ ( - (n + d - 1) / d + DIV_ROUND_UP(n,d) | - (n + (d - 1)) / d + DIV_ROUND_UP(n,d) ) Signed-off-by: Amitoj Kaur Chawla Signed-off-by: David Vrabel (cherry picked from commit 585423c8c4d2f39a2c299bc6dd16433e6141fba5) Signed-off-by: Bob Liu Orabug: 24820937 --- diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 8015db319bd7b..928916bfb0d6e 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -620,7 +620,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr) { unsigned long va = dtr->address; unsigned int size = dtr->size + 1; - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE; + unsigned pages = DIV_ROUND_UP(size, PAGE_SIZE); unsigned long frames[pages]; int f; @@ -669,7 +669,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr) { unsigned long va = dtr->address; unsigned int size = dtr->size + 1; - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE; + unsigned pages = DIV_ROUND_UP(size, PAGE_SIZE); unsigned long frames[pages]; int f;