On 05/20/14 at 12:57am, Rafael J. Wysocki wrote:
> On Monday, May 05, 2014 12:48:25 PM Baoquan He wrote:
> > This variable was defined and assigned in x86, is used to indicate
> > whether LAPIC exists in MADT. Now introduce it into ia64 to help
> > make correct judgment when get information for acpi processor later.
> >
> > Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
>
> This and [2/2] queued up for 3.16, thanks!
Thanks, Rafael!
>
> > ---
> > arch/ia64/include/asm/acpi.h | 1 +
> > arch/ia64/kernel/acpi.c | 3 +++
> > 2 files changed, 4 insertions(+)
> >
> > diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
> > index d651102..b478219 100644
> > --- a/arch/ia64/include/asm/acpi.h
> > +++ b/arch/ia64/include/asm/acpi.h
> > @@ -85,6 +85,7 @@ ia64_acpi_release_global_lock (unsigned int *lock)
> > ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
> >
> > #ifdef CONFIG_ACPI
> > +extern int acpi_lapic;
> > #define acpi_disabled 0 /* ACPI always enabled on IA64 */
> > #define acpi_noirq 0 /* ACPI always enabled on IA64 */
> > #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
> > diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
> > index 0d407b3..615ef81 100644
> > --- a/arch/ia64/kernel/acpi.c
> > +++ b/arch/ia64/kernel/acpi.c
> > @@ -56,6 +56,7 @@
> >
> > #define PREFIX "ACPI: "
> >
> > +int acpi_lapic;
> > unsigned int acpi_cpei_override;
> > unsigned int acpi_cpei_phys_cpuid;
> >
> > @@ -676,6 +677,8 @@ int __init early_acpi_boot_init(void)
> > if (ret < 1)
> > printk(KERN_ERR PREFIX
> > "Error parsing MADT - no LAPIC entries\n");
> > + else
> > + acpi_lapic = 1;
> >
> > #ifdef CONFIG_SMP
> > if (available_cpus == 0) {
> >
>
> --
> I speak only for myself.
> Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
