Skip to content

Commit

Permalink
8312180: (bf) MappedMemoryUtils passes incorrect arguments to msync (…
Browse files Browse the repository at this point in the history
…aix)

Reviewed-by: clanger, stuefe
  • Loading branch information
Tyler Steele committed Aug 18, 2023
1 parent 7521211 commit fdac6a6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/hotspot/share/classfile/javaClasses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
#include "runtime/vframe.inline.hpp"
#include "runtime/vm_version.hpp"
#include "utilities/align.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/preserveException.hpp"
#include "utilities/utf8.hpp"
Expand Down Expand Up @@ -4711,7 +4712,7 @@ class UnsafeConstantsFixup : public FieldClosure {
UnsafeConstantsFixup() {
// round up values for all static final fields
_address_size = sizeof(void*);
_page_size = (int)os::vm_page_size();
_page_size = AIX_ONLY(sysconf(_SC_PAGESIZE)) NOT_AIX((int)os::vm_page_size());
_big_endian = LITTLE_ENDIAN_ONLY(false) BIG_ENDIAN_ONLY(true);
_use_unaligned_access = UseUnalignedAccesses;
_data_cache_line_flush_size = (int)VM_Version::data_cache_line_flush_size();
Expand Down

3 comments on commit fdac6a6

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@backwaterred
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on fdac6a6 Aug 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@backwaterred the backport was successfully created on the branch backwaterred-backport-fdac6a6a in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit fdac6a6a from the openjdk/jdk repository.

The commit being backported was authored by Tyler Steele on 18 Aug 2023 and was reviewed by Christoph Langer and Thomas Stuefe.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git backwaterred-backport-fdac6a6a:backwaterred-backport-fdac6a6a
$ git checkout backwaterred-backport-fdac6a6a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git backwaterred-backport-fdac6a6a

Please sign in to comment.