Re: [PATCH gnumach] model_dep: Call acpi_apic_init if APIC defined

[Samuel Thibault]

Applied, thanks!

Damien Zammit, le dim. 19 févr. 2023 02:24:03 +0000, a ecrit:
> Fixes boot --enable-ncpus=1 with --enable-apic configuration
> albeit the keyboard is stuck and network cannot be accessed.
> 
> Error messages:
> 
> Timeout reached while wating for return value
> /bin/console: Could not receive return value from daemon process: Connection 
> timed out
> ---
>  i386/i386at/model_dep.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
> index 5bde5d17..baff8da1 100644
> --- a/i386/i386at/model_dep.c
> +++ b/i386/i386at/model_dep.c
> @@ -162,9 +162,10 @@ void machine_init(void)
>  #ifdef MACH_HYP
>       hyp_init();
>  #else        /* MACH_HYP */
> -
> -#if (NCPUS > 1)
> +#if defined(APIC)
>       acpi_apic_init();
> +#endif
> +#if (NCPUS > 1)
>       smp_init();
>  #endif
>  #if defined(APIC)
> --
> 2.34.1
> 
> 
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.