[PATCH 12/34] __initdata cleanup - powerpc

Alon Bar-Lev
2007-02-09T15:42:20Z

diff -urNp linux-2.6.20-rc6-mm3.org/arch/powerpc/kernel/legacy_serial.c linux-2.6.20-rc6-mm3/arch/powerpc/kernel/legacy_serial.c
--- linux-2.6.20-rc6-mm3.org/arch/powerpc/kernel/legacy_serial.c 2007-01-31 22:15:31.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/powerpc/kernel/legacy_serial.c 2007-01-31 22:19:30.000000000 +0200
@@ -565,7 +565,7 @@ static int __init check_legacy_serial_co
DBG("Found serial console at ttyS%d\n", offset);

if (speed) {
- static char __initdata opt[16];
+ static char __initdata opt[16] = {0};
sprintf(opt, "%d", speed);
return add_preferred_console("ttyS", offset, opt);
} else
diff -urNp linux-2.6.20-rc6-mm3.org/arch/powerpc/kernel/pci_32.c linux-2.6.20-rc6-mm3/arch/powerpc/kernel/pci_32.c
--- linux-2.6.20-rc6-mm3.org/arch/powerpc/kernel/pci_32.c 2007-01-31 22:15:31.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/powerpc/kernel/pci_32.c 2007-01-31 22:19:30.000000000 +0200
@@ -889,7 +889,7 @@ void __init
pci_process_bridge_OF_ranges(struct pci_controller *hose,
struct device_node *dev, int primary)
{
- static unsigned int static_lc_ranges[256] __initdata;
+ static unsigned int static_lc_ranges[256] __initdata = {0};
const unsigned int *dt_ranges;
unsigned int *lc_ranges, *ranges, *prev, size;
int rlen = 0, orig_rlen;
diff -urNp linux-2.6.20-rc6-mm3.org/arch/powerpc/kernel/prom.c linux-2.6.20-rc6-mm3/arch/powerpc/kernel/prom.c
--- linux-2.6.20-rc6-mm3.org/arch/powerpc/kernel/prom.c 2007-01-31 22:15:31.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/powerpc/kernel/prom.c 2007-01-31 22:19:30.000000000 +0200
@@ -60,8 +60,8 @@
#endif

-static int __initdata dt_root_addr_cells;
-static int __initdata dt_root_size_cells;
+static int __initdata dt_root_addr_cells = 0;
+static int __initdata dt_root_size_cells = 0;

#ifdef CONFIG_PPC64
int __initdata iommu_is_off;
diff -urNp linux-2.6.20-rc6-mm3.org/arch/powerpc/kernel/prom_init.c linux-2.6.20-rc6-mm3/arch/powerpc/kernel/prom_init.c
--- linux-2.6.20-rc6-mm3.org/arch/powerpc/kernel/prom_init.c 2007-01-31 22:15:31.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/powerpc/kernel/prom_init.c 2007-01-31 22:19:30.000000000 +0200
@@ -157,26 +157,26 @@ extern void copy_and_flush(unsigned long
unsigned long size, unsigned long offset);

/* prom structure */
-static struct prom_t __initdata prom;
+static struct prom_t __initdata prom = {0};

-static unsigned long prom_entry __initdata;
+static unsigned long prom_entry __initdata = 0l;

#define PROM_SCRATCH_SIZE 256

-static char __initdata of_stdout_device[256];
-static char __initdata prom_scratch[PROM_SCRATCH_SIZE];
+static char __initdata of_stdout_device[256] = {0};
+static char __initdata prom_scratch[PROM_SCRATCH_SIZE] = {0};

-static unsigned long __initdata dt_header_start;
-static unsigned long __initdata dt_struct_start, dt_struct_end;
-static unsigned long __initdata dt_string_start, dt_string_end;
+static unsigned long __initdata dt_header_start = 0l;
+static unsigned long __initdata dt_struct_start = 0l, dt_struct_end = 0l;
+static unsigned long __initdata dt_string_start = 0l, dt_string_end = 0l;

-static unsigned long __initdata prom_initrd_start, prom_initrd_end;
+static unsigned long __initdata prom_initrd_start = 0l, prom_initrd_end = 0l;

#ifdef CONFIG_PPC64
-static int __initdata prom_iommu_force_on;
-static int __initdata prom_iommu_off;
-static unsigned long __initdata prom_tce_alloc_start;
-static unsigned long __initdata prom_tce_alloc_end;
+static int __initdata prom_iommu_force_on = 0;
+static int __initdata prom_iommu_off = 0;
+static unsigned long __initdata prom_tce_alloc_start = 0l;
+static unsigned long __initdata prom_tce_alloc_end = 0l;
#endif

/* Platforms codes are now obsolete in the kernel. Now only used within this
@@ -189,20 +189,20 @@ static unsigned long __initdata prom_tce
#define PLATFORM_POWERMAC 0x0400
#define PLATFORM_GENERIC 0x0500

-static int __initdata of_platform;
+static int __initdata of_platform = 0;

-static char __initdata prom_cmd_line[COMMAND_LINE_SIZE];
+static char __initdata prom_cmd_line[COMMAND_LINE_SIZE] = "";

-static unsigned long __initdata alloc_top;
-static unsigned long __initdata alloc_top_high;
-static unsigned long __initdata alloc_bottom;
-static unsigned long __initdata rmo_top;
-static unsigned long __initdata ram_top;
+static unsigned long __initdata alloc_top = 0l;
+static unsigned long __initdata alloc_top_high = 0l;
+static unsigned long __initdata alloc_bottom = 0l;
+static unsigned long __initdata rmo_top = 0l;
+static unsigned long __initdata ram_top = 0l;

-static struct mem_map_entry __initdata mem_reserve_map[MEM_RESERVE_MAP_SIZE];
-static int __initdata mem_reserve_cnt;
+static struct mem_map_entry __initdata mem_reserve_map[MEM_RESERVE_MAP_SIZE] = {{0}};
+static int __initdata mem_reserve_cnt = 0;

-static cell_t __initdata regbuf[1024];
+static cell_t __initdata regbuf[1024] = {0};

#define MAX_CPU_THREADS 2
diff -urNp linux-2.6.20-rc6-mm3.org/arch/powerpc/mm/numa.c linux-2.6.20-rc6-mm3/arch/powerpc/mm/numa.c
--- linux-2.6.20-rc6-mm3.org/arch/powerpc/mm/numa.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/powerpc/mm/numa.c 2007-01-31 22:19:30.000000000 +0200
@@ -35,7 +35,7 @@ EXPORT_SYMBOL(numa_cpu_lookup_table);
EXPORT_SYMBOL(numa_cpumask_lookup_table);
EXPORT_SYMBOL(node_data);

-static bootmem_data_t __initdata plat_node_bdata[MAX_NUMNODES];
+static bootmem_data_t __initdata plat_node_bdata[MAX_NUMNODES] = {{0}};
static int min_common_depth;
static int n_mem_addr_cells, n_mem_size_cells;

diff -urNp linux-2.6.20-rc6-mm3.org/arch/powerpc/platforms/iseries/dt.c linux-2.6.20-rc6-mm3/arch/powerpc/platforms/iseries/dt.c
--- linux-2.6.20-rc6-mm3.org/arch/powerpc/platforms/iseries/dt.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/powerpc/platforms/iseries/dt.c 2007-01-31 22:19:30.000000000 +0200
@@ -61,7 +61,7 @@ struct iseries_flat_dt {
u64 reserve_map[2];
};

-static void * __initdata dt_data;
+static void * __initdata dt_data = NULL;

/*
* Putting these strings here keeps them out of the section
diff -urNp linux-2.6.20-rc6-mm3.org/arch/powerpc/platforms/powermac/bootx_init.c linux-2.6.20-rc6-mm3/arch/powerpc/platforms/powermac/bootx_init.c
--- linux-2.6.20-rc6-mm3.org/arch/powerpc/platforms/powermac/bootx_init.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/powerpc/platforms/powermac/bootx_init.c 2007-01-31 22:19:30.000000000 +0200
@@ -32,11 +32,11 @@

extern void __start(unsigned long r3, unsigned long r4, unsigned long r5);

-static unsigned long __initdata bootx_dt_strbase;
-static unsigned long __initdata bootx_dt_strend;
-static unsigned long __initdata bootx_node_chosen;
-static boot_infos_t * __initdata bootx_info;
-static char __initdata bootx_disp_path[256];
+static unsigned long __initdata bootx_dt_strbase = 0l;
+static unsigned long __initdata bootx_dt_strend = 0l;
+static unsigned long __initdata bootx_node_chosen = 0l;
+static boot_infos_t * __initdata bootx_info = NULL;
+static char __initdata bootx_disp_path[256] = {0};

/* Is boot-info compatible ? */
#define BOOT_INFO_IS_COMPATIBLE(bi) \
diff -urNp linux-2.6.20-rc6-mm3.org/arch/powerpc/xmon/xmon.c linux-2.6.20-rc6-mm3/arch/powerpc/xmon/xmon.c
--- linux-2.6.20-rc6-mm3.org/arch/powerpc/xmon/xmon.c 2007-01-25 04:19:28.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/powerpc/xmon/xmon.c 2007-01-31 22:19:30.000000000 +0200
@@ -2632,7 +2632,7 @@ static int __init setup_xmon_sysrq(void)
__initcall(setup_xmon_sysrq);
#endif /* CONFIG_MAGIC_SYSRQ */

-int __initdata xmon_early, xmon_off;
+int __initdata xmon_early = 0, xmon_off = 0;

static int __init early_parse_xmon(char *p)
{