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

Commit 3cbc8565 authored by Tejun Heo's avatar Tejun Heo
Browse files

percpu: add @align to pcpu_fc_alloc_fn_t 



pcpu_fc_alloc_fn_t is about to see more interesting usage, add @align
parameter.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 1d9d3257

arch/x86/kernel/setup_percpu.c

+2 −2
Original line number Diff line number Diff line
@@ -126,9 +126,9 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, 
/*

 * Helpers for first chunk memory allocation

 */

static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size)

static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)

{

	return pcpu_alloc_bootmem(cpu, size, size);

	return pcpu_alloc_bootmem(cpu, size, align);

}



static void __init pcpu_fc_free(void *ptr, size_t size)

include/linux/percpu.h

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ extern const char *pcpu_fc_names[PCPU_FC_NR]; 


extern enum pcpu_fc pcpu_chosen_fc;



typedef void * (*pcpu_fc_alloc_fn_t)(unsigned int cpu, size_t size);

typedef void * (*pcpu_fc_alloc_fn_t)(unsigned int cpu, size_t size,

				     size_t align);

typedef void (*pcpu_fc_free_fn_t)(void *ptr, size_t size);

typedef void (*pcpu_fc_populate_pte_fn_t)(unsigned long addr);

typedef int (pcpu_fc_cpu_distance_fn_t)(unsigned int from, unsigned int to);

mm/percpu.c

+2 −2
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ ssize_t __init pcpu_page_first_chunk(size_t reserved_size, 
		for (i = 0; i < unit_pages; i++) {

			void *ptr;



			ptr = alloc_fn(cpu, PAGE_SIZE);

			ptr = alloc_fn(cpu, PAGE_SIZE, PAGE_SIZE);

			if (!ptr) {

				pr_warning("PERCPU: failed to allocate %s page "

					   "for cpu%u\n", psize_str, cpu);
@@ -1888,7 +1888,7 @@ ssize_t __init pcpu_lpage_first_chunk(size_t reserved_size, size_t dyn_size, 
				goto found;

		continue;

	found:

		ptr = alloc_fn(cpu, lpage_size);

		ptr = alloc_fn(cpu, lpage_size, lpage_size);

		if (!ptr) {

			pr_warning("PERCPU: failed to allocate large page "

				   "for cpu%u\n", cpu);