From a751e96b1a3fe71929a73704de327336972b7082 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 7 Sep 2018 15:38:33 +0900 Subject: [PATCH] Add mck_num_processors symbol pointing to num_processors the 'num_processors' symbol is also used by linux, so trying to load all symbols from linux and mckernel at the same time renders either symbol inaccessible (the first to be seen is kept by default). This provides an alternate name for the mckernel symbol, thus letting us access both more easily if required. Change-Id: I8074d4f9f9ac45717df9a8df16be710ff762e161 --- kernel/init.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/init.c b/kernel/init.c index 25a805dd..2618b983 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -59,6 +59,13 @@ static void handler_init(void) ihk_mc_set_syscall_handler(syscall); } + +/* Symbols with name conflict with the linux kernel + * Give the possibility to load all symbols at the same time + */ +int *mck_num_processors = &num_processors; + + unsigned long data[1024] __attribute__((aligned(64))); #ifdef USE_DMA