Re: [PATCH 05/10] mini-os: don't repeat definition available via header file

[Samuel Thibault <samuel.thibault@ens-lyon.org>]

Juergen Gross, le lun. 06 déc. 2021 08:23:32 +0100, a ecrit:
> arch/x86/setup.c is repeating the definition of __pte() instead using
> the appropriate header. Fix that.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

> ---
>  arch/x86/setup.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/arch/x86/setup.c b/arch/x86/setup.c
> index 1ec68d3..b27bbed 100644
> --- a/arch/x86/setup.c
> +++ b/arch/x86/setup.c
> @@ -29,6 +29,7 @@
>  #include <mini-os/os.h>
>  #include <mini-os/lib.h> /* for printk, memcpy */
>  #include <mini-os/kernel.h>
> +#include <mini-os/hypervisor.h>
>  #include <xen/xen.h>
>  #include <xen/arch-x86/cpuid.h>
>  #include <xen/arch-x86/hvm/start_info.h>
> @@ -61,13 +62,6 @@ char stack[2*STACK_SIZE];
>  
>  extern char shared_info[PAGE_SIZE];
>  
> -#if defined(__x86_64__)
> -#define __pte(x) ((pte_t) { (x) } )
> -#else
> -#define __pte(x) ({ unsigned long long _x = (x);        \
> -    ((pte_t) {(unsigned long)(_x), (unsigned long)(_x>>32)}); })
> -#endif
> -
>  static inline void fpu_init(void) {
>  	asm volatile("fninit");
>  }
> -- 
> 2.26.2
> 

-- 
Samuel
 jr> J'ai fait.
 Ne bougez pas, l'aide soignante va venir nettoyer.
 -+- FF in GNU - Le vieil homme et la merde -+-