From 20250c0b1f6de53b2bfddd1c714fb8c97e655ce2 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Wed, 11 Oct 2017 11:56:19 -0500 Subject: Ensure AbaPtr is not used in runtime code The AbaPtr makes assumptions that we have pointer values that are only 32-bits long. In our runtime (HBRT) environment that assumption is not true so we need to make sure none of the code that runs there is trying to use the AbaPtr code. Change-Id: I0a26558f305fada723bf3cb3447a2bdfddb194d0 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48248 Reviewed-by: Martin Gloff Tested-by: Jenkins Server Reviewed-by: Matt Derksen Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/include/kernel/heapmgr.H | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/include/kernel') diff --git a/src/include/kernel/heapmgr.H b/src/include/kernel/heapmgr.H index bf4fe1cc7..9f1d0a7ed 100644 --- a/src/include/kernel/heapmgr.H +++ b/src/include/kernel/heapmgr.H @@ -26,10 +26,13 @@ #define __KERNEL_HEAPMGR_H #include -#include #include #include +#ifndef __HOSTBOOT_RUNTIME +#include +#endif + extern "C" void kernel_execute_decrementer(); @@ -81,6 +84,8 @@ class HeapManager }; +// we only want the constants in HBRT +#ifndef __HOSTBOOT_RUNTIME friend class CpuManager; friend void kernel_execute_decrementer(); @@ -231,5 +236,8 @@ class HeapManager static uint32_t cv_smallheap_page_count; //!< # of pages being used static uint32_t cv_largeheap_page_count; //!< # of pages being used static uint32_t cv_largeheap_page_max; //!< Max # of pages used + +#endif //__HOSTBOOT_RUNTIME + }; #endif -- cgit v1.2.3