[Ltp-commits] [Git] ltp updated.

[Garrett C. <ris...@li...>]

The branch, pu, has been updated
       via  303a69af83bd2dd9bf358e50a11ef6b5b78e5041 (commit)
       via  b4bd3c001ec8d74bb5c85754b8c94f8f0b2770b8 (commit)
      from  1c9ec5ec1389062a4a091fee7295b36a6583df5d (commit)


- Log -----------------------------------------------------------------
commit 303a69af83bd2dd9bf358e50a11ef6b5b78e5041
Merge: b4bd3c001ec8d74bb5c85754b8c94f8f0b2770b8 1c9ec5ec1389062a4a091fee7295b36a6583df5d
Author: Garrett Cooper <yan...@gm...>
Date:   Thu Apr 15 22:13:27 2010 -0700

    Merge branch 'pu' of ssh://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev into pu

commit b4bd3c001ec8d74bb5c85754b8c94f8f0b2770b8
Author: Garrett Cooper <yan...@gm...>
Date:   Thu Apr 15 22:12:00 2010 -0700

    Fix inconsistent hugepages after setup call.
    
    If the system doesn't have hugepages support, then setup has no business being run.
    
    Signed-off-by: Garrett Cooper <yan...@gm...>

-----------------------------------------------------------------------

Summary of changes:
 .../kernel/mem/hugetlb/hugeshmget/hugeshmget01.c   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
index 6fa02ab..87e33ee 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
@@ -78,14 +78,14 @@ int main(int ac, char **av)
 		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
 	}
 
-	setup();			/* global setup */
-
 	/* The following loop checks looping state if -i option given */
         if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
              tst_brkm(TCONF, cleanup, "Not enough available Hugepages");
         else             
               huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
-        
+
+	setup();			/* global setup */
+
         for (lc = 0; TEST_LOOPING(lc); lc++) {
 		/* reset Tst_count in case we are looping */
 		Tst_count = 0;


hooks/post-receive
-- 
ltp