Skip to content

Conversation

@hoopoepg
Copy link
Contributor

  • due to some refactoring and adding new functionality compilation
    of ikrit module was broken
  • this commit restores compilation

backport from #6979

Signed-off-by: Sergey Oblomov sergeyo@mellanox.com
(cherry picked from commit 991082a)

- due to some refactoring and adding new functionality compilation
  of ikrit module was broken
- this commit restores compilation

Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com>
(cherry picked from commit 991082a)
@hoopoepg hoopoepg changed the title IKRIT: restored compilation IKRIT: restored compilation - v4.0 Sep 23, 2019
@hoopoepg hoopoepg added this to the v4.0.2 milestone Sep 23, 2019
#define MEMHEAP_BASE_PAGE_ORDER 21
#define MEMHEAP_BASE_PRIVATE_SIZE (1ULL << MEMHEAP_BASE_PAGE_ORDER) /* should be at least the same as a huge page size */
#define MEMHEAP_BASE_MIN_SIZE (1ULL << MEMHEAP_BASE_PAGE_ORDER) /* must fit into at least one huge page */
#define MEMHEAP_BASE_MIN_SIZE (1ULL << MEMHEAP_BASE_PAGE_ORDER) /* must fit into at least one huge page */
Copy link
Member

Choose a reason for hiding this comment

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

I realize that this is a cherry-pick from master and therefore we can't really fix this here, but can you please try to avoid spurious whitespace changes in commits that contain code/logic changes in the future?

Whitespace-only changes are fine, but please fix those in a separate commit that has no other code/logic changes. Doing it this way just makes it easier to see code/logic fixes (which is the important stuff).

Thanks.

@gpaulsen gpaulsen merged commit 9f4b7ba into open-mpi:v4.0.x Sep 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants