[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [mini-os master] mini-os: don't repeat definition available via header file
commit 7749b0814a194b1853390b4994737e584b0a3ca1 Author: Juergen Gross <jgross@xxxxxxxx> AuthorDate: Tue Dec 21 09:46:31 2021 +0100 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Tue Dec 21 10:53:49 2021 +0000 mini-os: don't repeat definition available via header file arch/x86/setup.c is repeating the definition of __pte() instead using the appropriate header. Fix that. Signed-off-by: Juergen Gross <jgross@xxxxxxxx> Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> --- 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"); } -- generated by git-patchbot for /home/xen/git/mini-os.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |