diff options
author | Patrick Williams <iawillia@us.ibm.com> | 2012-07-03 13:40:36 -0500 |
---|---|---|
committer | Douglas R. Gilbert <dgilbert@us.ibm.com> | 2012-07-03 16:05:19 -0500 |
commit | dfff59856617139f7776d473fdc226a91761128e (patch) | |
tree | ecbd6f52bee214cd3bd15acdc120c9747be2d9f9 /src/kernel | |
parent | 84ca59a64988ff565f6b9127cb8749c92e996a24 (diff) | |
download | talos-hostboot-dfff59856617139f7776d473fdc226a91761128e.tar.gz talos-hostboot-dfff59856617139f7776d473fdc226a91761128e.zip |
Fix gerrit/master failures.
Opened Issue 44509 to resolve MDIA issue.
Opened Issue 44511 to resolve OOM.
Change-Id: I5b1e577fb45344a1bed0cfb33ded98ecc836bdf5
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1291
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/pagemgr.C | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/src/kernel/pagemgr.C b/src/kernel/pagemgr.C index cf9287a27..fb969ce87 100644 --- a/src/kernel/pagemgr.C +++ b/src/kernel/pagemgr.C @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/kernel/pagemgr.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2010 - 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/pagemgr.C $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2010-2012 + * + * 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_TAG + */ #include <limits.h> #include <kernel/pagemgr.H> #include <util/singleton.H> @@ -187,6 +188,9 @@ void PageManager::coalesce( void ) // Coalsesce adjacent free memory blocks void PageManager::_coalesce( void ) { + // TODO: Issue 44511 - Function appears to leak memory. + return; + // Look at all the "free buckets" and find blocks to merge // Since this is binary, all merges will be from the same free bucket // Each bucket is a stack of non-allocated memory blocks of the same size |