[PATCH 14/34] __initdata cleanup - s390

Alon Bar-Lev
2007-02-09T15:43:12Z

Trivial.

**NOT TESTED***

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Signed-off-by: Bernhard Walle <bwalle@suse.de>

---

diff -urNp linux-2.6.20-rc6-mm3.org/arch/s390/kernel/setup.c linux-2.6.20-rc6-mm3/arch/s390/kernel/setup.c
--- linux-2.6.20-rc6-mm3.org/arch/s390/kernel/setup.c
+++ linux-2.6.20-rc6-mm3/arch/s390/kernel/setup.c
@@ -74,9 +74,9 @@ unsigned int console_devno = -1;
unsigned int console_irq = -1;
unsigned long machine_flags = 0;

-struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];
+struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS] = {{0}};
volatile int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */
-static unsigned long __initdata memory_end;
+static unsigned long __initdata memory_end = 0l;

/*
* This is set up by the setup-routine at boot-time
diff -urNp linux-2.6.20-rc6-mm3.org/arch/s390/kernel/smp.c linux-2.6.20-rc6-mm3/arch/s390/kernel/smp.c
--- linux-2.6.20-rc6-mm3.org/arch/s390/kernel/smp.c
+++ linux-2.6.20-rc6-mm3/arch/s390/kernel/smp.c
@@ -603,8 +603,8 @@ __cpu_up(unsigned int cpu)
return 0;
}

-static unsigned int __initdata additional_cpus;
-static unsigned int __initdata possible_cpus;
+static unsigned int __initdata additional_cpus = 0;
+static unsigned int __initdata possible_cpus = 0;

void __init smp_setup_cpu_possible_map(void)
{
diff -urNp linux-2.6.20-rc6-mm3.org/drivers/s390/block/xpram.c linux-2.6.20-rc6-mm3/drivers/s390/block/xpram.c
--- linux-2.6.20-rc6-mm3.org/drivers/s390/block/xpram.c
+++ linux-2.6.20-rc6-mm3/drivers/s390/block/xpram.c
@@ -63,7 +63,7 @@ static int xpram_devs;
* Parameter parsing functions.
*/
static int __initdata devs = XPRAM_DEVS;
-static char __initdata *sizes[XPRAM_MAX_DEVS];
+static char __initdata *sizes[XPRAM_MAX_DEVS] = {0};

module_param(devs, int, 0);
module_param_array(sizes, charp, NULL, 0);