diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-10-11 11:56:19 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-10-19 22:17:12 -0400 |
| commit | 20250c0b1f6de53b2bfddd1c714fb8c97e655ce2 (patch) | |
| tree | 3d67d0922a68c11bc71218880844233604ebf50d /src/include/kernel | |
| parent | 281503375a8c02c78b8fa188c58c6207affe3713 (diff) | |
| download | talos-hostboot-20250c0b1f6de53b2bfddd1c714fb8c97e655ce2.tar.gz talos-hostboot-20250c0b1f6de53b2bfddd1c714fb8c97e655ce2.zip | |
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 <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/kernel')
| -rw-r--r-- | src/include/kernel/heapmgr.H | 10 |
1 files changed, 9 insertions, 1 deletions
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 <stdint.h> -#include <util/lockfree/stack.H> #include <builtins.h> #include <kernel/types.h> +#ifndef __HOSTBOOT_RUNTIME +#include <util/lockfree/stack.H> +#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 |
