diff options
| author | Nadav Amit <namit@vmware.com> | 2018-09-20 10:30:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-25 20:11:42 +0200 |
| commit | 25acbdd7e76158099dd9768cdd8ffdeaf2dcb021 (patch) | |
| tree | d5b9d2491db322f41d169da6ec7877da95310ff2 /drivers/misc | |
| parent | 8fa3c61a79868ad3529f1dc61709a4c46adab467 (diff) | |
vmw_balloon: rename VMW_BALLOON_2M_SHIFT to VMW_BALLOON_2M_ORDER
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/vmw_balloon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 4e067d269706..626abe65eddb 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -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) /* @@ -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; } @@ -387,7 +387,7 @@ 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); } @@ -395,7 +395,7 @@ static struct page *vmballoon_alloc_page(bool is_2m_page) 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); } |