Skip to content

Commit

Permalink
vmw_balloon: rename VMW_BALLOON_2M_SHIFT to VMW_BALLOON_2M_ORDER
Browse files Browse the repository at this point in the history
The name of the macro'd VMW_BALLOON_2M_SHIFT is misleading. The value
reflects 2M huge-page order. Unfortunately, we cannot use
HPAGE_PMD_ORDER, since it is not defined when transparent huge-pages are
off, so we need to define our own one.

Rename it to VMW_BALLOON_2M_ORDER. No functional change.

Signed-off-by: Nadav Amit <namit@vmware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Nadav Amit authored and Greg Kroah-Hartman committed Sep 25, 2018
1 parent 8fa3c61 commit 25acbdd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/misc/vmw_balloon.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ enum vmwballoon_capabilities {
| VMW_BALLOON_BATCHED_2M_CMDS \
| VMW_BALLOON_SIGNALLED_WAKEUP_CMD)

#define VMW_BALLOON_2M_SHIFT (9)
#define VMW_BALLOON_2M_ORDER (PMD_SHIFT - PAGE_SHIFT)
#define VMW_BALLOON_NUM_PAGE_SIZES (2)

/*
Expand Down Expand Up @@ -348,7 +348,7 @@ static bool vmballoon_send_guest_id(struct vmballoon *b)
static u16 vmballoon_page_size(bool is_2m_page)
{
if (is_2m_page)
return 1 << VMW_BALLOON_2M_SHIFT;
return 1 << VMW_BALLOON_2M_ORDER;

return 1;
}
Expand Down Expand Up @@ -387,15 +387,15 @@ static struct page *vmballoon_alloc_page(bool is_2m_page)
{
if (is_2m_page)
return alloc_pages(VMW_HUGE_PAGE_ALLOC_FLAGS,
VMW_BALLOON_2M_SHIFT);
VMW_BALLOON_2M_ORDER);

return alloc_page(VMW_PAGE_ALLOC_FLAGS);
}

static void vmballoon_free_page(struct page *page, bool is_2m_page)
{
if (is_2m_page)
__free_pages(page, VMW_BALLOON_2M_SHIFT);
__free_pages(page, VMW_BALLOON_2M_ORDER);
else
__free_page(page);
}
Expand Down

0 comments on commit 25acbdd

Please sign in to comment.