aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDou Liyang <douly.fnst@cn.fujitsu.com>2017-12-03 23:03:12 -0500
committerThomas Gleixner <tglx@linutronix.de>2017-12-28 06:32:06 -0500
commit4fcab6693445cfb84f2b65868c58043535090e52 (patch)
tree4e1cc9ffdd07d206ce6345d9111bfbe2cc1c5a59
parentac461122c88a10b7d775de2f56467f097c9e627a (diff)
x86/apic: Avoid wrong warning when parsing 'apic=' in X86-32 case
There are two consumers of apic=: apic_set_verbosity() for setting the APIC debug level; parse_apic() for registering APIC driver by hand. X86-32 supports both of them, but sometimes, kernel issues a weird warning. eg: when kernel was booted up with 'apic=bigsmp' in command line, early_param would warn like that: ... [ 0.000000] APIC Verbosity level bigsmp not recognised use apic=verbose or apic=debug [ 0.000000] Malformed early option 'apic' ... Wrap the warning code in CONFIG_X86_64 case to avoid this. Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: peterz@infradead.org Cc: rdunlap@infradead.org Cc: corbet@lwn.net Link: https://lkml.kernel.org/r/20171204040313.24824-1-douly.fnst@cn.fujitsu.com
-rw-r--r--arch/x86/kernel/apic/apic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 6e272f3ea984..880441f24146 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2626,11 +2626,13 @@ static int __init apic_set_verbosity(char *arg)
2626 apic_verbosity = APIC_DEBUG; 2626 apic_verbosity = APIC_DEBUG;
2627 else if (strcmp("verbose", arg) == 0) 2627 else if (strcmp("verbose", arg) == 0)
2628 apic_verbosity = APIC_VERBOSE; 2628 apic_verbosity = APIC_VERBOSE;
2629#ifdef CONFIG_X86_64
2629 else { 2630 else {
2630 pr_warning("APIC Verbosity level %s not recognised" 2631 pr_warning("APIC Verbosity level %s not recognised"
2631 " use apic=verbose or apic=debug\n", arg); 2632 " use apic=verbose or apic=debug\n", arg);
2632 return -EINVAL; 2633 return -EINVAL;
2633 } 2634 }
2635#endif
2634 2636
2635 return 0; 2637 return 0;
2636} 2638}