diff options
Diffstat (limited to 'src/kernel/block.C')
| -rw-r--r-- | src/kernel/block.C | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/src/kernel/block.C b/src/kernel/block.C index 8afc39ae7..1ea12d2c0 100644 --- a/src/kernel/block.C +++ b/src/kernel/block.C @@ -1,26 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/kernel/block.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/block.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,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 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 <limits.h> #include <assert.h> #include <string.h> @@ -38,6 +37,7 @@ #include <kernel/console.H> #include <util/align.H> #include <kernel/basesegment.H> +#include <arch/ppc.H> // Track eviction requests due to aging pages uint32_t Block::cv_ro_evict_req = 0; @@ -265,6 +265,7 @@ uint64_t Block::findPhysicalAddress(uint64_t i_vaddr) const { paddr = pte->getPageAddr(); paddr += i_vaddr % PAGESIZE; + paddr |= getHRMOR(); } return paddr; |
