Skip to content
Permalink
Browse files

Fix broken build by PR#255.

Signed-off-by: Colin Xu <colin.xu@intel.com>
  • Loading branch information
coxuintel committed Dec 26, 2019
1 parent a797927 commit ea1a80e3effd987c46ec31c63a763dff4384331a
@@ -218,6 +218,8 @@ void hax_unmap_page(struct hax_page *page);
void hax_log(int level, const char *fmt, ...);
void hax_panic(const char *fmt, ...);

uint32_t hax_cpu_id(void);

#ifdef __cplusplus
}
#endif
@@ -315,7 +317,6 @@ static inline bool cpu_is_online(hax_cpumap_t *cpu_map, uint32_t cpu_id)
return !!(((hax_cpumask_t)1 << bit) & map);
}

extern uint32_t hax_cpu_id(void);
static inline void get_online_map(void *param)
{
hax_cpumap_t *omap = (hax_cpumap_t *)param;
@@ -78,8 +78,8 @@ extern "C" void hax_panic(const char *fmt, ...)
va_end(args);
}

extern int cpu_number(void);
inline uint32_t hax_cpu_id(void)
extern "C" int cpu_number(void);
extern "C" uint32_t hax_cpu_id(void)
{
return (uint32_t)cpu_number();
}
@@ -81,7 +81,7 @@ void hax_panic(const char *fmt, ...)
va_end(args);
}

inline uint32_t hax_cpu_id(void)
uint32_t hax_cpu_id(void)
{
return (uint32_t)smp_processor_id();
}
@@ -73,7 +73,7 @@ void hax_panic(const char *fmt, ...)
va_end(args);
}

inline uint32_t hax_cpu_id(void)
uint32_t hax_cpu_id(void)
{
return (uint32_t)cpu_number();
}
@@ -31,7 +31,7 @@
#include "hax_win.h"
#include "../../core/include/ia32.h"

inline uint32_t hax_cpu_id(void)
uint32_t hax_cpu_id(void)
{
PROCESSOR_NUMBER ProcNumber = {0};
return (uint32_t)KeGetCurrentProcessorNumberEx(&ProcNumber);

0 comments on commit ea1a80e

Please sign in to comment.
You can’t perform that action at this time.