Disable page castout test

Disabling the page castout test because it happens anyway already
and it takes a long time with all of the mainstore space we have
now.  I also fixed a missed todo in ptmgr related to expanding
into mainstore.

Change-Id: I9d2027a13cc968ab33c0d5a61d5023b6cebc9add
RTC: 37748
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2371
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 9 insertions, 17 deletions

diff --git a/src/kernel/ptmgr.C b/src/kernel/ptmgr.C
index 573712994..019563cd1 100644
--- a/src/kernel/ptmgr.C
+++ b/src/kernel/ptmgr.C
@@ -322,17 +322,8 @@ PageTableManager::PageTableManager( bool i_userSpace )
 {
     if( i_userSpace )
     {
-        //@TODO: Remove with 43401.
-        // Don't have enough contiguous memory to do this allocation, so
-        // allocate a VMM block instead.
-        ivTABLE = reinterpret_cast<char*>(VMM_VADDR_RMVPAGE_TEST - getSize());
-        mm_alloc_block(NULL, ivTABLE, getSize());
-        mm_set_permission(ivTABLE, getSize(), WRITABLE | ALLOCATE_FROM_ZERO);
-
-        //@TODO: Add back after 43401.
-        //ivTABLE = new char[getSize()];
-
-        //printk( "** PageTableManager running in USER_SPACE : ivTABLE = %p**\n", ivTABLE );
+        ivTABLE = new char[getSize()];
+        printk( "** PageTableManager running in USER_SPACE : ivTABLE = %p**\n", ivTABLE );
     }
     else
     {
@@ -362,11 +353,7 @@ void PageTableManager::invalidatePT( void )
 PageTableManager::~PageTableManager()
 {
     if( ivTABLE ) {
-        //@TODO: Remove after 43401.
-        mm_remove_pages(RELEASE, ivTABLE, getSize());
-
-        //@TODO: Add back after 43401.
-        //delete[] ivTABLE;
+        delete[] ivTABLE;
     }
 }
 
diff --git a/src/usr/testcore/kernel/vmmbasetest.H b/src/usr/testcore/kernel/vmmbasetest.H
index ce5fd990b..fbfdddf70 100644
--- a/src/usr/testcore/kernel/vmmbasetest.H
+++ b/src/usr/testcore/kernel/vmmbasetest.H
@@ -90,7 +90,12 @@ class VmmBaseTest : public CxxTest::TestSuite
             // @TODO. VMM not ready.
         }
 
-        void testCastOutPages()
+        // Do not run this test by default since we now have a lot of
+        //  mainstore to fill up.  We know that this function gets
+        //  tested during the IPL so the unit test isn't required.
+        //  However, leaving it here in case we want to run some
+        //  targeted tests at a later date.
+        void skipme_testCastOutPages()
         {
             uint64_t l_testAddr = VMM_VADDR_RMVPAGE_TEST;
             uint64_t l_testSize = VMM_SIZE_RMVPAGE_TEST;