diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-08-25 19:33:42 +1000 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-05-17 10:29:00 -0400 |
| commit | 7b9c08ba27912b81a699413afba749a48e353981 (patch) | |
| tree | ac1a40ff799eea9a0079f167c27391b3ce37c155 /src | |
| parent | 09f01f96d8935f7387dd75dafead6d23a83b545e (diff) | |
| download | talos-hostboot-7b9c08ba27912b81a699413afba749a48e353981.tar.gz talos-hostboot-7b9c08ba27912b81a699413afba749a48e353981.zip | |
Change cv_forcedMemPeriodic to uint8_t as bool is invalid
GCC6 throws the following error:
operand type ?bool*? is incompatible with argument 1
of ?__sync_fetch_and_and?
GCC documents that bool is invalid for __sync builtins over at
https://gcc.gnu.org/onlinedocs/gcc/
_005f_005fsync-Builtins.html#g_t_005f_005fsync-Builtins
"GCC allows any scalar type that is 1, 2, 4 or 8 bytes in size other
than the C type _Bool or the C++ type bool"
Change-Id: I4608b03e5d8aa16a0a350030b552a8f8e791649c
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36898
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/kernel/cpumgr.H | 2 | ||||
| -rw-r--r-- | src/kernel/cpumgr.C | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/include/kernel/cpumgr.H b/src/include/kernel/cpumgr.H index c3c8387d9..da669bdd8 100644 --- a/src/include/kernel/cpumgr.H +++ b/src/include/kernel/cpumgr.H @@ -224,7 +224,7 @@ class CpuManager */ static uint64_t cv_cpuSeq; - static bool cv_forcedMemPeriodic; //!< force free / coalesce. + static uint8_t cv_forcedMemPeriodic; //!< force free / coalesce. // If a shutdown of all CPUs is requested static bool cv_shutdown_requested; diff --git a/src/kernel/cpumgr.C b/src/kernel/cpumgr.C index e6c8348f5..2469ad36b 100644 --- a/src/kernel/cpumgr.C +++ b/src/kernel/cpumgr.C @@ -52,7 +52,7 @@ cpu_t** CpuManager::cv_cpus[KERNEL_MAX_SUPPORTED_NODES]; bool CpuManager::cv_shutdown_requested = false; uint64_t CpuManager::cv_shutdown_status = 0; size_t CpuManager::cv_cpuSeq = 0; -bool CpuManager::cv_forcedMemPeriodic = false; +uint8_t CpuManager::cv_forcedMemPeriodic = 0; InteractiveDebug CpuManager::cv_interactive_debug; CpuManager::CpuManager() : iv_lastStartTimebase(0) @@ -364,7 +364,7 @@ void CpuManager::executePeriodics(cpu_t * i_cpu) } bool forceMemoryPeriodic = __sync_fetch_and_and(&cv_forcedMemPeriodic, - false); + 0); ++(i_cpu->periodic_count); if((0 == (i_cpu->periodic_count % CPU_PERIODIC_CHECK_MEMORY)) || @@ -485,7 +485,7 @@ size_t CpuManager::getThreadCount() void CpuManager::forceMemoryPeriodic() { - cv_forcedMemPeriodic = true; + cv_forcedMemPeriodic = 1; } |
