Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a1198d authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: mem-offline: Update end pfn calculation"

parents 9a7f4ba8 d75bf42d

arch/arm64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static int arm64_online_page(struct page *page) 
{

	unsigned long phy_addr = page_to_phys(page);



	if (phy_addr + PAGE_SIZE >= bootloader_memory_limit)

	if (phy_addr + PAGE_SIZE > bootloader_memory_limit)

		return -EINVAL;



	__online_page_set_limits(page);

drivers/soc/qcom/mem-offline.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int mem_event_callback(struct notifier_block *self, 
static int mem_online_remaining_blocks(void)

{

	unsigned long memblock_end_pfn = __phys_to_pfn(memblock_end_of_DRAM());

	unsigned long ram_end_pfn = __phys_to_pfn(bootloader_memory_limit);

	unsigned long ram_end_pfn = __phys_to_pfn(bootloader_memory_limit - 1);

	unsigned long block_size, memblock, pfn;

	unsigned int nid;

	phys_addr_t phys_addr;