aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/acpi.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/pci/acpi.c')
-rw-r--r--arch/x86/pci/acpi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 8ddf4f4c7253..959e548a7039 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -69,17 +69,17 @@ align_resource(struct acpi_device *bridge, struct resource *res)
69 * that claim this address space have starting alignment and length 69 * that claim this address space have starting alignment and length
70 * constraints, so fix any obvious BIOS goofs. 70 * constraints, so fix any obvious BIOS goofs.
71 */ 71 */
72 if (res->start & (align - 1)) { 72 if (!IS_ALIGNED(res->start, align)) {
73 dev_printk(KERN_DEBUG, &bridge->dev, 73 dev_printk(KERN_DEBUG, &bridge->dev,
74 "host bridge window %pR invalid; " 74 "host bridge window %pR invalid; "
75 "aligning start to %d-byte boundary\n", res, align); 75 "aligning start to %d-byte boundary\n", res, align);
76 res->start &= ~(align - 1); 76 res->start &= ~(align - 1);
77 } 77 }
78 if ((res->end + 1) & (align - 1)) { 78 if (!IS_ALIGNED(res->end + 1, align)) {
79 dev_printk(KERN_DEBUG, &bridge->dev, 79 dev_printk(KERN_DEBUG, &bridge->dev,
80 "host bridge window %pR invalid; " 80 "host bridge window %pR invalid; "
81 "aligning end to %d-byte boundary\n", res, align); 81 "aligning end to %d-byte boundary\n", res, align);
82 res->end = roundup(res->end, align) - 1; 82 res->end = ALIGN(res->end, align) - 1;
83 } 83 }
84} 84}
85 85