Changeset b1c57a8 in mainline for kernel/arch/amd64/src

Timestamp:

2014-10-09T15:03:55Z (11 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.

Location:

kernel/arch/amd64/src

Files:

• amd64.c (modified) (1 diff)
• cpu/cpu.c (modified) (1 diff)
• interrupt.c (modified) (3 diffs)
• smp/smp_call.c (added)

kernel/arch/amd64/src/amd64.c

@@ -168 +168 @@
 }
 
-void arch_post_cpu_init()
+void arch_post_cpu_init(void)
 {
 #ifdef CONFIG_SMP

kernel/arch/amd64/src/cpu/cpu.c

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

kernel/arch/amd64/src/interrupt.c

@@ -55 +55 @@
 #include <symtab.h>
 #include <stacktrace.h>
+#include <smp/smp_call.h>
 
 /*
@@ -161 +162 @@
         trap_virtual_eoi();
         tlb_shootdown_ipi_recv();
+}
+
+static void arch_smp_call_ipi_recv(unsigned int n, istate_t *istate)
+{
+        trap_virtual_eoi();
+        smp_call_ipi_recv();
 }
 #endif
@@ -224 +231 @@
         exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true,
             (iroutine_t) tlb_shootdown_ipi);
+        exc_register(VECTOR_SMP_CALL_IPI, "smp_call", true, 
+                (iroutine_t) arch_smp_call_ipi_recv);
 #endif
 }