The patch titled
i386: replace intermediate array-size definitions with ARRAY_SIZE()
has been added to the -mm tree. Its filename is
i386-replace-intermediate-array-size-definitions-with-array_size.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i386: replace intermediate array-size definitions with ARRAY_SIZE()
From: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Code is easier to validate if array sizes aren't hidden behind extra
#defines.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/setup.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff -puN arch/i386/kernel/setup.c~i386-replace-intermediate-array-size-definitions-with-array_size arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~i386-replace-intermediate-array-size-definitions-with-array_size
+++ a/arch/i386/kernel/setup.c
@@ -222,9 +222,6 @@ static struct resource adapter_rom_resou
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
} };
-#define ADAPTER_ROM_RESOURCES \
- (sizeof adapter_rom_resources / sizeof adapter_rom_resources[0])
-
static struct resource video_rom_resource = {
.name = "Video ROM",
.start = 0xc0000,
@@ -286,9 +283,6 @@ static struct resource standard_io_resou
.flags = IORESOURCE_BUSY | IORESOURCE_IO
} };
-#define STANDARD_IO_RESOURCES \
- (sizeof standard_io_resources / sizeof standard_io_resources[0])
-
#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
static int __init romchecksum(unsigned char *rom, unsigned long length)
@@ -345,7 +339,7 @@ static void __init probe_roms(void)
}
/* check for adapter roms on 2k boundaries */
- for (i = 0; i < ADAPTER_ROM_RESOURCES && start < upper; start += 2048) {
+ for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) {
rom = isa_bus_to_virt(start);
if (!romsignature(rom))
continue;
@@ -1385,7 +1379,7 @@ static int __init request_standard_resou
request_resource(&iomem_resource, &video_ram_resource);
/* request I/O space for devices used on all i[345]86 PCs */
- for (i = 0; i < STANDARD_IO_RESOURCES; i++)
+ for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)
request_resource(&ioport_resource, &standard_io_resources[i]);
return 0;
}
_
Patches currently in -mm which might be from bjorn.helgaas@xxxxxx are
origin.patch
2.6-sony_acpi4.patch
i386-replace-intermediate-array-size-definitions-with-array_size.patch
dmi-decode-and-save-oem-string-information.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
