The patch titled
reduce MAX_NR_ZONES: fix MAX_NR_ZONES array initializations
has been added to the -mm tree. Its filename is
reduce-max_nr_zones-fix-max_nr_zones-array-initializations.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: reduce MAX_NR_ZONES: fix MAX_NR_ZONES array initializations
From: Christoph Lameter <clameter@xxxxxxx>
Fix array initialization in lots of arches
The number of zones may now be reduced from 4 to 2 for many arches. Fix the
array initialization for the zones array for all architectures so that it is
not initializing a fixed number of elements.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/alpha/mm/init.c | 2 +-
arch/frv/mm/init.c | 2 +-
arch/h8300/mm/init.c | 2 +-
arch/i386/kernel/setup.c | 2 +-
arch/i386/mm/discontig.c | 2 +-
arch/m32r/mm/init.c | 2 +-
arch/m68knommu/mm/init.c | 2 +-
arch/mips/mm/init.c | 2 +-
arch/mips/sgi-ip27/ip27-memory.c | 2 +-
arch/parisc/mm/init.c | 2 +-
arch/sh64/mm/init.c | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff -puN arch/alpha/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/alpha/mm/init.c
--- a/arch/alpha/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/alpha/mm/init.c
@@ -270,7 +270,7 @@ callback_init(void * kernel_end)
void
paging_init(void)
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned long dma_pfn, high_pfn;
dma_pfn = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
diff -puN arch/frv/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/frv/mm/init.c
--- a/arch/frv/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/frv/mm/init.c
@@ -98,7 +98,7 @@ void show_mem(void)
*/
void __init paging_init(void)
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
/* allocate some pages for kernel housekeeping tasks */
empty_bad_page_table = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
diff -puN arch/h8300/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/h8300/mm/init.c
--- a/arch/h8300/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/h8300/mm/init.c
@@ -138,7 +138,7 @@ void paging_init(void)
#endif
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
diff -puN arch/i386/kernel/setup.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/i386/kernel/setup.c
@@ -1181,7 +1181,7 @@ static unsigned long __init setup_memory
void __init zone_sizes_init(void)
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = { 0, };
unsigned int max_dma, low;
max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
diff -puN arch/i386/mm/discontig.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/i386/mm/discontig.c
--- a/arch/i386/mm/discontig.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/i386/mm/discontig.c
@@ -367,7 +367,7 @@ void __init zone_sizes_init(void)
for_each_online_node(nid) {
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned long *zholes_size;
unsigned int max_dma;
diff -puN arch/m32r/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/m32r/mm/init.c
--- a/arch/m32r/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/m32r/mm/init.c
@@ -100,7 +100,7 @@ void free_initrd_mem(unsigned long, unsi
#ifndef CONFIG_DISCONTIGMEM
unsigned long __init zone_sizes_init(void)
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned long max_dma;
unsigned long low;
unsigned long start_pfn;
diff -puN arch/m68knommu/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/m68knommu/mm/init.c
--- a/arch/m68knommu/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/m68knommu/mm/init.c
@@ -136,7 +136,7 @@ void paging_init(void)
#endif
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
diff -puN arch/mips/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/mips/mm/init.c
--- a/arch/mips/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/mips/mm/init.c
@@ -141,7 +141,7 @@ extern void pagetable_init(void);
void __init paging_init(void)
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned long max_dma, high, low;
pagetable_init();
diff -puN arch/mips/sgi-ip27/ip27-memory.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/mips/sgi-ip27/ip27-memory.c
--- a/arch/mips/sgi-ip27/ip27-memory.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/mips/sgi-ip27/ip27-memory.c
@@ -508,7 +508,7 @@ extern unsigned long setup_zero_pages(vo
void __init paging_init(void)
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
unsigned node;
pagetable_init();
diff -puN arch/parisc/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/parisc/mm/init.c
--- a/arch/parisc/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/parisc/mm/init.c
@@ -809,7 +809,7 @@ void __init paging_init(void)
flush_tlb_all_local(NULL);
for (i = 0; i < npmem_ranges; i++) {
- unsigned long zones_size[MAX_NR_ZONES] = { 0, 0, 0 };
+ unsigned long zones_size[MAX_NR_ZONES] = { 0, };
/* We have an IOMMU, so all memory can go into a single
ZONE_DMA zone. */
diff -puN arch/sh64/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations arch/sh64/mm/init.c
--- a/arch/sh64/mm/init.c~reduce-max_nr_zones-fix-max_nr_zones-array-initializations
+++ a/arch/sh64/mm/init.c
@@ -110,7 +110,7 @@ void show_mem(void)
*/
void __init paging_init(void)
{
- unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
+ unsigned long zones_size[MAX_NR_ZONES] = {0, };
pgd_init((unsigned long)swapper_pg_dir);
pgd_init((unsigned long)swapper_pg_dir +
_
Patches currently in -mm which might be from clameter@xxxxxxx are
zvc-add-__inc_zone_state-for-smp-configuration.patch
reduce-max_nr_zones-remove-two-strange-uses-of-max_nr_zones.patch
reduce-max_nr_zones-fix-max_nr_zones-array-initializations.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem.patch
reduce-max_nr_zones-move-highmem-counters-into-highmemc-h.patch
reduce-max_nr_zones-page-allocator-zone_highmem-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment.patch
reduce-max_nr_zones-make-zone_dma32-optional.patch
reduce-max_nr_zones-make-zone_highmem-optional.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones.patch
reduce-max_nr_zones-fix-i386-srat-check-for-max_nr_zones.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.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
