Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: client/tests/kvm/tests/ksm_overcommit.py

Issue 3554003: Merge remote branch 'cros/upstream' into tempbranch3 (Closed) Base URL: http://git.chromium.org/git/autotest.git
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/tests/kvm/tests/build.py ('k') | client/tests/kvm/tests/pci_hotplug.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/kvm/tests/ksm_overcommit.py
diff --git a/client/tests/kvm/tests/ksm_overcommit.py b/client/tests/kvm/tests/ksm_overcommit.py
index 2b49a651f1d54c736d6e27c8591effd5f9f8618c..dd4a30d1a0d568d23849790d306a0805d457bce8 100644
--- a/client/tests/kvm/tests/ksm_overcommit.py
+++ b/client/tests/kvm/tests/ksm_overcommit.py
@@ -372,6 +372,11 @@ def run_ksm_overcommit(test, params, env):
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:
« no previous file with comments | « client/tests/kvm/tests/build.py ('k') | client/tests/kvm/tests/pci_hotplug.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698