From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 6 Aug 2014 16:01:55 +0000 (+0200)
Subject: x86/APIC: command line option adjustments
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4546
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=793e3480fc1cbed33add75f017495e93c112f4b5;p=xen.git

x86/APIC: command line option adjustments

Improving their documentation, and converting one option to boolean
since it has only boolean meaning.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown
index 4afa84f357..449219512a 100644
--- a/docs/misc/xen-command-line.markdown
+++ b/docs/misc/xen-command-line.markdown
@@ -674,6 +674,10 @@ debug hypervisor only).
 > `= <integer>`
 
 ### ioapic\_ack
+> `= old | new`
+
+> Default: `new` unless directed-EOI is supported
+
 ### iommu
 > `= List of [ <boolean> | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | verbose | debug ]`
 
@@ -789,10 +793,10 @@ Force the use of `[<seg>:]<bus>:<device>.<func>` as device ID of IO-APIC
 ACPI table.
 
 ### lapic
+> `= <boolean>`
 
 Force the use of use of the local APIC on a uniprocessor system, even
-if left disabled by the BIOS.  This option will accept any value at
-all.
+if left disabled by the BIOS.
 
 ### lapic\_timer\_c2\_ok
 > `= <boolean>`
@@ -828,6 +832,9 @@ with **crashinfo_maxaddr**.
 ### max\_gsi\_irqs
 > `= <integer>`
 
+Specifies the number of interrupts to be use for pin (IO-APIC or legacy PIC)
+based interrupts. Any higher IRQs will be available for use via PCI MSI.
+
 ### maxcpus
 > `= <integer>`
 
@@ -912,7 +919,7 @@ IRQ routing issues.
 > Default: `false`
 
 Ignore the local APIC on a uniprocessor system, even if enabled by the
-BIOS.  This option will accept value.
+BIOS.
 
 ### no-real-mode (x86)
 > `= <boolean>`
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index bbcc0a16d0..9cbfa6ae64 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -815,12 +815,7 @@ static void __init lapic_disable(char *str)
     setup_clear_cpu_cap(X86_FEATURE_APIC);
 }
 custom_param("nolapic", lapic_disable);
-
-static void __init lapic_enable(char *str)
-{
-    enable_local_apic = 1;
-}
-custom_param("lapic", lapic_enable);
+boolean_param("lapic", enable_local_apic);
 
 static void __init apic_set_verbosity(char *str)
 {