--- a/hotspot/src/cpu/zero/vm/stack_zero.cpp	Wed Jul 27 17:28:36 2011 -0700
+++ b/hotspot/src/cpu/zero/vm/stack_zero.cpp	Thu Jul 28 02:14:44 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -69,7 +69,8 @@
     break;
 
   case _thread_in_vm:
-    Exceptions::throw_stack_overflow_exception(thread, __FILE__, __LINE__);
+    Exceptions::throw_stack_overflow_exception(thread, __FILE__, __LINE__,
+                                               methodHandle());
     break;
 
   default:

--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed Jul 27 17:28:36 2011 -0700
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Thu Jul 28 02:14:44 2011 -0700
@@ -1281,7 +1281,6 @@
                                                                           \
   declare_toplevel_type(StubQueue)                                        \
   declare_toplevel_type(StubRoutines)                                     \
-  IA32_ONLY(declare_toplevel_type(StubRoutines::x86))                     \
   declare_toplevel_type(Stub)                                             \
            declare_type(InterpreterCodelet, Stub)                         \
                                                                           \