# HG changeset patch
# User never
# Date 1262816703 28800
# Node ID aad340e07bc41c7b02440b8451c96cf726ca3864
# Parent  b1f619d382492ab1a6acee8cfc4a01e67a2e2940# Parent  4ce7240d622cc57548a2c190852e9cec08245f61
Merge

diff -r 4ce7240d622c -r aad340e07bc4 src/share/vm/code/nmethod.cpp
--- a/src/share/vm/code/nmethod.cpp	Wed Jan 06 14:22:39 2010 -0800
+++ b/src/share/vm/code/nmethod.cpp	Wed Jan 06 14:25:03 2010 -0800
@@ -1170,7 +1170,7 @@
 }
 
 // Common functionality for both make_not_entrant and make_zombie
-bool nmethod::make_not_entrant_or_zombie(int state) {
+bool nmethod::make_not_entrant_or_zombie(unsigned int state) {
   assert(state == zombie || state == not_entrant, "must be zombie or not_entrant");
 
   // If the method is already zombie there is nothing to do
diff -r 4ce7240d622c -r aad340e07bc4 src/share/vm/code/nmethod.hpp
--- a/src/share/vm/code/nmethod.hpp	Wed Jan 06 14:22:39 2010 -0800
+++ b/src/share/vm/code/nmethod.hpp	Wed Jan 06 14:25:03 2010 -0800
@@ -255,7 +255,7 @@
   const char* reloc_string_for(u_char* begin, u_char* end);
   // Returns true if this thread changed the state of the nmethod or
   // false if another thread performed the transition.
-  bool make_not_entrant_or_zombie(int state);
+  bool make_not_entrant_or_zombie(unsigned int state);
   void inc_decompile_count();
 
   // used to check that writes to nmFlags are done consistently.