---

yaml --- r: 174780 b: refs/heads/master c: ea7f1b6 h: refs/heads/master v: v3
git-mirror · Nov 6, 2009 · f29c4f3 · f29c4f3
1 parent d0559eb
commit f29c4f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0efea0006335a2425b1a12a2ad35efad626fe353
+refs/heads/master: ea7f1b6ee9dc96c5827b06ba21d7769d553efb7d
diff --git a/trunk/arch/x86/pci/acpi.c b/trunk/arch/x86/pci/acpi.c
@@ -69,17 +69,17 @@ align_resource(struct acpi_device *bridge, struct resource *res)
 	 * that claim this address space have starting alignment and length
 	 * constraints, so fix any obvious BIOS goofs.
 	 */
-	if (res->start & (align - 1)) {
+	if (!IS_ALIGNED(res->start, align)) {
 		dev_printk(KERN_DEBUG, &bridge->dev,
 			   "host bridge window %pR invalid; "
 			   "aligning start to %d-byte boundary\n", res, align);
 		res->start &= ~(align - 1);
 	}
-	if ((res->end + 1) & (align - 1)) {
+	if (!IS_ALIGNED(res->end + 1, align)) {
 		dev_printk(KERN_DEBUG, &bridge->dev,
 			   "host bridge window %pR invalid; "
 			   "aligning end to %d-byte boundary\n", res, align);
-		res->end = roundup(res->end, align) - 1;
+		res->end = ALIGN(res->end, align) - 1;
 	}
 }