diff --git a/src/hotspot/share/prims/upcallLinker.cpp b/src/hotspot/share/prims/upcallLinker.cpp
index bc6a56dab05..4a7c613123c 100644
--- a/src/hotspot/share/prims/upcallLinker.cpp
+++ b/src/hotspot/share/prims/upcallLinker.cpp
@@ -130,7 +130,7 @@ void UpcallLinker::on_exit(UpcallStub::FrameData* context) {
   JNIHandleBlock::release_block(context->new_handles, thread);
 }
 
-void UpcallLinker::handle_uncaught_exception(oop exception) {
+void UpcallLinker::handle_uncaught_exception(oopDesc* exception) {
   tty->print_cr("Uncaught exception:");
   Handle exception_h(Thread::current(), exception);
   java_lang_Throwable::print_stack_trace(exception_h, tty);
diff --git a/src/hotspot/share/prims/upcallLinker.hpp b/src/hotspot/share/prims/upcallLinker.hpp
index f3275a22ef0..65699e0f1ff 100644
--- a/src/hotspot/share/prims/upcallLinker.hpp
+++ b/src/hotspot/share/prims/upcallLinker.hpp
@@ -44,7 +44,7 @@ public:
                                   bool needs_return_buffer, int ret_buf_size);
 
   // public for stubGenerator
-  static void handle_uncaught_exception(oop exception);
+  static void handle_uncaught_exception(oopDesc* exception);
 };
 
 #endif // SHARE_VM_PRIMS_UPCALLLINKER_HPP
diff --git a/test/jdk/java/foreign/TestUpcallStress.java b/test/jdk/java/foreign/TestUpcallStress.java
index d910723b559..152c76fc2a2 100644
--- a/test/jdk/java/foreign/TestUpcallStress.java
+++ b/test/jdk/java/foreign/TestUpcallStress.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @requires jdk.foreign.linker != "FALLBACK"
- * @requires (os.arch == "aarch64" | os.arch=="riscv64") & os.name == "Linux"
+ * @requires (os.arch == "aarch64" | os.arch=="riscv64" | os.arch=="x86_64" | os.arch=="amd64") & os.name == "Linux"
  * @requires os.maxMemory > 4G
  * @requires vm.compMode != "Xcomp"
  * @modules java.base/jdk.internal.foreign