Merge tag 'iwlwifi-for-kalle-2015-01-05' of https://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 7c5d87191b286a1275f43ef380d7cc0d9db6b43b..85be040a21c80505c09183c1578eb9c15f524244 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -228,8 +228,8 @@ memory_block_action(unsigned long phys_index, unsigned long action, int online_t
        struct page *first_page;
        int ret;
 
-       first_page = pfn_to_page(phys_index << PFN_SECTION_SHIFT);
-       start_pfn = page_to_pfn(first_page);
+       start_pfn = phys_index << PFN_SECTION_SHIFT;
+       first_page = pfn_to_page(start_pfn);
 
        switch (action) {
                case MEM_ONLINE: