# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1329215541 -3600
# Node ID d8a09bbba79aa9d592e53304ba451b5561b75df1
# Parent  717589e14dbd56d45812d4c4bb5dfd00da70bf33
Fix merge

diff -r 717589e14dbd -r d8a09bbba79a src/cpu/x86/vm/c2_globals_x86.hpp
--- a/src/cpu/x86/vm/c2_globals_x86.hpp	Tue Feb 14 11:28:57 2012 +0100
+++ b/src/cpu/x86/vm/c2_globals_x86.hpp	Tue Feb 14 11:32:21 2012 +0100
@@ -39,6 +39,7 @@
 define_pd_global(bool, PreferInterpreterNativeStubs, false);
 define_pd_global(bool, ProfileTraps,                 true);
 define_pd_global(bool, UseOnStackReplacement,        true);
+define_pd_global(intx, TypeProfileWidth,             2   );
 #ifdef CC_INTERP
 define_pd_global(bool, ProfileInterpreter,           false);
 #else