[PATCH 02/34] __initdata cleanup - arm

Alon Bar-Lev
2007-02-09T15:34:18Z

diff -urNp linux-2.6.20-rc6-mm3.org/arch/arm/kernel/setup.c linux-2.6.20-rc6-mm3/arch/arm/kernel/setup.c
--- linux-2.6.20-rc6-mm3.org/arch/arm/kernel/setup.c 2007-01-31 22:15:30.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/arm/kernel/setup.c 2007-01-31 22:19:30.000000000 +0200
@@ -106,7 +106,7 @@ unsigned long phys_initrd_size __initdat
static struct meminfo meminfo __initdata = { 0, };
static const char *cpu_name;
static const char *machine_name;
-static char __initdata command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE] = "";

static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
@@ -753,7 +753,7 @@ static struct init_tags {
{ 0, ATAG_NONE }
};

-static void (*init_machine)(void) __initdata;
+static void (*init_machine)(void) __initdata = NULL;

static int __init customize_machine(void)
{
diff -urNp linux-2.6.20-rc6-mm3.org/arch/arm26/kernel/setup.c linux-2.6.20-rc6-mm3/arch/arm26/kernel/setup.c
--- linux-2.6.20-rc6-mm3.org/arch/arm26/kernel/setup.c 2007-01-31 22:15:30.000000000 +0200
+++ linux-2.6.20-rc6-mm3/arch/arm26/kernel/setup.c 2007-01-31 22:19:30.000000000 +0200
@@ -80,7 +80,7 @@ unsigned long phys_initrd_size __initdat
static struct meminfo meminfo __initdata = { 0, };
static struct proc_info_item proc_info;
static const char *machine_name;
-static char __initdata command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE] = "";

static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;