b6dd2fcf75
Drop JDK-8210416/RH1632174 applied upstream. Drop JDK-8210425/RH1632174 applied upstream. Drop JDK-8210647/RH1632174 applied upstream. Drop JDK-8210761/RH1632174 applied upstream. Drop JDK-8210703/RH1632174 applied upstream. Add cast to resolve s390 ambiguity in call to log2_intptr
13 lines
587 B
Diff
13 lines
587 B
Diff
diff --git openjdk.orig/jdk/src/hotspot/share/runtime/os.cpp openjdk/jdk/src/hotspot/share/runtime/os.cpp
|
|
--- openjdk.orig/src/hotspot/share/runtime/os.cpp
|
|
+++ openjdk/src/hotspot/share/runtime/os.cpp
|
|
@@ -1368,7 +1368,7 @@
|
|
}
|
|
|
|
void os::set_memory_serialize_page(address page) {
|
|
- int count = log2_intptr(sizeof(class JavaThread)) - log2_int(64);
|
|
+ int count = log2_intptr((uintptr_t) sizeof(class JavaThread)) - log2_int(64);
|
|
_mem_serialize_page = (volatile int32_t *)page;
|
|
// We initialize the serialization page shift count here
|
|
// We assume a cache line size of 64 bytes
|