diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2014-02-17 17:29:55 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-27 11:38:43 -0600 |
| commit | 941d3e56f1f933dba3f98c3f82fae0561a5201e7 (patch) | |
| tree | f8f907280d7176c83685739ca03797eb822bbfe9 /src/kernel | |
| parent | 0f33e04d51a9ad3e37fa40db8970f166ff84432e (diff) | |
| download | talos-hostboot-941d3e56f1f933dba3f98c3f82fae0561a5201e7.tar.gz talos-hostboot-941d3e56f1f933dba3f98c3f82fae0561a5201e7.zip | |
Clean up beam errors in core.
Change-Id: I695a38ae88583a052cae19b930eb53171f8fab2b
RTC:94993
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9050
Tested-by: Jenkins Server
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/heapmgr.C | 2 | ||||
| -rw-r--r-- | src/kernel/ptmgr.C | 4 | ||||
| -rw-r--r-- | src/kernel/stacksegment.C | 46 | ||||
| -rw-r--r-- | src/kernel/vmmmgr.C | 6 |
4 files changed, 29 insertions, 29 deletions
diff --git a/src/kernel/heapmgr.C b/src/kernel/heapmgr.C index d09799a72..b9f8d4d37 100644 --- a/src/kernel/heapmgr.C +++ b/src/kernel/heapmgr.C @@ -446,7 +446,7 @@ void HeapManager::_coalesce() chunk = temp; } printkd("HeapMgr coalesced total %d\n",cv_coalesce_count); - test_pages(); /*no effect*/ // BEAM fix. + test_pages(); } void HeapManager::stats() diff --git a/src/kernel/ptmgr.C b/src/kernel/ptmgr.C index 6b6436d71..93dd2dc32 100644 --- a/src/kernel/ptmgr.C +++ b/src/kernel/ptmgr.C @@ -713,7 +713,7 @@ void PageTableManager::writePTE( PageTableEntry* i_pte, { // this should never happen because we should always go // through the delEntry() path instead - printPTE( "Stealing", i_dest ); /*no effect*/ // BEAM Fix. + printPTE( "Stealing", i_dest ); Eprintk( "**ERROR** PageTableManager::writePTE>" " Trying to steal a PTE\n" ); kassert(false); @@ -841,7 +841,7 @@ void PageTableManager::_printPT( void ) { if( pte->V == 1 ) { - printPTE( NULL, pte ); /*no effect*/ // BEAM Fix. + printPTE( NULL, pte ); } pte++; diff --git a/src/kernel/stacksegment.C b/src/kernel/stacksegment.C index fdc6c7a8f..2d15d8202 100644 --- a/src/kernel/stacksegment.C +++ b/src/kernel/stacksegment.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/kernel/stacksegment.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/kernel/stacksegment.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <assert.h> #include <util/singleton.H> @@ -58,7 +58,7 @@ StackSegment::~StackSegment() delete l_node->block; delete l_node; } - } while (l_node != NULL); /*using deallocated*/ // BEAM invalid error. + } while (l_node != NULL); } bool StackSegment::handlePageFault(task_t* i_task, uint64_t i_addr, diff --git a/src/kernel/vmmmgr.C b/src/kernel/vmmmgr.C index 223f4f4c6..941713f93 100644 --- a/src/kernel/vmmmgr.C +++ b/src/kernel/vmmmgr.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2010,2013 */ +/* COPYRIGHT International Business Machines Corp. 2010,2014 */ /* */ /* p1 */ /* */ @@ -54,7 +54,7 @@ void VmmManager::init() SegmentManager::initSLB(); v.initPTEs(); - v.initSDR1(); /*no effect*/ // BEAM Fix. + v.initSDR1(); }; @@ -63,7 +63,7 @@ void VmmManager::init_slb() VmmManager& v = Singleton<VmmManager>::instance(); SegmentManager::initSLB(); - v.initSDR1(); /*no effect*/ // BEAM Fix. + v.initSDR1(); } bool VmmManager::pteMiss(task_t* t, uint64_t effAddr, bool store) |
