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

Commit 81df9bff authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds
Browse files

bootmem: fix wrong call parameter for free_bootmem() 



It is strange that alloc_bootmem() returns a virtual address and
free_bootmem() requires a physical address.  Anyway, free_bootmem()'s
first parameter should be physical address.

There are some call sites for free_bootmem() with virtual address.  So fix
them.

[akpm@linux-foundation.org: improve free_bootmem() and free_bootmem_pate() documentation]
Signed-off-by: default avatarJoonsoo Kim <js1304@gmail.com>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e9b2e78c

arch/powerpc/platforms/cell/celleb_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -401,11 +401,11 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node, 
	} else {

		if (config && *config) {

			size = 256;

			free_bootmem((unsigned long)(*config), size);

			free_bootmem(__pa(*config), size);

		}

		if (res && *res) {

			size = sizeof(struct celleb_pci_resource);

			free_bootmem((unsigned long)(*res), size);

			free_bootmem(__pa(*res), size);

		}

	}

drivers/macintosh/smu.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ int __init smu_init (void) 
fail_db_node:

	of_node_put(smu->db_node);

fail_bootmem:

	free_bootmem((unsigned long)smu, sizeof(struct smu_device));

	free_bootmem(__pa(smu), sizeof(struct smu_device));

	smu = NULL;

fail_np:

	of_node_put(np);

include/linux/bootmem.h

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ extern unsigned long free_all_bootmem(void); 
extern void free_bootmem_node(pg_data_t *pgdat,

			      unsigned long addr,

			      unsigned long size);

extern void free_bootmem(unsigned long addr, unsigned long size);

extern void free_bootmem_late(unsigned long addr, unsigned long size);

extern void free_bootmem(unsigned long physaddr, unsigned long size);

extern void free_bootmem_late(unsigned long physaddr, unsigned long size);



/*

 * Flags for reserve_bootmem (also if CONFIG_HAVE_ARCH_BOOTMEM_NODE,

lib/cpumask.c

+1 −1
Original line number Diff line number Diff line
@@ -161,6 +161,6 @@ EXPORT_SYMBOL(free_cpumask_var); 
 */

void __init free_bootmem_cpumask_var(cpumask_var_t mask)

{

	free_bootmem((unsigned long)mask, cpumask_size());

	free_bootmem(__pa(mask), cpumask_size());

}

#endif

mm/bootmem.c

+10 −10
Original line number Diff line number Diff line
@@ -147,21 +147,21 @@ unsigned long __init init_bootmem(unsigned long start, unsigned long pages) 


/*

 * free_bootmem_late - free bootmem pages directly to page allocator

 * @addr: starting address of the range

 * @addr: starting physical address of the range

 * @size: size of the range in bytes

 *

 * This is only useful when the bootmem allocator has already been torn

 * down, but we are still initializing the system.  Pages are given directly

 * to the page allocator, no bootmem metadata is updated because it is gone.

 */

void __init free_bootmem_late(unsigned long addr, unsigned long size)

void __init free_bootmem_late(unsigned long physaddr, unsigned long size)

{

	unsigned long cursor, end;



	kmemleak_free_part(__va(addr), size);

	kmemleak_free_part(__va(physaddr), size);



	cursor = PFN_UP(addr);

	end = PFN_DOWN(addr + size);

	cursor = PFN_UP(physaddr);

	end = PFN_DOWN(physaddr + size);



	for (; cursor < end; cursor++) {

		__free_pages_bootmem(pfn_to_page(cursor), 0);
@@ -377,21 +377,21 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, 


/**

 * free_bootmem - mark a page range as usable

 * @addr: starting address of the range

 * @addr: starting physical address of the range

 * @size: size of the range in bytes

 *

 * Partial pages will be considered reserved and left as they are.

 *

 * The range must be contiguous but may span node boundaries.

 */

void __init free_bootmem(unsigned long addr, unsigned long size)

void __init free_bootmem(unsigned long physaddr, unsigned long size)

{

	unsigned long start, end;



	kmemleak_free_part(__va(addr), size);

	kmemleak_free_part(__va(physaddr), size);



	start = PFN_UP(addr);

	end = PFN_DOWN(addr + size);

	start = PFN_UP(physaddr);

	end = PFN_DOWN(physaddr + size);



	mark_bootmem(start, end, 0, 0);

}