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

Commit 79af9bec authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic - unify apic_set_verbosity 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0b23e8cf

arch/x86/kernel/apic_32.c

+14 −3
Original line number Diff line number Diff line
@@ -1768,13 +1768,24 @@ early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok); 


static int __init apic_set_verbosity(char *arg)

{

	if (!arg)

	if (!arg)  {

#ifdef CONFIG_X86_64

		skip_ioapic_setup = 0;

		ioapic_force = 1;

		return 0;

#endif

		return -EINVAL;

	}



	if (strcmp(arg, "debug") == 0)

	if (strcmp("debug", arg) == 0)

		apic_verbosity = APIC_DEBUG;

	else if (strcmp(arg, "verbose") == 0)

	else if (strcmp("verbose", arg) == 0)

		apic_verbosity = APIC_VERBOSE;

	else {

		printk(KERN_WARNING "APIC Verbosity level %s not recognised"

			" use apic=verbose or apic=debug\n", arg);

		return -EINVAL;

	}



	return 0;

}

arch/x86/kernel/apic_64.c

+25 −21
Original line number Diff line number Diff line
@@ -1759,27 +1759,6 @@ early_param("nox2apic", setup_nox2apic); 
/*

 * APIC command line parameters

 */

static int __init apic_set_verbosity(char *str)

{

	if (str == NULL)  {

		skip_ioapic_setup = 0;

		ioapic_force = 1;

		return 0;

	}

	if (strcmp("debug", str) == 0)

		apic_verbosity = APIC_DEBUG;

	else if (strcmp("verbose", str) == 0)

		apic_verbosity = APIC_VERBOSE;

	else {

		printk(KERN_WARNING "APIC Verbosity level %s not recognised"

				" use apic=verbose or apic=debug\n", str);

		return -EINVAL;

	}



	return 0;

}

early_param("apic", apic_set_verbosity);



static __init int setup_disableapic(char *str)

{

	disable_apic = 1;
@@ -1824,6 +1803,31 @@ static __init int setup_apicpmtimer(char *s) 
}

__setup("apicpmtimer", setup_apicpmtimer);



static int __init apic_set_verbosity(char *arg)

{

	if (!arg)  {

#ifdef CONFIG_X86_64

		skip_ioapic_setup = 0;

		ioapic_force = 1;

		return 0;

#endif

		return -EINVAL;

	}



	if (strcmp("debug", arg) == 0)

		apic_verbosity = APIC_DEBUG;

	else if (strcmp("verbose", arg) == 0)

		apic_verbosity = APIC_VERBOSE;

	else {

		printk(KERN_WARNING "APIC Verbosity level %s not recognised"

			" use apic=verbose or apic=debug\n", arg);

		return -EINVAL;

	}



	return 0;

}

early_param("apic", apic_set_verbosity);



static int __init lapic_insert_resource(void)

{

	if (!apic_phys)