# HG changeset patch
# User rraghavan
# Date 1497871396 0
# Node ID 34a17324cd6579b6bb44303840b290bdf2e155ea
# Parent  2d4e14c79154c48b3c03caa951bf65a272e6fdd7# Parent  744e7a498dac51a7058308c64a139dfa4c295554
Merge

diff -r 2d4e14c79154 -r 34a17324cd65 hotspot/src/cpu/x86/vm/vm_version_x86.cpp
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp	Fri May 12 14:59:35 2017 +0800
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp	Mon Jun 19 11:23:16 2017 +0000
@@ -641,9 +641,6 @@
     _features &= ~CPU_VZEROUPPER;
   }
 
-  if (!UseAES && !FLAG_IS_DEFAULT(UseAES))
-    _features &= ~CPU_AES;
-
   if (logical_processors_per_package() == 1) {
     // HT processor could be installed on a system which doesn't support HT.
     _features &= ~CPU_HT;