diff --git a/[refs] b/[refs] index 9275c639cade..2936f70bf478 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24eeb568aeeaee771b9f0a6fd6f5d01040a887da +refs/heads/master: e1ed81ab7a34fc0f92f2e200825bdb6d86d6c8ef diff --git a/trunk/arch/ia64/kernel/setup.c b/trunk/arch/ia64/kernel/setup.c index 88043841fb8a..b7e6b4cb374b 100644 --- a/trunk/arch/ia64/kernel/setup.c +++ b/trunk/arch/ia64/kernel/setup.c @@ -512,13 +512,13 @@ show_cpuinfo (struct seq_file *m, void *v) c->itc_freq / 1000000, c->itc_freq % 1000000, lpj*HZ/500000, (lpj*HZ/5000) % 100); #ifdef CONFIG_SMP + seq_printf(m, "siblings : %u\n", c->num_log); if (c->threads_per_core > 1 || c->cores_per_socket > 1) seq_printf(m, "physical id: %u\n" "core id : %u\n" "thread id : %u\n", c->socket_id, c->core_id, c->thread_id); - seq_printf(m, "siblings : %u\n", c->num_log); #endif seq_printf(m,"\n");