Changeset b1c57a8 in mainline for kernel/arch/ia32/src/cpu/cpu.c

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

• kernel/arch/ia32/src/cpu/cpu.c (modified) (1 diff)

kernel/arch/ia32/src/cpu/cpu.c

@@ -160 +160 @@
 void cpu_print_report(cpu_t* cpu)
 {
-        printf("cpu%u: (%s family=%u model=%u stepping=%u) %" PRIu16 " MHz\n",
-                cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
-                cpu->arch.model, cpu->arch.stepping, cpu->frequency_mhz);
+        printf("cpu%u: (%s family=%u model=%u stepping=%u apicid=%u) %" PRIu16 
+                " MHz\n", cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
+                cpu->arch.model, cpu->arch.stepping, cpu->arch.id, cpu->frequency_mhz);
 }