Skip to content

Commit

Permalink
x86, percpu: fix minor bugs in setup_percpu.c
Browse files Browse the repository at this point in the history
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: Tejun Heo <tj@kernel.org>
Reported-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Tejun Heo committed Feb 25, 2009
1 parent 0edcf8d commit 24ff954
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/x86/kernel/setup_percpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 24ff954

Please sign in to comment.