Skip to content

L
linux
Commit 6ff5815e authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Fix printk type warning (mpc_cpufeature is long)

parent 53a22115
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
arch/i386/kernel/mpparse.c
View file @ 6ff5815e
...@@ -109,13 +109,13 @@ void __init MP_processor_info (struct mpc_config_processor *m) ...@@ -109,13 +109,13 @@ void __init MP_processor_info (struct mpc_config_processor *m)
quad = translation_table[mpc_record]->trans_quad; quad = translation_table[mpc_record]->trans_quad;
logical_apicid = (quad << 4) + logical_apicid = (quad << 4) +
(m->mpc_apicid ? m->mpc_apicid << 1 : 1); (m->mpc_apicid ? m->mpc_apicid << 1 : 1);
printk("Processor #%d %d:%d APIC version %d (quad %d, apic %d)\n", printk("Processor #%d %ld:%ld APIC version %d (quad %d, apic %d)\n",
m->mpc_apicid, m->mpc_apicid,
(m->mpc_cpufeature & CPU_FAMILY_MASK)>>8, (m->mpc_cpufeature & CPU_FAMILY_MASK)>>8,
(m->mpc_cpufeature & CPU_MODEL_MASK)>>4, (m->mpc_cpufeature & CPU_MODEL_MASK)>>4,
m->mpc_apicver, quad, logical_apicid); m->mpc_apicver, quad, logical_apicid);
} else { } else {
printk("Processor #%d %d:%d APIC version %d\n", printk("Processor #%d %ld:%ld APIC version %d\n",
m->mpc_apicid, m->mpc_apicid,
(m->mpc_cpufeature & CPU_FAMILY_MASK)>>8, (m->mpc_cpufeature & CPU_FAMILY_MASK)>>8,
(m->mpc_cpufeature & CPU_MODEL_MASK)>>4, (m->mpc_cpufeature & CPU_MODEL_MASK)>>4,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7