patch-2.4.0-test10 linux/arch/alpha/kernel/setup.c

• Lines: 100
• Date: Fri Oct 27 10:55:01 2000
• Orig file: v2.4.0-test9/linux/arch/alpha/kernel/setup.c
• Orig date: Tue Jul 18 22:58:28 2000

diff -u --recursive --new-file v2.4.0-test9/linux/arch/alpha/kernel/setup.c linux/arch/alpha/kernel/setup.c
@@ -449,17 +449,13 @@
 }
 
 static struct console srmcons = {
-        "srm0",
-        srm_console_write,
-        NULL,
-        srm_console_device,
-        srm_console_wait_key,
-        NULL,
-	srm_console_setup,
-        CON_PRINTBUFFER | CON_ENABLED, /* fake it out */
-        -1,
-        0,
-        NULL
+	name:		"srm0",
+	write:		srm_console_write,
+	device:		srm_console_device,
+	wait_key:	srm_console_wait_key,
+	setup:		srm_console_setup,
+	flags:		CON_PRINTBUFFER | CON_ENABLED, /* fake it out */
+	index:		-1,
 };
 
 #else
@@ -683,7 +679,7 @@
 static struct alpha_machine_vector * __init
 get_sysvec(long type, long variation, long cpu)
 {
-	static struct alpha_machine_vector *systype_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *systype_vecs[] __initdata =
 	{
 		NULL,		/* 0 */
 		NULL,		/* ADU */
@@ -726,48 +722,48 @@
 		NULL,		/* Titan */
 	};
 
-	static struct alpha_machine_vector *unofficial_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *unofficial_vecs[] __initdata =
 	{
 		NULL,		/* 100 */
 		&ruffian_mv,
 	};
 
-	static struct alpha_machine_vector *api_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *api_vecs[] __initdata =
 	{
 		NULL,		/* 200 */
 		&nautilus_mv,
 	};
 
-	static struct alpha_machine_vector *alcor_vecs[] __initlocaldata = 
+	static struct alpha_machine_vector *alcor_vecs[] __initdata = 
 	{
 		&alcor_mv, &xlt_mv, &xlt_mv
 	};
 
-	static struct alpha_machine_vector *eb164_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *eb164_vecs[] __initdata =
 	{
 		&eb164_mv, &pc164_mv, &lx164_mv, &sx164_mv, &rx164_mv
 	};
 
-	static struct alpha_machine_vector *eb64p_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *eb64p_vecs[] __initdata =
 	{
 		&eb64p_mv,
 		&cabriolet_mv,
 		&cabriolet_mv		/* AlphaPCI64 */
 	};
 
-	static struct alpha_machine_vector *eb66_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *eb66_vecs[] __initdata =
 	{
 		&eb66_mv,
 		&eb66p_mv
 	};
 
-	static struct alpha_machine_vector *titan_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *titan_vecs[] __initdata =
 	{
 		NULL,
 		&privateer_mv,		/* privateer */
 	};
 
-	static struct alpha_machine_vector *tsunami_vecs[]  __initlocaldata =
+	static struct alpha_machine_vector *tsunami_vecs[]  __initdata =
 	{
 		NULL,
 		&dp264_mv,		/* dp264 */
@@ -860,7 +856,7 @@
 static struct alpha_machine_vector * __init
 get_sysvec_byname(const char *name)
 {
-	static struct alpha_machine_vector *all_vecs[] __initlocaldata =
+	static struct alpha_machine_vector *all_vecs[] __initdata =
 	{
 		&alcor_mv,
 		&alphabook1_mv,