--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Sun Sep 11 14:48:24 2011 -0700
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Mon Sep 12 13:51:40 2011 -0700
@@ -1341,6 +1341,7 @@
   declare_unsigned_integer_type(unsigned int)                             \
   declare_unsigned_integer_type(uint)                                     \
   declare_unsigned_integer_type(unsigned short)                           \
+  declare_unsigned_integer_type(jushort)                                  \
   declare_unsigned_integer_type(unsigned long)                            \
   /* The compiler thinks this is a different type than */                 \
   /* unsigned short on Win32 */                                           \
@@ -3216,7 +3217,7 @@
   if (!isRecurse) {
     tty->print_cr("type \"%s\" not found", typeName);
   }
-  return 2;
+  return 0;
 }