Revert "Merge remote branch 'cros/upstream' into tempbranch2"

client/tests/kvm/tests/ksm_overcommit.py

 import logging, time, random, string, math, os, tempfile
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.bin import utils
 import kvm_subprocess, kvm_test_utils, kvm_utils, kvm_preprocessing
 
 
 def run_ksm_overcommit(test, params, env):
     """
     Test how KSM (Kernel Shared Memory) act when more than physical memory is
     used. In second part we also test how KVM handles a situation when the host
@@ skipping 354 matching lines @@
         vm.destroy(gracefully = False)
 
 
     # Main test code
     logging.info("Starting phase 0: Initialization")
     new_ksm = False
     if (os.path.exists("/sys/kernel/mm/ksm/run")):
         utils.run("echo 50 > /sys/kernel/mm/ksm/sleep_millisecs")
         utils.run("echo 5000 > /sys/kernel/mm/ksm/pages_to_scan")
         utils.run("echo 1 > /sys/kernel/mm/ksm/run")
-
-        if (os.path.exists("/sys/kernel/mm/transparent_hugepage/enabled")):
-            utils.run("echo 'never' > /sys/kernel/mm/transparent_hugepage/enabled ")
-        if (os.path.exists("/sys/kernel/mm/redhat_transparent_hugepage/enabled")):
-            utils.run("echo 'never' > /sys/kernel/mm/redhat_transparent_hugepage/enabled ")
         new_ksm = True
     else:
         try:
             utils.run("modprobe ksm")
             utils.run("ksmctl start 5000 100")
         except error.CmdError, e:
             raise error.TestFail("Failed to load KSM: %s" % e)
 
     # host_reserve: mem reserve kept for the host system to run
     host_reserve = int(params.get("ksm_host_reserve", -1))
@@ skipping 224 matching lines @@
     if params['ksm_mode'] == "parallel":
         logging.info("Starting KSM test parallel mode")
         split_parallel()
         logging.info("KSM test parallel mode: PASS")
     elif params['ksm_mode'] == "serial":
         logging.info("Starting KSM test serial mode")
         initialize_guests()
         separate_first_guest()
         split_guest()
         logging.info("KSM test serial mode: PASS")