Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07ee862 authored by Horms's avatar Horms Committed by Tony Luck
Browse files

[IA64] Ensure that machvec is set up takes place before serial console 



Parse the machvec command line option outside of the early_param()
so that ia64_mv is set before any console intialisation that
may result from early_param parsing.

Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 6ffbc823

arch/ia64/kernel/machvec.c

+18 −9
Original line number Diff line number Diff line
@@ -13,14 +13,6 @@ 
struct ia64_machine_vector ia64_mv;

EXPORT_SYMBOL(ia64_mv);



static __initdata const char *mvec_name;

static __init int setup_mvec(char *s)

{

	mvec_name = s;

	return 0;

}

early_param("machvec", setup_mvec);



static struct ia64_machine_vector * __init

lookup_machvec (const char *name)

{
@@ -41,7 +33,7 @@ machvec_init (const char *name) 
	struct ia64_machine_vector *mv;



	if (!name)

		name = mvec_name ? mvec_name : acpi_get_sysname();

		name = acpi_get_sysname();

	mv = lookup_machvec(name);

	if (!mv)

		panic("generic kernel failed to find machine vector for"
@@ -51,6 +43,23 @@ machvec_init (const char *name) 
	printk(KERN_INFO "booting generic kernel on platform %s\n", name);

}



void __init

machvec_init_from_cmdline(const char *cmdline)

{

	char str[64];

	const char *start;

	char *end;



	if (! (start = strstr(cmdline, "machvec=")) )

		return machvec_init(NULL);



	strlcpy(str, start + strlen("machvec="), sizeof(str));

	if ( (end = strchr(str, ' ')) )

		*end = '\0';



	return machvec_init(str);

}



#endif /* CONFIG_IA64_GENERIC */



void

arch/ia64/kernel/setup.c

+8 −3
Original line number Diff line number Diff line
@@ -491,12 +491,17 @@ setup_arch (char **cmdline_p) 
	efi_init();

	io_port_init();



	parse_early_param();



#ifdef CONFIG_IA64_GENERIC

	machvec_init(NULL);

	/* machvec needs to be parsed from the command line

	 * before parse_early_param() is called to ensure

	 * that ia64_mv is initialised before any command line

	 * settings may cause console setup to occur

	 */

	machvec_init_from_cmdline(*cmdline_p);

#endif



	parse_early_param();



	if (early_console_setup(*cmdline_p) == 0)

		mark_bsp_online();

include/asm-ia64/machvec.h

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ struct ia64_machine_vector { 


extern struct ia64_machine_vector ia64_mv;

extern void machvec_init (const char *name);

extern void machvec_init_from_cmdline(const char *cmdline);



# else

#  error Unknown configuration.  Update asm-ia64/machvec.h.