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

Commit 24ff9542 authored by Tejun Heo's avatar Tejun Heo
Browse files

x86, percpu: fix minor bugs in setup_percpu.c 



Recent changes in setup_percpu.c made a now meaningless DBG()
statement fail to compile and introduced a
comparison-of-different-types warning.  Fix them.

Compile failure is reported by Ingo Molnar.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0edcf8d6

arch/x86/kernel/setup_percpu.c

+1 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static ssize_t __init setup_pcpu_embed(size_t static_size) 


	/* allocate and copy */

	pcpue_unit_size = PFN_ALIGN(static_size + PERCPU_DYNAMIC_RESERVE);

	pcpue_unit_size = max(pcpue_unit_size, PCPU_MIN_UNIT_SIZE);

	pcpue_unit_size = max_t(size_t, pcpue_unit_size, PCPU_MIN_UNIT_SIZE);

	pcpue_ptr = pcpu_alloc_bootmem(0, num_possible_cpus() * pcpue_unit_size,

				       PAGE_SIZE);

	if (!pcpue_ptr)
@@ -438,8 +438,6 @@ void __init setup_per_cpu_areas(void) 
		 */

		if (cpu == boot_cpu_id)

			switch_to_new_gdt(cpu);



		DBG("PERCPU: cpu %4d %p\n", cpu, ptr);

	}



	/* indicate the early static arrays will soon be gone */